1.升级gradle和kotln。

app/src/main/java/com/quansu/heifengwuliu/activity/HomeActivity.kt

@@ -10,6 +10,7 @@ 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.heifengwuliu.BuildConfig
 import com.quansu.heifengwuliu.R
 import com.quansu.heifengwuliu.base.MBActivity
 import com.quansu.heifengwuliu.config.ConfigRx

app/src/main/java/com/quansu/heifengwuliu/config/Config.kt

@@ -1,5 +1,6 @@
 package com.quansu.heifengwuliu.config
 
+import com.quansu.heifengwuliu.BuildConfig
 import com.ysnows.base.config.IConfig
 
 class Config : IConfig {
@@ -76,4 +77,16 @@ class Config : IConfig {
     override fun keyName(): String {
        return "actime"
     }
+    /**
+     * 获取版本号
+     */
+    override fun getVersionCode(): Int? {
+        return BuildConfig.VERSION_CODE;
+    }
+    /**
+     * 获取版本名
+     */
+    override fun getVersionName(): String? {
+        return BuildConfig.VERSION_NAME;
+    }
 }

app/src/main/java/com/quansu/heifengwuliu/utils/LoadEngin.kt

@@ -19,7 +19,20 @@ import java.io.File
 
 
     override fun loadImage(context: Context, url: String, imageView: ImageView) {
-        imageView.load(url)
+       // imageView.load(url)
+        if(url.contains("content://")){
+            imageView.load(url) {
+                crossfade(true)
+                placeholder(R.drawable.picture_image_placeholder)
+                transformations(CircleCropTransformation())
+            }
+
+        }else{
+            imageView.load(File(url))
+
+        }
+
+
         Log.e("-shy-", "url1=: "+url )
 
     }

app/src/main/java/com/quansu/heifengwuliu/utils/OssUtils.kt

@@ -65,7 +65,9 @@ class OssUtils(var bView: BView, val vm: BViewModel<*>) {
 
                 val qmuiProgressDialog = arrayOfNulls<QMUIProgressDialog>(1)
                 qmuiProgressDialog[0] = QMUIProgressDialog()
-                qmuiProgressDialog[0]!!.show(bView!!.context())
+                if(null!=bView?.context()) {
+                    qmuiProgressDialog[0]!!.show(bView!!.context())
+                }
 
                 val spe = "android/" + RandomUtils.getRandomOfLetter(1).toString() + "/"
                 for (i in urls.indices) {
@@ -109,7 +111,9 @@ class OssUtils(var bView: BView, val vm: BViewModel<*>) {
                             Log.e("-shy-", "onError: $e")
                             size[0]--
                             if (size[0] <= 0) {
-                                qmuiProgressDialog[0]!!.dismiss()
+                               if(null!=bView?.context()) {
+                                   qmuiProgressDialog[0]!!.dismiss()
+                               }
                             }
                         }
 
@@ -118,8 +122,9 @@ class OssUtils(var bView: BView, val vm: BViewModel<*>) {
                             onUploadListener.onUploadSuccess(arr[id]!!.key + "," + imageSign.host + arr[id]!!.key)
                             size[0]--
                             if (size[0] <= 0) {
-
-                                qmuiProgressDialog[0]!!.dismiss()
+                                if(null!=bView?.context()) {
+                                    qmuiProgressDialog[0]!!.dismiss()
+                                }
                             }
                         }
                     })

base/src/main/java/com/ysnows/base/config/IConPackage.kt

@@ -0,0 +1,8 @@
+package com.ysnows.base.config
+
+ interface IConPackage {
+
+    fun getVersionName(): String?
+    fun getVersionCode(): Int?
+
+}

base/src/main/java/com/ysnows/base/config/IConfig.java

@@ -1,6 +1,6 @@
 package com.ysnows.base.config;
 
-public interface IConfig extends ApiConfig,IConfigBugly, IConfigOss,IConfigUmeng,IConfigLocation,IConfigPublicKey {
+public interface IConfig extends ApiConfig,IConfigBugly, IConfigOss,IConfigUmeng,IConfigLocation,IConfigPublicKey,IConPackage {
 
 
 

base/src/main/java/com/ysnows/base/net/BHeaderInterceptor.java

@@ -3,7 +3,7 @@ package com.ysnows.base.net;
 import android.os.Build;
 
 import com.tencent.mmkv.MMKV;
-import com.ysnows.base.BuildConfig;
+import com.ysnows.base.base.BApp;
 
 import java.io.IOException;
 
@@ -16,7 +16,7 @@ public class BHeaderInterceptor implements Interceptor {
     public Response intercept(Chain chain) throws IOException {
 
         Request request = chain.request().newBuilder()
-                .addHeader("User-Agent", "type/android;app_version_code/" + BuildConfig.VERSION_CODE + ";app_version_name/" + BuildConfig.VERSION_NAME + ";phone_brand/" + Build.BRAND + ";phone_model/" + Build.MODEL + ";system_version_code/" + Build.VERSION.SDK_INT + ";system_version_name/" + Build.VERSION.RELEASE)
+                .addHeader("User-Agent", "type/android;app_version_code/" +  BApp.instance().config().getVersionCode() + ";app_version_name/" +  BApp.instance().config().getVersionName() + ";phone_brand/" + Build.BRAND + ";phone_model/" + Build.MODEL + ";system_version_code/" + Build.VERSION.SDK_INT + ";system_version_name/" + Build.VERSION.RELEASE)
                 .addHeader("Content-Type", "application/json")
                 .addHeader("X-TOKEN", MMKV.defaultMMKV().decodeString("token", ""))
                 .build();

build.gradle

@@ -2,7 +2,7 @@
 
 buildscript {
 
-    ext.kotlin_version = '1.4.0'
+    ext.kotlin_version = '1.4.20'
 
     ext.roomVersion = '2.2.5'
     ext.archLifecycleVersion = '2.2.0'
@@ -27,7 +27,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.1'
         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.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip