From 3f7c39923411c8f1af8c007b77978897555b9a8b Mon Sep 17 00:00:00 2001 From: xkeyC <3334969096@qq.com> Date: Mon, 29 Jan 2024 20:44:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E5=88=86=20AppConf?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/api/analytics.dart | 4 +-- lib/api/api.dart | 6 ++--- lib/api/rss.dart | 8 +++--- lib/common/{conf.dart => conf/app_conf.dart} | 26 +------------------ lib/common/conf/url_conf.dart | 25 ++++++++++++++++++ lib/global_ui_model.dart | 2 +- lib/main.dart | 2 +- lib/ui/about/about_ui.dart | 2 +- lib/ui/about/about_ui_model.dart | 2 +- lib/ui/home/home_ui_model.dart | 5 ++-- .../localization/localization_ui_model.dart | 5 ++-- lib/ui/home/webview/webview.dart | 5 ++-- lib/ui/index_ui.dart | 2 +- .../party_room_create_dialog_ui_model.dart | 2 +- .../party_room/party_room_chat_ui_model.dart | 2 +- lib/ui/settings/settings_ui.dart | 2 +- lib/ui/settings/settings_ui_model.dart | 2 +- lib/ui/settings/upgrade_dialog_ui.dart | 5 ++-- lib/ui/settings/upgrade_dialog_ui_model.dart | 2 +- lib/ui/tools/tools_ui_model.dart | 2 +- 20 files changed, 58 insertions(+), 53 deletions(-) rename lib/common/{conf.dart => conf/app_conf.dart} (80%) create mode 100644 lib/common/conf/url_conf.dart diff --git a/lib/api/analytics.dart b/lib/api/analytics.dart index 44906ef..587f7d8 100644 --- a/lib/api/analytics.dart +++ b/lib/api/analytics.dart @@ -1,6 +1,6 @@ import 'package:dio/dio.dart'; import 'package:flutter/foundation.dart'; -import 'package:starcitizen_doctor/common/conf.dart'; +import 'package:starcitizen_doctor/common/conf/url_conf.dart'; import 'package:starcitizen_doctor/common/utils/base_utils.dart'; class AnalyticsApi { @@ -11,7 +11,7 @@ class AnalyticsApi { if (kDebugMode) return; dPrint("AnalyticsApi.touch === $key start"); try { - await _dio.post("${AppConf.xkeycApiUrl}/analytics/$key"); + await _dio.post("${URLConf.xkeycApiUrl}/analytics/$key"); dPrint("AnalyticsApi.touch === $key over"); } catch (e) { dPrint("AnalyticsApi.touch === $key Error:$e"); diff --git a/lib/api/api.dart b/lib/api/api.dart index bea321d..df6ebbb 100644 --- a/lib/api/api.dart +++ b/lib/api/api.dart @@ -1,7 +1,7 @@ import 'dart:convert'; import 'package:dio/dio.dart'; -import 'package:starcitizen_doctor/common/conf.dart'; +import 'package:starcitizen_doctor/common/conf/url_conf.dart'; import 'package:starcitizen_doctor/data/app_placard_data.dart'; import 'package:starcitizen_doctor/data/app_version_data.dart'; import 'package:starcitizen_doctor/data/countdown_festival_item_data.dart'; @@ -37,7 +37,7 @@ class Api { static Future> getAppReleaseDataByVersionName( String version) async { final r = await dio - .get("${AppConf.gitlabApiPath}/repos/SCToolBox/Release/releases/tags/$version"); + .get("${URLConf.gitlabApiPath}/repos/SCToolBox/Release/releases/tags/$version"); return r.data; } @@ -66,7 +66,7 @@ class Api { } static Future getRepoData(String dir, String name) async { - final r = await dio.get("${AppConf.apiRepoPath}/$dir/$name"); + final r = await dio.get("${URLConf.apiRepoPath}/$dir/$name"); return r.data; } } diff --git a/lib/api/rss.dart b/lib/api/rss.dart index a84f3ed..04e20f1 100644 --- a/lib/api/rss.dart +++ b/lib/api/rss.dart @@ -2,7 +2,7 @@ import 'dart:io'; import 'package:dart_rss/dart_rss.dart'; import 'package:dio/dio.dart'; -import 'package:starcitizen_doctor/common/conf.dart'; +import 'package:starcitizen_doctor/common/conf/url_conf.dart'; class RSSApi { static final _dio = Dio(BaseOptions( @@ -10,15 +10,15 @@ class RSSApi { responseType: ResponseType.plain)); static Future> getRssVideo() async { - final r = await _dio.get(AppConf.rssVideoUrl); + final r = await _dio.get(URLConf.rssVideoUrl); final f = RssFeed.parse(r.data); return f.items.sublist(0, 8); } static Future> getRssText() async { - final r1 = await _dio.get(AppConf.rssTextUrl1); + final r1 = await _dio.get(URLConf.rssTextUrl1); final r1f = RssFeed.parse(r1.data); - final r2 = await _dio.get(AppConf.rssTextUrl2); + final r2 = await _dio.get(URLConf.rssTextUrl2); final r2f = RssFeed.parse(r2.data); final items = r1f.items..addAll(r2f.items); items.sort((a, b) { diff --git a/lib/common/conf.dart b/lib/common/conf/app_conf.dart similarity index 80% rename from lib/common/conf.dart rename to lib/common/conf/app_conf.dart index 14ce87a..606f1bf 100644 --- a/lib/common/conf.dart +++ b/lib/common/conf/app_conf.dart @@ -14,37 +14,13 @@ import 'package:starcitizen_doctor/global_ui_model.dart'; import 'package:uuid/uuid.dart'; import 'package:window_manager/window_manager.dart'; -import '../base/ui.dart'; +import '../../base/ui.dart'; class AppConf { static const String appVersion = "2.11.0 Beta"; static const int appVersionCode = 36; static const String appVersionDate = "2024-01-07"; - static const String giteaAttachmentsUrl = - "https://git.sctoolbox.sccsgo.com/SCToolBox/Release"; - static const String gitlabLocalizationUrl = - "https://git.sctoolbox.sccsgo.com/SCToolBox/LocalizationData"; - static const String apiRepoPath = - "https://git.sctoolbox.sccsgo.com/SCToolBox/api/raw/branch/main/"; - - static const String gitlabApiPath = - "https://git.sctoolbox.sccsgo.com/api/v1/"; - - static const String webTranslateHomeUrl = - "https://git.sctoolbox.sccsgo.com/SCToolBox/ScWeb_Chinese_Translate/raw/branch/main/json/locales"; - - static const String xkeycApiUrl = "https://sctoolbox.xkeyc.com"; - - static const _rssHomeUrl = "https://rss.sctoolbox.sccsgo.com"; - - static const rssVideoUrl = - "$_rssHomeUrl/bilibili/user/channel/27976358/290653"; - - static const rssTextUrl1 = "$_rssHomeUrl/bilibili/user/article/40102960"; - static const rssTextUrl2 = - "$_rssHomeUrl/baidu/tieba/user/%E7%81%AC%E7%81%ACG%E7%81%AC%E7%81%AC&"; - static const gameChannels = ["LIVE", "PTU", "EPTU"]; static String deviceUUID = ""; diff --git a/lib/common/conf/url_conf.dart b/lib/common/conf/url_conf.dart new file mode 100644 index 0000000..d98bbe9 --- /dev/null +++ b/lib/common/conf/url_conf.dart @@ -0,0 +1,25 @@ +class URLConf { + static const String giteaAttachmentsUrl = + "https://git.sctoolbox.sccsgo.com/SCToolBox/Release"; + static const String gitlabLocalizationUrl = + "https://git.sctoolbox.sccsgo.com/SCToolBox/LocalizationData"; + static const String apiRepoPath = + "https://git.sctoolbox.sccsgo.com/SCToolBox/api/raw/branch/main/"; + + static const String gitlabApiPath = + "https://git.sctoolbox.sccsgo.com/api/v1/"; + + static const String webTranslateHomeUrl = + "https://git.sctoolbox.sccsgo.com/SCToolBox/ScWeb_Chinese_Translate/raw/branch/main/json/locales"; + + static const String xkeycApiUrl = "https://sctoolbox.xkeyc.com"; + + static const _rssHomeUrl = "https://rss.sctoolbox.sccsgo.com"; + + static const rssVideoUrl = + "$_rssHomeUrl/bilibili/user/channel/27976358/290653"; + + static const rssTextUrl1 = "$_rssHomeUrl/bilibili/user/article/40102960"; + static const rssTextUrl2 = + "$_rssHomeUrl/baidu/tieba/user/%E7%81%AC%E7%81%ACG%E7%81%AC%E7%81%AC&"; +} diff --git a/lib/global_ui_model.dart b/lib/global_ui_model.dart index 0502823..39a4dd0 100644 --- a/lib/global_ui_model.dart +++ b/lib/global_ui_model.dart @@ -6,7 +6,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:hexcolor/hexcolor.dart'; import 'base/ui_model.dart'; -import 'common/conf.dart'; +import 'common/conf/app_conf.dart'; import 'ui/settings/upgrade_dialog_ui.dart'; import 'ui/settings/upgrade_dialog_ui_model.dart'; diff --git a/lib/main.dart b/lib/main.dart index 6c8efc5..9d3d445 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,7 +1,7 @@ import 'package:desktop_webview_window/desktop_webview_window.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:starcitizen_doctor/base/ui_model.dart'; -import 'package:starcitizen_doctor/common/conf.dart'; +import 'package:starcitizen_doctor/common/conf/app_conf.dart'; import 'package:starcitizen_doctor/ui/index_ui_model.dart'; import 'package:window_manager/window_manager.dart'; diff --git a/lib/ui/about/about_ui.dart b/lib/ui/about/about_ui.dart index 28809ec..91640b3 100644 --- a/lib/ui/about/about_ui.dart +++ b/lib/ui/about/about_ui.dart @@ -1,6 +1,6 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:starcitizen_doctor/base/ui.dart'; -import 'package:starcitizen_doctor/common/conf.dart'; +import 'package:starcitizen_doctor/common/conf/app_conf.dart'; import 'package:url_launcher/url_launcher_string.dart'; import 'about_ui_model.dart'; diff --git a/lib/ui/about/about_ui_model.dart b/lib/ui/about/about_ui_model.dart index 7859af2..edbf32c 100644 --- a/lib/ui/about/about_ui_model.dart +++ b/lib/ui/about/about_ui_model.dart @@ -1,5 +1,5 @@ import 'package:starcitizen_doctor/base/ui_model.dart'; -import 'package:starcitizen_doctor/common/conf.dart'; +import 'package:starcitizen_doctor/common/conf/app_conf.dart'; import 'package:starcitizen_doctor/global_ui_model.dart'; import 'package:url_launcher/url_launcher_string.dart'; diff --git a/lib/ui/home/home_ui_model.dart b/lib/ui/home/home_ui_model.dart index 8c83161..6e868a5 100644 --- a/lib/ui/home/home_ui_model.dart +++ b/lib/ui/home/home_ui_model.dart @@ -10,7 +10,8 @@ import 'package:starcitizen_doctor/api/analytics.dart'; import 'package:starcitizen_doctor/api/api.dart'; import 'package:starcitizen_doctor/api/rss.dart'; import 'package:starcitizen_doctor/base/ui_model.dart'; -import 'package:starcitizen_doctor/common/conf.dart'; +import 'package:starcitizen_doctor/common/conf/app_conf.dart'; +import 'package:starcitizen_doctor/common/conf/url_conf.dart'; import 'package:starcitizen_doctor/common/helper/log_helper.dart'; import 'package:starcitizen_doctor/common/helper/system_helper.dart'; import 'package:starcitizen_doctor/data/app_placard_data.dart'; @@ -107,7 +108,7 @@ class HomeUIModel extends BaseUIModel { notifyListeners(); appWebLocalizationVersionsData = AppWebLocalizationVersionsData.fromJson( json.decode((await Api.dio.get( - "${AppConf.webTranslateHomeUrl}/versions.json", + "${URLConf.webTranslateHomeUrl}/versions.json", options: Options(responseType: ResponseType.plain))) .data)); countdownFestivalListData = await Api.getFestivalCountdownList(); diff --git a/lib/ui/home/localization/localization_ui_model.dart b/lib/ui/home/localization/localization_ui_model.dart index e4ac407..9c209dd 100644 --- a/lib/ui/home/localization/localization_ui_model.dart +++ b/lib/ui/home/localization/localization_ui_model.dart @@ -7,7 +7,8 @@ import 'package:flutter/foundation.dart'; import 'package:starcitizen_doctor/api/analytics.dart'; import 'package:starcitizen_doctor/api/api.dart'; import 'package:starcitizen_doctor/base/ui_model.dart'; -import 'package:starcitizen_doctor/common/conf.dart'; +import 'package:starcitizen_doctor/common/conf/app_conf.dart'; +import 'package:starcitizen_doctor/common/conf/url_conf.dart'; import 'package:starcitizen_doctor/common/helper/system_helper.dart'; import 'package:starcitizen_doctor/data/sc_localization_data.dart'; @@ -134,7 +135,7 @@ class LocalizationUIModel extends BaseUIModel { return () async { AnalyticsApi.touch("install_localization"); final downloadUrl = - "${AppConf.gitlabLocalizationUrl}/archive/${value.versionName}.tar.gz"; + "${URLConf.gitlabLocalizationUrl}/archive/${value.versionName}.tar.gz"; final savePath = File("${downloadDir.absolute.path}\\${value.versionName}.sclang"); try { diff --git a/lib/ui/home/webview/webview.dart b/lib/ui/home/webview/webview.dart index 88f3446..536394d 100644 --- a/lib/ui/home/webview/webview.dart +++ b/lib/ui/home/webview/webview.dart @@ -9,7 +9,8 @@ import 'package:dio/dio.dart'; import 'package:flutter/services.dart'; import 'package:hive/hive.dart'; import 'package:local_auth/local_auth.dart'; -import 'package:starcitizen_doctor/common/conf.dart'; +import 'package:starcitizen_doctor/common/conf/app_conf.dart'; +import 'package:starcitizen_doctor/common/conf/url_conf.dart'; import 'package:starcitizen_doctor/common/win32/credentials.dart'; import 'package:starcitizen_doctor/data/app_web_localization_versions_data.dart'; @@ -181,7 +182,7 @@ class WebViewModel { /// https://github.com/CxJuice/Uex_Chinese_Translate // get versions - const hostUrl = AppConf.webTranslateHomeUrl; + const hostUrl = URLConf.webTranslateHomeUrl; dPrint("AppWebLocalizationVersionsData === ${v.toJson()}"); localizationResource["zh-CN"] = await _getJson("$hostUrl/zh-CN-rsi.json", diff --git a/lib/ui/index_ui.dart b/lib/ui/index_ui.dart index cac6c5b..518d921 100644 --- a/lib/ui/index_ui.dart +++ b/lib/ui/index_ui.dart @@ -1,5 +1,5 @@ import 'package:starcitizen_doctor/base/ui_model.dart'; -import 'package:starcitizen_doctor/common/conf.dart'; +import 'package:starcitizen_doctor/common/conf/app_conf.dart'; import 'package:starcitizen_doctor/main.dart'; import 'package:starcitizen_doctor/ui/about/about_ui.dart'; import 'package:starcitizen_doctor/ui/about/about_ui_model.dart'; diff --git a/lib/ui/party_room/dialogs/party_room_create_dialog_ui_model.dart b/lib/ui/party_room/dialogs/party_room_create_dialog_ui_model.dart index 65c1a10..3d66013 100644 --- a/lib/ui/party_room/dialogs/party_room_create_dialog_ui_model.dart +++ b/lib/ui/party_room/dialogs/party_room_create_dialog_ui_model.dart @@ -1,5 +1,5 @@ import 'package:starcitizen_doctor/base/ui_model.dart'; -import 'package:starcitizen_doctor/common/conf.dart'; +import 'package:starcitizen_doctor/common/conf/app_conf.dart'; import 'package:starcitizen_doctor/common/grpc/party_room_server.dart'; import 'package:starcitizen_doctor/generated/grpc/party_room_server/index.pb.dart'; import 'package:starcitizen_doctor/global_ui_model.dart'; diff --git a/lib/ui/party_room/party_room_chat_ui_model.dart b/lib/ui/party_room/party_room_chat_ui_model.dart index f418915..8d1b9e5 100644 --- a/lib/ui/party_room/party_room_chat_ui_model.dart +++ b/lib/ui/party_room/party_room_chat_ui_model.dart @@ -1,6 +1,6 @@ import 'package:grpc/grpc.dart'; import 'package:starcitizen_doctor/base/ui_model.dart'; -import 'package:starcitizen_doctor/common/conf.dart'; +import 'package:starcitizen_doctor/common/conf/app_conf.dart'; import 'package:starcitizen_doctor/common/grpc/party_room_server.dart'; import 'package:starcitizen_doctor/generated/grpc/party_room_server/index.pb.dart'; import 'package:starcitizen_doctor/global_ui_model.dart'; diff --git a/lib/ui/settings/settings_ui.dart b/lib/ui/settings/settings_ui.dart index 4624f5a..f5fb15b 100644 --- a/lib/ui/settings/settings_ui.dart +++ b/lib/ui/settings/settings_ui.dart @@ -1,6 +1,6 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:starcitizen_doctor/base/ui.dart'; -import 'package:starcitizen_doctor/common/conf.dart'; +import 'package:starcitizen_doctor/common/conf/app_conf.dart'; import 'package:starcitizen_doctor/ui/settings/settings_ui_model.dart'; class SettingUI extends BaseUI { diff --git a/lib/ui/settings/settings_ui_model.dart b/lib/ui/settings/settings_ui_model.dart index 887db97..46eda1c 100644 --- a/lib/ui/settings/settings_ui_model.dart +++ b/lib/ui/settings/settings_ui_model.dart @@ -5,7 +5,7 @@ import 'package:flutter/services.dart'; import 'package:hive/hive.dart'; import 'package:local_auth/local_auth.dart'; import 'package:starcitizen_doctor/base/ui_model.dart'; -import 'package:starcitizen_doctor/common/conf.dart'; +import 'package:starcitizen_doctor/common/conf/app_conf.dart'; import 'package:starcitizen_doctor/common/helper/system_helper.dart'; import 'package:starcitizen_doctor/common/win32/credentials.dart'; diff --git a/lib/ui/settings/upgrade_dialog_ui.dart b/lib/ui/settings/upgrade_dialog_ui.dart index 3b4d0fd..8cd8c9f 100644 --- a/lib/ui/settings/upgrade_dialog_ui.dart +++ b/lib/ui/settings/upgrade_dialog_ui.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart' show Material; import 'package:starcitizen_doctor/base/ui_model.dart'; -import 'package:starcitizen_doctor/common/conf.dart'; +import 'package:starcitizen_doctor/common/conf/app_conf.dart'; +import 'package:starcitizen_doctor/common/conf/url_conf.dart'; import 'upgrade_dialog_ui_model.dart'; @@ -35,7 +36,7 @@ class UpgradeDialogUI extends BaseUI { ) ] else ...makeMarkdownView(model.description!, - attachmentsUrl: AppConf.giteaAttachmentsUrl), + attachmentsUrl: URLConf.giteaAttachmentsUrl), ], ), ), diff --git a/lib/ui/settings/upgrade_dialog_ui_model.dart b/lib/ui/settings/upgrade_dialog_ui_model.dart index 66d2b55..dc95f95 100644 --- a/lib/ui/settings/upgrade_dialog_ui_model.dart +++ b/lib/ui/settings/upgrade_dialog_ui_model.dart @@ -3,7 +3,7 @@ import 'dart:io'; import 'package:dio/dio.dart'; import 'package:starcitizen_doctor/api/api.dart'; import 'package:starcitizen_doctor/base/ui_model.dart'; -import 'package:starcitizen_doctor/common/conf.dart'; +import 'package:starcitizen_doctor/common/conf/app_conf.dart'; import 'package:starcitizen_doctor/common/helper/system_helper.dart'; import 'package:url_launcher/url_launcher_string.dart'; diff --git a/lib/ui/tools/tools_ui_model.dart b/lib/ui/tools/tools_ui_model.dart index 824ae9c..692b0c6 100644 --- a/lib/ui/tools/tools_ui_model.dart +++ b/lib/ui/tools/tools_ui_model.dart @@ -6,7 +6,7 @@ import 'package:flutter/foundation.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:starcitizen_doctor/api/analytics.dart'; import 'package:starcitizen_doctor/base/ui_model.dart'; -import 'package:starcitizen_doctor/common/conf.dart'; +import 'package:starcitizen_doctor/common/conf/app_conf.dart'; import 'package:starcitizen_doctor/common/helper/log_helper.dart'; import 'package:starcitizen_doctor/common/helper/system_helper.dart'; import 'package:starcitizen_doctor/ui/tools/downloader/downloader_dialog_ui_model.dart';