From 5ab59dd60f8e3f70020a18305785f0e965107cd6 Mon Sep 17 00:00:00 2001
From: huangjian <huangjian@xuanyinyy.com>
Date: Tue, 5 Jan 2021 11:51:57 +0800
Subject: [PATCH] =?UTF-8?q?1.=E9=83=A8=E5=88=86SDK=E6=9B=B4=E6=96=B0=202.?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96=E6=95=B4=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 android_crop_lib/build.gradle                 |  2 +-
 app/build.gradle                              | 15 ++------
 .../java/com/yizhuan/erban/MainActivity.java  |  1 +
 .../ui/webview/CommonWebViewActivity.java     |  9 -----
 .../main/res/layout/fragment_dialog_web.xml   |  2 +-
 build.gradle                                  |  2 +-
 core/build.gradle                             |  9 ++---
 gradle.properties                             |  1 -
 library/build.gradle                          | 34 +++++++++++--------
 nim_uikit/build.gradle                        |  9 ++---
 10 files changed, 32 insertions(+), 52 deletions(-)

diff --git a/android_crop_lib/build.gradle b/android_crop_lib/build.gradle
index bac08935a..17b97a7a0 100644
--- a/android_crop_lib/build.gradle
+++ b/android_crop_lib/build.gradle
@@ -25,7 +25,7 @@ android {
 dependencies {
     api 'androidx.annotation:annotation:1.1.0'
     api 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation "androidx.core:core-ktx:+"
+    implementation "androidx.core:core-ktx:1.3.2"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 repositories {
diff --git a/app/build.gradle b/app/build.gradle
index 65cb3ed2d..776df8632 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -189,20 +189,13 @@ android {
 
 }
 
-def supportLibraryVersion = "27.1.1"
 def Lombok = "1.16.20"
 
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
+    testImplementation 'junit:junit:4.13.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 
-    api 'androidx.recyclerview:recyclerview:1.1.0'
-    api 'androidx.cardview:cardview:1.0.0'
-    api 'androidx.gridlayout:gridlayout:1.0.0'
     api 'androidx.multidex:multidex:2.0.1'
 
     debugApi "com.squareup.leakcanary:leakcanary-android:1.6.3"
@@ -245,7 +238,6 @@ dependencies {
 
     compileOnly "org.projectlombok:lombok:${Lombok}"
     annotationProcessor "org.projectlombok:lombok:${Lombok}"
-    api 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     implementation 'nl.dionsegijn:konfetti:1.1.2'
 
     // 华为推送
@@ -288,9 +280,6 @@ dependencies {
 
     implementation 'com.github.fodroid:XRadioGroup:v1.5'
     implementation files('libs/msa_mdid_1.0.13.aar')
-    implementation "androidx.core:core-ktx:+"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'com.huawei.hms:push:4.0.4.301'
     implementation fileTree(dir: 'libs', include: ['oppo-mcssdk-2.0.2.jar'])
 }
diff --git a/app/src/main/java/com/yizhuan/erban/MainActivity.java b/app/src/main/java/com/yizhuan/erban/MainActivity.java
index c2f7d4a83..b513f8cbd 100644
--- a/app/src/main/java/com/yizhuan/erban/MainActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/MainActivity.java
@@ -100,6 +100,7 @@ import com.yizhuan.erban.ui.im.chat.SysMsgV2ViewHolder;
 import com.yizhuan.erban.ui.im.chat.SysMsgViewHolder;
 import com.yizhuan.erban.ui.login.BindPhoneActivity;
 import com.yizhuan.erban.ui.login.fragment.AddUserInfoFragment;
+import com.yizhuan.erban.ui.patriarch.PatriarchModeDialog;
 import com.yizhuan.erban.ui.patriarch.help.LimitEnterRoomHelper;
 import com.yizhuan.erban.ui.patriarch.help.PmDialogShowMrg;
 import com.yizhuan.erban.ui.user.UserInfoActivity;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/webview/CommonWebViewActivity.java b/app/src/main/java/com/yizhuan/erban/ui/webview/CommonWebViewActivity.java
index 47e26ac76..dabb9196f 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/webview/CommonWebViewActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/webview/CommonWebViewActivity.java
@@ -475,15 +475,6 @@ public class CommonWebViewActivity extends BaseActivity implements ShareDialog.O
         void onResult(String str);
     }
 
-    @Override
-    public AssetManager getAssets() {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
-            return getResources().getAssets();
-        } else {
-            return super.getAssets();
-        }
-    }
-
     @Override
     protected boolean needSteepStateBar() {
         return true;
diff --git a/app/src/main/res/layout/fragment_dialog_web.xml b/app/src/main/res/layout/fragment_dialog_web.xml
index 4162aac01..4b025d981 100644
--- a/app/src/main/res/layout/fragment_dialog_web.xml
+++ b/app/src/main/res/layout/fragment_dialog_web.xml
@@ -13,7 +13,7 @@
         android:layout_marginStart="@dimen/dp_20"
         android:layout_marginEnd="@dimen/dp_20">
 
-        <com.yizhuan.erban.avroom.widget.LollipopFixedWebView
+        <WebView
             android:id="@+id/webview"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
diff --git a/build.gradle b/build.gradle
index 4365539a7..5866cb454 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.61'
+    ext.kotlin_version = '1.4.0'
 
     println "\n\n\n"
     println '当前选择版本 Version Name：'+ version_name
diff --git a/core/build.gradle b/core/build.gradle
index 15d06984f..07b88a577 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -67,15 +67,14 @@ def link_page = "1.1.16"
 def loggerVersion = "2.2.0"
 def BaiduMtjVersion = "3.8.2.1"
 def Lombok = "1.16.20"
-def room_version = "1.1.1"
 def umeng_common = "2.2.5"
 def umeng_analytics = "8.1.6"
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    testImplementation 'junit:junit:4.13.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 
     api "cc.linkedme.deeplinks:link-page:${link_page}"
 
@@ -125,8 +124,6 @@ dependencies {
     api project(':nim_uikit')
     api project(':library')
     api project(':agora-ktv-kit-release')
-    implementation "androidx.core:core-ktx:+"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 repositories {
     mavenCentral()
diff --git a/gradle.properties b/gradle.properties
index 6795f63f4..09a17100a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -14,7 +14,6 @@ org.gradle.daemon=true
 # org.gradle.parallel=true
 android.enableD8=true
 android.injected.testOnly=false
-android.useNewApkCreator=false
 android.useAndroidX=true
 android.enableJetifier=true
 with_jenkins=false
diff --git a/library/build.gradle b/library/build.gradle
index 50b96b4c4..b38f62e76 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -35,13 +35,12 @@ android {
 }
 
 dependencies {
-    def supportLibraryVersion = "27.1.1"
     def glideVersion = "4.11.0"
-    def retrofitVersion = "2.3.0"
-    def okhttp3 = "3.12.0"
-    def okio = "1.16.0"
+    def retrofitVersion = "2.9.0"
+    def okhttp3 = "3.14.9"
+    def okio = "2.2.2"
     def rxjava_adapter = "2.3.0"
-    def gson_converter = "2.3.0"
+    def gson_converter = "2.9.0"
     def rxjava = "2.1.7"
     def rxjava_android = "2.0.1"
     def rxlifecycle = "3.1.0"
@@ -49,18 +48,26 @@ dependencies {
     def qiniu = "7.3.15"
     def SmartRefreshLayoutVersion = "1.0.3"
     def eventbusVersion = "3.0.0"
+    def fragment_version = "1.2.5"
 
 
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
+    testImplementation 'junit:junit:4.13.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-
-    api 'androidx.appcompat:appcompat:1.1.0'
+    api 'androidx.constraintlayout:constraintlayout:2.0.4'
+    api 'androidx.appcompat:appcompat:1.2.0'
     api 'androidx.recyclerview:recyclerview:1.1.0'
-    api 'com.google.android.material:material:1.1.0'
+    api 'androidx.cardview:cardview:1.0.0'
+    api 'androidx.gridlayout:gridlayout:1.0.0'
+    api "androidx.core:core-ktx:1.3.2"
+    api "androidx.fragment:fragment:$fragment_version"
+    api "androidx.fragment:fragment-ktx:$fragment_version"
+    api 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0'
+    api 'androidx.lifecycle:lifecycle-extensions:2.2.0'
+
+    api 'com.google.android.material:material:1.2.1'
 
     api "com.squareup.retrofit2:retrofit:${retrofitVersion}"
     api "com.squareup.okhttp3:okhttp:${okhttp3}"
@@ -86,8 +93,7 @@ dependencies {
     api "com.qiniu:qiniu-android-sdk:${qiniu}"
 
     api "org.greenrobot:eventbus:${eventbusVersion}"
-    implementation "androidx.core:core-ktx:+"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
 }
 repositories {
diff --git a/nim_uikit/build.gradle b/nim_uikit/build.gradle
index 050fa23f2..ee3cede00 100644
--- a/nim_uikit/build.gradle
+++ b/nim_uikit/build.gradle
@@ -43,9 +43,8 @@ android {
 def overscroll_android = "1.0.4"
 def base_recyclerview_helper = "2.9.49-androidx"
 def ShortcutBadger = "1.1.17"
-def ConstraintLayoutVersion = "1.1.3"
 def GlideTransformationsVersion = "3.0.1"
-def NimNetVersion = "7.8.4"
+def NimNetVersion = "7.9.0"
 def glideVersion = "4.11.0"
 
 dependencies {
@@ -53,9 +52,8 @@ dependencies {
     api "me.everything:overscroll-decor-android:${overscroll_android}"
     api "com.github.CymChad:BaseRecyclerViewAdapterHelper:${base_recyclerview_helper}"
     api "me.leolin:ShortcutBadger:${ShortcutBadger}@aar"
-    api 'androidx.constraintlayout:constraintlayout:1.1.3'
     api "jp.wasabeef:glide-transformations:${GlideTransformationsVersion}"
-    annotationProcessor 'androidx.annotation:annotation:1.1.0'
+
     // 基础功能 (必需)
     api "com.netease.nimlib:basesdk:${NimNetVersion}"
     // 聊天室需要
@@ -69,8 +67,7 @@ dependencies {
     annotationProcessor "com.github.bumptech.glide:compiler:${glideVersion}"
 
     implementation project(':library')
-    implementation "androidx.core:core-ktx:1.3.1"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+
 
 }
 repositories {