太子

1.一键连更改模式选择代码

app/src/main/java/com/yingmao/clash/act/ChangeNodeActivity.kt

@@ -132,27 +132,28 @@ class ChangeNodeActivity : BaseActivity(), View.OnClickListener {
 
 
         tvProA.setOnClickListener {
-            if(!clashRunning){
+            val getIsGlo= MMKV.defaultMMKV().decodeBool(BZYConstants.MMKV_KEY_GLOBAL_MODEL, false)
+            Log.d("clIntelligentMode ==>${getIsGlo}")
+            if(getIsGlo){
                 setBackground(ProxyMode.PAC)
                 MMKV.defaultMMKV().encode(BZYConstants.MMKV_KEY_GLOBAL_MODEL, false)
                 checkGlo()
-            }else{
-                RxToast.info(resources.getString(R.string.closeRunningChoose))
-            }
-            if(clashRunning){
-                RxToast.info(resources.getString(R.string.SwitchingSourceModel))
-                return@setOnClickListener
             }
 
         }
         tvProj.setOnClickListener {
-            if(!clashRunning){
+            if (!clashRunning) {
-                MMKV.defaultMMKV().encode(BZYConstants.MMKV_KEY_GLOBAL_MODEL, true)
+                RxToast.info(resources.getString(R.string.SwitchingSourceModel))
-                setBackground(ProxyMode.GLOBAL)
+                return@setOnClickListener
-            }else{
-                RxToast.info(resources.getString(R.string.closeRunningChoose))
             }
 
+            val getIsGlo= MMKV.defaultMMKV().decodeBool(BZYConstants.MMKV_KEY_GLOBAL_MODEL, false)
+            Log.d("clGlobalModel ==>${getIsGlo}")
+            if (!getIsGlo) {
+                setBackground(ProxyMode.GLOBAL)
+                MMKV.defaultMMKV().encode(BZYConstants.MMKV_KEY_GLOBAL_MODEL, true)
+                checkGlo()
+            }
         }
 
         aiBack.setOnClickListener {

app/src/main/java/com/yingmao/clash/fragment/home/HomeFragment.kt

@@ -229,20 +229,33 @@ open class HomeFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispa
             startActivityForResult(intent, 2)
         }
         tvIntelligentMode.setOnClickListener {
-            if(clashRunning){
+//            if(clashRunning){
-                RxToast.info(resources.getString(R.string.SwitchingSourceModel))
+//                RxToast.info(resources.getString(R.string.SwitchingSourceModel))
-                return@setOnClickListener
+//                return@setOnClickListener
-            }
+//            }
+            val getIsGlo= MMKV.defaultMMKV().decodeBool(BZYConstants.MMKV_KEY_GLOBAL_MODEL, false)
+            Log.d("clIntelligentMode ==>${getIsGlo}")
+            if(getIsGlo){
                 setProxyModeView(ProxyMode.PAC)
                 MMKV.defaultMMKV().encode(BZYConstants.MMKV_KEY_GLOBAL_MODEL, false)
+                checkGlo()
+            }
+
         }
         tvGlobalMode.setOnClickListener {
-            if(clashRunning){
+            if (!clashRunning) {
                 RxToast.info(resources.getString(R.string.SwitchingSourceModel))
                 return@setOnClickListener
             }
+
+            val getIsGlo= MMKV.defaultMMKV().decodeBool(BZYConstants.MMKV_KEY_GLOBAL_MODEL, false)
+            Log.d("clGlobalModel ==>${getIsGlo}")
+            if (!getIsGlo) {
                 setProxyModeView(ProxyMode.GLOBAL)
                 MMKV.defaultMMKV().encode(BZYConstants.MMKV_KEY_GLOBAL_MODEL, true)
+                checkGlo()
+            }
+
         }
         clLinks.setOnClickListener {
             if (clashRunning) {
@@ -348,12 +361,12 @@ open class HomeFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispa
 
     private fun startClash(isStart: Boolean) {
         launch {
-            if (isStart) {
-                delay(2000)
-            }
             MainActivity.profileBinder?.let { pm ->
                 val active = pm.queryActive()
                 if (active == null) {
+                    if (isStart) {
+                        delay(2000)
+                    }
                     Log.d("startClash: 未选择")
                     val pro = pm.queryAll().find {
                         it.name == Conf.getClashConfName(this@HomeFragment.context)
@@ -512,7 +525,14 @@ open class HomeFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispa
     fun nodeChooseBase(data: Intent?) {
         val node = data?.extras?.getString(BZYConstants.MMKV_KEY_SELECT_NODE_NAME)
         val isRunning = data?.extras?.getBoolean(BZYConstants.EXTRA_KEY_IS_RUNING)
-        Log.d("onActivityResult ==>>>  Node:${node}")
+        val getIsGlo= MMKV.defaultMMKV().decodeBool(BZYConstants.MMKV_KEY_GLOBAL_MODEL, false)
+        if(getIsGlo){
+            setProxyModeView(ProxyMode.GLOBAL)
+        }else{
+            setProxyModeView(ProxyMode.PAC)
+        }
+        Log.d("onActivityResult ==>>>  Node:${node} ::getIsGlo::${getIsGlo}")
+
         node?.let {
             setNodeNameAndImg(it)
             if (clashRunning) {
@@ -635,6 +655,12 @@ open class HomeFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispa
         Log.i("checkGlo isGlobal==>${isGlobal} clashRunning==>${clashRunning}")
         launch(Dispatchers.IO) {
             if (isGlobal) {
+                if (clashRunning) {
+                    Log.i("AAAAAAAAAAAAAA  innner to==>")
+                    getNodes()
+                }
+            }else{
+                if(clashRunning){
                     delay(1000)
                     clashBinder?.let { cm ->
                         val names = cm.queryProxyGroupNames(false)
@@ -660,7 +686,7 @@ open class HomeFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispa
                             }
                         }
                     }
-                getNodes()
+                }
             }
         }
     }

app/src/main/res/values/strings.xml

@@ -479,4 +479,5 @@
     <string name="ShartPagetxt">邀请新朋友通过你的分享链接注册并订购任意会员套餐，\n
 您可以获得30天会员（仅限新用户订购有效）</string>
     <string name="LinkSharetxt">点击分享</string>
+    <string name="OpenSwitchingSourceModel">请开启加速后在进行全局模式切换</string>
 </resources>