From 74ad39b8abdab54495c057ad2a4abd307367adf0 Mon Sep 17 00:00:00 2001
From: leiyun <waitshan@163.com>
Date: Sat, 20 Feb 2021 18:46:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/gradle.xml                              |   1 +
 .idea/jarRepositories.xml                     |   5 ++
 app/build.gradle                              |   8 +-
 .../com/yzx/webebook/activity/WebActivity.kt  |  49 +++++++++--
 .../com/yzx/webebook/widget/BaseDialog.kt     |  16 ++++
 app/src/main/res/drawable/custom_bg.png       | Bin 0 -> 19398 bytes
 app/src/main/res/drawable/shape_corner.xml    |   5 ++
 .../main/res/drawable/shape_corner_plain.xml  |   6 ++
 app/src/main/res/layout/version_dialog.xml    |  80 ++++++++++++++++++
 app/src/main/res/values/strings.xml           |   2 +
 app/src/main/res/values/styles.xml            |  11 ++-
 build.gradle                                  |   2 +-
 12 files changed, 172 insertions(+), 13 deletions(-)
 create mode 100644 app/src/main/java/com/yzx/webebook/widget/BaseDialog.kt
 create mode 100644 app/src/main/res/drawable/custom_bg.png
 create mode 100644 app/src/main/res/drawable/shape_corner.xml
 create mode 100644 app/src/main/res/drawable/shape_corner_plain.xml
 create mode 100644 app/src/main/res/layout/version_dialog.xml

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 6e45dfc..91320a1 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -6,6 +6,7 @@
       <GradleProjectSettings>
         <option name="delegatedBuild" value="true" />
         <option name="testRunner" value="PLATFORM" />
+        <option name="disableWrapperSourceDistributionNotification" value="true" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index a5f05cd..2370474 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -21,5 +21,10 @@
       <option name="name" value="Google" />
       <option name="url" value="https://dl.google.com/dl/android/maven2/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="https://jitpack.io" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 820de6f..89abc60 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,12 +5,12 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.3"
+    compileSdkVersion 30
+    buildToolsVersion "31.0.0 rc1"
     defaultConfig {
         applicationId "com.yzx.webebook"
         minSdkVersion 26
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 2
         versionName "2.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -77,6 +77,6 @@ dependencies {
     implementation 'com.blankj:utilcodex:1.30.5'
     implementation 'com.google.code.gson:gson:2.8.6'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
-
+    implementation 'com.github.AlexLiuSheng:CheckVersionLib:2.4.1_androidx'
 
 }
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 1c1c723..3f5db7b 100644
--- a/app/src/main/java/com/yzx/webebook/activity/WebActivity.kt
+++ b/app/src/main/java/com/yzx/webebook/activity/WebActivity.kt
@@ -3,6 +3,7 @@ package com.yzx.webebook.activity
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.app.AlertDialog
+import android.app.Dialog
 import android.content.Intent
 import android.net.http.SslError
 import android.os.Build
@@ -12,13 +13,18 @@ import android.view.View
 import android.view.ViewGroup
 import android.webkit.*
 import android.widget.LinearLayout
+import android.widget.TextView
 import androidx.annotation.RequiresApi
+import com.allenliu.versionchecklib.v2.AllenVersionChecker
+import com.allenliu.versionchecklib.v2.builder.UIData
 import com.yzx.webebook.MainActivity
 import com.yzx.webebook.R
 import com.yzx.webebook.activity.base.BaseActivity
 import com.yzx.webebook.presenter.base.BasePresenter
+import com.yzx.webebook.widget.BaseDialog
 import kotlinx.android.synthetic.main.activity_web.*
 import org.jetbrains.anko.ctx
+import org.jetbrains.anko.find
 import org.jetbrains.anko.startActivity
 import org.jetbrains.anko.toast
 import org.json.JSONObject
@@ -55,6 +61,33 @@ class WebActivity : BaseActivity<BasePresenter<*>>() {
         url = intent?.getStringExtra("link") ?: "https://m.qbjjyyun.net/"
         this.initData()
     }
+
+    private fun checkVersion(): Unit {
+        val url =
+            "https://filea.oa.qbjjyyun.net/edufile/download?uniqueKey=22de6670beaa78a822ae4a95bdb2c6f5"
+        AllenVersionChecker
+            .getInstance()
+            .downloadOnly(
+                UIData.create()
+                    .setTitle("检测到新版本")
+                    .setContent("1.优化了笔记的体验\n2.解决了若干已知bug\n")
+                    .setDownloadUrl(url)
+
+            )
+            .setCustomVersionDialogListener { context, versionBundle ->
+                val dialog = BaseDialog(context, R.style.BaseDialog, R.layout.version_dialog)
+                val title = dialog.find<TextView>(R.id.tv_title)
+                title.text = "检测到新版本"
+                val content = dialog.find<TextView>(R.id.tv_msg)
+                content.text = "1.优化了笔记的体验\n2.解决了若干已知bug\n"
+                dialog.window?.setDimAmount(0.1f)
+                val cancelBtn = dialog.find<View>(R.id.cancel_btn)
+                //cancelBtn.visibility = View.GONE
+                return@setCustomVersionDialogListener dialog
+            }
+            .executeMission(this)
+    }
+
     @SuppressLint("SetJavaScriptEnabled")
     override fun initView() {
         url = intent?.getStringExtra("link") ?: "https://m.qbjjyyun.net/"
@@ -170,6 +203,7 @@ class WebActivity : BaseActivity<BasePresenter<*>>() {
 
     override fun initData() {
         webView.loadUrl(url)
+//        checkVersion()
     }
 
     override fun initPresenter(): BasePresenter<*>? {
@@ -197,12 +231,13 @@ class WebActivity : BaseActivity<BasePresenter<*>>() {
     override fun onDestroy() {
         super.onDestroy()
         webView.apply {
-            webViewClient = null
+//            webViewClient = null
             webChromeClient = null
             (parent as ViewGroup).removeView(webView)
             removeAllViews()
             destroy()
         }
+        AllenVersionChecker.getInstance().cancelAllMission()
     }
 
     /**
@@ -233,7 +268,7 @@ class WebActivity : BaseActivity<BasePresenter<*>>() {
         }
 
         if (requestCode == NoteActivity.REQ_CODE && resultCode == Activity.RESULT_OK) {
-            val json = data?.getStringExtra("note_info")?:""
+            val json = data?.getStringExtra("note_info") ?: ""
             evaluateJavascript("onImageUploadSuccess", json)
         }
     }
@@ -273,10 +308,10 @@ class YzxJavascriptInterface(var ctx: Activity) {
     @JavascriptInterface
     fun notePage(
         title: String,
-        note_info:String,
-        can_add_page:Int=1
+        note_info: String,
+        can_add_page: Int = 1
     ) {
-        NoteActivity.active(ctx, title, note_info ,can_add_page)
+        NoteActivity.active(ctx, title, note_info, can_add_page)
     }
 
     /**
@@ -287,9 +322,9 @@ class YzxJavascriptInterface(var ctx: Activity) {
     @JavascriptInterface
     fun notePage(
         title: String,
-        note_info:String
+        note_info: String
     ) {
-        NoteActivity.active(ctx, title, note_info ,1)
+        NoteActivity.active(ctx, title, note_info, 1)
     }
 
     /**
diff --git a/app/src/main/java/com/yzx/webebook/widget/BaseDialog.kt b/app/src/main/java/com/yzx/webebook/widget/BaseDialog.kt
new file mode 100644
index 0000000..360a40c
--- /dev/null
+++ b/app/src/main/java/com/yzx/webebook/widget/BaseDialog.kt
@@ -0,0 +1,16 @@
+package com.yzx.webebook.widget
+
+import android.app.Dialog
+import android.content.Context
+
+class BaseDialog(context: Context, themeResId: Int, res: Int) : Dialog(context, themeResId) {
+    private var res: Int = 0
+
+    init {
+        setContentView(res)
+        this.res = res
+        setCanceledOnTouchOutside(false)
+        setCancelable(false)
+        window?.setDimAmount(0f)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/custom_bg.png b/app/src/main/res/drawable/custom_bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..cf24bd38409ccee9e64429f3808cccb6b860f5e9
GIT binary patch
literal 19398
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
RHU<Cy002ovPDHLkV1gI%B%S~O

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/shape_corner.xml b/app/src/main/res/drawable/shape_corner.xml
new file mode 100644
index 0000000..777cc6a
--- /dev/null
+++ b/app/src/main/res/drawable/shape_corner.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+<corners android:radius="5dp"></corners>
+    <solid android:color="#000"></solid>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_corner_plain.xml b/app/src/main/res/drawable/shape_corner_plain.xml
new file mode 100644
index 0000000..e467575
--- /dev/null
+++ b/app/src/main/res/drawable/shape_corner_plain.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+<corners android:radius="5dp"></corners>
+    <solid android:color="#fff"></solid>
+    <stroke android:color="#000" android:width="1px"></stroke>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/version_dialog.xml b/app/src/main/res/layout/version_dialog.xml
new file mode 100644
index 0000000..5b87632
--- /dev/null
+++ b/app/src/main/res/layout/version_dialog.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@android:color/transparent"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="300dp"
+            android:layout_height="150dp"
+            android:background="@drawable/custom_bg"
+            android:scaleType="centerCrop" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@android:color/white"
+            android:orientation="vertical"
+            android:padding="15dp">
+
+            <TextView
+                android:id="@+id/tv_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="10dp"
+                android:text="@string/update_title"
+                android:textColor="@android:color/black"
+                android:textSize="13sp" />
+
+            <TextView
+                android:id="@+id/tv_msg"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:text="@string/updatecontent"
+                android:textColor="#666"
+                android:textSize="12sp" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+                <FrameLayout
+                    android:id="@+id/cancel_btn"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_marginEnd="15dp"
+                    android:layout_height="wrap_content">
+
+                    <Button
+                        android:id="@id/versionchecklib_version_dialog_cancel"
+                        android:layout_width="match_parent"
+                        android:layout_height="35dp"
+                        android:layout_marginTop="10dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/shape_corner_plain"
+                        android:text="取消"
+                        android:textColor="@android:color/black" />
+                </FrameLayout>
+
+                <Button
+                    android:id="@id/versionchecklib_version_dialog_commit"
+                    android:layout_width="0dp"
+                    android:layout_height="35dp"
+                    android:layout_marginTop="10dp"
+                    android:layout_weight="1"
+                    android:background="@drawable/shape_corner"
+                    android:text="立即升级"
+                    android:textColor="@android:color/white" />
+
+            </LinearLayout>
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a3bad76..526e071 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,5 @@
 <resources>
     <string name="app_name">云智学</string>
+    <string name="update_title">检测到新版本</string>
+    <string name="updatecontent">解决了若干bug</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 5670dbe..984821d 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -8,5 +8,14 @@
         <item name="colorAccent">@color/colorAccent</item>
         <item name="android:windowBackground">@color/backgroundColor</item>
     </style>
-
+    <style name="BaseDialog" parent="android:Theme.Light">
+        <item name="android:windowFrame">@null</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:backgroundDimEnabled">true</item>
+        <item name="android:backgroundDimAmount">0.1</item>
+    </style>
 </resources>
diff --git a/build.gradle b/build.gradle
index bdc59a1..b717e51 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,7 @@ allprojects {
     repositories {
         google()
         jcenter()
-        
+        maven { url 'https://jitpack.io' }
     }
 }