Merge pull request #495 from xiaoyaocz/dev

Release 1.7.3 / TV 1.1.9
xiaoyaocz · Aug 13, 2024 · b12df3c · b12df3c
2 parents cbaaad8 + f7eb5d0
commit b12df3c
Show file tree

Hide file tree

Showing 9 changed files with 198 additions and 188 deletions.
diff --git a/assets/app_version.json b/assets/app_version.json
@@ -1,7 +1,7 @@
 {
-    "version": "1.7.2",
-    "version_num": 10702,
-    "version_desc": "- - 修复斗鱼分类无法加载 #485\n- 修复哔哩哔哩直播加载失败 #489\n- 支持远程同步数据\n- 支持导入导出应用设置\n- 支持手动输入Cookie登录哔哩哔哩 #463\n- 支持定时自动更新关注列表 #453",
+    "version": "1.7.3",
+    "version_num": 10703,
+    "version_desc": "- 修复斗鱼分类无法加载 #485\n- 修复哔哩哔哩直播加载失败 #489\n- 支持远程同步数据\n- 支持导入导出应用设置\n- 支持手动输入Cookie登录哔哩哔哩 #463\n- 支持定时自动更新关注列表 #453",
     "prerelease":false,
     "download_url": "https://github.com/xiaoyaocz/dart_simple_live/releases"
 }
diff --git a/assets/tv_app_version.json b/assets/tv_app_version.json
@@ -1,6 +1,6 @@
 {
-    "version": "1.1.8",
-    "version_num": 10108,
+    "version": "1.1.9",
+    "version_num": 10109,
     "version_desc": "- 修复斗鱼分类无法加载\n- 修复哔哩哔哩直播加载失败\n- 支持定时自动更新关注列表",
     "prerelease":true,
     "download_url": "https://github.com/xiaoyaocz/dart_simple_live/releases"

diff --git a/simple_live_app/lib/app/controller/app_settings_controller.dart b/simple_live_app/lib/app/controller/app_settings_controller.dart
@@ -130,7 +130,7 @@ class AppSettingsController extends GetxController {
         .getValue(LocalStorageService.kAutoUpdateFollowEnable, true);
 
     autoUpdateFollowDuration.value = LocalStorageService.instance
-        .getValue(LocalStorageService.kAutoUpdateFollowEnable, 10);
+        .getValue(LocalStorageService.kUpdateFollowDuration, 10);
 
     updateFollowThreadCount.value = LocalStorageService.instance
         .getValue(LocalStorageService.kUpdateFollowThreadCount, 4);
@@ -490,7 +490,7 @@ class AppSettingsController extends GetxController {
   void setAutoUpdateFollowDuration(int e) {
     autoUpdateFollowDuration.value = e;
     LocalStorageService.instance
-        .setValue(LocalStorageService.kAutoUpdateFollowEnable, e);
+        .setValue(LocalStorageService.kUpdateFollowDuration, e);
   }
 
   var updateFollowThreadCount = 4.obs;

diff --git a/simple_live_app/lib/services/local_storage_service.dart b/simple_live_app/lib/services/local_storage_service.dart
@@ -154,9 +154,14 @@ class LocalStorageService extends GetxService {
   }
 
   T getValue<T>(dynamic key, T defaultValue) {
-    var value = settingsBox.get(key, defaultValue: defaultValue) as T;
-    Log.d("Get LocalStorage：$key\r\n$value");
-    return value;
+    try {
+      var value = settingsBox.get(key, defaultValue: defaultValue) as T;
+      Log.d("Get LocalStorage：$key\r\n$value");
+      return value;
+    } catch (e) {
+      Log.logPrint(e);
+      return defaultValue;
+    }
   }
 
   Future setValue<T>(dynamic key, T value) async {

diff --git a/simple_live_app/pubspec.yaml b/simple_live_app/pubspec.yaml
@@ -1,5 +1,5 @@
 name: simple_live_app
-version: 1.7.2+10702
+version: 1.7.3+10703
 publish_to: none
 description: "Simple Live APP"
 environment: 
@@ -10,7 +10,7 @@ dependencies:
     path: ../simple_live_core
   # 图标
   cupertino_icons: ^1.0.2
-  remixicon: ^1.0.0 #Remix图标
+  remixicon: ^1.2.0 #Remix图标
 
   # 框架、工具
   get: ^4.6.6 #状态管理、路由管理、国际化

diff --git a/simple_live_tv_app/lib/app/controller/app_settings_controller.dart b/simple_live_tv_app/lib/app/controller/app_settings_controller.dart
@@ -95,7 +95,7 @@ class AppSettingsController extends GetxController {
         .getValue(LocalStorageService.kAutoUpdateFollowEnable, true);
 
     autoUpdateFollowDuration.value = LocalStorageService.instance
-        .getValue(LocalStorageService.kAutoUpdateFollowEnable, 10);
+        .getValue(LocalStorageService.kUpdateFollowDuration, 10);
 
     updateFollowThreadCount.value = LocalStorageService.instance
         .getValue(LocalStorageService.kUpdateFollowThreadCount, 4);
@@ -325,7 +325,7 @@ class AppSettingsController extends GetxController {
   void setAutoUpdateFollowDuration(int e) {
     autoUpdateFollowDuration.value = e;
     LocalStorageService.instance
-        .setValue(LocalStorageService.kAutoUpdateFollowEnable, e);
+        .setValue(LocalStorageService.kUpdateFollowDuration, e);
   }
 
   var updateFollowThreadCount = 4.obs;

diff --git a/simple_live_tv_app/lib/services/local_storage_service.dart b/simple_live_tv_app/lib/services/local_storage_service.dart
@@ -136,9 +136,14 @@ class LocalStorageService extends GetxService {
   }
 
   T getValue<T>(dynamic key, T defaultValue) {
-    var value = settingsBox.get(key, defaultValue: defaultValue) as T;
-    Log.d("Get LocalStorage：$key\r\n$value");
-    return value;
+    try {
+      var value = settingsBox.get(key, defaultValue: defaultValue) as T;
+      Log.d("Get LocalStorage：$key\r\n$value");
+      return value;
+    } catch (e) {
+      Log.logPrint(e);
+      return defaultValue;
+    }
   }
 
   Future setValue<T>(dynamic key, T value) async {