升级到androidX,旧版本机器

app/build.gradle

@@ -36,13 +36,13 @@ android {
         release {
             keyAlias 'demo'
             keyPassword '123456'
-            storeFile file("../signAPK/demo.jks")
+            storeFile file("../signAPK/project.jks") //新机器(黑色)用project.jks签名，老机器用demo.jks
             storePassword '123456'
         }
         debug {
             keyAlias 'demo'
             keyPassword '123456'
-            storeFile file("../signAPK/demo.jks")
+            storeFile file("../signAPK/project.jks")
             storePassword '123456'
         }
     }

build.gradle

@@ -4,7 +4,7 @@ buildscript {
     /**
      * Kotlin统一版本
      */
-    ext.kotlin_version = '1.2.40'
+    ext.kotlin_version = '1.3.10'
 
     /**
      * Aop编制版本
@@ -50,6 +50,8 @@ buildscript {
         maven { url 'https://jitpack.io' }
     }
     dependencies {
+        classpath 'com.android.tools.build:gradle'
+        classpath 'com.android.tools.build:gradle:3.5.4'
         repositories {
             /**
              * 依赖仓储
@@ -62,7 +64,7 @@ buildscript {
         /**
          * Gradle插件
          */
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle'
 
         /**
          * Kawo组件化插件

framework/src/main/java/com/wdkl/ncs/framework/base/BaseActivity.kt

@@ -2,15 +2,15 @@ package com.wdkl.ncs.framework.base
 
 import android.content.Context
 import android.content.Intent
-import android.databinding.DataBindingUtil
-import android.databinding.ViewDataBinding
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
 import android.util.Log
 import android.view.View
 import android.view.Window
 import android.view.WindowManager
 import android.view.inputmethod.InputMethodManager
+import androidx.appcompat.app.AppCompatActivity
+import androidx.databinding.DataBindingUtil
+import androidx.databinding.ViewDataBinding
 import org.greenrobot.eventbus.EventBus
 import java.lang.reflect.Field
 import javax.inject.Inject
@@ -90,7 +90,7 @@ abstract class BaseActivity<PresenterType : BaseContract.BasePresenter, DataBind
         /**创建根视图*/
         val rootView = layoutInflater.inflate(getLayId(), null, false)
         /**初始化Databinding对象*/
-        mViewBinding = DataBindingUtil.bind(rootView)
+        mViewBinding = DataBindingUtil.bind(rootView)!!
         /**设置根视图到Activity*/
         setContentView(rootView)
 

framework/src/main/java/com/wdkl/ncs/framework/base/BaseApplication.kt

@@ -4,8 +4,7 @@ import android.annotation.SuppressLint
 import android.app.Application
 import android.content.Context
 import android.content.Intent
-import android.support.multidex.MultiDexApplication
-
+import androidx.multidex.MultiDexApplication
 
 
 /**

framework/src/main/java/com/wdkl/ncs/framework/utils/ExtendMethods.kt

@@ -8,14 +8,14 @@ package com.wdkl.ncs.framework.utils
  */
 
 import android.content.Context
-import android.databinding.ObservableField
 import android.os.Looper
-import android.support.v4.content.ContextCompat
 import android.util.Log
 import android.view.View
 import android.view.ViewGroup
 import android.view.animation.Animation
 import android.widget.Toast
+import androidx.core.content.ContextCompat
+import androidx.databinding.ObservableField
 import com.wdkl.ncs.framework.base.BaseApplication
 import com.wdkl.ncs.framework.base.DisposableManager
 import io.reactivex.disposables.Disposable

framework/src/main/java/com/wdkl/ncs/framework/utils/SystemTool.java

@@ -9,11 +9,12 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Environment;
 import android.os.StatFs;
-import android.support.v4.app.ActivityCompat;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.util.Log;
 
+import androidx.core.app.ActivityCompat;
+
 import com.google.common.base.Strings;
 
 import java.io.File;

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Sep 15 15:05:58 CST 2021
+#Sat Nov 05 15:33:16 CST 2022
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+zipStoreBase=GRADLE_USER_HOME

janus/build.gradle

@@ -3,8 +3,8 @@ plugins {
 }
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion "30.0.3"
+    compileSdkVersion target_sdk_version
+    buildToolsVersion build_tools_version
 
     defaultConfig {
         minSdkVersion 22