1

lib/app/const/const.dart

@@ -1,9 +1,6 @@
 import 'dart:io';
 import 'package:path/path.dart' as path;
 import 'package:process_run/shell_run.dart';
-import 'package:device_info_plus/device_info_plus.dart';
-
-var arch = "amd64";
 
 class ClashName {
   static String get platform {
@@ -12,9 +9,10 @@ class ClashName {
     if (Platform.isLinux) return 'linux';
     return 'unknown';
   }
-  // static String get arch {
-  //   return  const String.fromEnvironment('OS_ARCH', defaultValue: "arm64"); //amd64
-  // }
+
+  static String get arch {
+    return const String.fromEnvironment('OS_ARCH', defaultValue: 'amd64'); //amd64
+  }
 
   static String get ext {
     if (Platform.isWindows) return '.exe';
@@ -53,10 +51,10 @@ class Files {
   }
 
   static File get assetsClashService {
-    return File(path.join(Paths.assetsBin.path, 'ccore-service-${ClashName.platform}-$arch${ClashName.ext}'));
+    return File(path.join(Paths.assetsBin.path, 'ccore-service-${ClashName.platform}-${ClashName.arch}${ClashName.ext}'));
   }
   static File get assetsCCore {
-    return File(path.join(Paths.assetsBin.path, 'ccore-${ClashName.platform}-$arch${ClashName.ext}'));
+    return File(path.join(Paths.assetsBin.path, 'ccore-${ClashName.platform}-${ClashName.arch}${ClashName.ext}'));
   }
   static File get assetsCountryMmdb {
     return File(path.join(Paths.assetsDep.path, 'Country.mmdb'));

lib/main.dart

@@ -20,7 +20,6 @@ import 'package:naiyouwl/app/controller/tray.dart';
 import 'package:naiyouwl/app/controller/window.dart';
 import 'package:proxy_manager/proxy_manager.dart';
 import 'package:window_manager/window_manager.dart';
-import 'package:device_info_plus/device_info_plus.dart';
 
 
 import 'app/const/const.dart';
@@ -48,12 +47,6 @@ void main() async {
   }));
 
 
-  DeviceInfoPlugin deviceInfo = DeviceInfoPlugin();
-  if (Platform.isMacOS) {
-    MacOsDeviceInfo macInfo = await deviceInfo.macOsInfo;
-    print('macOS 架构: ${macInfo.arch}');
-    arch = macInfo.arch;
-  }
 
 
   Get.put(TrayController());

macos/Flutter/GeneratedPluginRegistrant.swift

@@ -6,7 +6,6 @@ import FlutterMacOS
 import Foundation
 
 import connectivity_plus_macos
-import device_info_plus
 import file_selector_macos
 import flutter_secure_storage_macos
 import path_provider_foundation
@@ -21,7 +20,6 @@ import window_manager
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin"))
-  DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
   FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin"))
   FlutterSecureStorageMacosPlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStorageMacosPlugin"))
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))

pubspec.yaml

@@ -35,7 +35,7 @@ dependencies:
   kommon: ^0.4.1
   bot_toast: ^4.1.3
   protocol_handler: ^0.1.2
-  device_info_plus: ^9.1.0
+
 
 dev_dependencies:
 

scripts/init.dart

@@ -4,7 +4,6 @@ import 'dart:io';
 import 'package:dio/dio.dart';
 import 'package:archive/archive.dart';
 import 'package:naiyouwl/app/const/const.dart';
-import 'package:naiyouwl/app/const/const.dart';
 import 'package:path/path.dart' as path;
 
 final dio = Dio();
@@ -16,7 +15,7 @@ final depDir = Directory(path.join(assetsPath, 'dep'));
 
 Future downloadLatestClashCore() async {
   const version = "v1.16.0";
-  final String clashCoreName = 'clash.meta-${ClashName.platform}-$arch-cgo-$version';
+  final String clashCoreName = 'clash.meta-${ClashName.platform}-${ClashName.arch}-cgo-$version';
 
 // Fetching release info from the GitHub API
   final info = await dio.get('https://api.github.com/repos/MetaCubeX/Clash.Meta/releases/tags/$version');
@@ -50,7 +49,7 @@ Future downloadLatestClashCore() async {
 Future<void> downloadAndUnarchiveService() async {
  // const String token = "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"; // 请确保不在公共代码中硬编码这个token
 
-  final serviceName = 'ccore-service-${ClashName.platform}-$arch';
+  final serviceName = 'ccore-service-${ClashName.platform}-${ClashName.arch}';
   // "name" -> "ccore-service-darwin-amd64-v1.0.0.gz"
   //final newSericeName = "$serviceName-v1.0.0.gz";
   // 获取GitHub release信息
@@ -92,7 +91,7 @@ Future<void> downloadAndUnarchiveService() async {
 }
 
 Future downloadLatestClashService() async {
-    final String serviceName = 'ccore-service-${ClashName.platform}-$arch';
+    final String serviceName = 'ccore-service-${ClashName.platform}-${ClashName.arch}';
   // // final info = await dio.get('https://api.github.com/repos/alroyso/clash-for-flutter-service/releases/latest');
   // // final Map<String, dynamic> latest = (info.data['assets'] as List<dynamic>).firstWhere((it) => (it['name'] as String).contains(serviceName));
   // //https://github.com/alroyso/clash-for-flutter-service/releases/download/untagged-8273cca760b55d0725ab/naiyou-service-darwin-arm64-v1.0.1.gz
@@ -145,7 +144,7 @@ Future downloadWintun() async {
   print('Download Success');
   print('Unarchiving wintun.zip');
   final files = ZipDecoder().decodeBytes(await wintunFile.readAsBytes());
-  final file = files.firstWhere((it) => it.name == 'wintun/bin/$arch/wintun.dll');
+  final file = files.firstWhere((it) => it.name == 'wintun/bin/${ClashName.arch}/wintun.dll');
   await File(path.join(depDir.path, 'wintun.dll')).writeAsBytes(file.content);
   await wintunFile.delete();
   print('Unarchiv Success');