优化版本升级

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/activity/CallingdoorActivity.kt

@@ -417,16 +417,23 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
     }
 
     override fun loadAppVersion(appInfo: AppVersionDO) {
-        Log.d("AppUpdate", "loadAppVersion111 =====>>  versionNo: " + appInfo.versionNo + ", path: " + appInfo.appPath)
-        showMessage("获取版本成功，当前版本号: " + BuildConfig.VERSION_CODE + ", 服务器版本号: " + appInfo.versionNo)
-
-        //服务器版本和当前版本不一致才做升级操作
-        if (BuildConfig.VERSION_CODE != appInfo.versionNo && !updating) {
-            Constant.APP_PATH = appInfo.appPath
-            updating = true
-            AppTool.Time.delay(200) {
-                push("/callingdoor/update")
+        val newAppVersion = appInfo.versionCode.substring(1)
+        Log.d("AppUpdate", "loadAppVersion =====>>  newAppVersion: " + newAppVersion + ", curAppVersion: " + BuildConfig.VERSION_NAME + ", path: " + appInfo.appPath)
+        showMessage("获取版本成功，当前版本: " + BuildConfig.VERSION_NAME + "_" + BuildConfig.VERSION_CODE + ", 服务器版本: " + newAppVersion + "_" + appInfo.versionNo)
+
+        if (BuildConfig.VERSION_CODE < appInfo.versionNo) {
+            if (!updating) {
+                showMessage("即将升级...")
+                Constant.APP_PATH = appInfo.appPath
+                updating = true
+                AppTool.Time.delay(200) {
+                    push("/callingdoor/update")
+                }
+            } else {
+                showMessage("正在升级中...")
             }
+        } else {
+            showMessage("当前已是最新版本")
         }
     }