|
@@ -53,25 +53,39 @@ class GlobalController extends GetxController {
|
|
|
|
|
|
// init config
|
|
|
await controllers.config.initConfig();
|
|
|
+ await controllers.service.initConfig();
|
|
|
+ await initService();
|
|
|
// final language = controllers.config.config.value.language.split('_');
|
|
|
//
|
|
|
// await applyLanguage(Locale(language[0], language[1]));
|
|
|
|
|
|
- await controllers.service.initConfig();
|
|
|
+ // await controllers.service.initConfig();
|
|
|
+ // // init service
|
|
|
+ // await controllers.service.startService();
|
|
|
+ // if (controllers.service.serviceStatus.value != RunningState.running) return;
|
|
|
+ // // await controllers.service.serviceModeSwitch(true);
|
|
|
+ // // init clash core
|
|
|
+ //
|
|
|
+ // await controllers.service.startClashCore();
|
|
|
+ // if (controllers.service.coreStatus.value != RunningState.running) return;
|
|
|
+ // await controllers.core.updateVersion();
|
|
|
+ // await controllers.global.updateDate();
|
|
|
+ //await controllers.service.install();
|
|
|
+ initRegularlyUpdate();
|
|
|
+ }
|
|
|
+
|
|
|
+ Future<void> initService() async {
|
|
|
+
|
|
|
// init service
|
|
|
- await controllers.service.install();
|
|
|
+ await controllers.service.startService();
|
|
|
if (controllers.service.serviceStatus.value != RunningState.running) return;
|
|
|
- // await controllers.service.serviceModeSwitch(true);
|
|
|
+ // await controllers.service.serviceModeSwitch(true);
|
|
|
// init clash core
|
|
|
|
|
|
- // await controllers.service.startClashCore();
|
|
|
- // if (controllers.service.coreStatus.value != RunningState.running) return;
|
|
|
- // await controllers.core.updateVersion();
|
|
|
- // await controllers.pageProxie.updateDate();
|
|
|
-
|
|
|
- initRegularlyUpdate();
|
|
|
+ await controllers.service.startClashCore();
|
|
|
+ if (controllers.service.coreStatus.value != RunningState.running) return;
|
|
|
+ await controllers.core.updateVersion();
|
|
|
}
|
|
|
-
|
|
|
Future<void> updateRoute(String route) async {
|
|
|
if(allowStatusUpdate){
|
|
|
|
|
@@ -86,27 +100,27 @@ class GlobalController extends GetxController {
|
|
|
}
|
|
|
Future<void> fetchNodes() async {
|
|
|
nodeModes.value = await ApiService().getNode("/api/client/v4/nodes?vless=1");
|
|
|
- // await makeProxy();
|
|
|
- // if(controllers.service.coreStatus.value == RunningState.stoped){
|
|
|
- // await controllers.service.reloadClashCore();
|
|
|
- // }
|
|
|
- // if (controllers.service.coreStatus.value != RunningState.running) return;
|
|
|
- // await controllers.core.updateVersion();
|
|
|
- // await updateDate();
|
|
|
+ await makeProxy();
|
|
|
+ if(controllers.service.coreStatus.value == RunningState.stoped){
|
|
|
+ await controllers.service.reloadClashCore();
|
|
|
+ }
|
|
|
+ if (controllers.service.coreStatus.value != RunningState.running) return;
|
|
|
+ await controllers.core.updateVersion();
|
|
|
+ await updateDate();
|
|
|
//
|
|
|
- // NodeMode? targetNode;
|
|
|
- // if (selectedNode.value == null) {
|
|
|
- // targetNode = await findNodeWithMinUsers(nodeModes);
|
|
|
- // } else {
|
|
|
- // targetNode = selectedNode.value;
|
|
|
- // }
|
|
|
- // if (targetNode != null){
|
|
|
- // selectNode(targetNode);
|
|
|
- // ProxieProxiesItem? targetProxie = await findProxieByName(targetNode.name);
|
|
|
- // if (targetProxie != null) {
|
|
|
- // handleSetProxieGroup(targetProxie, targetNode.name);
|
|
|
- // }
|
|
|
- // }
|
|
|
+ NodeMode? targetNode;
|
|
|
+ if (selectedNode.value == null) {
|
|
|
+ targetNode = await findNodeWithMinUsers(nodeModes);
|
|
|
+ } else {
|
|
|
+ targetNode = selectedNode.value;
|
|
|
+ }
|
|
|
+ if (targetNode != null){
|
|
|
+ selectNode(targetNode);
|
|
|
+ ProxieProxiesItem? targetProxie = await findProxieByName(targetNode.name);
|
|
|
+ if (targetProxie != null) {
|
|
|
+ handleSetProxieGroup(targetProxie, targetNode.name);
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
}
|
|
|
|
|
@@ -126,7 +140,7 @@ class GlobalController extends GetxController {
|
|
|
handleSetProxieGroup(targetProxie, targetNode.name);
|
|
|
}
|
|
|
}
|
|
|
- await updateDate();
|
|
|
+ //await updateDate();
|
|
|
}
|
|
|
Future<void> startTunMode() async {
|
|
|
await makeProxy();
|
|
@@ -143,7 +157,7 @@ class GlobalController extends GetxController {
|
|
|
handleSetProxieGroup(targetProxie, targetNode.name);
|
|
|
}
|
|
|
}
|
|
|
- await updateDate();
|
|
|
+
|
|
|
}
|
|
|
|
|
|
Future<void> swift(String name) async {
|