From 52c160df79068584b3a705a65dc6ce93170ceea1 Mon Sep 17 00:00:00 2001 From: gallonyin Date: Tue, 14 Mar 2023 23:33:27 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=A8=A1=E6=8B=9F=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/yameida/worktool/activity/ListenActivity.kt | 7 ++++++- .../java/org/yameida/worktool/model/MyConfigBean.kt | 5 ++++- .../org/yameida/worktool/service/WeworkLoopImpl.kt | 10 +++++++++- .../java/org/yameida/worktool/utils/HttpUtil.kt | 13 +++++++++++-- 4 files changed, 30 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/org/yameida/worktool/activity/ListenActivity.kt b/app/src/main/java/org/yameida/worktool/activity/ListenActivity.kt index d87ee6a..a94d144 100644 --- a/app/src/main/java/org/yameida/worktool/activity/ListenActivity.kt +++ b/app/src/main/java/org/yameida/worktool/activity/ListenActivity.kt @@ -131,7 +131,12 @@ class ListenActivity : AppCompatActivity() { sw_accessibility.isChecked = false ToastUtils.showLong("请先填写并保存链接号~") } else if (!PermissionHelper.isAccessibilitySettingOn()) { - startActivity(Intent(this, AccessibilityGuideActivity::class.java)) + if (SPUtils.getInstance().getBoolean("risk", false)) { + sw_accessibility.isChecked = false + ToastUtils.showLong("新号请勿使用模拟器/云手机!") + } else { + startActivity(Intent(this, AccessibilityGuideActivity::class.java)) + } } } else { if (PermissionHelper.isAccessibilitySettingOn()) { diff --git a/app/src/main/java/org/yameida/worktool/model/MyConfigBean.kt b/app/src/main/java/org/yameida/worktool/model/MyConfigBean.kt index eba6b11..192e15c 100644 --- a/app/src/main/java/org/yameida/worktool/model/MyConfigBean.kt +++ b/app/src/main/java/org/yameida/worktool/model/MyConfigBean.kt @@ -14,5 +14,8 @@ data class MyConfigBean( var robotKeyCheck: Int? = null, //通讯加密 0不加密 1加密 - var encryptType: Int? = null + var encryptType: Int? = null, + + //创建时间 + var createTime: String? = null ) \ No newline at end of file diff --git a/app/src/main/java/org/yameida/worktool/service/WeworkLoopImpl.kt b/app/src/main/java/org/yameida/worktool/service/WeworkLoopImpl.kt index 0bafd58..91de2cd 100644 --- a/app/src/main/java/org/yameida/worktool/service/WeworkLoopImpl.kt +++ b/app/src/main/java/org/yameida/worktool/service/WeworkLoopImpl.kt @@ -66,7 +66,8 @@ object WeworkLoopImpl { } /** - * 检查账号是否已实名 + * 检查账号是否已实名 & 新号使用模拟环境 + * @return 通过检查 true 否则 false */ private fun checkRealName(): Boolean { if (!SPUtils.getInstance("myInfo").getBoolean("realName", false) @@ -77,6 +78,13 @@ object WeworkLoopImpl { sleep(5000) return false } + if (SPUtils.getInstance().getBoolean("risk", false)) { + LogUtils.e("新号请勿使用模拟器/云手机!") + ToastUtils.show("新号请勿使用模拟器/云手机!") + MyApplication.launchIntent() + sleep(5000) + return false + } return true } 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 358f34d..44e8818 100644 --- a/app/src/main/java/org/yameida/worktool/utils/HttpUtil.kt +++ b/app/src/main/java/org/yameida/worktool/utils/HttpUtil.kt @@ -11,6 +11,7 @@ import org.yameida.worktool.R import org.yameida.worktool.model.network.CheckUpdateResult import org.yameida.worktool.model.network.GetMyConfigResult import org.yameida.worktool.service.log +import org.yameida.worktool.utils.envcheck.CheckRoot import update.UpdateAppUtils import java.io.File @@ -88,12 +89,20 @@ object HttpUtil { if (commonResult.code != 200) { return onError(response) } - LogUtils.i(commonResult.data) + LogUtils.i("获取配置", commonResult.data) + SPUtils.getInstance().put("risk", false) + if (CheckRoot.isDeviceRooted()) { + val date = TimeUtils.string2Date(commonResult.data.createTime, "yyyy-MM-dd'T'HH:mm:ss") + if (System.currentTimeMillis() - date.time < 7 * 68400 * 1000) { + LogUtils.e("新号使用模拟环境!") + ToastUtils.showLong("新号请勿使用模拟器/云手机!") + SPUtils.getInstance().put("risk", true) + } + } commonResult.data?.apply { Constant.qaUrl = this.callbackUrl ?: "" Constant.openCallback = this.openCallback ?: 0 Constant.replyStrategy = (this.replyAll ?: 0) + 1 - return } } catch (e: Exception) { LogUtils.e(e)