diff --git a/lib/main.dart b/lib/main.dart index 7097f320..7423e5d7 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -13,6 +13,7 @@ import 'package:PiliPlus/services/service_locator.dart'; import 'package:PiliPlus/utils/app_scheme.dart'; import 'package:PiliPlus/utils/cache_manage.dart'; import 'package:PiliPlus/utils/data.dart'; +import 'package:PiliPlus/utils/date_util.dart'; import 'package:PiliPlus/utils/recommend_filter.dart'; import 'package:PiliPlus/utils/storage.dart'; import 'package:PiliPlus/utils/theme_utils.dart'; @@ -71,8 +72,8 @@ void main() async { if (GStorage.enableLog) { // 异常捕获 logo记录 - const String buildConfig = '''\n -Build Time: ${BuildConfig.buildTime} + String buildConfig = '''\n +Build Time: ${DateUtil.format(BuildConfig.buildTime, format: DateUtil.longFormatDs)} Commit Hash: ${BuildConfig.commitHash}'''; final Catcher2Options debugConfig = Catcher2Options( SilentReportMode(), diff --git a/lib/pages/about/view.dart b/lib/pages/about/view.dart index 14d0d24d..5eb1f281 100644 --- a/lib/pages/about/view.dart +++ b/lib/pages/about/view.dart @@ -8,6 +8,7 @@ import 'package:PiliPlus/pages/mine/controller.dart'; import 'package:PiliPlus/services/loggeer.dart'; import 'package:PiliPlus/utils/accounts/account.dart'; import 'package:PiliPlus/utils/cache_manage.dart'; +import 'package:PiliPlus/utils/date_util.dart'; import 'package:PiliPlus/utils/login_utils.dart'; import 'package:PiliPlus/utils/page_utils.dart'; import 'package:PiliPlus/utils/storage.dart'; @@ -132,11 +133,11 @@ class _AboutPageState extends State { ), ), ListTile( - title: const Text( + title: Text( ''' -Build Time: ${BuildConfig.buildTime} +Build Time: ${DateUtil.format(BuildConfig.buildTime, format: DateUtil.longFormatDs)} Commit Hash: ${BuildConfig.commitHash}''', - style: TextStyle(fontSize: 14), + style: const TextStyle(fontSize: 14), ), leading: const Icon(Icons.info_outline), onTap: () => PageUtils.launchURL( diff --git a/lib/scripts/build.sh b/lib/scripts/build.sh index 515d0e12..6946cbbb 100644 --- a/lib/scripts/build.sh +++ b/lib/scripts/build.sh @@ -1,16 +1,11 @@ #!/bin/bash -if [[ "$OSTYPE" == "darwin"* ]]; then - build_time=$(date -u -v+8H +"%Y-%m-%d %H:%M:%S") -else - build_time=$(date -u +"%Y-%m-%d %H:%M:%S" -d "+8 hours") -fi - +build_time=$(date +%s) commit_hash=$(git rev-parse HEAD) cat < lib/build_config.dart class BuildConfig { - static const String buildTime = '$build_time'; + static const int buildTime = $build_time; static const String commitHash = '$commit_hash'; } EOL diff --git a/lib/utils/update.dart b/lib/utils/update.dart index 73ef2377..c9f12dba 100644 --- a/lib/utils/update.dart +++ b/lib/utils/update.dart @@ -23,10 +23,10 @@ class Update { } return; } - DateTime latest = DateTime.parse(res.data[0]['created_at']); - DateTime current = DateTime.parse('${BuildConfig.buildTime}Z'); - current = current.copyWith(hour: current.hour - 8); - if (current.compareTo(latest) >= 0) { + int latest = + DateTime.parse(res.data[0]['created_at']).millisecondsSinceEpoch ~/ + 1000; + if (BuildConfig.buildTime >= latest) { if (!isAuto) { SmartDialog.showToast('已是最新版本'); }