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(Constant.getCheckUpdateUrl()) + fun checkUpdate(url: String? = null) { + OkGo.get(url ?: Constant.getCheckUpdateUrl()) .execute(object : StringCallback() { override fun onSuccess(response: Response) { 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 @@ + + + + + + + + + + + + + + + +