From 2f240e85a51a4c2e3af51cb052d8d318ea6c4cc6 Mon Sep 17 00:00:00 2001 From: level <1364007522@qq.com> Date: Tue, 1 Jul 2025 17:21:57 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82:=20bug=20fix=20:1.=E5=8D=95?= =?UTF-8?q?=E7=82=B9=E7=99=BB=E5=BD=95=20=E5=85=85=E5=80=BC=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E6=A3=80=E6=B5=8B=E7=99=BB=E5=BD=95=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=94=B9=E5=8F=98=E4=B9=8B=E5=90=8E=E9=80=80=E5=87=BA=E5=88=B0?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=202.=E7=94=A8=E6=88=B7=E4=BD=BF=E7=94=A8=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=94=B110s=E6=94=B9=E4=B8=BA60s=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=203.=E5=86=85=E6=A0=B8=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8E=E7=AD=89=E5=BE=85=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E6=8F=90=E7=A4=BA=E5=AE=8C=E6=88=90=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yingmao/clash/act/MemberRechargeActivity.kt | 6 +++--- .../java/com/yingmao/clash/act/UIMainActivity.kt | 4 ++-- .../yingmao/clash/fragment/home/HomeFragment.kt | 14 +++++++++----- .../clash/fragment/setting/SettingFragment.kt | 13 ++++++------- app/src/main/res/values-en/strings.xml | 2 +- app/src/main/res/values-zh-rHK/strings.xml | 2 +- app/src/main/res/values-zh-rTW/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 8 files changed, 24 insertions(+), 21 deletions(-) diff --git a/app/src/main/java/com/yingmao/clash/act/MemberRechargeActivity.kt b/app/src/main/java/com/yingmao/clash/act/MemberRechargeActivity.kt index ea076fc..d39d82f 100644 --- a/app/src/main/java/com/yingmao/clash/act/MemberRechargeActivity.kt +++ b/app/src/main/java/com/yingmao/clash/act/MemberRechargeActivity.kt @@ -105,11 +105,10 @@ class MemberRechargeActivity : BaseActivity() { mainAtyVM = ViewModelProvider(this)[MainAtyVM::class.java] val validPeriod = MMKV.defaultMMKV().decodeLong(BZYConstants.MMKV_KEY_VPN_VALID_PERIOD) setExpireDate(validPeriod) - android.util.Log.i("AAAAAAAAAAA:","isvip::"+ isVip) if (isVip) { - userIdentity.text = resources.getString(R.string.TemporaryUser) - } else { userIdentity.text = resources.getString(R.string.VIPMember) + } else { + userIdentity.text = resources.getString(R.string.TemporaryUser) } userIdentityNumber.text = MMKV.defaultMMKV().decodeString(BZYConstants.MMKV_KEY_REMEMBER_USERNAME) @@ -667,6 +666,7 @@ class MemberRechargeActivity : BaseActivity() { if (clashRunning) { HomeFragment().stopClash() } + UIMainActivity.isSubbed=false mainAtyVM.stopHeartBeat() cleanProfile() val intent=Intent(CommonUtils.getApp(), LoginActivity::class.java) diff --git a/app/src/main/java/com/yingmao/clash/act/UIMainActivity.kt b/app/src/main/java/com/yingmao/clash/act/UIMainActivity.kt index e78932f..1e5a611 100644 --- a/app/src/main/java/com/yingmao/clash/act/UIMainActivity.kt +++ b/app/src/main/java/com/yingmao/clash/act/UIMainActivity.kt @@ -113,7 +113,6 @@ class UIMainActivity : BaseActivity() { var profileBinder: IProfileManager? = null var isUpload: Boolean = false var hostsMem: ArrayList = ArrayList() - var isSubed = false var newMainActGlo: Boolean = false var isVip:Boolean=false } @@ -320,7 +319,6 @@ class UIMainActivity : BaseActivity() { val expensesRecordList = expensesRecordRsp.data.expensesRecords if(expensesRecordList!=null){ if(expensesRecordList.size>0){ - android.util.Log.i("AAAAAAAA:","data::"+expensesRecordList.size) isVip=true }else{ isVip=false @@ -391,6 +389,7 @@ class UIMainActivity : BaseActivity() { if (clashRunning) { fragments.filterIsInstance().forEach { it.stopClash() } } + isSubbed=false stopUploadTimer() mainAtyVM.stopHeartBeat() cleanProfile() @@ -725,6 +724,7 @@ class UIMainActivity : BaseActivity() { if (clashRunning) { fragments.filterIsInstance().forEach { it.stopClash() } } + isSubbed=false stopUploadTimer() mainAtyVM.stopHeartBeat() cleanProfile() diff --git a/app/src/main/java/com/yingmao/clash/fragment/home/HomeFragment.kt b/app/src/main/java/com/yingmao/clash/fragment/home/HomeFragment.kt index 36498bc..1b3169b 100644 --- a/app/src/main/java/com/yingmao/clash/fragment/home/HomeFragment.kt +++ b/app/src/main/java/com/yingmao/clash/fragment/home/HomeFragment.kt @@ -45,7 +45,7 @@ import com.yingmao.clash.act.ConnectionModeActivity import com.yingmao.clash.act.LoginActivity import com.yingmao.clash.act.UIMainActivity import com.yingmao.clash.act.UIMainActivity.Companion.clashBinder -import com.yingmao.clash.act.UIMainActivity.Companion.isSubed +import com.yingmao.clash.act.UIMainActivity.Companion.isSubbed import com.yingmao.clash.act.UIMainActivity.Companion.newMainActGlo import com.yingmao.clash.act.UIMainActivity.Companion.newUuid import com.yingmao.clash.act.UIMainActivity.Companion.profileBinder @@ -261,7 +261,13 @@ class HomeFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatcher } rxDialogSureCancel.show() } else { - startClash() + android.util.Log.i("AAAAAAAAAAAAA::","data isSubbed::: "+isSubbed) + if(isSubbed){ + startClash() + }else{ + RxToast.success(resources.getString(R.string.tooFast)) + } + } } clActivity.setOnClickListener { @@ -277,7 +283,7 @@ class HomeFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatcher var selected_name = - MMKV.defaultMMKV().decodeString(BZYConstants.NODE_SELECTED_NAME_KEY, ""); + MMKV.defaultMMKV().decodeString(BZYConstants.NODE_SELECTED_NAME_KEY, "") if (!TextUtils.isEmpty(selected_name)) { if (!BuildConfig.is_tz){ setNodeNameAndImg(selected_name!!) @@ -526,14 +532,12 @@ class HomeFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatcher pm.setActive(profile) newUuid = profile.uuid.toString() - isSubed = true } ?: run { //为空的情况下选择第一个 pm.queryAll().forEach { profile -> pm.setActive(profile) newUuid = profile.uuid.toString() - isSubed = true return@forEach } } diff --git a/app/src/main/java/com/yingmao/clash/fragment/setting/SettingFragment.kt b/app/src/main/java/com/yingmao/clash/fragment/setting/SettingFragment.kt index fee1466..ca1ebd4 100644 --- a/app/src/main/java/com/yingmao/clash/fragment/setting/SettingFragment.kt +++ b/app/src/main/java/com/yingmao/clash/fragment/setting/SettingFragment.kt @@ -57,7 +57,6 @@ import com.yingmao.clash.act.ShareActivity import com.yingmao.clash.act.SplashActivity import com.yingmao.clash.act.SplashHelper import com.yingmao.clash.act.UIMainActivity -import com.yingmao.clash.act.UIMainActivity.Companion.isSubed import com.yingmao.clash.act.UIMainActivity.Companion.isVip import com.yingmao.clash.act.UIMainActivity.Companion.newUuid import com.yingmao.clash.act.UIMainActivity.Companion.profileBinder @@ -259,9 +258,9 @@ class SettingFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatc setExpireDate() if (isVip) { - userIdentity.text = requireActivity().resources.getString(R.string.TemporaryUser) - } else { userIdentity.text = requireActivity().resources.getString(R.string.VIPMember) + } else { + userIdentity.text = requireActivity().resources.getString(R.string.TemporaryUser) } userIdentityNumber.text = MMKV.defaultMMKV().decodeString(BZYConstants.MMKV_KEY_REMEMBER_USERNAME) @@ -338,6 +337,7 @@ class SettingFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatc launch(Dispatchers.IO) { profileBinder?.let { pm -> pm.queryAll().forEach { profile -> + Log.d("setting profile delete ==>${profile.name}") pm.delete(profile.uuid) } @@ -637,6 +637,7 @@ class SettingFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatc MMKV.defaultMMKV().removeValueForKey(BZYConstants.MMKV_KEY_VPN_UserCommand) MMKV.defaultMMKV().removeValueForKey(BZYConstants.NODE_All_ITEM_NAME_KEY) MMKV.defaultMMKV().removeValueForKey(BZYConstants.PROFILE_SUB_URL) + UIMainActivity.isSubbed=false Log.d("cleanUserInfo clashRunning==>${clashRunning}") if (clashRunning) { fragments.filterIsInstance().forEach { it.stopClash() } @@ -825,7 +826,6 @@ class SettingFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatc delay(500) pm.update(it.uuid) newUuid = pro.uuid.toString() - isSubed = true } ?: run { val uuid: UUID = pm.create( Profile.Type.Url, Conf.getClashConfName(requireActivity().applicationContext) @@ -844,7 +844,6 @@ class SettingFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatc ) } newUuid = qPro.uuid.toString() - isSubed = true // } } } @@ -904,7 +903,7 @@ class SettingFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatc Log.d("new main actname==>" + actName) pm.setActive(it) newUuid = pro.uuid.toString(); - isSubed = true + UIMainActivity.isSubbed = true Log.d("setSub2 setActive end") finishInit() } ?: run { @@ -925,7 +924,7 @@ class SettingFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatc ) } newUuid = qPro.uuid.toString(); - isSubed = true + UIMainActivity.isSubbed = true // } } finishInit() diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index c456beb..aa1ea77 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -359,5 +359,5 @@ Service Description\n Email registration Recharge Membership It is detected that the current account is logged in on other devices. If it is not your own operation, please change the password immediately and log out of the unfamiliar device. - + The application is initializing. Please wait for 1~2 seconds and try again. \ No newline at end of file diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 75f481d..fb30da2 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -350,5 +350,5 @@ 充值會員 檢測到當前賬號在其他設備登錄，如非本人操作，請立即修改密碼並退出陌生設備。 - + 應用初始化中,請等待1~2秒後重試 \ No newline at end of file diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index fd17ff3..2cef652 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -348,5 +348,5 @@ 手動注册 充值會員 檢測到當前賬號在其他設備登錄，如非本人操作，請立即修改密碼並退出陌生設備。 - + 應用初始化中,請等待1~2秒後重試 \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 64aecc4..3c85c12 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -370,5 +370,5 @@ 充值会员 检测到当前账号在其他设备登录，如非本人操作，请立即修改密码并退出陌生设备。 - + 应用初始化中,请等待1~2秒后重试 \ No newline at end of file