Merge branch 'design' into alpha

lib/common/widgets/video_card_v.dart

@@ -247,7 +247,7 @@ class VideoContent extends StatelessWidget {
                     },
                   ),
                 ] else ...[
-                  const SizedBox(height: 26)
+                  const SizedBox(height: 24)
                 ]
               ],
             ),

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));

lib/main.dart

@@ -15,6 +15,7 @@ import 'package:pilipala/router/app_pages.dart';
 import 'package:pilipala/pages/main/view.dart';
 import 'package:pilipala/utils/app_scheme.dart';
 import 'package:pilipala/utils/data.dart';
+import 'package:pilipala/utils/proxy.dart';
 import 'package:pilipala/utils/storage.dart';
 import 'package:media_kit/media_kit.dart'; // Provides [Player], [Media], [Playlist] etc.
 
@@ -25,6 +26,7 @@ void main() async {
           [DeviceOrientation.portraitUp, DeviceOrientation.portraitDown])
       .then((_) async {
     await GStrorage.init();
+    CustomProxy().init();
     runApp(const MyApp());
     // 小白条、导航栏沉浸
     SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);

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) {

lib/pages/setting/extra_setting.dart

@@ -55,6 +55,18 @@ class _ExtraSettingState extends State<ExtraSetting> {
             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: '点按收藏至默认，长按选择文件夹',

lib/utils/proxy.dart

@@ -0,0 +1,26 @@
+import 'dart:io';
+import 'package:system_proxy/system_proxy.dart';
+
+class CustomProxy {
+   init() async{
+    Map<String, String>? proxy = await SystemProxy.getProxySettings();
+    if (proxy != null) {
+      HttpOverrides.global = ProxiedHttpOverrides(proxy['host']!, proxy['port']!);
+    }
+  }
+}
+class ProxiedHttpOverrides extends HttpOverrides {
+  final String _port;
+  final String _host;
+
+  ProxiedHttpOverrides(this._host, this._port);
+
+  @override
+  HttpClient createHttpClient(SecurityContext? context) {
+    return super.createHttpClient(context)
+    // set proxy
+      ..findProxy = (uri) {
+        return "PROXY $_host:$_port;";
+      };
+  }
+}

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';