From dbd48e24375c930e8a9a56b7550583de801cfba6 Mon Sep 17 00:00:00 2001
From: gallonyin <gallonyin@gmail.com>
Date: Mon, 10 Jul 2023 19:41:37 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=A3=80=E6=9F=A5=E6=96=B0=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/yameida/worktool/Constant.kt     |  2 +
 .../worktool/activity/SettingsActivity.kt     |  5 ++
 .../org/yameida/worktool/utils/HttpUtil.kt    |  4 +-
 app/src/main/res/layout/activity_settings.xml | 56 +++++++++++++++++++
 4 files changed, 65 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/yameida/worktool/Constant.kt b/app/src/main/java/org/yameida/worktool/Constant.kt
index d958ece..17a4b47 100644
--- a/app/src/main/java/org/yameida/worktool/Constant.kt
+++ b/app/src/main/java/org/yameida/worktool/Constant.kt
@@ -102,6 +102,8 @@ object Constant {
 
     fun getCheckUpdateUrl() = "${getBaseUrl()}/appUpdate/checkUpdate"
 
+    fun getMasterCheckUpdateUrl() = "https://worktool.asrtts.cn/appUpdate/checkUpdate"
+
     fun getMyConfig() = "${getBaseUrl()}/robot/robotInfo/get?robotId=$robotId"
 
     fun getRobotUpdateUrl() = "${getBaseUrl()}/robot/robotInfo/update?robotId=$robotId"
diff --git a/app/src/main/java/org/yameida/worktool/activity/SettingsActivity.kt b/app/src/main/java/org/yameida/worktool/activity/SettingsActivity.kt
index fa9e053..44ffd6d 100644
--- a/app/src/main/java/org/yameida/worktool/activity/SettingsActivity.kt
+++ b/app/src/main/java/org/yameida/worktool/activity/SettingsActivity.kt
@@ -69,6 +69,7 @@ class SettingsActivity : AppCompatActivity() {
         })
         rl_reply_strategy.setOnClickListener { showReplyStrategyDialog() }
         rl_log.setOnClickListener { showLogDialog() }
+        rl_update.setOnClickListener { showUpdateDialog() }
         rl_donate.setOnClickListener { showDonateDialog() }
         rl_share.setOnClickListener { showShareDialog() }
         rl_advance.setOnClickListener { SettingsAdvanceActivity.enterActivity(this) }
@@ -138,6 +139,10 @@ class SettingsActivity : AppCompatActivity() {
         }
     }
 
+    private fun showUpdateDialog() {
+        HttpUtil.checkUpdate(Constant.getMasterCheckUpdateUrl())
+    }
+
     private fun showDonateDialog() {
         DonateUtil.zfbDonate(this)
     }
diff --git a/app/src/main/java/org/yameida/worktool/utils/HttpUtil.kt b/app/src/main/java/org/yameida/worktool/utils/HttpUtil.kt
index c53a4d6..5cf6963 100644
--- a/app/src/main/java/org/yameida/worktool/utils/HttpUtil.kt
+++ b/app/src/main/java/org/yameida/worktool/utils/HttpUtil.kt
@@ -20,8 +20,8 @@ object HttpUtil {
     /**
      * 检查更新
      */
-    fun checkUpdate() {
-        OkGo.get<String>(Constant.getCheckUpdateUrl())
+    fun checkUpdate(url: String? = null) {
+        OkGo.get<String>(url ?: Constant.getCheckUpdateUrl())
             .execute(object : StringCallback() {
                 override fun onSuccess(response: Response<String>) {
                     try {
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 3c837f3..608c152 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -473,6 +473,62 @@
 
             </RelativeLayout>
 
+            <RelativeLayout
+                android:id="@+id/rl_update"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingStart="@dimen/setting_start_padding"
+                android:paddingTop="@dimen/setting_vertical_padding"
+                android:paddingEnd="@dimen/setting_end_padding"
+                android:paddingBottom="@dimen/setting_vertical_padding">
+
+                <ImageView
+                    android:id="@+id/iv_rec_update_"
+                    android:layout_width="@dimen/setting_start_image_width"
+                    android:layout_height="@dimen/setting_start_image_width"
+                    android:layout_centerVertical="true"
+                    android:scaleX="1.1"
+                    android:scaleY="1.1"
+                    android:src="@drawable/settings_directory" />
+
+                <TextView
+                    android:id="@+id/tv_select_update"
+                    android:layout_width="@dimen/setting_end_font_width"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentEnd="true"
+                    android:layout_centerVertical="true"
+                    android:layout_marginStart="@dimen/setting_end_start_padding"
+                    android:textColor="@color/float_time_color"
+                    android:textSize="@dimen/setting_end_font_size"
+                    android:textStyle="bold" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_marginStart="@dimen/setting_start_padding"
+                    android:layout_toStartOf="@id/tv_select_update"
+                    android:layout_toEndOf="@id/iv_rec_update_"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="检查新版本"
+                        android:textColor="@color/color_333333"
+                        android:textSize="@dimen/setting_start_font_size" />
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="WorkTool官方版本更新检查"
+                        android:textColor="@color/color_999999"
+                        android:textSize="@dimen/setting_end_font_size" />
+
+                </LinearLayout>
+
+            </RelativeLayout>
+
             <RelativeLayout
                 android:id="@+id/rl_donate"
                 android:layout_width="match_parent"