From 2d70fca71bf3767d0e42396e1c15195786fed551 Mon Sep 17 00:00:00 2001 From: xkeyC <3334969096@qq.com> Date: Fri, 10 Nov 2023 22:51:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/common/conf.dart | 4 ++ lib/data/app_version_data.dart | 89 ++++++++++++++++++++++++++-------- lib/main.dart | 9 ++-- pubspec.yaml | 1 + 4 files changed, 80 insertions(+), 23 deletions(-) diff --git a/lib/common/conf.dart b/lib/common/conf.dart index 025f7e1..26b0c07 100644 --- a/lib/common/conf.dart +++ b/lib/common/conf.dart @@ -43,6 +43,10 @@ class AppConf { static late final WindowsDeviceInfo windowsDeviceInfo; + static String colorBackground = "#132431"; + static String colorMenu = "#122D42"; + static String colorMica = "#0A3142"; + static const isMSE = String.fromEnvironment("MSE", defaultValue: "false") == "true"; diff --git a/lib/data/app_version_data.dart b/lib/data/app_version_data.dart index 249ca7b..a902b72 100644 --- a/lib/data/app_version_data.dart +++ b/lib/data/app_version_data.dart @@ -1,47 +1,98 @@ -/// lastVersion : "V2.9" -/// lastVersionCode : 13 -/// lastBetaVersion : "V2.9" -/// lastBetaVersionCode : 13 -/// minVersionCode : 13 -/// minBetaVersionCode : 13 +/// lastVersion : "V2.9.9" +/// lastVersionCode : 25 +/// minVersionCode : 15 +/// MSE_lastVersion : "V2.9.13" +/// MSE_lastVersionCode : 27 +/// MSE_minVersionCode : 27 /// p4kDownloadUrl : "https://p4k.42kit.com/Data.p4k" +/// activityColors : {"enable":true,"startTime":1700236800000,"endTime":1701360000000,"background":"","menu":"","mica":""} class AppVersionData { AppVersionData({ this.lastVersion, this.lastVersionCode, - this.lastBetaVersion, - this.lastBetaVersionCode, this.minVersionCode, - this.minBetaVersionCode, - this.p4kDownloadUrl,}); + this.mSELastVersion, + this.mSELastVersionCode, + this.mSEMinVersionCode, + this.p4kDownloadUrl, + this.activityColors,}); AppVersionData.fromJson(dynamic json) { lastVersion = json['lastVersion']; lastVersionCode = json['lastVersionCode']; - lastBetaVersion = json['lastBetaVersion']; - lastBetaVersionCode = json['lastBetaVersionCode']; minVersionCode = json['minVersionCode']; - minBetaVersionCode = json['minBetaVersionCode']; + mSELastVersion = json['MSE_lastVersion']; + mSELastVersionCode = json['MSE_lastVersionCode']; + mSEMinVersionCode = json['MSE_minVersionCode']; p4kDownloadUrl = json['p4kDownloadUrl']; + activityColors = json['activityColors'] != null ? ActivityColors.fromJson(json['activityColors']) : null; } String? lastVersion; num? lastVersionCode; - String? lastBetaVersion; - num? lastBetaVersionCode; num? minVersionCode; - num? minBetaVersionCode; + String? mSELastVersion; + num? mSELastVersionCode; + num? mSEMinVersionCode; String? p4kDownloadUrl; + ActivityColors? activityColors; Map toJson() { final map = {}; map['lastVersion'] = lastVersion; map['lastVersionCode'] = lastVersionCode; - map['lastBetaVersion'] = lastBetaVersion; - map['lastBetaVersionCode'] = lastBetaVersionCode; map['minVersionCode'] = minVersionCode; - map['minBetaVersionCode'] = minBetaVersionCode; + map['MSE_lastVersion'] = mSELastVersion; + map['MSE_lastVersionCode'] = mSELastVersionCode; + map['MSE_minVersionCode'] = mSEMinVersionCode; map['p4kDownloadUrl'] = p4kDownloadUrl; + if (activityColors != null) { + map['activityColors'] = activityColors?.toJson(); + } + return map; + } + +} + +/// enable : true +/// startTime : 1700236800000 +/// endTime : 1701360000000 +/// background : "" +/// menu : "" +/// mica : "" + +class ActivityColors { + ActivityColors({ + this.enable, + this.startTime, + this.endTime, + this.background, + this.menu, + this.mica,}); + + ActivityColors.fromJson(dynamic json) { + enable = json['enable']; + startTime = json['startTime']; + endTime = json['endTime']; + background = json['background']; + menu = json['menu']; + mica = json['mica']; + } + bool? enable; + num? startTime; + num? endTime; + String? background; + String? menu; + String? mica; + + Map toJson() { + final map = {}; + map['enable'] = enable; + map['startTime'] = startTime; + map['endTime'] = endTime; + map['background'] = background; + map['menu'] = menu; + map['mica'] = mica; return map; } diff --git a/lib/main.dart b/lib/main.dart index 6b1f292..992a21f 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,5 +1,6 @@ import 'package:desktop_webview_window/desktop_webview_window.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:hexcolor/hexcolor.dart'; import 'package:starcitizen_doctor/base/ui_model.dart'; import 'package:starcitizen_doctor/common/conf.dart'; import 'package:starcitizen_doctor/ui/index_ui_model.dart'; @@ -34,11 +35,11 @@ class AppUI extends BaseUI { darkTheme: FluentThemeData( brightness: Brightness.dark, fontFamily: "SourceHanSansCN-Regular", - navigationPaneTheme: const NavigationPaneThemeData( - backgroundColor: Color.fromRGBO(19, 36, 49, .75), + navigationPaneTheme: NavigationPaneThemeData( + backgroundColor: HexColor(AppConf.colorBackground).withOpacity(.75), ), - menuColor: const Color.fromRGBO(18, 45, 66, .95), - micaBackgroundColor: const Color.fromRGBO(10, 49, 66, 1.0), + menuColor: HexColor(AppConf.colorMenu).withOpacity(.95), + micaBackgroundColor: HexColor(AppConf.colorMica), ), debugShowCheckedModeBanner: false, home: BaseUIContainer( diff --git a/pubspec.yaml b/pubspec.yaml index 60ec832..f30f64e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -61,6 +61,7 @@ dependencies: local_auth: ^2.1.7 cryptography: ^2.7.0 cryptography_flutter: ^2.3.2 + hexcolor: ^3.0.1 dev_dependencies: flutter_test: