From 3bb67f05bb3401a0bd88b853693198403b56a14d Mon Sep 17 00:00:00 2001 From: level <1364007522@qq.com> Date: Mon, 14 Jul 2025 18:28:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E9=94=AE=E8=BF=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yingmao/clash/act/SettingActivity.kt | 17 ++++++++++++++++- .../yingmao/clash/fragment/NewAccFragment.kt | 16 ++++++++++++---- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/yingmao/clash/act/SettingActivity.kt b/app/src/main/java/com/yingmao/clash/act/SettingActivity.kt index c3be5dc..b5ca9c7 100644 --- a/app/src/main/java/com/yingmao/clash/act/SettingActivity.kt +++ b/app/src/main/java/com/yingmao/clash/act/SettingActivity.kt @@ -320,6 +320,11 @@ class SettingActivity : BaseActivity() { } findViewById(R.id.clChushihua).setOnClickListener { android.util.Log.i("AAAAAAAA","data:::"+subUrl) + if (checkExpire()) { + RxToast.info(resources.getString(R.string.AccountExpired)) + RxToast.success(resources.getString(R.string.tooFast)) + return@setOnClickListener + } if (TextUtils.isEmpty(subUrl)){ return@setOnClickListener } @@ -456,7 +461,17 @@ class SettingActivity : BaseActivity() { } - + private fun checkExpire(): Boolean { + val validPeriod = MMKV.defaultMMKV().decodeLong(BZYConstants.MMKV_KEY_VPN_VALID_PERIOD) + if (validPeriod > 0) { + val nowTime = System.currentTimeMillis() + Log.d("validPeriod==>$validPeriod, nowTime==>$nowTime") + if (validPeriod >= nowTime) { + return false + } + } + return true; + } private suspend fun setSub2(url: String, pm: IProfileManager) { pm.queryAll().forEach { itemPro -> if (itemPro.name != Conf.getClashConfName(MainApplication.getApp())) { diff --git a/app/src/main/java/com/yingmao/clash/fragment/NewAccFragment.kt b/app/src/main/java/com/yingmao/clash/fragment/NewAccFragment.kt index 84236c6..ac68350 100644 --- a/app/src/main/java/com/yingmao/clash/fragment/NewAccFragment.kt +++ b/app/src/main/java/com/yingmao/clash/fragment/NewAccFragment.kt @@ -196,12 +196,20 @@ open class NewAccFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dis } else { android.util.Log.i("NewAccFragment::","data isSubbed::: "+ isSubbed) - if(isSubbed){ - startClash() + if (checkExpire()) { + if (isAdded) { + RxToast.info(resources.getString(R.string.AccountExpired)) + } + return }else{ - RxToast.success(resources.getString(R.string.tooFast)) + if(isSubbed){ + startClash() + getDelayData() + }else{ + RxToast.success(resources.getString(R.string.tooFast)) + } } - getDelayData() + } } }