mirror of
https://ghfast.top/https://github.com/StarCitizenToolBox/app.git
synced 2025-05-10 03:51:23 +08:00
feat: 42kit Nav Support network config
This commit is contained in:
parent
03c941c970
commit
3c061f995c
@ -1,12 +1,12 @@
|
||||
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/data/nav_api_data.dart';
|
||||
|
||||
class UDBNavApi {
|
||||
static Future<NavApiData> getNavItems({int pageNo = 1}) async {
|
||||
final r = await RSHttp.getText(
|
||||
"https://payload.citizenwiki.cn/api/community-navs?sort=is_sponsored&depth=2&page=$pageNo&limit=1000");
|
||||
final r = await RSHttp.getText(URLConf.nav42KitUrl);
|
||||
if (r.isEmpty) throw "Network Error";
|
||||
final result = NavApiData.fromJson(jsonDecode(r));
|
||||
return result;
|
||||
|
@ -22,6 +22,7 @@ import 'package:window_manager/window_manager.dart';
|
||||
|
||||
import 'api/analytics.dart';
|
||||
import 'api/api.dart';
|
||||
import 'common/conf/url_conf.dart';
|
||||
import 'common/helper/system_helper.dart';
|
||||
import 'common/io/rs_http.dart';
|
||||
import 'common/rust/frb_generated.dart';
|
||||
@ -214,6 +215,9 @@ class AppGlobalModel extends _$AppGlobalModel {
|
||||
dPrint("lastVersion=${networkVersionData.lastVersion} ${networkVersionData.lastVersionCode}");
|
||||
}
|
||||
state = state.copyWith(networkVersionData: networkVersionData);
|
||||
if (networkVersionData.nav42KitUrl != null) {
|
||||
URLConf.nav42KitUrl = networkVersionData.nav42KitUrl!;
|
||||
}
|
||||
} catch (e) {
|
||||
checkUpdateError = e;
|
||||
dPrint("_checkUpdate Error:$e");
|
||||
|
@ -39,6 +39,7 @@ class URLConf {
|
||||
|
||||
static const feedbackUrl = "https://support.citizenwiki.cn/all";
|
||||
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";
|
||||
|
||||
|
@ -17,6 +17,9 @@ class AppVersionData {
|
||||
this.mSEMinVersionCode,
|
||||
this.p4kDownloadUrl,
|
||||
this.activityColors,
|
||||
this.nav42KitUrl,
|
||||
this.gameChannels,
|
||||
this.webMirrors,
|
||||
});
|
||||
|
||||
AppVersionData.fromJson(dynamic json) {
|
||||
@ -27,11 +30,10 @@ class AppVersionData {
|
||||
mSELastVersionCode = json['MSE_lastVersionCode'];
|
||||
mSEMinVersionCode = json['MSE_minVersionCode'];
|
||||
p4kDownloadUrl = json['p4kDownloadUrl'];
|
||||
activityColors = json['activityColors'] != null
|
||||
? ActivityColors.fromJson(json['activityColors'])
|
||||
: null;
|
||||
activityColors = json['activityColors'] != null ? ActivityColors.fromJson(json['activityColors']) : null;
|
||||
gameChannels = List.from(json["game_channels"]).cast<String>();
|
||||
webMirrors = json["web_mirrors"];
|
||||
nav42KitUrl = json['nav_42kit_url'];
|
||||
}
|
||||
|
||||
String? lastVersion;
|
||||
@ -44,6 +46,7 @@ class AppVersionData {
|
||||
ActivityColors? activityColors;
|
||||
List<String>? gameChannels;
|
||||
Map? webMirrors;
|
||||
String? nav42KitUrl;
|
||||
|
||||
Map<String, dynamic> toJson() {
|
||||
final map = <String, dynamic>{};
|
||||
@ -59,6 +62,7 @@ class AppVersionData {
|
||||
}
|
||||
map["web_mirrors"] = webMirrors;
|
||||
map["game_channels"] = gameChannels;
|
||||
map["nav_42kit_url"] = nav42KitUrl;
|
||||
return map;
|
||||
}
|
||||
}
|
||||
|
@ -43,41 +43,44 @@ class HomeCountdownDialogUI extends HookConsumerWidget {
|
||||
itemBuilder: (BuildContext context, int index) {
|
||||
final item =
|
||||
homeState.countdownFestivalListData![index];
|
||||
return Container(
|
||||
decoration: BoxDecoration(
|
||||
color: FluentTheme.of(context).cardColor,
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
),
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(12),
|
||||
child: Row(
|
||||
children: [
|
||||
if (item.icon != null && item.icon != "") ...[
|
||||
ClipRRect(
|
||||
borderRadius: BorderRadius.circular(1000),
|
||||
child: Image.asset(
|
||||
"assets/countdown/${item.icon}",
|
||||
width: 38,
|
||||
height: 38,
|
||||
return GridItemAnimator(
|
||||
index: index,
|
||||
child: Container(
|
||||
decoration: BoxDecoration(
|
||||
color: FluentTheme.of(context).cardColor,
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
),
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(12),
|
||||
child: Row(
|
||||
children: [
|
||||
if (item.icon != null && item.icon != "") ...[
|
||||
ClipRRect(
|
||||
borderRadius: BorderRadius.circular(1000),
|
||||
child: Image.asset(
|
||||
"assets/countdown/${item.icon}",
|
||||
width: 38,
|
||||
height: 38,
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 12),
|
||||
] else
|
||||
const SizedBox(width: 50),
|
||||
Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
"${item.name}",
|
||||
),
|
||||
CountdownTimeText(
|
||||
targetTime:
|
||||
DateTime.fromMillisecondsSinceEpoch(
|
||||
item.time ?? 0),
|
||||
)
|
||||
],
|
||||
)
|
||||
],
|
||||
const SizedBox(width: 12),
|
||||
] else
|
||||
const SizedBox(width: 50),
|
||||
Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
"${item.name}",
|
||||
),
|
||||
CountdownTimeText(
|
||||
targetTime:
|
||||
DateTime.fromMillisecondsSinceEpoch(
|
||||
item.time ?? 0),
|
||||
)
|
||||
],
|
||||
)
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
|
Loading…
x
Reference in New Issue
Block a user