From 96a0b9cfd25272c37b08966b25d5d4dee5ae1417 Mon Sep 17 00:00:00 2001 From: lollipopkit Date: Sat, 9 Mar 2024 17:43:15 +0800 Subject: [PATCH] opt.: use cdn as default --- lib/data/res/build_data.dart | 6 +++--- lib/data/res/url.dart | 1 - lib/data/service/app.dart | 5 +---- lib/data/store/setting.dart | 5 ----- lib/view/page/home.dart | 27 -------------------------- macos/Runner.xcodeproj/project.pbxproj | 12 ++++++------ 6 files changed, 10 insertions(+), 46 deletions(-) diff --git a/lib/data/res/build_data.dart b/lib/data/res/build_data.dart index 03cc5429..ae05bdb3 100644 --- a/lib/data/res/build_data.dart +++ b/lib/data/res/build_data.dart @@ -2,9 +2,9 @@ class BuildData { static const String name = "ServerBox"; - static const int build = 793; + static const int build = 796; static const String engine = "3.19.2"; - static const String buildAt = "2024-03-08 15:18:32"; - static const int modifications = 2; + static const String buildAt = "2024-03-09 16:45:22"; + static const int modifications = 1; static const int script = 40; } diff --git a/lib/data/res/url.dart b/lib/data/res/url.dart index 7d8ed491..82da2e26 100644 --- a/lib/data/res/url.dart +++ b/lib/data/res/url.dart @@ -1,5 +1,4 @@ abstract final class Urls { - static const resBase = 'https://res.lolli.tech/serverbox'; static const cdnBase = 'https://cdn.lolli.tech/serverbox'; static const myGithub = 'https://github.com/lollipopkit'; static const appHelp = '$myGithub/flutter_server_box#-help'; diff --git a/lib/data/service/app.dart b/lib/data/service/app.dart index 4a796841..f903406b 100644 --- a/lib/data/service/app.dart +++ b/lib/data/service/app.dart @@ -1,14 +1,11 @@ import 'package:dio/dio.dart'; -import 'package:toolbox/data/res/store.dart'; import '../model/app/update.dart'; import '../res/url.dart'; class AppService { Future getUpdate() async { - final useCDN = Stores.setting.useCdn.fetch() == 1; - final resp = - await Dio().get('${useCDN ? Urls.cdnBase : Urls.resBase}/update.json'); + final resp = await Dio().get('${Urls.cdnBase}/update.json'); return AppUpdate.fromJson(resp.data); } } diff --git a/lib/data/store/setting.dart b/lib/data/store/setting.dart index 4c4a99d0..b47adbd5 100644 --- a/lib/data/store/setting.dart +++ b/lib/data/store/setting.dart @@ -251,11 +251,6 @@ class SettingStore extends PersistentStore { /// when building traffic view on server tab late final ignoreLocalNet = property('ignoreLocalNetIface', true); - /// Use cdn - /// It's recommended to use cdn for non-China users - /// 0: unset, 1: use, 2: not use - late final useCdn = property('useCdn', 0); - /// Index of terminal cursor type late final termCursor = property('termCursor', TerminalCursorType.block.index); diff --git a/lib/view/page/home.dart b/lib/view/page/home.dart index c7973726..9e043a5d 100644 --- a/lib/view/page/home.dart +++ b/lib/view/page/home.dart @@ -7,7 +7,6 @@ import 'package:flutter_markdown/flutter_markdown.dart'; import 'package:get_it/get_it.dart'; import 'package:toolbox/core/channel/bg_run.dart'; import 'package:toolbox/core/channel/home_widget.dart'; -import 'package:toolbox/core/extension/context/common.dart'; import 'package:toolbox/core/extension/context/dialog.dart'; import 'package:toolbox/core/extension/context/locale.dart'; import 'package:toolbox/core/persistant_store.dart'; @@ -326,32 +325,6 @@ ${GithubIds.participants.map((e) => '[$e](${e.url})').join(' ')} await GetIt.I.allReady(); await Pros.server.load(); await Pros.server.refresh(); - - _notifyUseCDN(); - } - - Future _notifyUseCDN() async { - final useCDN = Stores.setting.useCdn.fetch(); - if (useCDN != 0) return; - final use = await context.showRoundDialog( - title: Text(l10n.useCdn), - child: Text(l10n.useCdnTip), - actions: [ - TextButton( - onPressed: () => context.pop(true), - child: Text(l10n.ok), - ), - TextButton( - onPressed: () => context.pop(false), - child: Text(l10n.cancel, style: UIs.textRed), - ), - ], - ); - if (use == true) { - Stores.setting.useCdn.put(1); - } else if (use == false) { - Stores.setting.useCdn.put(2); - } } Future _onLongPressSetting() async { diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index 51e07cf3..f6ec87b4 100644 --- a/macos/Runner.xcodeproj/project.pbxproj +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -467,7 +467,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 793; + CURRENT_PROJECT_VERSION = 796; DEVELOPMENT_TEAM = BA88US33G6; INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "Server Box"; @@ -477,7 +477,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 1.0.793; + MARKETING_VERSION = 1.0.796; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "Server Box"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -604,7 +604,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 793; + CURRENT_PROJECT_VERSION = 796; DEVELOPMENT_TEAM = BA88US33G6; INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "Server Box"; @@ -614,7 +614,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 1.0.793; + MARKETING_VERSION = 1.0.796; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "Server Box"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -634,7 +634,7 @@ "CODE_SIGN_IDENTITY[sdk=macosx*]" = "3rd Party Mac Developer Application"; CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 793; + CURRENT_PROJECT_VERSION = 796; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=macosx*]" = BA88US33G6; INFOPLIST_FILE = Runner/Info.plist; @@ -645,7 +645,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 1.0.793; + MARKETING_VERSION = 1.0.796; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "Server Box"; PROVISIONING_PROFILE_SPECIFIER = "";