From b9b1ac7ec592298392c3c99df7c6feb48bcf6740 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 3 Sep 2023 13:22:20 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/common/widgets/video_card_v.dart | 2 +- lib/http/video.dart | 3 +++ lib/pages/search/controller.dart | 4 +++- lib/pages/setting/extra_setting.dart | 12 ++++++++++++ lib/utils/storage.dart | 2 ++ 5 files changed, 21 insertions(+), 2 deletions(-) diff --git a/lib/common/widgets/video_card_v.dart b/lib/common/widgets/video_card_v.dart index 02c7c217..1a5d4077 100644 --- a/lib/common/widgets/video_card_v.dart +++ b/lib/common/widgets/video_card_v.dart @@ -247,7 +247,7 @@ class VideoContent extends StatelessWidget { }, ), ] else ...[ - const SizedBox(height: 26) + const SizedBox(height: 24) ] ], ), diff --git a/lib/http/video.dart b/lib/http/video.dart index a6084a6c..d0ce616c 100644 --- a/lib/http/video.dart +++ b/lib/http/video.dart @@ -20,6 +20,8 @@ import 'package:pilipala/utils/storage.dart'; class VideoHttp { static Box localCache = GStrorage.localCache; static Box setting = GStrorage.setting; + static bool enableRcmdDynamic = + setting.get(SettingBoxKey.enableRcmdDynamic, defaultValue: true); // 首页推荐视频 static Future rcmdVideoList({required int ps, required int freshIdx}) async { @@ -73,6 +75,7 @@ class VideoHttp { for (var i in res.data['data']['items']) { // 屏蔽推广和拉黑用户 if (i['card_goto'] != 'ad_av' && + (!enableRcmdDynamic ? i['card_goto'] != 'picture' : true) && (i['args'] != null && !blackMidsList.contains(i['args']['up_mid']))) { list.add(RecVideoItemAppModel.fromJson(i)); diff --git a/lib/pages/search/controller.dart b/lib/pages/search/controller.dart index 64f3cb65..9a93dabe 100644 --- a/lib/pages/search/controller.dart +++ b/lib/pages/search/controller.dart @@ -27,7 +27,9 @@ class SSearchController extends GetxController { @override void onInit() { super.onInit(); - searchDefault(); + if (setting.get(SettingBoxKey.enableSearchWord, defaultValue: true)) { + searchDefault(); + } // 其他页面跳转过来 if (Get.parameters.keys.isNotEmpty) { if (Get.parameters['keyword'] != null) { diff --git a/lib/pages/setting/extra_setting.dart b/lib/pages/setting/extra_setting.dart index f9d30f41..f56029e6 100644 --- a/lib/pages/setting/extra_setting.dart +++ b/lib/pages/setting/extra_setting.dart @@ -55,6 +55,18 @@ class _ExtraSettingState extends State { defaultVal: true, callFn: (val) => {SmartDialog.showToast('下次启动时生效')}, ), + const SetSwitchItem( + title: '搜索默认词', + subTitle: '是否展示搜索框默认词', + setKey: SettingBoxKey.enableSearchWord, + defaultVal: true, + ), + const SetSwitchItem( + title: '推荐动态', + subTitle: '是否在推荐内容中展示动态', + setKey: SettingBoxKey.enableRcmdDynamic, + defaultVal: true, + ), const SetSwitchItem( title: '快速收藏', subTitle: '点按收藏至默认,长按选择文件夹', diff --git a/lib/utils/storage.dart b/lib/utils/storage.dart index f73b1ba7..b0be21b0 100644 --- a/lib/utils/storage.dart +++ b/lib/utils/storage.dart @@ -113,6 +113,8 @@ class SettingBoxKey { static const String enableHotKey = 'enableHotKey'; static const String enableQuickFav = 'enableQuickFav'; static const String enableWordRe = 'enableWordRe'; + static const String enableSearchWord = 'enableSearchWord'; + static const String enableRcmdDynamic = 'enableRcmdDynamic'; /// 外观 static const String themeMode = 'themeMode';