Selaa lähdekoodia

## [1.0.2] version 2 - 2021-10-14

weizhengliang 3 vuotta sitten
vanhempi
commit
51525b6d06

+ 4 - 2
build.gradle

@@ -26,6 +26,8 @@ buildscript {
 
     /**
      * SDK最小支持版本
+     * 19--android 4.4
+     * 24--android 7.0
      */
     ext.min_sdk_version = 24
 
@@ -47,12 +49,12 @@ buildscript {
     /**
      * APP版本码
      */
-    ext.app_version_code = 1
+    ext.app_version_code = 2
 
     /**
      * APP版本号
      */
-    ext.app_version = "1.0.1"
+    ext.app_version = "1.0.2"
 
     /**
      * 项目依赖库

+ 13 - 8
callingbed/src/main/java/com/wdkl/app/ncs/callingbed/activity/CallingbedActivity.kt

@@ -557,18 +557,23 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, CallingbedMa
     }
 
     override fun loadAppVersion(appInfo: AppVersionDO) {
-        Log.d("AppUpdate", "loadAppVersion111 =====>>  version_code: " + appInfo.versionCode + ", path: " + appInfo.appPath)
         val newAppVersion = appInfo.versionCode.substring(1)
-        Log.d("AppUpdate", "loadAppVersion222 =====>>  newAppVersion: " + newAppVersion + ", curAppVersion: " + BuildConfig.VERSION_NAME)
+        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 && !updating) {
-            Constant.APP_PATH = appInfo.appPath
-            updating = true
-            AppTool.Time.delay(200) {
-                push("/callingbed/update")
+        if (BuildConfig.VERSION_CODE < appInfo.versionNo) {
+            if (!updating) {
+                showMessage("即将升级...")
+                Constant.APP_PATH = appInfo.appPath
+                updating = true
+                AppTool.Time.delay(200) {
+                    push("/callingbed/update")
+                }
+            } else {
+                showMessage("正在升级中...")
             }
+        } else {
+            showMessage("当前已是最新版本")
         }
     }
 

+ 5 - 0
readme.md

@@ -26,5 +26,10 @@
 
 ---
 
+## [1.0.2] version 2 - 2021-10-14
+### CHANGE 
+- 集成医院版本5寸分机相关功能
+- 长按右侧中间二维码按键3s检查版本升级
+- 优化在线升级等
 
 ### 新系统5寸分机医院版本