From fa5b707c2232865306cd85cce81ad0e4ad57bea9 Mon Sep 17 00:00:00 2001 From: yezhiqiu <983577727@qq.com> Date: Tue, 21 Apr 2026 18:00:06 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=9C=A8=E8=A7=A3=E7=BB=91=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E8=AF=AD=E2=80=9CAuto-Renew:=20Cancel=E2=80=9D=202.=E9=80=82?= =?UTF-8?q?=E9=85=8DGoogle=20Play=20=E8=A6=81=E6=B1=82=E6=94=AF=E6=8C=81?= =?UTF-8?q?=2016=20KB=20=E7=9A=84=E5=86=85=E5=AD=98=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F=EF=BC=8C=E6=9B=B4=E6=96=B0=E5=A4=A7=E9=83=A8?= =?UTF-8?q?=E5=88=86=E7=AC=AC=E4=B8=89=E6=96=B9=E5=BA=93=E5=88=B0=E6=9C=80?= =?UTF-8?q?=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/abbidot/tracker/dialog/DFUNewDialog.kt | 3 ++- .../ui/activity/account/EmailAddressActivity.kt | 6 +++++- app/src/main/java/com/abbidot/tracker/util/Util.kt | 12 ++++++++++++ .../com/abbidot/tracker/vm/DownLoadFileViewModel.kt | 7 +++---- 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/abbidot/tracker/dialog/DFUNewDialog.kt b/app/src/main/java/com/abbidot/tracker/dialog/DFUNewDialog.kt index bb3e39d..92c10c4 100644 --- a/app/src/main/java/com/abbidot/tracker/dialog/DFUNewDialog.kt +++ b/app/src/main/java/com/abbidot/tracker/dialog/DFUNewDialog.kt @@ -17,7 +17,8 @@ class DFUNewDialog(context: Context) : private var mVersion = "" override fun initView() { - setCanceledOnTouchOutside(false) +// setCanceledOnTouchOutside(false) + setCancelable(false) mViewBinding.apply { btnDialogDfuNewUpgradeNow.setChangeAlphaWhenPress(true) setOnClickListenerViews(tvDialogDfuNewLaterBtn, btnDialogDfuNewDone) diff --git a/app/src/main/java/com/abbidot/tracker/ui/activity/account/EmailAddressActivity.kt b/app/src/main/java/com/abbidot/tracker/ui/activity/account/EmailAddressActivity.kt index c7ac1cd..4f2ad9c 100644 --- a/app/src/main/java/com/abbidot/tracker/ui/activity/account/EmailAddressActivity.kt +++ b/app/src/main/java/com/abbidot/tracker/ui/activity/account/EmailAddressActivity.kt @@ -10,6 +10,7 @@ import com.abbidot.tracker.base.BaseActivity import com.abbidot.tracker.base.BaseDialog import com.abbidot.tracker.constant.GetResultCallback import com.abbidot.tracker.databinding.ActivityEmailAddressBinding +import com.abbidot.tracker.util.Util import com.abbidot.tracker.util.ViewUtil import com.abbidot.tracker.vm.UserProfileViewModel @@ -25,7 +26,7 @@ class EmailAddressActivity : setTopBarTitle(R.string.txt_email_address) mViewBinding.apply { - setOnClickListenerViews(btnEmailAddressChange) + setOnClickListenerViews(btnEmailAddressChange, tvEmailAddressShow) } } @@ -66,6 +67,9 @@ class EmailAddressActivity : mViewBinding.apply { when (v!!) { btnEmailAddressChange -> startChange() + tvEmailAddressShow -> Util.copyToClipboard( + mContext, tvEmailAddressShow.text.toString() + ) } } } diff --git a/app/src/main/java/com/abbidot/tracker/util/Util.kt b/app/src/main/java/com/abbidot/tracker/util/Util.kt index 0ca65d8..55a0f19 100644 --- a/app/src/main/java/com/abbidot/tracker/util/Util.kt +++ b/app/src/main/java/com/abbidot/tracker/util/Util.kt @@ -1,5 +1,7 @@ package com.abbidot.tracker.util +import android.content.ClipData +import android.content.ClipboardManager import android.content.Context import android.content.Intent import android.content.pm.PackageManager @@ -858,6 +860,16 @@ class Util { } return isControl } + + /** + * 复制内容到剪贴板 + */ + fun copyToClipboard(context: Context, text: String) { + val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager + val clip = ClipData.newPlainText("text", text) + clipboard.setPrimaryClip(clip) + } + } /** diff --git a/app/src/main/java/com/abbidot/tracker/vm/DownLoadFileViewModel.kt b/app/src/main/java/com/abbidot/tracker/vm/DownLoadFileViewModel.kt index 15b8eb2..a1cdfad 100644 --- a/app/src/main/java/com/abbidot/tracker/vm/DownLoadFileViewModel.kt +++ b/app/src/main/java/com/abbidot/tracker/vm/DownLoadFileViewModel.kt @@ -16,6 +16,7 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay import kotlinx.coroutines.launch import java.io.File +import androidx.core.net.toUri /** @@ -41,7 +42,7 @@ class DownLoadFileViewModel : ViewModel() { file.delete() } mDownloadManager = context.getSystemService(DOWNLOAD_SERVICE) as DownloadManager - val uri: Uri = Uri.parse(downloadUrl) + val uri = downloadUrl.toUri() val request = DownloadManager.Request(uri) //设置文件类型 request.setMimeType("zip/*") @@ -105,9 +106,7 @@ class DownLoadFileViewModel : ViewModel() { LogUtil.i(path) } val dfuStateBean = DFUStateBean( - context.getString(R.string.txt_down_firmware), - progress.toInt(), - path + context.getString(R.string.txt_down_firmware), progress.toInt(), path ) mDownloadProgressLiveData.postValue(dfuStateBean) }