1.gradle升级到7.2。

app/build.gradle

@@ -122,7 +122,7 @@ dependencies {
 
     implementation project(':base')
     implementation project(path: ':update')
-    implementation project(path: ':alipay')
+//    implementation project(path: ':alipay')
 
 
     // addComponent 'umeng'

app/src/main/AndroidManifest.xml

@@ -85,6 +85,7 @@
         <activity
             android:name="com.zswc.creativity.activity.MainActivity"
             android:screenOrientation="portrait"
+            android:exported="true"
             android:windowSoftInputMode="adjustResize|adjustPan"
             android:theme="@style/FullScreenTheme" >
             <intent-filter >
@@ -159,7 +160,9 @@
             </intent-filter >
         </activity >
 
-        <activity android:name="com.zswc.creativity.activity.MsgActivity" >
+        <activity android:name="com.zswc.creativity.activity.MsgActivity"
+            android:exported="true"
+            >
             <intent-filter>
                 <action android:name="jpush.testAction" />
                 <category android:name="jpush.testCategory" />

app/src/main/java/com/zswc/creativity/activity/IntegralDetailsActivity.kt

@@ -22,7 +22,6 @@ import com.githang.statusbar.StatusBarCompat
 import com.hwangjr.rxbus.annotation.Subscribe
 import com.hwangjr.rxbus.annotation.Tag
 import com.qmuiteam.qmui.kotlin.onClick
-import com.quansu.alipay.componnent.CpAlipay
 import com.ysnows.base.utils.B
 import com.ysnows.base.utils.UiSwitch
 import com.ysnows.base.utils.UiUtils

app/src/main/java/com/zswc/creativity/activity/WebViewActivity.kt

@@ -26,8 +26,8 @@ open class WebViewActivity : MBActivity<BViewModel<BRepository>, ActivityWebview
             override fun shouldOverrideUrlLoading(view: WebView?, url: String?): Boolean {
                 Log.e("-shy-", "url=: " + url)
 
-                //发送消息--关闭
-                if (url!!.contains("https://cc.chuangchi.vip/order?orderId")) {
+                //发送消息--关闭 "https://cc.chuangchi.vip/order?orderId
+                if (url!!.contains("https://javawalletapi.chuangchi.vip/order?orderId")) {
 
                     var ss = url!!.split("?")
                     var s1 = ss[1].split("=")
@@ -52,7 +52,7 @@ open class WebViewActivity : MBActivity<BViewModel<BRepository>, ActivityWebview
                 super.onLoadResource(view, url)
 
                 //发送消息--关闭
-                if (url!!.contains("https://cc.chuangchi.vip/order?orderId")) {
+                if (url!!.contains("https://javawalletapi.chuangchi.vip/order?orderId")) {
 
                     var ss = url!!.split("?")
                     var s1 = ss[1].split("=")

app/src/main/java/com/zswc/creativity/adapter/ConsignOrderListFragmentAdapter.kt

@@ -33,7 +33,7 @@ class ConsignOrderListFragmentAdapter(val vm: ConsignOrderListFragmentVModel) :
                 holder.dataBinding?.imgCover?.visibility = View.GONE
 
             } else {
-                GlideUtils.lImg(context, item.proInfoObj.cover, 18,150, 150, holder.dataBinding?.imgCover)
+                GlideUtils.lImg(context, item.proInfoObj.cover, 18, holder.dataBinding?.imgCover)
                 holder.dataBinding?.imgCoverGif?.visibility = View.GONE
                 holder.dataBinding?.imgCover?.visibility = View.VISIBLE
 

app/src/main/java/com/zswc/creativity/adapter/HomeSaleAdapter.kt

@@ -25,16 +25,16 @@ class HomeSaleAdapter(val vm: HomeSaleVModel) : BAdapter<SellListBean, BaseDataB
         holder.dataBinding?.item = item
 
 
-        if (!TextUtils.isEmpty(item.cover)) {
-            var ss = item.cover.substring(item.cover.length - 3, item.cover.length);
+        if (!TextUtils.isEmpty(item.covers)) {
+            var ss = item.covers.substring(item.covers.length - 3, item.covers.length);
             if (ss == "gif" || ss == "GIF") {
-                GlideUtils.lImg(context, item.cover, holder.dataBinding?.imgCoverGif!!)
+                GlideUtils.lImg(context, item.covers, holder.dataBinding?.imgCoverGif!!)
                 holder.dataBinding?.imgCoverGif?.visibility= View.VISIBLE
                 holder.dataBinding?.imgCover?.visibility= View.GONE
 
             } else {
 
-                GlideUtils.lImg(context, item.cover, 12,200,200,holder.dataBinding?.imgCover!!)
+                GlideUtils.lImg(context, item.covers,12, holder.dataBinding?.imgCover!!)
                 holder.dataBinding?.imgCoverGif?.visibility= View.GONE
                 holder.dataBinding?.imgCover?.visibility= View.VISIBLE
 
@@ -44,7 +44,7 @@ class HomeSaleAdapter(val vm: HomeSaleVModel) : BAdapter<SellListBean, BaseDataB
             holder.dataBinding?.imgCover?.visibility= View.VISIBLE
         }
 
-        GlideUtils.lImg(context, item.cover, holder.dataBinding?.imgCover)
+//        GlideUtils.lImg(context, item.cover, holder.dataBinding?.imgCover)
 
         holder.dataBinding?.ll?.onClick {
             //寄售详情

app/src/main/java/com/zswc/creativity/model/SellListBean.kt

@@ -8,7 +8,7 @@ import com.ysnows.base.inter.IModel
  */
 data class SellListBean(
         var id:String,var orderNo:String,
-        var name:String,var cover:String,var memberName:String,
+        var name:String,var covers:String,var memberName:String,
         var memberHeadimg:String,var resalePrice:String,
         var proInfoObj:ProInfo?, var isBuy:Int
         ):IModel {

app/src/main/res/layout/item_consignorder_list.xml

@@ -62,14 +62,13 @@
 <!--                    app:qmui_border_color="@color/translucent"-->
 <!--                    app:qmui_corner_radius="18dp" />-->
 
-                <com.zswc.creativity.view.AspectRatioImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/img_cover"
                     android:src="@drawable/bg_need_error"
-                    android:scaleType="fitCenter"
+                    android:scaleType="centerInside"
                     android:layout_width="100dp"
                     android:layout_height="100dp"
                     android:layout_gravity="center"
-
                     />
 
 

app/src/main/res/layout/item_home_sale.xml

@@ -52,36 +52,42 @@
                     android:orientation="vertical">
 
 
-                    <androidx.appcompat.widget.AppCompatImageView
-                        android:id="@+id/img_cover_gif"
+                    <FrameLayout
                         android:layout_width="match_parent"
-                        android:layout_height="139dp"
-                        android:scaleType="fitXY"
-                        android:visibility="gone"
-                        android:adjustViewBounds="true"
-                        android:src="@drawable/bg_need_error"
-                        />
-
-
-                    <com.zswc.creativity.view.AspectRatioImageView
-                        android:id="@+id/img_cover"
-                        android:src="@drawable/bg_need_error"
-                        android:layout_height="139dp"
-                        android:layout_width="wrap_content"
-                        android:scaleType="fitCenter"
-                        android:layout_gravity="center"
+                        android:layout_height="140dp">
+
 
-                        />
+                        <androidx.appcompat.widget.AppCompatImageView
+                            android:id="@+id/img_cover_gif"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:adjustViewBounds="true"
+                            android:scaleType="fitXY"
+                            android:src="@drawable/bg_need_error"
+                            android:visibility="gone" />
 
-<!--                    <com.qmuiteam.qmui.widget.QMUIRadiusImageView-->
-<!--                        android:id="@+id/img_cover"-->
-<!--                        android:layout_width="match_parent"-->
-<!--                        android:layout_height="139dp"-->
-<!--                        android:src="@drawable/bg_need_error"-->
-<!--                        app:qmui_border_color="@color/translucent"-->
-<!--                        app:qmui_corner_radius="12dp"-->
-<!--                        android:scaleType="fitXY"-->
-<!--                       />-->
+
+                        <androidx.appcompat.widget.AppCompatImageView
+                            android:id="@+id/img_cover"
+                            android:src="@drawable/bg_need_error"
+                            android:layout_height="match_parent"
+                            android:layout_width="match_parent"
+                            android:scaleType="centerInside"
+                            android:layout_gravity="center"
+                            />
+
+
+                    </FrameLayout>
+
+                    <!--                    <com.qmuiteam.qmui.widget.QMUIRadiusImageView-->
+                    <!--                        android:id="@+id/img_cover"-->
+                    <!--                        android:layout_width="match_parent"-->
+                    <!--                        android:layout_height="139dp"-->
+                    <!--                        android:src="@drawable/bg_need_error"-->
+                    <!--                        app:qmui_border_color="@color/translucent"-->
+                    <!--                        app:qmui_corner_radius="12dp"-->
+                    <!--                        android:scaleType="fitXY"-->
+                    <!--                       />-->
 
 
                     <TextView
@@ -155,26 +161,25 @@
                     android:id="@+id/ll_lock"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:visibility="@{item.isBuy==1?View.VISIBLE:View.GONE}"
-                    android:orientation="vertical"
                     android:gravity="center"
+                    android:orientation="vertical"
+                    android:visibility="@{item.isBuy==1?View.VISIBLE:View.GONE}"
                     app:qmui_backgroundColor="#66000000"
                     app:qmui_borderColor="@color/translucent"
-                    app:qmui_radius="12dp"
-                    >
+                    app:qmui_radius="12dp">
 
                     <ImageView
-                        android:src="@drawable/ct_lock"
                         android:layout_width="26dp"
-                        android:layout_height="26dp"/>
+                        android:layout_height="26dp"
+                        android:src="@drawable/ct_lock" />
 
                     <TextView
-                        android:text="用户支付中"
-                        android:textSize="12sp"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/dp_11"
+                        android:text="用户支付中"
                         android:textColor="@color/white"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"/>
+                        android:textSize="12sp" />
 
                 </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 

app/src/main/res/layout/item_my_collect.xml

@@ -61,25 +61,27 @@
                 />
 
 
-
             <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
                 android:layout_width="wrap_content"
-                android:paddingStart="12dp"
-                android:paddingEnd="12dp"
+                android:paddingStart="20dp"
+                android:paddingEnd="20dp"
                 android:paddingTop="3dp"
                 android:visibility="@{item.resaleStatus==2?View.VISIBLE:View.GONE}"
                 android:paddingBottom="2dp"
                 android:text="寄售中"
                 android:textColor="@color/white"
                 android:layout_gravity="center"
+                android:layout_marginBottom="40dp"
                 android:layout_marginTop="40dp"
-                android:textSize="10sp"
+                android:textSize="12sp"
                 app:qmui_radius="11dp"
                 app:qmui_backgroundColor="#66000000"
                 app:qmui_borderColor="@color/translucent"
                 android:layout_height="wrap_content"/>
 
 
+
+
         </FrameLayout>
 
 

build.gradle

@@ -28,7 +28,7 @@ buildscript {
     }
 
     dependencies {
-         classpath 'com.android.tools.build:gradle:4.2.1'
+        classpath 'com.android.tools.build:gradle:7.1.3'
         classpath 'com.billy.android:cc-register:1.1.2'
 
         // NOTE: Do not place your application dependencies here; they belong

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip

settings.gradle

@@ -2,8 +2,8 @@
 //include ':umeng'
 include ':update'
 //include ':gaode'
-include ':lookimg'
-include ':alipay'
+//include ':lookimg'
+//include ':alipay'
 
 include ':app',':base'