From 1c5e0f0aec879fce411ae5218f1fda73c020d23e Mon Sep 17 00:00:00 2001 From: cyh Date: Thu, 3 Jul 2025 16:43:20 +0800 Subject: [PATCH] fix --- .../main/java/com/yingmao/clash/act/UIMainActivity.kt | 10 +++++----- .../yingmao/clash/fragment/setting/SettingFragment.kt | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) 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 a3e010a..5c7b86f 100644 --- a/app/src/main/java/com/yingmao/clash/act/UIMainActivity.kt +++ b/app/src/main/java/com/yingmao/clash/act/UIMainActivity.kt @@ -267,26 +267,26 @@ class UIMainActivity : BaseActivity() { } data.data.let { url -> android.util.Log.e("Data", "机场URL:=${url}") - var url2="https://api.ymvpnpro11.cc:8700/7air2vr7ikiqzgvxz/api/v1/client/subscribe?token=22f3d75079ec6fa546c1862c4354e448" +// var url2="https://api.ymvpnpro11.cc:8700/7air2vr7ikiqzgvxz/api/v1/client/subscribe?token=22f3d75079ec6fa546c1862c4354e448" // if (url.isNotEmpty()) { // subUrl = url // lifecycleScope.launch(Dispatchers.IO) { // setSub2(url) // } // } - if (url2.isNotEmpty()) { + if (url.isNotEmpty()) { //todo 判断订阅地址是否修改过,未修改就用接口返回的地址反之使用本地修改的地址 var pro_sub_url = MMKV.defaultMMKV().decodeString(BZYConstants.PROFILE_SUB_URL, "") // Log.d("pro_sub_url==>${pro_sub_url}") if (!TextUtils.isEmpty(pro_sub_url)) { - if (pro_sub_url == url2) { - subUrl = url2 + if (pro_sub_url == url) { + subUrl = url } else { subUrl = pro_sub_url } } else { - subUrl = url2 + subUrl = url } lifecycleScope.launch(Dispatchers.IO) { // setSub(url) 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 7a4bda8..9bbb900 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 @@ -642,7 +642,7 @@ class SettingFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatc MMKV.defaultMMKV().removeValueForKey(BZYConstants.MMKV_KEY_Switch_Finsh_Set) //清除源切换记录 - + UIMainActivity.isSubbed=false Log.d("cleanUserInfo clashRunning==>${clashRunning}") if (clashRunning) {