《一些修复》

orz12 · Dec 28, 2024 · 3ddeaa9 · 3ddeaa9
1 parent ac047fb
commit 3ddeaa9
Show file tree

Hide file tree

Showing 25 changed files with 293 additions and 217 deletions.
diff --git a/README.md b/README.md
@@ -56,7 +56,7 @@ flutter --version
 Android相关版本：
 > JDK: 21.0.4
 > gradle: 8.10.2
-> kotlin: 2.0.20
+> kotlin: 2.1.0
 > minSdk: 21
 > targetSdk: 34
 > compileSdk: 34

diff --git a/lib/common/widgets/video_popup_menu.dart b/lib/common/widgets/video_popup_menu.dart
@@ -219,13 +219,13 @@ class VideoCustomActions {
                       act: 5,
                       reSrc: 11,
                     );
-                    List<int> blackMidsList = GStorage.localCache
-                        .get(LocalCacheKey.blackMidsList, defaultValue: [-1])
+                    List<int> blackMidsList = GStorage.onlineCache
+                        .get(OnlineCacheKey.blackMidsList, defaultValue: [-1])
                         .map<int>((i) => i as int)
                         .toList();
                     blackMidsList.insert(0, videoItem.owner.mid);
-                    GStorage.localCache
-                        .put(LocalCacheKey.blackMidsList, blackMidsList);
+                    GStorage.onlineCache
+                        .put(OnlineCacheKey.blackMidsList, blackMidsList);
                     Get.back();
                     SmartDialog.showToast(res['msg'] ?? '成功');
                   },

diff --git a/lib/http/search.dart b/lib/http/search.dart
@@ -7,10 +7,11 @@ import '../models/search/hot.dart';
 import '../models/search/result.dart';
 import '../models/search/suggest.dart';
 import '../utils/storage.dart';
+import '../utils/wbi_sign.dart';
 import 'index.dart';
 
 class SearchHttp {
-  static Box localCache = GStorage.localCache;
+  static Box onlineCache = GStorage.onlineCache;
   static Future hotSearchList() async {
     var res = await Request().get(Api.hotSearchList);
     if (res.data is String) {
@@ -84,14 +85,16 @@ class SearchHttp {
       if (order != null) 'order': order,
       if (duration != null) 'duration': duration,
     };
+    Map<String, dynamic> params = await WbiSign().makSign(reqData);
+    reqData.addAll(params);
     var res = await Request().get(Api.searchByType, data: reqData);
     if (res.data['code'] == 0 && res.data['data']['numPages'] > 0) {
       Object data;
       try {
         switch (searchType) {
           case SearchType.video:
-            List<int> blackMidsList = localCache
-                .get(LocalCacheKey.blackMidsList, defaultValue: [-1])
+            List<int> blackMidsList = onlineCache
+                .get(OnlineCacheKey.blackMidsList, defaultValue: [-1])
                 .map<int>((i) => i as int)
                 .toList();
             for (var i in res.data['data']['result']) {

diff --git a/lib/http/video.dart b/lib/http/video.dart
@@ -27,6 +27,7 @@ import 'login.dart';
 /// view层根据 status 判断渲染逻辑
 class VideoHttp {
   static Box localCache = GStorage.localCache;
+  static Box onlineCache = GStorage.onlineCache;
   static Box setting = GStorage.setting;
   static bool enableRcmdDynamic =
       setting.get(SettingBoxKey.enableRcmdDynamic, defaultValue: true);
@@ -48,8 +49,8 @@ class VideoHttp {
     );
     if (res.data['code'] == 0) {
       List<RecVideoItemModel> list = [];
-      List<int> blackMidsList = localCache
-          .get(LocalCacheKey.blackMidsList, defaultValue: [-1])
+      List<int> blackMidsList = onlineCache
+          .get(OnlineCacheKey.blackMidsList, defaultValue: [-1])
           .map<int>((e) => e as int)
           .toList();
       for (var i in res.data['data']['item']) {
@@ -138,8 +139,8 @@ class VideoHttp {
     log(res.data['data'].toString());
     if (res.data['code'] == 0) {
       List<RecVideoItemAppModel> list = [];
-      List<int> blackMidsList = localCache
-          .get(LocalCacheKey.blackMidsList, defaultValue: [-1])
+      List<int> blackMidsList = onlineCache
+          .get(OnlineCacheKey.blackMidsList, defaultValue: [-1])
           .map<int>((e) => e as int)
           .toList();
       for (var i in res.data['data']['items']) {
@@ -171,8 +172,8 @@ class VideoHttp {
       );
       if (res.data['code'] == 0) {
         List<HotVideoItemModel> list = [];
-        List<int> blackMidsList = localCache
-            .get(LocalCacheKey.blackMidsList, defaultValue: [-1])
+        List<int> blackMidsList = onlineCache
+            .get(OnlineCacheKey.blackMidsList, defaultValue: [-1])
             .map<int>((e) => e as int)
             .toList();
         for (var i in res.data['data']['list']) {
@@ -266,6 +267,11 @@ class VideoHttp {
 
   // 相关视频
   static Future relatedVideoList({required String bvid}) async {
+    print(
+        'RecommendFilter.disableRelatedVideos: ${RecommendFilter.disableRelatedVideos}');
+    if (RecommendFilter.disableRelatedVideos) {
+      return {'status': true, 'data': []};
+    }
     var res = await Request().get(Api.relatedList, data: {'bvid': bvid});
     if (res.data['code'] == 0) {
       List<HotVideoItemModel> list = [];
@@ -778,8 +784,8 @@ class VideoHttp {
       var res = await Request().get(rankApi);
       if (res.data['code'] == 0) {
         List<HotVideoItemModel> list = [];
-        List<int> blackMidsList = localCache
-            .get(LocalCacheKey.blackMidsList, defaultValue: [-1])
+        List<int> blackMidsList = onlineCache
+            .get(OnlineCacheKey.blackMidsList, defaultValue: [-1])
             .map<int>((e) => e as int)
             .toList();
         for (var i in res.data['data']['list']) {
@@ -806,8 +812,8 @@ class VideoHttp {
     print("getRegionVideoList: $res");
     if (res.data['code'] == 0) {
       List<HotVideoItemModel> list = [];
-      List<int> blackMidsList = localCache
-          .get(LocalCacheKey.blackMidsList, defaultValue: [-1])
+      List<int> blackMidsList = onlineCache
+          .get(OnlineCacheKey.blackMidsList, defaultValue: [-1])
           .map<int>((e) => e as int)
           .toList();
       print(res.data['data']['archives']);

diff --git a/lib/pages/about/index.dart b/lib/pages/about/index.dart
@@ -276,6 +276,7 @@ class _AboutPageState extends State<AboutPage> {
                           GStorage.localCache.clear();
                           GStorage.video.clear();
                           GStorage.historyWord.clear();
+                          GStorage.onlineCache.clear();
                           SmartDialog.showToast('重置成功');
                         },
                         child: const Text('重置所有数据（含登录信息）'),

diff --git a/lib/pages/blacklist/index.dart b/lib/pages/blacklist/index.dart
@@ -22,7 +22,7 @@ class _BlackListPageState extends State<BlackListPage> {
   final ScrollController scrollController = ScrollController();
   Future? _futureBuilderFuture;
   bool _isLoadingMore = false;
-  Box localCache = GStorage.localCache;
+  Box onlineCache = GStorage.onlineCache;
 
   @override
   void initState() {
@@ -46,7 +46,7 @@ class _BlackListPageState extends State<BlackListPage> {
   void dispose() {
     List<int> blackMidsList =
         _blackListController.blackList.map<int>((e) => e.mid!).toList();
-    localCache.put(LocalCacheKey.blackMidsList, blackMidsList);
+    onlineCache.put(OnlineCacheKey.blackMidsList, blackMidsList);
     scrollController.removeListener(() {});
     super.dispose();
   }

diff --git a/lib/pages/danmaku_block/index.dart b/lib/pages/danmaku_block/index.dart
@@ -20,7 +20,7 @@ class _DanmakuBlockPageState extends State<DanmakuBlockPage> {
   final DanmakuBlockController _danmakuBlockController =
       Get.put(DanmakuBlockController());
   final ScrollController scrollController = ScrollController();
-  Box localCache = GStorage.localCache;
+  Box onlineCache = GStorage.onlineCache;
   late PlPlayerController plPlayerController;
 
   static const Map<int, String> ruleLabels = {
@@ -51,7 +51,7 @@ class _DanmakuBlockPageState extends State<DanmakuBlockPage> {
       return e.toMap();
     }).toList();
     print("simpleRuleList:$simpleRuleList");
-    localCache.put(LocalCacheKey.danmakuFilterRule, simpleRuleList);
+    onlineCache.put(OnlineCacheKey.danmakuFilterRule, simpleRuleList);
     plPlayerController.danmakuFilterRule.value = simpleRuleList;
     scrollController.removeListener(() {});
     scrollController.dispose();

diff --git a/lib/pages/dynamics/view.dart b/lib/pages/dynamics/view.dart
@@ -73,8 +73,11 @@ class _DynamicsPageState extends State<DynamicsPage>
 
   @override
   void dispose() {
-    _dynamicsController.tabController.removeListener(() {});
-    _dynamicsController.tabController.dispose();
+    // print('dynamic '
+    //     'dispose');
+    // print(StackTrace.current);
+    // _dynamicsController.tabController.removeListener(() {});
+    // _dynamicsController.tabController.dispose();
     super.dispose();
   }