From 488ad2a485b52b91f3bd55ca55f8ce4407336d1d Mon Sep 17 00:00:00 2001 From: xkeyC <3334969096@qq.com> Date: Sun, 1 Jun 2025 16:36:10 +0800 Subject: [PATCH] feat: VehicleSorting --- lib/common/conf/conf.dart | 3 + lib/ui/home/home_ui_model.dart | 101 ++---- lib/ui/home/home_ui_model.g.dart | 2 +- .../input_method_dialog_ui_model.dart | 2 +- .../input_method_dialog_ui_model.g.dart | 2 +- .../advanced_localization_ui_model.dart | 135 +++---- .../advanced_localization_ui_model.g.dart | 2 +- .../localization/localization_dialog_ui.dart | 2 + .../localization/localization_ui_model.dart | 221 ++++++------ .../localization/localization_ui_model.g.dart | 2 +- .../dialogs/vehicle_sorting_dialog_ui.dart | 337 ++++++++++++++++++ 11 files changed, 530 insertions(+), 279 deletions(-) create mode 100644 lib/ui/tools/dialogs/vehicle_sorting_dialog_ui.dart diff --git a/lib/common/conf/conf.dart b/lib/common/conf/conf.dart index 21983e7..cdd34f2 100644 --- a/lib/common/conf/conf.dart +++ b/lib/common/conf/conf.dart @@ -11,6 +11,9 @@ class ConstConf { "HOTFIX", ]; static const isMSE = String.fromEnvironment("MSE", defaultValue: "false") == "true"; + static const win32AppId = isMSE + ? "56575xkeyC.MSE_bsn1nexg8e4qe!starcitizendoctor" + : "{6D809377-6AF0-444B-8957-A3773F02200E}\\Starcitizen_Doctor\\starcitizen_doctor.exe"; static const dohAddress = "https://223.6.6.6/resolve"; static const inputMethodServerPort = 59399; } diff --git a/lib/ui/home/home_ui_model.dart b/lib/ui/home/home_ui_model.dart index 0e87d8b..295d8bb 100644 --- a/lib/ui/home/home_ui_model.dart +++ b/lib/ui/home/home_ui_model.dart @@ -76,17 +76,15 @@ class HomeUIModel extends _$HomeUIModel { } Future reScanPath() async { - state = state.copyWith( - scInstalledPath: "not_install", - lastScreenInfo: S.current.home_action_info_scanning); + state = state.copyWith(scInstalledPath: "not_install", lastScreenInfo: S.current.home_action_info_scanning); try { final listData = await SCLoggerHelper.getLauncherLogList(); if (listData == null) { state = state.copyWith(scInstalledPath: "not_install"); return; } - final scInstallPaths = await SCLoggerHelper.getGameInstallPath(listData, - withVersion: AppConf.gameChannels, checkExists: true); + final scInstallPaths = + await SCLoggerHelper.getGameInstallPath(listData, withVersion: AppConf.gameChannels, checkExists: true); String scInstalledPath = "not_install"; @@ -95,17 +93,13 @@ class HomeUIModel extends _$HomeUIModel { scInstalledPath = scInstallPaths.first; } } - final lastScreenInfo = S.current - .home_action_info_scan_complete_valid_directories_found( - scInstallPaths.length.toString()); + final lastScreenInfo = + S.current.home_action_info_scan_complete_valid_directories_found(scInstallPaths.length.toString()); state = state.copyWith( - scInstalledPath: scInstalledPath, - scInstallPaths: scInstallPaths, - lastScreenInfo: lastScreenInfo); + scInstalledPath: scInstalledPath, scInstallPaths: scInstallPaths, lastScreenInfo: lastScreenInfo); } catch (e) { state = state.copyWith( - scInstalledPath: "not_install", - lastScreenInfo: S.current.home_action_info_log_file_parse_fail); + scInstalledPath: "not_install", lastScreenInfo: S.current.home_action_info_log_file_parse_fail); AnalyticsApi.touch("error_launchLogs"); // showToast(context!, // "${S.current.home_action_info_log_file_parse_fail} \n请关闭游戏，退出RSI启动器后重试，若仍有问题，请使用工具箱中的 RSI Launcher log 修复。"); @@ -134,14 +128,11 @@ class HomeUIModel extends _$HomeUIModel { // ignore: avoid_build_context_in_providers Future goWebView(BuildContext context, String title, String url, - {bool useLocalization = false, - bool loginMode = false, - RsiLoginCallback? rsiLoginCallback}) async { + {bool useLocalization = false, bool loginMode = false, RsiLoginCallback? rsiLoginCallback}) async { if (useLocalization) { const tipVersion = 2; final box = await Hive.openBox("app_conf"); - final skip = - await box.get("skip_web_localization_tip_version", defaultValue: 0); + final skip = await box.get("skip_web_localization_tip_version", defaultValue: 0); if (skip != tipVersion) { if (!context.mounted) return; final ok = await showConfirmDialogs( @@ -151,8 +142,7 @@ class HomeUIModel extends _$HomeUIModel { S.current.home_action_info_web_localization_plugin_disclaimer, style: const TextStyle(fontSize: 16), ), - constraints: BoxConstraints( - maxWidth: MediaQuery.of(context).size.width * .6)); + constraints: BoxConstraints(maxWidth: MediaQuery.of(context).size.width * .6)); if (!ok) { if (loginMode) { rsiLoginCallback?.call(null, false); @@ -164,19 +154,14 @@ class HomeUIModel extends _$HomeUIModel { } if (!await WebviewWindow.isWebviewAvailable()) { if (!context.mounted) return; - showToast( - context, S.current.home_login_action_title_need_webview2_runtime); - launchUrlString( - "https://developer.microsoft.com/en-us/microsoft-edge/webview2/"); + showToast(context, S.current.home_login_action_title_need_webview2_runtime); + launchUrlString("https://developer.microsoft.com/en-us/microsoft-edge/webview2/"); return; } if (!context.mounted) return; - final webViewModel = WebViewModel(context, - loginMode: loginMode, loginCallback: rsiLoginCallback); + final webViewModel = WebViewModel(context, loginMode: loginMode, loginCallback: rsiLoginCallback); if (useLocalization) { - state = state.copyWith( - isFixing: true, - isFixingString: S.current.home_action_info_initializing_resources); + state = state.copyWith(isFixing: true, isFixingString: S.current.home_action_info_initializing_resources); try { await webViewModel.initLocalization(state.webLocalizationVersionsData!); } catch (e) { @@ -236,10 +221,8 @@ class HomeUIModel extends _$HomeUIModel { } } - final appWebLocalizationVersionsData = - AppWebLocalizationVersionsData.fromJson(json.decode( - (await RSHttp.getText( - "${URLConf.webTranslateHomeUrl}/versions.json")))); + final appWebLocalizationVersionsData = AppWebLocalizationVersionsData.fromJson( + json.decode((await RSHttp.getText("${URLConf.webTranslateHomeUrl}/versions.json")))); final countdownFestivalListData = await Api.getFestivalCountdownList(); state = state.copyWith( webLocalizationVersionsData: appWebLocalizationVersionsData, @@ -284,20 +267,16 @@ class HomeUIModel extends _$HomeUIModel { state = state.copyWith(localizationUpdateInfo: null); return; } - state = - state.copyWith(localizationUpdateInfo: MapEntry(updates.first, true)); + state = state.copyWith(localizationUpdateInfo: MapEntry(updates.first, true)); if (_appUpdateTimer != null) { _appUpdateTimer?.cancel(); _appUpdateTimer = null; // 发送通知 await win32.sendNotify( summary: S.current.home_localization_new_version_available, - body: - S.current.home_localization_new_version_installed(updates.first), + body: S.current.home_localization_new_version_installed(updates.first), appName: S.current.home_title_app_name, - appId: ConstConf.isMSE - ? "56575xkeyC.MSE_bsn1nexg8e4qe!starcitizendoctor" - : "{6D809377-6AF0-444B-8957-A3773F02200E}\\Starcitizen_Doctor\\starcitizen_doctor.exe"); + appId: ConstConf.win32AppId); } } @@ -310,25 +289,17 @@ class HomeUIModel extends _$HomeUIModel { if (ConstConf.isMSE) { if (state.isCurGameRunning) { - await Process.run( - SystemHelper.powershellPath, ["ps \"StarCitizen\" | kill"]); + await Process.run(SystemHelper.powershellPath, ["ps \"StarCitizen\" | kill"]); return; } AnalyticsApi.touch("gameLaunch"); - showDialog( - context: context, - dismissWithEsc: false, - builder: (context) => HomeGameLoginDialogUI(context)); + showDialog(context: context, dismissWithEsc: false, builder: (context) => HomeGameLoginDialogUI(context)); } else { final ok = await showConfirmDialogs( - context, - S.current.home_info_one_click_launch_warning, - Text(S.current.home_info_account_security_warning), - confirm: S.current.home_action_install_microsoft_store_version, - cancel: S.current.home_action_cancel); + context, S.current.home_info_one_click_launch_warning, Text(S.current.home_info_account_security_warning), + confirm: S.current.home_action_install_microsoft_store_version, cancel: S.current.home_action_cancel); if (ok == true) { - await launchUrlString( - "https://apps.microsoft.com/detail/9NF3SWFWNKL1?launch=true"); + await launchUrlString("https://apps.microsoft.com/detail/9NF3SWFWNKL1?launch=true"); await Future.delayed(const Duration(seconds: 2)); exit(0); } @@ -338,9 +309,7 @@ class HomeUIModel extends _$HomeUIModel { void onChangeInstallPath(String? value) { if (value == null) return; state = state.copyWith(scInstalledPath: value); - ref - .read(localizationUIModelProvider.notifier) - .onChangeGameInstallPath(value); + ref.read(localizationUIModelProvider.notifier).onChangeGameInstallPath(value); } doLaunchGame( @@ -359,16 +328,8 @@ class HomeUIModel extends _$HomeUIModel { result = await Process.run(launchExe, args); } else { dPrint("set Affinity === $processorAffinity launchExe === $launchExe"); - result = await Process.run("cmd.exe", [ - '/C', - 'Start', - '"StarCitizen"', - '/High', - '/Affinity', - processorAffinity, - launchExe, - ...args - ]); + result = await Process.run( + "cmd.exe", ['/C', 'Start', '"StarCitizen"', '/High', '/Affinity', processorAffinity, launchExe, ...args]); } dPrint('Exit code: ${result.exitCode}'); dPrint('stdout: ${result.stdout}'); @@ -394,12 +355,8 @@ class HomeUIModel extends _$HomeUIModel { result.exitCode.toString(), result.stdout ?? "", result.stderr ?? "", - exitInfo == null - ? S.current.home_action_info_unknown_error - : exitInfo.key, - hasUrl - ? S.current.home_action_info_check_web_link - : exitInfo?.value ?? "")); + exitInfo == null ? S.current.home_action_info_unknown_error : exitInfo.key, + hasUrl ? S.current.home_action_info_check_web_link : exitInfo?.value ?? "")); if (hasUrl) { await Future.delayed(const Duration(seconds: 3)); launchUrlString(exitInfo!.value); diff --git a/lib/ui/home/home_ui_model.g.dart b/lib/ui/home/home_ui_model.g.dart index b171b51..ae8141f 100644 --- a/lib/ui/home/home_ui_model.g.dart +++ b/lib/ui/home/home_ui_model.g.dart @@ -6,7 +6,7 @@ part of 'home_ui_model.dart'; // RiverpodGenerator // ************************************************************************** -String _$homeUIModelHash() => r'3ff5a689cae80acdaf95ee823da9b86615bed95f'; +String _$homeUIModelHash() => r'8bde330ebc2cd73f76d2d49df8b328f301d42e44'; /// See also [HomeUIModel]. @ProviderFor(HomeUIModel) diff --git a/lib/ui/home/input_method/input_method_dialog_ui_model.dart b/lib/ui/home/input_method/input_method_dialog_ui_model.dart index c55afe6..a1b9409 100644 --- a/lib/ui/home/input_method/input_method_dialog_ui_model.dart +++ b/lib/ui/home/input_method/input_method_dialog_ui_model.dart @@ -33,7 +33,7 @@ class InputMethodDialogUIModel extends _$InputMethodDialogUIModel { return state; } - _init({bool skipUpdate = false}) async { + Future _init({bool skipUpdate = false}) async { final localizationState = ref.read(localizationUIModelProvider); final localizationModel = ref.read(localizationUIModelProvider.notifier); if (localizationState.installedCommunityInputMethodSupportVersion == null) { diff --git a/lib/ui/home/input_method/input_method_dialog_ui_model.g.dart b/lib/ui/home/input_method/input_method_dialog_ui_model.g.dart index 9e8c840..918ba65 100644 --- a/lib/ui/home/input_method/input_method_dialog_ui_model.g.dart +++ b/lib/ui/home/input_method/input_method_dialog_ui_model.g.dart @@ -7,7 +7,7 @@ part of 'input_method_dialog_ui_model.dart'; // ************************************************************************** String _$inputMethodDialogUIModelHash() => - r'397b36296183404c07298d83c14f4bce590375fc'; + r'7086eb73fc75e4a79d1490646b25cd23ac611c80'; /// See also [InputMethodDialogUIModel]. @ProviderFor(InputMethodDialogUIModel) diff --git a/lib/ui/home/localization/advanced_localization_ui_model.dart b/lib/ui/home/localization/advanced_localization_ui_model.dart index b626f03..ccce614 100644 --- a/lib/ui/home/localization/advanced_localization_ui_model.dart +++ b/lib/ui/home/localization/advanced_localization_ui_model.dart @@ -45,12 +45,11 @@ extension AdvancedLocalizationUIStateEx on AdvancedLocalizationUIState { Map get typeNames => { AppAdvancedLocalizationClassKeysDataMode.localization: S.current.home_localization_advanced_action_mod_change_localization, - AppAdvancedLocalizationClassKeysDataMode.unLocalization: S.current - .home_localization_advanced_action_mod_change_un_localization, - AppAdvancedLocalizationClassKeysDataMode.mixed: - S.current.home_localization_advanced_action_mod_change_mixed, - AppAdvancedLocalizationClassKeysDataMode.mixedNewline: S - .current.home_localization_advanced_action_mod_change_mixed_newline, + AppAdvancedLocalizationClassKeysDataMode.unLocalization: + S.current.home_localization_advanced_action_mod_change_un_localization, + AppAdvancedLocalizationClassKeysDataMode.mixed: S.current.home_localization_advanced_action_mod_change_mixed, + AppAdvancedLocalizationClassKeysDataMode.mixedNewline: + S.current.home_localization_advanced_action_mod_change_mixed_newline, }; } @@ -65,14 +64,11 @@ class AdvancedLocalizationUIModel extends _$AdvancedLocalizationUIModel { return state; } - Future _init(LocalizationUIState localizationUIState, - LocalizationUIModel localizationUIModel) async { - final (p4kGlobalIni, serverGlobalIni) = - await _readIni(localizationUIState, localizationUIModel); + Future _init(LocalizationUIState localizationUIState, LocalizationUIModel localizationUIModel) async { + final (p4kGlobalIni, serverGlobalIni) = await _readIni(localizationUIState, localizationUIModel); final ald = await _readClassJson(); if (ald.classKeys == null) return; - state = state.copyWith( - workingText: S.current.home_localization_advanced_msg_classifying); + state = state.copyWith(workingText: S.current.home_localization_advanced_msg_classifying); final m = await compute(_doClassIni, ( ald, p4kGlobalIni, @@ -133,10 +129,8 @@ class AdvancedLocalizationUIModel extends _$AdvancedLocalizationUIModel { final p4kIniMap = readIniAsMap(p4kGlobalIni); final serverIniMap = readIniAsMap(serverGlobalIni); - var regexList = classMap.values - .expand((c) => - c.keys!.map((k) => MapEntry(c, RegExp(k, caseSensitive: false)))) - .toList(); + var regexList = + classMap.values.expand((c) => c.keys!.map((k) => MapEntry(c, RegExp(k, caseSensitive: false)))).toList(); iniKeysLoop: for (var p4kIniKey in p4kIniMap.keys) { @@ -185,39 +179,31 @@ class AdvancedLocalizationUIModel extends _$AdvancedLocalizationUIModel { return AppAdvancedLocalizationData.fromJson(advancedLocalizationJsonData); } - Future<(String, String)> _readIni(LocalizationUIState localizationUIState, - LocalizationUIModel localizationUIModel) async { + Future<(String, String)> _readIni( + LocalizationUIState localizationUIState, LocalizationUIModel localizationUIModel) async { final homeUIState = ref.read(homeUIModelProvider); final gameDir = homeUIState.scInstalledPath; if (gameDir == null) return ("", ""); - state = state.copyWith( - workingText: S.current.home_localization_advanced_msg_reading_p4k); + state = state.copyWith(workingText: S.current.home_localization_advanced_msg_reading_p4k); final p4kGlobalIni = await readEnglishInI(gameDir); dPrint("read p4kGlobalIni => ${p4kGlobalIni.length}"); - state = state.copyWith( - workingText: S.current - .home_localization_advanced_msg_reading_server_localization_text); + state = state.copyWith(workingText: S.current.home_localization_advanced_msg_reading_server_localization_text); if (state.customizeGlobalIni != null) { - final apiLocalizationData = ScLocalizationData( - versionName: S.current.localization_info_custom_files, - info: "Customize"); + final apiLocalizationData = + ScLocalizationData(versionName: S.current.localization_info_custom_files, info: "Customize"); state = state.copyWith(apiLocalizationData: apiLocalizationData); return (p4kGlobalIni, state.customizeGlobalIni!); } else { - final apiLocalizationData = - localizationUIState.apiLocalizationData?.values.firstOrNull; + final apiLocalizationData = localizationUIState.apiLocalizationData?.values.firstOrNull; if (apiLocalizationData == null) return ("", ""); - final file = File( - "${localizationUIModel.getDownloadDir().absolute.path}\\${apiLocalizationData.versionName}.sclang"); + final file = + File("${localizationUIModel.getDownloadDir().absolute.path}\\${apiLocalizationData.versionName}.sclang"); if (!await file.exists()) { - await localizationUIModel.downloadLocalizationFile( - file, apiLocalizationData); + await localizationUIModel.downloadLocalizationFile(file, apiLocalizationData); } state = state.copyWith(apiLocalizationData: apiLocalizationData); - final serverGlobalIni = - (await compute(LocalizationUIModel.readArchive, file.absolute.path)) - .toString(); + final serverGlobalIni = (await compute(LocalizationUIModel.readArchive, file.absolute.path)).toString(); dPrint("read serverGlobalIni => ${serverGlobalIni.length}"); return (p4kGlobalIni, serverGlobalIni); } @@ -225,17 +211,10 @@ class AdvancedLocalizationUIModel extends _$AdvancedLocalizationUIModel { Future readEnglishInI(String gameDir) async { try { - var data = await Unp4kCModel.unp4kTools( - appGlobalState.applicationBinaryModuleDir!, [ - "extract_memory", - "$gameDir\\Data.p4k", - "Data\\Localization\\english\\global.ini" - ]); + var data = await Unp4kCModel.unp4kTools(appGlobalState.applicationBinaryModuleDir!, + ["extract_memory", "$gameDir\\Data.p4k", "Data\\Localization\\english\\global.ini"]); // remove bom - if (data.length > 3 && - data[0] == 0xEF && - data[1] == 0xBB && - data[2] == 0xBF) { + if (data.length > 3 && data[0] == 0xEF && data[1] == 0xBB && data[2] == 0xBF) { data = data.sublist(3); } final iniData = String.fromCharCodes(data); @@ -253,13 +232,11 @@ class AdvancedLocalizationUIModel extends _$AdvancedLocalizationUIModel { return ""; } - onChangeMod(AppAdvancedLocalizationClassKeysData item, - AppAdvancedLocalizationClassKeysDataMode mode) async { + Future onChangeMod(AppAdvancedLocalizationClassKeysData item, AppAdvancedLocalizationClassKeysDataMode mode) async { if (item.lockMod) return; item.mode = mode; item.isWorking = true; - final classMap = - Map.from(state.classMap!); + final classMap = Map.from(state.classMap!); classMap[item.id!] = item; state = state.copyWith(classMap: classMap); @@ -276,12 +253,10 @@ class AdvancedLocalizationUIModel extends _$AdvancedLocalizationUIModel { newValuesMap[kv.key] = p4kIniMap[kv.key] ?? ""; break; case AppAdvancedLocalizationClassKeysDataMode.mixed: - newValuesMap[kv.key] = - "${serverIniMap[kv.key]} [${p4kIniMap[kv.key]}]"; + newValuesMap[kv.key] = "${serverIniMap[kv.key]} [${p4kIniMap[kv.key]}]"; break; case AppAdvancedLocalizationClassKeysDataMode.mixedNewline: - newValuesMap[kv.key] = - "${serverIniMap[kv.key]}\\n${p4kIniMap[kv.key]}"; + newValuesMap[kv.key] = "${serverIniMap[kv.key]}\\n${p4kIniMap[kv.key]}"; break; } await Future.delayed(Duration.zero); @@ -292,11 +267,10 @@ class AdvancedLocalizationUIModel extends _$AdvancedLocalizationUIModel { state = state.copyWith(classMap: classMap); } - Future doInstall({bool isEnableCommunityInputMethod = false}) async { + // ignore: avoid_build_context_in_providers + Future doInstall(BuildContext context, {bool isEnableCommunityInputMethod = false}) async { AnalyticsApi.touch("advanced_localization_apply"); - state = state.copyWith( - workingText: - S.current.home_localization_advanced_msg_gen_localization_text); + state = state.copyWith(workingText: S.current.home_localization_advanced_msg_gen_localization_text); final classMap = state.classMap!; final globalIni = StringBuffer(); for (var item in classMap.values) { @@ -305,15 +279,11 @@ class AdvancedLocalizationUIModel extends _$AdvancedLocalizationUIModel { await Future.delayed(Duration.zero); } } - state = state.copyWith( - workingText: - S.current.home_localization_advanced_msg_gen_localization_install); + state = state.copyWith(workingText: S.current.home_localization_advanced_msg_gen_localization_install); final localizationUIModel = ref.read(localizationUIModelProvider.notifier); - - await localizationUIModel.installFormString( - globalIni, state.apiLocalizationData?.versionName ?? "-", - advanced: true, - isEnableCommunityInputMethod: isEnableCommunityInputMethod); + if (!context.mounted) return false; + await localizationUIModel.installFormString(globalIni, state.apiLocalizationData?.versionName ?? "-", + advanced: true, isEnableCommunityInputMethod: isEnableCommunityInputMethod, context: context); state = state.copyWith(workingText: ""); return true; } @@ -321,9 +291,8 @@ class AdvancedLocalizationUIModel extends _$AdvancedLocalizationUIModel { // ignore: avoid_build_context_in_providers Future onInstall(BuildContext context) async { var isEnableCommunityInputMethod = true; - final userOK = await showConfirmDialogs( - context, S.current.input_method_confirm_install_advanced_localization, - HookConsumer( + final userOK = + await showConfirmDialogs(context, S.current.input_method_confirm_install_advanced_localization, HookConsumer( builder: (BuildContext context, WidgetRef ref, Widget? child) { final globalIni = useState(null); final enableCommunityInputMethod = useState(true); @@ -354,13 +323,10 @@ class AdvancedLocalizationUIModel extends _$AdvancedLocalizationUIModel { ? makeLoading(context) : CodeEditor( readOnly: true, - controller: CodeLineEditingController.fromText( - globalIni.value!.toString()), + controller: CodeLineEditingController.fromText(globalIni.value!.toString()), style: CodeEditorStyle( codeTheme: CodeHighlightTheme( - languages: { - 'ini': CodeHighlightThemeMode(mode: langIni) - }, + languages: {'ini': CodeHighlightThemeMode(mode: langIni)}, theme: vs2015Theme, ), ), @@ -376,13 +342,12 @@ class AdvancedLocalizationUIModel extends _$AdvancedLocalizationUIModel { Spacer(), ToggleSwitch( checked: enableCommunityInputMethod.value, - onChanged: - localizationState.communityInputMethodLanguageData == null - ? null - : (v) { - isEnableCommunityInputMethod = v; - enableCommunityInputMethod.value = v; - }, + onChanged: localizationState.communityInputMethodLanguageData == null + ? null + : (v) { + isEnableCommunityInputMethod = v; + enableCommunityInputMethod.value = v; + }, ) ], ) @@ -390,12 +355,12 @@ class AdvancedLocalizationUIModel extends _$AdvancedLocalizationUIModel { ); }, ), - constraints: BoxConstraints( - maxWidth: MediaQuery.of(context).size.width * .8, - )); + constraints: BoxConstraints( + maxWidth: MediaQuery.of(context).size.width * .8, + )); if (userOK) { - await doInstall( - isEnableCommunityInputMethod: isEnableCommunityInputMethod); + if (!context.mounted) return; + await doInstall(context, isEnableCommunityInputMethod: isEnableCommunityInputMethod); } } } diff --git a/lib/ui/home/localization/advanced_localization_ui_model.g.dart b/lib/ui/home/localization/advanced_localization_ui_model.g.dart index f153af1..b03eb0e 100644 --- a/lib/ui/home/localization/advanced_localization_ui_model.g.dart +++ b/lib/ui/home/localization/advanced_localization_ui_model.g.dart @@ -7,7 +7,7 @@ part of 'advanced_localization_ui_model.dart'; // ************************************************************************** String _$advancedLocalizationUIModelHash() => - r'52d4f40f20e9f4d2f34fae7d0378acb31cf681ac'; + r'2f890c854bc56e506c441acabc2014438a163617'; /// See also [AdvancedLocalizationUIModel]. @ProviderFor(AdvancedLocalizationUIModel) diff --git a/lib/ui/home/localization/localization_dialog_ui.dart b/lib/ui/home/localization/localization_dialog_ui.dart index ca39c35..9bac86a 100644 --- a/lib/ui/home/localization/localization_dialog_ui.dart +++ b/lib/ui/home/localization/localization_dialog_ui.dart @@ -438,10 +438,12 @@ class LocalizationDialogUI extends HookConsumerWidget { builder: (BuildContext context) => const LocalizationFromFileDialogUI(), ); if (sb is (StringBuffer, bool)) { + if (!context.mounted) return; await model.installFormString( sb.$1, S.current.localization_info_custom_files, isEnableCommunityInputMethod: sb.$2, + context: context, ); } break; diff --git a/lib/ui/home/localization/localization_ui_model.dart b/lib/ui/home/localization/localization_ui_model.dart index 9ade269..9f4a612 100644 --- a/lib/ui/home/localization/localization_ui_model.dart +++ b/lib/ui/home/localization/localization_ui_model.dart @@ -20,6 +20,7 @@ import 'package:starcitizen_doctor/data/input_method_api_data.dart'; import 'package:starcitizen_doctor/data/sc_localization_data.dart'; import 'package:starcitizen_doctor/generated/no_l10n_strings.dart'; import 'package:starcitizen_doctor/ui/home/home_ui_model.dart'; +import 'package:starcitizen_doctor/ui/tools/dialogs/vehicle_sorting_dialog_ui.dart'; import 'package:starcitizen_doctor/widgets/widgets.dart'; import 'package:url_launcher/url_launcher_string.dart'; @@ -50,13 +51,11 @@ class LocalizationUIModel extends _$LocalizationUIModel { "chinese_(traditional)": NoL10n.langZHT, }; - Directory get _downloadDir => - Directory("${appGlobalState.applicationSupportDir}\\Localizations"); + Directory get _downloadDir => Directory("${appGlobalState.applicationSupportDir}\\Localizations"); Directory getDownloadDir() => _downloadDir; - Directory get _scDataDir => - Directory("${ref.read(homeUIModelProvider).scInstalledPath}\\data"); + Directory get _scDataDir => Directory("${ref.read(homeUIModelProvider).scInstalledPath}\\data"); File get _cfgFile => File("${_scDataDir.absolute.path}\\system.cfg"); @@ -80,16 +79,14 @@ class LocalizationUIModel extends _$LocalizationUIModel { _customizeDirListenSub = null; }); final appConfBox = await Hive.openBox("app_conf"); - final lang = await appConfBox.get("localization_selectedLanguage", - defaultValue: languageSupport.keys.first); + final lang = await appConfBox.get("localization_selectedLanguage", defaultValue: languageSupport.keys.first); state = state.copyWith(selectedLanguage: lang); // fix for ui performance await Future.delayed(Duration(milliseconds: 250)); await _loadData(); } - final Map> - _allVersionLocalizationData = {}; + final Map> _allVersionLocalizationData = {}; Future _loadCommunityInputMethodData() async { try { @@ -141,16 +138,11 @@ class LocalizationUIModel extends _$LocalizationUIModel { final userCfgFile = File("$_scInstallPath\\USER.cfg"); if (await userCfgFile.exists()) { final cfgString = await userCfgFile.readAsString(); - if (cfgString.contains("g_language") && - !cfgString.contains("g_language=${state.selectedLanguage}")) { + if (cfgString.contains("g_language") && !cfgString.contains("g_language=${state.selectedLanguage}")) { if (!context.mounted) return; - final ok = await showConfirmDialogs( - context, - S.current.localization_info_remove_incompatible_translation_params, - Text(S.current - .localization_info_incompatible_translation_params_warning), - constraints: BoxConstraints( - maxWidth: MediaQuery.of(context).size.width * .35)); + final ok = await showConfirmDialogs(context, S.current.localization_info_remove_incompatible_translation_params, + Text(S.current.localization_info_incompatible_translation_params_warning), + constraints: BoxConstraints(maxWidth: MediaQuery.of(context).size.width * .35)); if (ok == true) { var finalString = ""; for (var item in cfgString.split("\n")) { @@ -226,8 +218,7 @@ class LocalizationUIModel extends _$LocalizationUIModel { VoidCallback? doDelIniFile() { return () async { - final iniFile = File( - "${_scDataDir.absolute.path}\\Localization\\${state.selectedLanguage}\\global.ini"); + final iniFile = File("${_scDataDir.absolute.path}\\Localization\\${state.selectedLanguage}\\global.ini"); if (await iniFile.exists()) await iniFile.delete(); await updateLangCfg(false); await _updateStatus(); @@ -243,10 +234,11 @@ class LocalizationUIModel extends _$LocalizationUIModel { String versionName, { bool? advanced, bool isEnableCommunityInputMethod = false, + bool isEnableVehicleSorting = false, + BuildContext? context, }) async { dPrint("LocalizationUIModel -> installFormString $versionName"); - final iniFile = File( - "${_scDataDir.absolute.path}\\Localization\\${state.selectedLanguage}\\global.ini"); + final iniFile = File("${_scDataDir.absolute.path}\\Localization\\${state.selectedLanguage}\\global.ini"); if (versionName.isNotEmpty) { if (!globalIni.toString().endsWith("\n")) { globalIni.write("\n"); @@ -258,8 +250,7 @@ class LocalizationUIModel extends _$LocalizationUIModel { final data = state.communityInputMethodLanguageData; if (data != null) { communityInputMethodVersion = data.version; - final str = - await downloadOrGetCachedCommunityInputMethodSupportFile(data); + final str = await downloadOrGetCachedCommunityInputMethodSupportFile(data); if (str.trim().isNotEmpty) { communityInputMethodSupportData = str; } @@ -267,8 +258,8 @@ class LocalizationUIModel extends _$LocalizationUIModel { } if (communityInputMethodVersion != null) { - globalIni.write( - "_starcitizen_doctor_localization_community_input_method_version=$communityInputMethodVersion\n"); + globalIni + .write("_starcitizen_doctor_localization_community_input_method_version=$communityInputMethodVersion\n"); } if (communityInputMethodSupportData != null) { for (var line in communityInputMethodSupportData.split("\n")) { @@ -278,27 +269,34 @@ class LocalizationUIModel extends _$LocalizationUIModel { if (advanced ?? false) { globalIni.write("_starcitizen_doctor_localization_advanced=true\n"); } - globalIni - .write("_starcitizen_doctor_localization_version=$versionName\n"); + globalIni.write("_starcitizen_doctor_localization_version=$versionName\n"); } - /// write cfg - if (await _cfgFile.exists()) {} + var iniStringData = globalIni.toString().trim(); + + if ((context?.mounted ?? false) && isEnableVehicleSorting) { + if (!context!.mounted) return; + final iniStringDataVN = ValueNotifier(iniStringData); + final ok = await showConfirmDialogs(context, "载具排序", VehicleSortingDialogUi(iniStringData: iniStringDataVN),constraints: BoxConstraints( + maxWidth: MediaQuery.of(context).size.width * .75, + )); + if (ok) { + iniStringData = iniStringDataVN.value; + } + } /// write ini if (await iniFile.exists()) { await iniFile.delete(); } await iniFile.create(recursive: true); - await iniFile.writeAsString("\uFEFF${globalIni.toString().trim()}", - flush: true); + await iniFile.writeAsString("\uFEFF$iniStringData", flush: true); await updateLangCfg(true); await _updateStatus(); } Future?> getCommunityInputMethodSupportData() async { - final iniPath = - "${_scDataDir.absolute.path}\\Localization\\${state.selectedLanguage}\\global.ini"; + final iniPath = "${_scDataDir.absolute.path}\\Localization\\${state.selectedLanguage}\\global.ini"; final iniFile = File(iniPath); if (!await iniFile.exists()) { return {}; @@ -309,13 +307,10 @@ class LocalizationUIModel extends _$LocalizationUIModel { for (var i = 0; i < iniStringSplit.length; i++) { final line = iniStringSplit[i]; - if (line.trim().startsWith( - "_starcitizen_doctor_localization_community_input_method_version=")) { + if (line.trim().startsWith("_starcitizen_doctor_localization_community_input_method_version=")) { b = true; continue; - } else if (line - .trim() - .startsWith("_starcitizen_doctor_localization_version=")) { + } else if (line.trim().startsWith("_starcitizen_doctor_localization_version=")) { b = false; return communityInputMethodSupportData; } else if (b) { @@ -328,10 +323,8 @@ class LocalizationUIModel extends _$LocalizationUIModel { return null; } - Future<(String, String)> - getIniContentWithoutCommunityInputMethodSupportData() async { - final iniPath = - "${_scDataDir.absolute.path}\\Localization\\${state.selectedLanguage}\\global.ini"; + Future<(String, String)> getIniContentWithoutCommunityInputMethodSupportData() async { + final iniPath = "${_scDataDir.absolute.path}\\Localization\\${state.selectedLanguage}\\global.ini"; final iniFile = File(iniPath); if (!await iniFile.exists()) { return ("", ""); @@ -342,13 +335,10 @@ class LocalizationUIModel extends _$LocalizationUIModel { for (var i = 0; i < iniStringSplit.length; i++) { final line = iniStringSplit[i]; - if (line.trim().startsWith( - "_starcitizen_doctor_localization_community_input_method_version=")) { + if (line.trim().startsWith("_starcitizen_doctor_localization_community_input_method_version=")) { b = true; continue; - } else if (line - .trim() - .startsWith("_starcitizen_doctor_localization_version=")) { + } else if (line.trim().startsWith("_starcitizen_doctor_localization_version=")) { b = false; return (sb.toString(), line.split("=").last.trim()); } else if (!b) { @@ -359,11 +349,10 @@ class LocalizationUIModel extends _$LocalizationUIModel { } Future? doRemoteInstall(BuildContext context, ScLocalizationData value, - {bool isEnableCommunityInputMethod = false}) async { + {bool isEnableCommunityInputMethod = false, bool isEnableVehicleSorting = false}) async { AnalyticsApi.touch("install_localization"); - final savePath = - File("${_downloadDir.absolute.path}\\${value.versionName}.sclang"); + final savePath = File("${_downloadDir.absolute.path}\\${value.versionName}.sclang"); try { state = state.copyWith(workingVersion: value.versionName!); if (!await savePath.exists()) { @@ -379,15 +368,17 @@ class LocalizationUIModel extends _$LocalizationUIModel { if (globalIni.isEmpty) { throw S.current.localization_info_corrupted_file; } + if (!context.mounted) return; await installFormString( globalIni, value.versionName ?? "", isEnableCommunityInputMethod: isEnableCommunityInputMethod, + isEnableVehicleSorting: isEnableVehicleSorting, + context: context, ); } catch (e) { if (!context.mounted) return; - await showToast( - context, S.current.localization_info_installation_error(e)); + await showToast(context, S.current.localization_info_installation_error(e)); if (await savePath.exists()) await savePath.delete(); } state = state.copyWith(workingVersion: ""); @@ -400,19 +391,16 @@ class LocalizationUIModel extends _$LocalizationUIModel { final cachedVersion = box.get("${lang}_version"); if (cachedVersion != communityInputMethodData.version) { - final data = await Api.getCommunityInputMethodData( - communityInputMethodData.file ?? ""); + final data = await Api.getCommunityInputMethodData(communityInputMethodData.file ?? ""); await box.put("${lang}_data", data); return data; } return box.get("${lang}_data").toString(); } - Future downloadLocalizationFile( - File savePath, ScLocalizationData value) async { + Future downloadLocalizationFile(File savePath, ScLocalizationData value) async { dPrint("downloading file to $savePath"); - final downloadUrl = - "${URLConf.gitlabLocalizationUrl}/archive/${value.versionName}.tar.gz"; + final downloadUrl = "${URLConf.gitlabLocalizationUrl}/archive/${value.versionName}.tar.gz"; final r = await RSHttp.get(downloadUrl); if (r.statusCode == 200 && r.data != null) { await savePath.create(recursive: true); @@ -446,8 +434,7 @@ class LocalizationUIModel extends _$LocalizationUIModel { } void selectLang(String v) async { - state = state.copyWith( - selectedLanguage: v, communityInputMethodLanguageData: null); + state = state.copyWith(selectedLanguage: v, communityInputMethodLanguageData: null); _loadData(); final appConfBox = await Hive.openBox("app_conf"); await appConfBox.put("localization_selectedLanguage", v); @@ -469,14 +456,11 @@ class LocalizationUIModel extends _$LocalizationUIModel { } _updateStatus() async { - final iniPath = - "${_scDataDir.absolute.path}\\Localization\\${state.selectedLanguage}\\global.ini"; - final patchStatus = MapEntry( - await _getLangCfgEnableLang(lang: state.selectedLanguage!), - await _getInstalledIniVersion(iniPath)); + final iniPath = "${_scDataDir.absolute.path}\\Localization\\${state.selectedLanguage}\\global.ini"; + final patchStatus = + MapEntry(await _getLangCfgEnableLang(lang: state.selectedLanguage!), await _getInstalledIniVersion(iniPath)); final isInstalledAdvanced = await _checkAdvancedStatus(iniPath); - final installedCommunityInputMethodSupportVersion = - await getInstalledCommunityInputMethodSupportVersion(iniPath); + final installedCommunityInputMethodSupportVersion = await getInstalledCommunityInputMethodSupportVersion(iniPath); dPrint( "_updateStatus updateStatus: $patchStatus , isInstalledAdvanced: $isInstalledAdvanced ,installedCommunityInputMethodSupportVersion: $installedCommunityInputMethodSupportVersion"); @@ -484,23 +468,19 @@ class LocalizationUIModel extends _$LocalizationUIModel { state = state.copyWith( patchStatus: patchStatus, isInstalledAdvanced: isInstalledAdvanced, - installedCommunityInputMethodSupportVersion: - installedCommunityInputMethodSupportVersion, + installedCommunityInputMethodSupportVersion: installedCommunityInputMethodSupportVersion, ); } - Future getInstalledCommunityInputMethodSupportVersion( - String path) async { + Future getInstalledCommunityInputMethodSupportVersion(String path) async { final iniFile = File(path); if (!await iniFile.exists()) { return null; } final iniStringSplit = (await iniFile.readAsString()).split("\n"); for (var i = iniStringSplit.length - 1; i > 0; i--) { - if (iniStringSplit[i].contains( - "_starcitizen_doctor_localization_community_input_method_version=")) { - final v = iniStringSplit[i].trim().split( - "_starcitizen_doctor_localization_community_input_method_version=")[1]; + if (iniStringSplit[i].contains("_starcitizen_doctor_localization_community_input_method_version=")) { + final v = iniStringSplit[i].trim().split("_starcitizen_doctor_localization_community_input_method_version=")[1]; return v; } } @@ -516,8 +496,7 @@ class LocalizationUIModel extends _$LocalizationUIModel { return iniString.contains("_starcitizen_doctor_localization_advanced=true"); } - Future _getLangCfgEnableLang( - {String lang = "", String gamePath = ""}) async { + Future _getLangCfgEnableLang({String lang = "", String gamePath = ""}) async { if (gamePath.isEmpty) { gamePath = _scInstallPath; } @@ -536,11 +515,8 @@ class LocalizationUIModel extends _$LocalizationUIModel { } final iniStringSplit = (await iniFile.readAsString()).split("\n"); for (var i = iniStringSplit.length - 1; i > 0; i--) { - if (iniStringSplit[i] - .contains("_starcitizen_doctor_localization_version=")) { - final v = iniStringSplit[i] - .trim() - .split("_starcitizen_doctor_localization_version=")[1]; + if (iniStringSplit[i].contains("_starcitizen_doctor_localization_version=")) { + final v = iniStringSplit[i].trim().split("_starcitizen_doctor_localization_version=")[1]; return v; } } @@ -567,11 +543,8 @@ class LocalizationUIModel extends _$LocalizationUIModel { final dirList = await scDataDir.list().toList(); for (var element in dirList) { for (var lang in languageSupport.keys) { - if (element.path.contains(lang) && - await _getLangCfgEnableLang( - lang: lang, gamePath: scInstallPath)) { - final installedVersion = - await _getInstalledIniVersion("${element.path}\\global.ini"); + if (element.path.contains(lang) && await _getLangCfgEnableLang(lang: lang, gamePath: scInstallPath)) { + final installedVersion = await _getInstalledIniVersion("${element.path}\\global.ini"); if (installedVersion == S.current.home_action_info_game_built_in || installedVersion == S.current.localization_info_custom_files) { continue; @@ -603,22 +576,17 @@ class LocalizationUIModel extends _$LocalizationUIModel { if (cloudVersion == null || localVersion == null) return; if (localVersion != cloudVersion) { // 版本不一致，自动检查更新 - final (localIniString, versioName) = - await getIniContentWithoutCommunityInputMethodSupportData(); + final (localIniString, versioName) = await getIniContentWithoutCommunityInputMethodSupportData(); if (localIniString.trim().isEmpty) { - dPrint( - "[InputMethodDialogUIModel] check update Error localIniString is empty"); + dPrint("[InputMethodDialogUIModel] check update Error localIniString is empty"); return; } - await installFormString(StringBuffer(localIniString), versioName, - isEnableCommunityInputMethod: true); + await installFormString(StringBuffer(localIniString), versioName, isEnableCommunityInputMethod: true); await win32.sendNotify( summary: S.current.input_method_support_updated, body: S.current.input_method_support_updated_to_version(cloudVersion), appName: S.current.home_title_app_name, - appId: ConstConf.isMSE - ? "56575xkeyC.MSE_bsn1nexg8e4qe!starcitizendoctor" - : "{6D809377-6AF0-444B-8957-A3773F02200E}\\Starcitizen_Doctor\\starcitizen_doctor.exe"); + appId: ConstConf.win32AppId); } } @@ -627,11 +595,11 @@ class LocalizationUIModel extends _$LocalizationUIModel { } Future onRemoteInsTall( - BuildContext context, - MapEntry item, - LocalizationUIState state) async { - bool enableCommunityInputMethod = - state.communityInputMethodLanguageData != null; + BuildContext context, MapEntry item, LocalizationUIState state) async { + final appBox = Hive.box("app_conf"); + bool enableCommunityInputMethod = state.communityInputMethodLanguageData != null; + bool isEnableVehicleSorting = appBox.get("vehicle_sorting", defaultValue: false) ?? false; + if (!context.mounted) return; final userOK = await showConfirmDialogs( context, "${item.value.info}", @@ -644,20 +612,17 @@ class LocalizationUIModel extends _$LocalizationUIModel { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - S.current.localization_info_version_number( - item.value.versionName ?? ""), + S.current.localization_info_version_number(item.value.versionName ?? ""), style: TextStyle(color: Colors.white.withValues(alpha: .6)), ), const SizedBox(height: 4), Text( - S.current - .localization_info_channel(item.value.gameChannel ?? ""), + S.current.localization_info_channel(item.value.gameChannel ?? ""), style: TextStyle(color: Colors.white.withValues(alpha: .6)), ), const SizedBox(height: 4), Text( - S.current - .localization_info_update_time(item.value.updateAt ?? ""), + S.current.localization_info_update_time(item.value.updateAt ?? ""), style: TextStyle(color: Colors.white.withValues(alpha: .6)), ), const SizedBox(height: 12), @@ -665,9 +630,7 @@ class LocalizationUIModel extends _$LocalizationUIModel { ), const SizedBox(height: 12), Container( - decoration: BoxDecoration( - color: FluentTheme.of(context).cardColor, - borderRadius: BorderRadius.circular(7)), + decoration: BoxDecoration(color: FluentTheme.of(context).cardColor, borderRadius: BorderRadius.circular(7)), padding: const EdgeInsets.all(12), child: Row( children: [ @@ -688,8 +651,7 @@ class LocalizationUIModel extends _$LocalizationUIModel { ), Spacer(), StatefulBuilder( - builder: (BuildContext context, - void Function(void Function()) setState) { + builder: (BuildContext context, void Function(void Function()) setState) { return ToggleSwitch( checked: enableCommunityInputMethod, onChanged: state.communityInputMethodLanguageData == null @@ -702,19 +664,44 @@ class LocalizationUIModel extends _$LocalizationUIModel { }, ) ], - ) + ), + SizedBox(height: 12), + Row( + children: [ + Text( + "载具排序", + ), + Spacer(), + StatefulBuilder( + builder: (BuildContext context, void Function(void Function()) setState) { + return ToggleSwitch( + checked: isEnableVehicleSorting, + onChanged: (v) async { + setState(() { + isEnableVehicleSorting = v; + }); + }, + ); + }, + ) + ], + ), ], ), confirm: S.current.localization_action_install, cancel: S.current.home_action_cancel, - constraints: - BoxConstraints(maxWidth: MediaQuery.of(context).size.width * .45), + constraints: BoxConstraints(maxWidth: MediaQuery.of(context).size.width * .45), ); if (userOK) { + await appBox.put("vehicle_sorting", isEnableVehicleSorting); if (!context.mounted) return; dPrint("doRemoteInstall ${item.value} $enableCommunityInputMethod"); - await doRemoteInstall(context, item.value, - isEnableCommunityInputMethod: enableCommunityInputMethod); + await doRemoteInstall( + context, + item.value, + isEnableCommunityInputMethod: enableCommunityInputMethod, + isEnableVehicleSorting: isEnableVehicleSorting, + ); } } diff --git a/lib/ui/home/localization/localization_ui_model.g.dart b/lib/ui/home/localization/localization_ui_model.g.dart index 03a0a4d..3b35e07 100644 --- a/lib/ui/home/localization/localization_ui_model.g.dart +++ b/lib/ui/home/localization/localization_ui_model.g.dart @@ -7,7 +7,7 @@ part of 'localization_ui_model.dart'; // ************************************************************************** String _$localizationUIModelHash() => - r'9c45db7c36a19710584d04441c4b263010e59e4e'; + r'640a129e8ecf7854d7668278046e808925d7f9d2'; /// See also [LocalizationUIModel]. @ProviderFor(LocalizationUIModel) diff --git a/lib/ui/tools/dialogs/vehicle_sorting_dialog_ui.dart b/lib/ui/tools/dialogs/vehicle_sorting_dialog_ui.dart new file mode 100644 index 0000000..8eeacd7 --- /dev/null +++ b/lib/ui/tools/dialogs/vehicle_sorting_dialog_ui.dart @@ -0,0 +1,337 @@ +import 'package:fluent_ui/fluent_ui.dart'; +import 'package:flutter_hooks/flutter_hooks.dart'; +import 'package:hive_ce/hive.dart'; +import 'package:hooks_riverpod/hooks_riverpod.dart'; +import 'package:starcitizen_doctor/common/utils/log.dart'; + +class VehicleSortingDialogUi extends HookConsumerWidget { + final ValueNotifier iniStringData; + + const VehicleSortingDialogUi({ + super.key, + required this.iniStringData, + }); + + static const List vehicleLineRegExpList = ["vehicle_Name.*"]; + + @override + Widget build(BuildContext context, WidgetRef ref) { + final leftVehiclesList = useState>?>(null); + final rightVehiclesList = useState>>([]); + final leftSearchKey = useState(""); + final leftSearchController = useTextEditingController(); + + useEffect(() { + _loadVehiclesList(leftVehiclesList, rightVehiclesList); + return () { + _saveSortedVehicles(rightVehiclesList.value); + }; + }, const []); + + if (leftVehiclesList.value == null) { + return const Center(child: ProgressRing()); + } + + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + padding: const EdgeInsets.all(8.0), + decoration: BoxDecoration( + color: Colors.white.withValues(alpha: .03), + borderRadius: BorderRadius.circular(4.0), + ), + child: Text( + "将左侧载具拖动到右侧列表中，这将会为载具名称增加 001、002 .. 等前缀，方便您在游戏内 UI 快速定位载具。在右侧列表上下拖动可以调整载具的顺序。", + ), + ), + const SizedBox(height: 12), + Expanded( + child: Row( + children: [ + // 左侧载具列表 + Expanded( + flex: 2, + child: Card( + padding: EdgeInsets.only( + left: 8.0, + top: 8.0, + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const Padding( + padding: EdgeInsets.all(4.0), + child: Text( + "载具", + style: TextStyle(fontWeight: FontWeight.bold), + ), + ), + Padding( + padding: const EdgeInsets.only(top: 12, bottom: 12), + child: Row( + children: [ + Expanded( + child: TextFormBox( + controller: leftSearchController, + placeholder: "搜索载具", + onChanged: (value) { + leftSearchKey.value = value; + }, + ), + ), + SizedBox(width: 6), + // clear button + Button( + child: Padding( + padding: const EdgeInsets.only(top: 4, bottom: 4), + child: const Icon(FluentIcons.clear), + ), + onPressed: () { + leftSearchKey.value = ""; + leftSearchController.clear(); + }, + ), + ], + ), + ), + Expanded( + child: ListView.builder( + itemCount: leftVehiclesList.value!.length, + padding: EdgeInsets.only(right: 8), + itemBuilder: (context, index) { + final vehicle = leftVehiclesList.value![index]; + if (leftSearchKey.value.isNotEmpty) { + // 如果搜索关键字不为空，则过滤列表 + // key value 匹配 + if (!vehicle.key.toLowerCase().contains(leftSearchKey.value.toLowerCase()) && + !vehicle.value.toLowerCase().contains(leftSearchKey.value.toLowerCase())) { + return const SizedBox.shrink(); + } + } + return Draggable>( + data: vehicle, + feedback: _buildVehicleItem(context, vehicle, (MediaQuery.of(context).size.width / 3)), + childWhenDragging: _buildVehicleItem(context, vehicle, null, opacity: 0.5), + child: _buildVehicleItem(context, vehicle, null), + onDragCompleted: () { + // 当拖动完成后，从左侧列表移除 + final updatedList = [...leftVehiclesList.value!]; + updatedList.removeAt(index); + leftVehiclesList.value = updatedList; + }, + ); + }, + ), + ), + ], + ), + ), + ), + const SizedBox(width: 12), + // 右侧载具列表（已排序）a + Expanded( + flex: 3, + child: Card( + padding: EdgeInsets.only( + left: 8.0, + top: 8.0, + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const Padding( + padding: EdgeInsets.all(4.0), + child: Text( + "已排序载具", + style: TextStyle(fontWeight: FontWeight.bold), + ), + ), + Expanded( + child: DragTarget>( + onAcceptWithDetails: (detail) { + // 接受从左侧拖过来的数据 + final updatedList = [...rightVehiclesList.value]; + updatedList.add(detail.data); + rightVehiclesList.value = updatedList; + _applyChanges(rightVehiclesList.value); + }, + builder: (context, candidateData, rejectedData) { + return ReorderableListView.builder( + buildDefaultDragHandles: false, + padding: EdgeInsets.only(right: 8.0), + onReorder: (oldIndex, newIndex) { + final updatedList = [...rightVehiclesList.value]; + if (oldIndex < newIndex) { + newIndex -= 1; + } + final item = updatedList.removeAt(oldIndex); + updatedList.insert(newIndex, item); + rightVehiclesList.value = updatedList; + }, + onReorderEnd: (_) { + _applyChanges(rightVehiclesList.value); + }, + itemCount: rightVehiclesList.value.length, + itemBuilder: (context, index) { + final vehicle = rightVehiclesList.value[index]; + // 创建带有前缀的显示值 + final prefixedValue = _getPrefixedValue(index, vehicle.value); + + return Container( + key: ValueKey(vehicle.key + index.toString()), + margin: const EdgeInsets.symmetric(vertical: 2.0), + child: Row( + children: [ + IconButton( + icon: const Icon(FluentIcons.delete), + onPressed: () { + // 从右侧移除，添加回左侧 + final updatedRightList = [...rightVehiclesList.value]; + final removed = updatedRightList.removeAt(index); + rightVehiclesList.value = updatedRightList; + + final updatedLeftList = [...leftVehiclesList.value!]; + updatedLeftList.add(removed); + leftVehiclesList.value = updatedLeftList; + _applyChanges(rightVehiclesList.value); + }, + ), + Expanded( + child: ReorderableDragStartListener( + index: index, + child: _buildVehicleItem( + context, + MapEntry(vehicle.key, prefixedValue), + null, + isRightList: true, + ), + ), + ), + ], + ), + ); + }, + ); + }, + ), + ), + ], + ), + ), + ), + ], + ), + ), + ], + ); + } + + Widget _buildVehicleItem(BuildContext context, MapEntry vehicle, double? width, + {double opacity = 1.0, bool isRightList = false}) { + return Container( + width: width, + padding: const EdgeInsets.all(8.0), + margin: const EdgeInsets.symmetric(vertical: 2.0, horizontal: 4.0), + decoration: BoxDecoration( + color: Colors.white.withValues(alpha: 0.05), + borderRadius: BorderRadius.circular(4.0), + ), + child: Opacity( + opacity: opacity, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + vehicle.value, + style: const TextStyle(fontSize: 14), + overflow: TextOverflow.ellipsis, + ), + Text( + vehicle.key, + style: TextStyle( + fontSize: 12, + color: Colors.white.withValues( + alpha: .4, + ), + ), + overflow: TextOverflow.ellipsis, + ), + ], + ), + ), + ); + } + + String _getPrefixedValue(int index, String originalValue) { + // 生成前缀 (001, 002, etc.) + final prefix = (index + 1).toString().padLeft(3, '0'); + return "$prefix - $originalValue"; + } + + void _applyChanges(List> sortedVehicles) async { + final lines = iniStringData.value.split('\n'); + final updatedLines = []; + + for (final line in lines) { + bool matched = false; + final lineKey = line.split('=')[0].trim(); + for (var i = 0; i < sortedVehicles.length; i++) { + final vehicle = sortedVehicles[i]; + if (lineKey == vehicle.key) { + // 使用新的前缀值替换 + final prefixedValue = _getPrefixedValue(i, vehicle.value); + updatedLines.add("$lineKey=$prefixedValue"); + matched = true; + break; + } + } + if (!matched) { + updatedLines.add(line); + } + } + iniStringData.value = updatedLines.join('\n'); + dPrint("[VehicleSortingDialogUi] Applied changes to ${sortedVehicles.length} vehicles"); + } + + Future _saveSortedVehicles(List> sortedVehicles) async { + final appBox = await Hive.openBox("app_conf"); + appBox.put("sorted_vehicles", sortedVehicles.map((e) => e.key).toList()); + dPrint("[VehicleSortingDialogUi] Saved sorted vehicles: ${sortedVehicles.length}"); + } + + void _loadVehiclesList( + ValueNotifier>?> vehiclesList, + ValueNotifier>> rightVehiclesList, + ) async { + final vehicleMap = {}; + final lines = iniStringData.value.split('\n'); + for (final regExp in vehicleLineRegExpList) { + final pattern = RegExp(regExp); + for (final line in lines) { + if (pattern.hasMatch(line)) { + final parts = line.split('='); + if (parts.length == 2) { + final key = parts[0].trim(); + final value = parts[1].trim(); + vehicleMap[key] = value; + } + } + } + } + vehiclesList.value = vehicleMap.entries.toList(); + dPrint("[VehicleSortingDialogUi] Loaded vehicles: ${vehiclesList.value?.length ?? 0}"); + + // Load sorted vehicles from app_conf + final appBox = await Hive.openBox("app_conf"); + final sortedVehicles = appBox.get("sorted_vehicles", defaultValue: []) as List; + if (sortedVehicles.isNotEmpty) { + // 只保留有效载具 + rightVehiclesList.value = sortedVehicles + .where((key) => vehicleMap.containsKey(key)) + .map((key) => MapEntry(key, vehicleMap[key]!)) + .toList(); + dPrint("[VehicleSortingDialogUi] Loaded sorted vehicles: ${rightVehiclesList.value.length}"); + } + } +}