SCToolBox/app
1
0
Fork 0
mirror of https://ghfast.top/https://github.com/StarCitizenToolBox/app.git synced 2025-05-10 03:51:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: 42kit Nav Support network config

Browse Source
This commit is contained in:
xkeyC 2025-05-08 22:44:22 +08:00
parent 03c941c970
commit 3c061f995c
5 changed files with 51 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/api/udb.dart
View File

@ -1,12 +1,12 @@
import 'dart:convert'; import 'dart:convert';
import 'package:starcitizen_doctor/common/conf/url_conf.dart';
import 'package:starcitizen_doctor/common/io/rs_http.dart'; import 'package:starcitizen_doctor/common/io/rs_http.dart';
import 'package:starcitizen_doctor/data/nav_api_data.dart'; import 'package:starcitizen_doctor/data/nav_api_data.dart';
class UDBNavApi { class UDBNavApi {
static Future<NavApiData> getNavItems({int pageNo = 1}) async { static Future<NavApiData> getNavItems({int pageNo = 1}) async {
final r = await RSHttp.getText( final r = await RSHttp.getText(URLConf.nav42KitUrl);
"https://payload.citizenwiki.cn/api/community-navs?sort=is_sponsored&depth=2&page=$pageNo&limit=1000");
if (r.isEmpty) throw "Network Error"; if (r.isEmpty) throw "Network Error";
final result = NavApiData.fromJson(jsonDecode(r)); final result = NavApiData.fromJson(jsonDecode(r));
return result; return result;

4
lib/app.dart
View File

@ -22,6 +22,7 @@ import 'package:window_manager/window_manager.dart';
import 'api/analytics.dart'; import 'api/analytics.dart';
import 'api/api.dart'; import 'api/api.dart';
import 'common/conf/url_conf.dart';
import 'common/helper/system_helper.dart'; import 'common/helper/system_helper.dart';
import 'common/io/rs_http.dart'; import 'common/io/rs_http.dart';
import 'common/rust/frb_generated.dart'; import 'common/rust/frb_generated.dart';
@ -214,6 +215,9 @@ class AppGlobalModel extends _$AppGlobalModel {
dPrint("lastVersion=${networkVersionData.lastVersion} ${networkVersionData.lastVersionCode}"); dPrint("lastVersion=${networkVersionData.lastVersion} ${networkVersionData.lastVersionCode}");
} }
state = state.copyWith(networkVersionData: networkVersionData); state = state.copyWith(networkVersionData: networkVersionData);
if (networkVersionData.nav42KitUrl != null) {
URLConf.nav42KitUrl = networkVersionData.nav42KitUrl!;
}
} catch (e) { } catch (e) {
checkUpdateError = e; checkUpdateError = e;
dPrint("_checkUpdate Error:$e"); dPrint("_checkUpdate Error:$e");

1
lib/common/conf/url_conf.dart
View File

@ -39,6 +39,7 @@ class URLConf {
static const feedbackUrl = "https://support.citizenwiki.cn/all"; static const feedbackUrl = "https://support.citizenwiki.cn/all";
static const feedbackFAQUrl = "https://support.citizenwiki.cn/t/sc-toolbox"; static const feedbackFAQUrl = "https://support.citizenwiki.cn/t/sc-toolbox";
static String nav42KitUrl = "https://payload.citizenwiki.cn/api/community-navs?sort=is_sponsored&depth=2&page=1&limit=1000";
static String get devReleaseUrl => "$gitApiHome/SCToolBox/Release/releases"; static String get devReleaseUrl => "$gitApiHome/SCToolBox/Release/releases";

10
lib/data/app_version_data.dart
View File

@ -17,6 +17,9 @@ class AppVersionData {
this.mSEMinVersionCode, this.mSEMinVersionCode,
this.p4kDownloadUrl, this.p4kDownloadUrl,
this.activityColors, this.activityColors,
this.nav42KitUrl,
this.gameChannels,
this.webMirrors,
}); });
AppVersionData.fromJson(dynamic json) { AppVersionData.fromJson(dynamic json) {
@ -27,11 +30,10 @@ class AppVersionData {
mSELastVersionCode = json['MSE_lastVersionCode']; mSELastVersionCode = json['MSE_lastVersionCode'];
mSEMinVersionCode = json['MSE_minVersionCode']; mSEMinVersionCode = json['MSE_minVersionCode'];
p4kDownloadUrl = json['p4kDownloadUrl']; p4kDownloadUrl = json['p4kDownloadUrl'];
activityColors = json['activityColors'] != null activityColors = json['activityColors'] != null ? ActivityColors.fromJson(json['activityColors']) : null;
? ActivityColors.fromJson(json['activityColors'])
: null;
gameChannels = List.from(json["game_channels"]).cast<String>(); gameChannels = List.from(json["game_channels"]).cast<String>();
webMirrors = json["web_mirrors"]; webMirrors = json["web_mirrors"];
nav42KitUrl = json['nav_42kit_url'];
} }
String? lastVersion; String? lastVersion;
@ -44,6 +46,7 @@ class AppVersionData {
ActivityColors? activityColors; ActivityColors? activityColors;
List<String>? gameChannels; List<String>? gameChannels;
Map? webMirrors; Map? webMirrors;
String? nav42KitUrl;
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
final map = <String, dynamic>{}; final map = <String, dynamic>{};
@ -59,6 +62,7 @@ class AppVersionData {
} }
map["web_mirrors"] = webMirrors; map["web_mirrors"] = webMirrors;
map["game_channels"] = gameChannels; map["game_channels"] = gameChannels;
map["nav_42kit_url"] = nav42KitUrl;
return map; return map;
} }
} }

71
lib/ui/home/dialogs/home_countdown_dialog_ui.dart
View File

@ -43,41 +43,44 @@ class HomeCountdownDialogUI extends HookConsumerWidget {
itemBuilder: (BuildContext context, int index) { itemBuilder: (BuildContext context, int index) {
final item = final item =
homeState.countdownFestivalListData![index]; homeState.countdownFestivalListData![index];
return Container( return GridItemAnimator(
decoration: BoxDecoration( index: index,
color: FluentTheme.of(context).cardColor, child: Container(
borderRadius: BorderRadius.circular(12), decoration: BoxDecoration(
), color: FluentTheme.of(context).cardColor,
child: Padding( borderRadius: BorderRadius.circular(12),
padding: const EdgeInsets.all(12), ),
child: Row( child: Padding(
children: [ padding: const EdgeInsets.all(12),
if (item.icon != null && item.icon != "") ...[ child: Row(
ClipRRect( children: [
borderRadius: BorderRadius.circular(1000), if (item.icon != null && item.icon != "") ...[
child: Image.asset( ClipRRect(
"assets/countdown/${item.icon}", borderRadius: BorderRadius.circular(1000),
width: 38, child: Image.asset(
height: 38, "assets/countdown/${item.icon}",
width: 38,
height: 38,
),
), ),
), const SizedBox(width: 12),
const SizedBox(width: 12), ] else
] else const SizedBox(width: 50),
const SizedBox(width: 50), Column(
Column( crossAxisAlignment: CrossAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, children: [
children: [ Text(
Text( "${item.name}",
"${item.name}", ),
), CountdownTimeText(
CountdownTimeText( targetTime:
targetTime: DateTime.fromMillisecondsSinceEpoch(
DateTime.fromMillisecondsSinceEpoch( item.time ?? 0),
item.time ?? 0), )
) ],
], )
) ],
], ),
), ),
), ),
); );