tanjianbin/lzwcai-terminal-worktool
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 检查新版本

Browse Source
This commit is contained in:
gallonyin
2023-07-10 19:41:37 +08:00
parent 54fc206cb0
commit dbd48e2437
4 changed files with 65 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/yameida/worktool/Constant.kt
View File

@@ -102,6 +102,8 @@ object Constant {
fun getCheckUpdateUrl() = "${getBaseUrl()}/appUpdate/checkUpdate" fun getCheckUpdateUrl() = "${getBaseUrl()}/appUpdate/checkUpdate"
fun getMasterCheckUpdateUrl() = "https://worktool.asrtts.cn/appUpdate/checkUpdate"
fun getMyConfig() = "${getBaseUrl()}/robot/robotInfo/get?robotId=$robotId" fun getMyConfig() = "${getBaseUrl()}/robot/robotInfo/get?robotId=$robotId"
fun getRobotUpdateUrl() = "${getBaseUrl()}/robot/robotInfo/update?robotId=$robotId" fun getRobotUpdateUrl() = "${getBaseUrl()}/robot/robotInfo/update?robotId=$robotId"

5
app/src/main/java/org/yameida/worktool/activity/SettingsActivity.kt
View File

@@ -69,6 +69,7 @@ class SettingsActivity : AppCompatActivity() {
}) })
rl_reply_strategy.setOnClickListener { showReplyStrategyDialog() } rl_reply_strategy.setOnClickListener { showReplyStrategyDialog() }
rl_log.setOnClickListener { showLogDialog() } rl_log.setOnClickListener { showLogDialog() }
rl_update.setOnClickListener { showUpdateDialog() }
rl_donate.setOnClickListener { showDonateDialog() } rl_donate.setOnClickListener { showDonateDialog() }
rl_share.setOnClickListener { showShareDialog() } rl_share.setOnClickListener { showShareDialog() }
rl_advance.setOnClickListener { SettingsAdvanceActivity.enterActivity(this) } rl_advance.setOnClickListener { SettingsAdvanceActivity.enterActivity(this) }
@@ -138,6 +139,10 @@ class SettingsActivity : AppCompatActivity() {
} }
} }
private fun showUpdateDialog() {
HttpUtil.checkUpdate(Constant.getMasterCheckUpdateUrl())
}
private fun showDonateDialog() { private fun showDonateDialog() {
DonateUtil.zfbDonate(this) DonateUtil.zfbDonate(this)
} }

4
app/src/main/java/org/yameida/worktool/utils/HttpUtil.kt
View File

@@ -20,8 +20,8 @@ object HttpUtil {
/** /**
* 检查更新 * 检查更新
*/ */
fun checkUpdate() { fun checkUpdate(url: String? = null) {
OkGo.get<String>(Constant.getCheckUpdateUrl()) OkGo.get<String>(url ?: Constant.getCheckUpdateUrl())
.execute(object : StringCallback() { .execute(object : StringCallback() {
override fun onSuccess(response: Response<String>) { override fun onSuccess(response: Response<String>) {
try { try {

56
app/src/main/res/layout/activity_settings.xml
View File

@@ -473,6 +473,62 @@
</RelativeLayout> </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 <RelativeLayout
android:id="@+id/rl_donate" android:id="@+id/rl_donate"
android:layout_width="match_parent" android:layout_width="match_parent"