alroyso 1 vuosi sitten
vanhempi
säilyke
942a0e7bea

+ 3 - 0
lib/app/controller/service.dart

@@ -237,6 +237,7 @@ class ServiceController extends GetxController {
 
     Future<void> serviceModeSwitch(bool open) async {
       if (serviceStatus.value == RunningState.running) await stopService();
+      if (coreStatus.value == RunningState.running) await stopClashCore();
       try {
         controllers.global.updateMsg(open ? "安装服务" : "卸载服务");
         open ? await install() : await uninstall();
@@ -245,8 +246,10 @@ class ServiceController extends GetxController {
       }
       if(open){
         await startService();
+        await startClashCore();
       }else{
         serviceMode.value = false;
+        await startClashCore();
       }
       //await startClashCore();
     }

+ 16 - 16
lib/app/modules/home/controllers/home_controller.dart

@@ -164,23 +164,23 @@ class HomeController extends GetxController {
       }
 
       updateStatus(ConnectionStatus.connecting);
-      updateStatus(ConnectionStatus.stopped);
-      await controllers.global.updateDate();
-      await controllers.global.updateNode();
-      //
-      await controllers.tray.updateTray();
 
-      if(routeModes == "tun"){
-        controllers.global.updateMsg("启动tun模式完成...");
-      }
-      else{
-        await controllers.global.systemProxySwitch(true);
-        controllers.global.updateMsg("设置系统代理完成...");
-      }
-      isConnect.value = true;
-      // Future.delayed(const Duration(seconds: 3), () async {
-      //
-      // });
+      Future.delayed(const Duration(seconds: 3), () async {
+        updateStatus(ConnectionStatus.stopped);
+        await controllers.global.updateDate();
+        await controllers.global.updateNode();
+        //
+        await controllers.tray.updateTray();
+
+        if(routeModes == "tun"){
+          controllers.global.updateMsg("启动tun模式完成...");
+        }
+        else{
+          await controllers.global.systemProxySwitch(true);
+          controllers.global.updateMsg("设置系统代理完成...");
+        }
+        isConnect.value = true;
+      });
 
     }
   }