云信SDK升级到8.11.5

app/build.gradle

@@ -220,14 +220,6 @@ dependencies {
     annotationProcessor "org.projectlombok:lombok:${Lombok}"
     implementation 'nl.dionsegijn:konfetti:1.1.2'
 
-    // 华为推送
-//    api(name: 'base-2.6.1.301', ext: 'aar')
-//    api(name: 'push-2.6.1.301', ext: 'aar')
-    // 魅族推送
-    implementation 'com.meizu.flyme.internet:push-internal:3.9.0@aar'
-    // vivo推送
-    implementation files("libs/vivo_pushsdk-v2.9.0.0.aar")
-
     //阿里云实名认证
     api(name: 'rpsdk-4.13.1-open', ext: 'aar')
     api(name: 'MiddleTierSDK-external-release-5.5.13874142', ext: 'aar')
@@ -252,14 +244,22 @@ dependencies {
     implementation 'io.github.yidun:quicklogin:3.1.5'
 
     implementation 'com.github.fodroid:XRadioGroup:v1.5'
-    implementation files('libs/msa_mdid_1.0.13.aar')
-    implementation 'com.huawei.hms:push:4.0.4.301'
-    implementation fileTree(dir: 'libs', include: ['oppo-mcssdk-2.0.2.jar'])
 
     implementation files('libs/humesdk-1.0.0.aar')
 
     implementation(name: 'SudMGP-v1.1.32.200', ext: 'aar')
 
+    // 魅族推送
+    implementation 'com.meizu.flyme.internet:push-internal:3.9.0@aar'
+    // vivo推送
+    implementation files("libs/vivo_pushsdk_v3.0.0.0_480.aar")
+    //魅族推送
+    implementation files('libs/msa_mdid_1.0.13.aar')
+    //华为推送
+    implementation 'com.huawei.hms:push:5.3.0.304'
+    //oppo推送
+    implementation files("libs/com.heytap.msp-push-2.1.0.aar")
+
     // xplan flutter module
     if (useFlutterAar) {
         implementation 'com.mango.flutter.xplan:flutter_release:1.0'

app/src/main/java/com/yizhuan/erban/application/XChatApplication.java

@@ -34,7 +34,6 @@ import android.util.Log;
 import androidx.multidex.MultiDex;
 
 import com.alibaba.security.realidentity.RPVerify;
-import com.alibaba.security.rp.RPSDK;
 import com.bumptech.glide.request.target.ViewTarget;
 import com.bytedance.hume.readapk.HumeSDK;
 import com.coorchice.library.utils.LogUtils;

app/src/module_community/java/com/yizhuan/erban/community/photo/DynamicImageAdapter.java

@@ -10,7 +10,6 @@ import android.widget.ImageView;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.heytap.mcssdk.utils.LogUtil;
 import com.yizhuan.erban.R;
 import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2;
 import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;
@@ -74,6 +73,5 @@ public class DynamicImageAdapter extends BaseQuickAdapter<DynamicMedia, BaseView
                     break;
             }
         }
-        LogUtil.d("layoutParams=" +layoutParams.height);
     }
 }

build.gradle

@@ -38,13 +38,6 @@ allprojects {
         maven { url "https://mvn.mob.com/android" }
         maven { url 'https://repo1.maven.org/maven2/' }
         maven { url 'https://developer.huawei.com/repo/' }
-        maven(){
-            url 'https://sdk-repository.wujiehh.com/repository/WJHD/'
-            credentials {
-                username = 'wjhd'
-                password = 'WV9#i%C3e@p$jtPyU*ds^VUp317koE1Y'
-            }
-        }
     }
     //网络慢的话就去 https://maven.aliyun.com/mvn/view 里面找个代理的仓库。
 }

nim_uikit/build.gradle

@@ -3,8 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion '30.0.3'
+    compileSdkVersion 29
 
     defaultConfig {
         minSdkVersion 21
@@ -38,13 +37,17 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
 }
 
 def overscroll_android = "1.0.4"
 def base_recyclerview_helper = "2.9.49-androidx"
 def ShortcutBadger = "1.1.17"
 def GlideTransformationsVersion = "3.0.1"
-def NimNetVersion = "7.9.0"
+def NimNetVersion = "8.11.5"
 def glideVersion = "4.11.0"
 
 dependencies {
@@ -62,7 +65,7 @@ dependencies {
     api "com.netease.nimlib:lucene:${NimNetVersion}"
     // 小米、华为、魅族、fcm 推送
     api "com.netease.nimlib:push:${NimNetVersion}"
-    api "com.alibaba:fastjson:1.2.35"
+    api "com.alibaba:fastjson:1.2.41"
 
     annotationProcessor "com.github.bumptech.glide:compiler:${glideVersion}"