Merge branch 'fix'

ios/Runner/AppDelegate.swift

@@ -1,5 +1,6 @@
 import UIKit
 import Flutter
+import AVFoundation
 
 @UIApplicationMain
 @objc class AppDelegate: FlutterAppDelegate {
@@ -8,6 +9,14 @@ import Flutter
     didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
   ) -> Bool {
     GeneratedPluginRegistrant.register(with: self)
+    
+    // 设置音频会话类别，确保在静音模式下播放音频
+    do {
+      try AVAudioSession.sharedInstance().setCategory(.playback, options: [.duckOthers])
+    } catch {
+      print("Failed to set audio session category: \(error)")
+    }
+    
     return super.application(application, didFinishLaunchingWithOptions: launchOptions)
   }
 }

lib/http/interceptor.dart

@@ -46,7 +46,8 @@ class ApiInterceptor extends Interceptor {
     // 处理网络请求错误
     // handler.next(err);
     String url = err.requestOptions.uri.toString();
-    if (!url.contains('heartbeat')) {
+    final excludedPatterns = RegExp(r'heartbeat|seg\.so|online/total');
+    if (!excludedPatterns.hasMatch(url)) {
       SmartDialog.showToast(
         await dioError(err),
         displayType: SmartToastType.onlyRefresh,

lib/pages/follow_search/controller.dart

@@ -48,7 +48,7 @@ class FollowSearchController extends GetxController {
       return {'status': true, 'data': <FollowItemModel>[].obs};
     }
     if (type == 'init') {
-      ps = 1;
+      pn = 1;
     }
     var res = await MemberHttp.getfollowSearch(
       mid: mid,

lib/pages/member/view.dart

@@ -406,7 +406,7 @@ class _MemberPageState extends State<MemberPage>
                                   ? '个人认证：'
                                   : '企业认证：',
                               style: TextStyle(
-                                color: Theme.of(context).primaryColor,
+                                color: Theme.of(context).colorScheme.primary,
                               ),
                               children: [
                                 TextSpan(

lib/pages/member_archive/controller.dart

@@ -27,10 +27,13 @@ class MemberArchiveController extends GetxController {
 
   // 获取用户投稿
   Future getMemberArchive(type) async {
+    if (isLoading.value) {
+      return;
+    }
+    isLoading.value = true;
     if (type == 'init') {
       pn = 1;
       archivesList.clear();
-      isLoading.value = true;
     }
     var res = await MemberHttp.memberArchive(
       mid: mid,

lib/pages/member_seasons/controller.dart

@@ -21,7 +21,7 @@ class MemberSeasonsController extends GetxController {
     mid = int.parse(Get.parameters['mid']!);
     category = Get.parameters['category']!;
     if (category == '0') {
-      seasonId = int.parse(Get.parameters['seriesId']!);
+      seasonId = int.parse(Get.parameters['seasonId']!);
     }
     if (category == '1') {
       seriesId = int.parse(Get.parameters['seriesId']!);

lib/pages/message/like/view.dart

@@ -203,9 +203,9 @@ class LikeItem extends StatelessWidget {
                       Text.rich(TextSpan(children: [
                         TextSpan(text: nickNameList.join('、')),
                         const TextSpan(text: ' '),
-                        if (item.users!.length > 1)
+                        if (item.counts! > 1)
                           TextSpan(
-                            text: '等总计${item.users!.length}人',
+                            text: '等总计${item.counts}人',
                             style: TextStyle(color: outline),
                           ),
                         TextSpan(

lib/pages/search_panel/widgets/video_panel.dart

@@ -261,13 +261,16 @@ class VideoPanelController extends GetxController {
   onShowFilterSheet(searchPanelCtr) {
     showModalBottomSheet(
       context: Get.context!,
+      isScrollControlled: true,
       builder: (context) {
         return StatefulBuilder(
           builder: (context, StateSetter setState) {
-            return Container(
+            return Padding(
-              color: Theme.of(Get.context!).colorScheme.surface,
+              padding: EdgeInsets.only(
-              padding: const EdgeInsets.only(top: 12),
+                  top: 12, bottom: MediaQuery.of(context).padding.bottom + 20),
-              child: Column(
+              child: Wrap(
+                children: [
+                  Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
                       const ListTile(
@@ -295,9 +298,10 @@ class VideoPanelController extends GetxController {
                                   onSelect: (value) async {
                                     currentTimeFilterval.value = i['value'];
                                     setState(() {});
-                                SmartDialog.showToast("「${i['label']}」的筛选结果");
+                                    SmartDialog.showToast(
-                                SearchPanelController ctr =
+                                        "「${i['label']}」的筛选结果");
-                                    Get.find<SearchPanelController>(
+                                    SearchPanelController ctr = Get.find<
+                                            SearchPanelController>(
                                         tag: 'video${searchPanelCtr.keyword!}');
                                     ctr.duration.value = i['value'];
                                     Get.back();
@@ -326,13 +330,14 @@ class VideoPanelController extends GetxController {
                               SearchText(
                                 searchText: i['label'],
                                 searchTextIdx: i['value'],
-                            isSelect: currentPartFilterval.value == i['value'],
+                                isSelect:
+                                    currentPartFilterval.value == i['value'],
                                 onSelect: (value) async {
                                   currentPartFilterval.value = i['value'];
                                   setState(() {});
                                   SmartDialog.showToast("「${i['label']}」的筛选结果");
-                              SearchPanelController ctr =
+                                  SearchPanelController ctr = Get.find<
-                                  Get.find<SearchPanelController>(
+                                          SearchPanelController>(
                                       tag: 'video${searchPanelCtr.keyword!}');
                                   ctr.tids.value = i['value'];
                                   Get.back();
@@ -347,6 +352,8 @@ class VideoPanelController extends GetxController {
                       )
                     ],
                   ),
+                ],
+              ),
             );
           },
         );