diff --git a/lib/api/api.dart b/lib/api/api.dart index a38d6d7..bea321d 100644 --- a/lib/api/api.dart +++ b/lib/api/api.dart @@ -37,7 +37,7 @@ class Api { static Future> getAppReleaseDataByVersionName( String version) async { final r = await dio - .get("${AppConf.gitlabApiPath}/projects/152243/releases/$version"); + .get("${AppConf.gitlabApiPath}/repos/SCToolBox/Release/releases/tags/$version"); return r.data; } diff --git a/lib/common/conf.dart b/lib/common/conf.dart index cef0f8e..0ed0f80 100644 --- a/lib/common/conf.dart +++ b/lib/common/conf.dart @@ -18,30 +18,33 @@ import 'package:window_manager/window_manager.dart'; import '../base/ui.dart'; class AppConf { - static const String appVersion = "2.9.22 Beta"; - static const int appVersionCode = 33; - static const String appVersionDate = "2023-11-30"; + static const String appVersion = "2.9.23-1 Beta"; + static const int appVersionCode = 32; + static const String appVersionDate = "2023-12-05"; - static const String gitlabHomeUrl = - "https://jihulab.com/StarCitizenCN_Community/StarCitizenDoctor"; + static const String giteaAttachmentsUrl = + "https://git.sctoolbox.sccsgo.com/SCToolBox/Release"; static const String gitlabLocalizationUrl = - "https://jihulab.com/StarCitizenCN_Community/LocalizationData"; + "https://git.sctoolbox.sccsgo.com/SCToolBox/LocalizationData"; static const String apiRepoPath = - "https://jihulab.com/StarCitizenCN_Community/api/-/raw/main/"; - static const String gitlabApiPath = "https://jihulab.com/api/v4/"; + "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://jihulab.com/StarCitizenCN_Community/scweb_chinese_translate/-/raw/main/json/locales"; + "https://git.sctoolbox.sccsgo.com/SCToolBox/ScWeb_Chinese_Translate/raw/branch/main/json/locales"; static const String xkeycApiUrl = "https://sctoolbox.xkeyc.com"; - static const rssVideoUrl = - "https://rss.42kit.com/bilibili/user/channel/27976358/290653"; + static const _rssHomeUrl = "https://rss.sctoolbox.sccsgo.com"; - static const rssTextUrl1 = - "https://rss.42kit.com/bilibili/user/article/40102960"; + static const rssVideoUrl = + "$_rssHomeUrl/bilibili/user/channel/27976358/290653"; + + static const rssTextUrl1 = "$_rssHomeUrl/bilibili/user/article/40102960"; static const rssTextUrl2 = - "https://rss.42kit.com/baidu/tieba/user/%E7%81%AC%E7%81%ACG%E7%81%AC%E7%81%AC&"; + "$_rssHomeUrl/baidu/tieba/user/%E7%81%AC%E7%81%ACG%E7%81%AC%E7%81%AC&"; static late final String applicationSupportDir; diff --git a/lib/common/grpc/grpc.dart b/lib/common/grpc/grpc.dart deleted file mode 100644 index b53fa1a..0000000 --- a/lib/common/grpc/grpc.dart +++ /dev/null @@ -1,17 +0,0 @@ -import 'package:grpc/grpc.dart'; -import 'package:starcitizen_doctor/common/conf.dart'; - -class GrpcClient { - static final channel = ClientChannel( - 'grpc.sctoolbox.xkeyc.com', - port: 8439, - options: ChannelOptions( - credentials: ChannelCredentials.secure( - certificates: AppConf.certData, - authority: 'grpc.sctoolbox.fake.bilibili.com', - ), - codecRegistry: - CodecRegistry(codecs: const [GzipCodec(), IdentityCodec()]), - ), - ); -} diff --git a/lib/ui/home/home_ui_model.dart b/lib/ui/home/home_ui_model.dart index 12d4c56..3b11192 100644 --- a/lib/ui/home/home_ui_model.dart +++ b/lib/ui/home/home_ui_model.dart @@ -174,6 +174,7 @@ class HomeUIModel extends BaseUIModel { final t = await RSSApi.getRssText(); rssTextItems = t; notifyListeners(); + dPrint("RSS update Success !"); } VoidCallback? doCheck() { diff --git a/lib/ui/home/localization/localization_ui_model.dart b/lib/ui/home/localization/localization_ui_model.dart index 0c2fa11..a9ba0f3 100644 --- a/lib/ui/home/localization/localization_ui_model.dart +++ b/lib/ui/home/localization/localization_ui_model.dart @@ -132,7 +132,7 @@ class LocalizationUIModel extends BaseUIModel { return () async { AnalyticsApi.touch("install_localization"); final downloadUrl = - "${AppConf.gitlabLocalizationUrl}/-/archive/${value.versionName}/LocalizationData-${value.versionName}.tar.bz2"; + "${AppConf.gitlabLocalizationUrl}/archive/${value.versionName}.tar.gz"; final savePath = File("${downloadDir.absolute.path}\\${value.versionName}.sclang"); try { @@ -284,7 +284,7 @@ class LocalizationUIModel extends BaseUIModel { static StringBuffer _readArchive(String savePath) { final inputStream = InputFileStream(savePath); final archive = - TarDecoder().decodeBytes(BZip2Decoder().decodeBuffer(inputStream)); + TarDecoder().decodeBytes(GZipDecoder().decodeBuffer(inputStream)); StringBuffer globalIni = StringBuffer(""); for (var element in archive.files) { if (element.name.contains("global.ini")) { diff --git a/lib/ui/settings/upgrade_dialog_ui.dart b/lib/ui/settings/upgrade_dialog_ui.dart index 5d50b64..3b4d0fd 100644 --- a/lib/ui/settings/upgrade_dialog_ui.dart +++ b/lib/ui/settings/upgrade_dialog_ui.dart @@ -34,7 +34,8 @@ class UpgradeDialogUI extends BaseUI { ), ) ] else - ...makeMarkdownView(model.description!), + ...makeMarkdownView(model.description!, + attachmentsUrl: AppConf.giteaAttachmentsUrl), ], ), ), diff --git a/lib/ui/settings/upgrade_dialog_ui_model.dart b/lib/ui/settings/upgrade_dialog_ui_model.dart index 74fd2a7..66d2b55 100644 --- a/lib/ui/settings/upgrade_dialog_ui_model.dart +++ b/lib/ui/settings/upgrade_dialog_ui_model.dart @@ -24,12 +24,11 @@ class UpgradeDialogUIModel extends BaseUIModel { ? AppConf.networkVersionData!.mSELastVersion! : AppConf.networkVersionData!.lastVersion!; final r = await Api.getAppReleaseDataByVersionName(targetVersion); - description = r["description"]; - final assetsLinks = List.of(r["assets"]?["links"] ?? []); - for (var link in assetsLinks) { - if (link["name"].toString().contains("SETUP.exe")) { - downloadUrl = link["direct_asset_url"]; - break; + description = r["body"]; + final assets = List.of(r["assets"] ?? []); + for (var asset in assets) { + if (asset["name"].toString().endsWith("SETUP.exe")) { + downloadUrl = asset["browser_download_url"]; } } notifyListeners(); diff --git a/lib/widgets/widgets.dart b/lib/widgets/widgets.dart index ba2e17d..2376d44 100644 --- a/lib/widgets/widgets.dart +++ b/lib/widgets/widgets.dart @@ -3,7 +3,6 @@ import 'dart:ui' as ui; import 'package:markdown_widget/config/all.dart'; import 'package:markdown_widget/widget/all.dart'; -import 'package:starcitizen_doctor/common/conf.dart'; import 'package:url_launcher/url_launcher_string.dart'; import '../base/ui.dart'; @@ -59,16 +58,19 @@ fastPadding( child: child); } -List makeMarkdownView(String description) { +List makeMarkdownView(String description, {String? attachmentsUrl}) { return MarkdownGenerator().buildWidgets(description, config: MarkdownConfig(configs: [ LinkConfig(onTap: (url) { - if (url.startsWith("/")) { - url = "${AppConf.gitlabHomeUrl}/$url"; + if (url.startsWith("/") && attachmentsUrl != null) { + url = "$attachmentsUrl/$url"; } launchUrlString(url); }), ImgConfig(builder: (String url, Map attributes) { + if (url.startsWith("/") && attachmentsUrl != null) { + url = "$attachmentsUrl/$url"; + } return ExtendedImage.network( url, loadStateChanged: (ExtendedImageState state) { @@ -93,7 +95,7 @@ List makeMarkdownView(String description) { image: state.extendedImageInfo?.image, ); case LoadState.failed: - return const Text("Loading Image error"); + return Text("Loading Image error $url"); } }, );