From 1dc8cd281b7858c26291ed0c18032420f6ad99c9 Mon Sep 17 00:00:00 2001
From: leiyun <waitshan@163.com>
Date: Wed, 24 Feb 2021 10:16:47 +0800
Subject: [PATCH] save master

---
 .../com/yzx/webebook/activity/WebActivity.kt  | 29 +++++++++++++++----
 app/src/main/res/layout/activity_book.xml     |  6 ++--
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/yzx/webebook/activity/WebActivity.kt b/app/src/main/java/com/yzx/webebook/activity/WebActivity.kt
index 1035883..5fb550f 100644
--- a/app/src/main/java/com/yzx/webebook/activity/WebActivity.kt
+++ b/app/src/main/java/com/yzx/webebook/activity/WebActivity.kt
@@ -78,7 +78,7 @@ class WebActivity : BaseActivity<BasePresenter<*>>() {
         this.initData()
     }
 
-    private fun checkVersion(): Unit {
+    fun checkVersion(userCheck: Boolean = false): Unit {
         val test = "192.168.69.112:9009"
         val online = "https://oa.qbjjyyun.net/api"
         val BASE_URL = online
@@ -100,12 +100,22 @@ class WebActivity : BaseActivity<BasePresenter<*>>() {
                         val lastTipTime = SPUtils.getInstance()
                             .getLong("last_tip_time${res.data.version_code}", 0)
                         if (versionCode > appVersionCode) {     //有新版本
-                            if (res.data.type == 1) {   //强制升级
-                                updateApp(res.data)
-                            } else if (curr - lastTipTime > 24 * 60 * 60 * 1000) {     //非强制一天以内提示一次
-                                updateApp(res.data)
+                            when {
+                                res.data.type == 1 -> {   //强制升级
+                                    updateApp(res.data)
+                                }
+                                curr - lastTipTime > 24 * 60 * 60 * 1000 -> {     //非强制一天以内提示一次
+                                    updateApp(res.data)
+                                }
+                                userCheck -> {      //
+                                    updateApp(res.data)
+                                }
                             }
 
+                        } else {
+                            if (userCheck) {
+                                toast("已经是最新版本了！")
+                            }
                         }
                     }
                 }
@@ -417,6 +427,15 @@ class YzxJavascriptInterface(var ctx: Activity) {
         ctx.toast("android:$msg")
     }
 
+    /**
+     * 检查版本升级
+     */
+    @JavascriptInterface
+    fun mCheckVersion() {
+        Log.d("mCheckVersion", "mCheckVersion: -------------------->")
+        val act = ctx as WebActivity
+        act.checkVersion(true)
+    }
 }
 
 
diff --git a/app/src/main/res/layout/activity_book.xml b/app/src/main/res/layout/activity_book.xml
index 0f802ee..8b41e9a 100644
--- a/app/src/main/res/layout/activity_book.xml
+++ b/app/src/main/res/layout/activity_book.xml
@@ -168,7 +168,8 @@
             android:drawableTop="@mipmap/ic_book_init"
             android:drawablePadding="5dp"
             android:textColor="#000"
-            android:paddingVertical="10dp"/>
+            android:paddingVertical="10dp"
+            android:visibility="gone"/>
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/new_add"
@@ -179,7 +180,8 @@
             android:drawableTop="@mipmap/ic_book_add"
             android:drawablePadding="5dp"
             android:textColor="#000"
-            android:paddingVertical="10dp"/>
+            android:paddingVertical="10dp"
+            android:visibility="gone"/>
 
         <Button
             android:id="@+id/delete"