1.在解绑提示页面,增加提示语“Auto-Renew: Cancel”

2.适配Google Play 要求支持 16 KB 的内存页面大小,更新大部分第三方库到最新版本
This commit is contained in:
yezhiqiu
2026-04-21 18:00:06 +08:00
parent 4547f844ba
commit fa5b707c22
4 changed files with 22 additions and 6 deletions

View File

@@ -17,7 +17,8 @@ class DFUNewDialog(context: Context) :
private var mVersion = "" private var mVersion = ""
override fun initView() { override fun initView() {
setCanceledOnTouchOutside(false) // setCanceledOnTouchOutside(false)
setCancelable(false)
mViewBinding.apply { mViewBinding.apply {
btnDialogDfuNewUpgradeNow.setChangeAlphaWhenPress(true) btnDialogDfuNewUpgradeNow.setChangeAlphaWhenPress(true)
setOnClickListenerViews(tvDialogDfuNewLaterBtn, btnDialogDfuNewDone) setOnClickListenerViews(tvDialogDfuNewLaterBtn, btnDialogDfuNewDone)

View File

@@ -10,6 +10,7 @@ import com.abbidot.tracker.base.BaseActivity
import com.abbidot.tracker.base.BaseDialog import com.abbidot.tracker.base.BaseDialog
import com.abbidot.tracker.constant.GetResultCallback import com.abbidot.tracker.constant.GetResultCallback
import com.abbidot.tracker.databinding.ActivityEmailAddressBinding import com.abbidot.tracker.databinding.ActivityEmailAddressBinding
import com.abbidot.tracker.util.Util
import com.abbidot.tracker.util.ViewUtil import com.abbidot.tracker.util.ViewUtil
import com.abbidot.tracker.vm.UserProfileViewModel import com.abbidot.tracker.vm.UserProfileViewModel
@@ -25,7 +26,7 @@ class EmailAddressActivity :
setTopBarTitle(R.string.txt_email_address) setTopBarTitle(R.string.txt_email_address)
mViewBinding.apply { mViewBinding.apply {
setOnClickListenerViews(btnEmailAddressChange) setOnClickListenerViews(btnEmailAddressChange, tvEmailAddressShow)
} }
} }
@@ -66,6 +67,9 @@ class EmailAddressActivity :
mViewBinding.apply { mViewBinding.apply {
when (v!!) { when (v!!) {
btnEmailAddressChange -> startChange() btnEmailAddressChange -> startChange()
tvEmailAddressShow -> Util.copyToClipboard(
mContext, tvEmailAddressShow.text.toString()
)
} }
} }
} }

View File

@@ -1,5 +1,7 @@
package com.abbidot.tracker.util package com.abbidot.tracker.util
import android.content.ClipData
import android.content.ClipboardManager
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.content.pm.PackageManager import android.content.pm.PackageManager
@@ -858,6 +860,16 @@ class Util {
} }
return isControl 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)
}
} }
/** /**

View File

@@ -16,6 +16,7 @@ import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import java.io.File import java.io.File
import androidx.core.net.toUri
/** /**
@@ -41,7 +42,7 @@ class DownLoadFileViewModel : ViewModel() {
file.delete() file.delete()
} }
mDownloadManager = context.getSystemService(DOWNLOAD_SERVICE) as DownloadManager mDownloadManager = context.getSystemService(DOWNLOAD_SERVICE) as DownloadManager
val uri: Uri = Uri.parse(downloadUrl) val uri = downloadUrl.toUri()
val request = DownloadManager.Request(uri) val request = DownloadManager.Request(uri)
//设置文件类型 //设置文件类型
request.setMimeType("zip/*") request.setMimeType("zip/*")
@@ -105,9 +106,7 @@ class DownLoadFileViewModel : ViewModel() {
LogUtil.i(path) LogUtil.i(path)
} }
val dfuStateBean = DFUStateBean( val dfuStateBean = DFUStateBean(
context.getString(R.string.txt_down_firmware), context.getString(R.string.txt_down_firmware), progress.toInt(), path
progress.toInt(),
path
) )
mDownloadProgressLiveData.postValue(dfuStateBean) mDownloadProgressLiveData.postValue(dfuStateBean)
} }