Merge 3dab05fc0e into f349b475e2

Bumps [build_runner](https://github.com/dart-lang/build) from 2.10.4 to 2.10.5.
- [Release notes](https://github.com/dart-lang/build/releases)
- [Commits](https://github.com/dart-lang/build/compare/build_runner-v2.10.4...build_runner-v2.10.5)

---
updated-dependencies:
- dependency-name: build_runner
  dependency-version: 2.10.5
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

lib/common/conf/conf.dart

@@ -1,9 +1,9 @@
 import 'dart:io';
 
 class ConstConf {
-  static const String appVersion = "3.0.0 Beta10";
-  static const int appVersionCode = 79;
-  static const String appVersionDate = "2025-12-27";
+  static const String appVersion = "3.1.0";
+  static const int appVersionCode = 80;
+  static const String appVersionDate = "2026-01-19";
   static const _gameChannels = ["LIVE", "4.0_PREVIEW", "PTU", "EPTU", "TECH-PREVIEW", "HOTFIX"];
   static const isMSE = String.fromEnvironment("MSE", defaultValue: "false") == "true";
   static const win32AppId = isMSE

lib/ui/home/home_ui_model.dart

@@ -247,9 +247,21 @@ class HomeUIModel extends _$HomeUIModel {
     final fixedList = list.map((item) {
       if (item.time == null) return item;
       final itemDateTime = DateTime.fromMillisecondsSinceEpoch(item.time!);
-      final itemDatePlusSeven = itemDateTime.add(const Duration(days: 7));
-      if (itemDatePlusSeven.isBefore(now)) {
-        final nextDate = DateTime(
+
+      // 计算今年的节日日期
+      final thisYearDate = DateTime(
+        now.year,
+        itemDateTime.month,
+        itemDateTime.day,
+        itemDateTime.hour,
+        itemDateTime.minute,
+        itemDateTime.second,
+      );
+
+      // 如果今年的节日日期 + 7天已经过了，使用明年的日期
+      final thisYearDatePlusSeven = thisYearDate.add(const Duration(days: 7));
+      if (thisYearDatePlusSeven.isBefore(now)) {
+        final nextYearDate = DateTime(
           now.year + 1,
           itemDateTime.month,
           itemDateTime.day,
@@ -257,11 +269,13 @@ class HomeUIModel extends _$HomeUIModel {
           itemDateTime.minute,
           itemDateTime.second,
         );
-        final newTimestamp = (nextDate.millisecondsSinceEpoch).round();
+        final newTimestamp = (nextYearDate.millisecondsSinceEpoch).round();
         return CountdownFestivalItemData(name: item.name, time: newTimestamp, icon: item.icon);
       }
 
-      return item;
+      // 否则使用今年的日期
+      final newTimestamp = (thisYearDate.millisecondsSinceEpoch).round();
+      return CountdownFestivalItemData(name: item.name, time: newTimestamp, icon: item.icon);
     }).toList();
 
     // Sort by time (ascending order - nearest festival first)

pubspec.lock

@@ -149,10 +149,10 @@ packages:
     dependency: "direct dev"
     description:
       name: build_runner
-      sha256: "110c56ef29b5eb367b4d17fc79375fa8c18a6cd7acd92c05bb3986c17a079057"
+      sha256: b4d854962a32fd9f8efc0b76f98214790b833af8b2e9b2df6bfc927c0415a072
       url: "https://pub.dev"
     source: hosted
-    version: "2.10.4"
+    version: "2.10.5"
   built_collection:
     dependency: transitive
     description:
@@ -673,10 +673,10 @@ packages:
     dependency: "direct main"
     description:
       name: hive_ce
-      sha256: "412c638aeac0f003bba664884e3048b9547e541aaca13f10cc639da788184bed"
+      sha256: b01cb16fc79cd4f63344d63f197d921eeb6c5bf1b5db6a21d0c21db0ec021516
       url: "https://pub.dev"
     source: hosted
-    version: "2.16.0"
+    version: "2.18.0"
   hooks_riverpod:
     dependency: "direct main"
     description:
@@ -761,10 +761,10 @@ packages:
     dependency: transitive
     description:
       name: isolate_channel
-      sha256: f3d36f783b301e6b312c3450eeb2656b0e7d1db81331af2a151d9083a3f6b18d
+      sha256: "68191008e3a219bc87cc8cddbcd1e29810bd9f3a0fdc2108b574ccbd9aafda08"
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.2+1"
+    version: "0.3.0"
   isolate_contactor:
     dependency: transitive
     description:

pubspec.yaml

@@ -2,7 +2,7 @@ name: starcitizen_doctor
 description: Designed for "StarCitizen" players, providing many convenient functions.
 publish_to: 'none'
 
-version: 3.0.1+78
+version: 3.1.0+80
 
 environment:
   sdk: ^3.8.0
@@ -30,7 +30,7 @@ dependencies:
   url_launcher: ^6.3.2
   font_awesome_flutter: ^10.12.0
   cupertino_icons: ^1.0.8
-  hive_ce: ^2.16.0
+  hive_ce: ^2.18.0
   path_provider: ^2.1.5
   dio: ^5.9.0
   markdown: ^7.3.0
@@ -83,7 +83,7 @@ dev_dependencies:
     sdk: flutter
   flutter_lints: ^6.0.0
   msix: ^3.16.12
-  build_runner: ^2.10.4
+  build_runner: ^2.10.5
   freezed: ^3.2.3
   json_serializable: ^6.11.2
   riverpod_generator: ^4.0.0+1
@@ -113,7 +113,7 @@ msix_config:
   publisher_display_name: xkeyC Studio
   identity_name: 56575xkeyC.MSE
   publisher: CN=B54C897B-C263-4680-B6AB-4913C603DF87
-  msix_version: 3.0.9.0
+  msix_version: 3.1.0.0
   logo_path: ./assets/app_logo.png
   capabilities: internetClient,allowElevation
   languages: zh-cn

rust/Cargo.lock

@@ -6412,9 +6412,9 @@ dependencies = [
 
 [[package]]
 name = "webkit2gtk"
-version = "2.0.1"
+version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76b1bc1e54c581da1e9f179d0b38512ba358fb1af2d634a1affe42e37172361a"
+checksum = "a1027150013530fb2eaf806408df88461ae4815a45c541c8975e61d6f2fc4793"
 dependencies = [
  "bitflags 1.3.2",
  "cairo-rs",
@@ -6436,9 +6436,9 @@ dependencies = [
 
 [[package]]
 name = "webkit2gtk-sys"
-version = "2.0.1"
+version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62daa38afc514d1f8f12b8693d30d5993ff77ced33ce30cd04deebc267a6d57c"
+checksum = "916a5f65c2ef0dfe12fff695960a2ec3d4565359fdbb2e9943c974e06c734ea5"
 dependencies = [
  "bitflags 1.3.2",
  "cairo-sys-rs",
@@ -7119,9 +7119,9 @@ checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9"
 
 [[package]]
 name = "wry"
-version = "0.53.5"
+version = "0.54.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "728b7d4c8ec8d81cab295e0b5b8a4c263c0d41a785fb8f8c4df284e5411140a2"
+checksum = "5ed1a195b0375491dd15a7066a10251be217ce743cf4bbbbdcf5391d6473bee0"
 dependencies = [
  "base64 0.22.1",
  "block2",

rust/Cargo.toml

@@ -62,7 +62,7 @@ bytes = "1.10"
 
 # WebView
 [target.'cfg(not(target_os = "macos"))'.dependencies]
-wry = "0.53.5"
+wry = "0.54.1"
 tao = { version = "0.34.5", features = ["serde"] }
 image = { version = "0.25.9", default-features = false, features = ["ico"] }