修复直播间问题

lib/controller/discover/room_controller.dart

@@ -320,7 +320,10 @@ class RoomController extends GetxController with WidgetsBindingObserver {
       final response = await _networkService.userApi.userGetUserTaskComplete(
         taskType: 1,
       );
-      if (response.data.isSuccess && response.data.data != null) {
+      if (response.data.isSuccess) {
+        if(response.data.data == null){
+          throw Exception(response.data.message ?? '获取数据失败');
+        }
         final data = response.data.data ?? TaskData();
         taskData.value = data;
       } else {
@@ -330,7 +333,7 @@ class RoomController extends GetxController with WidgetsBindingObserver {
       }
     } catch(e) {
       print('任务列表获取失败: $e');
-      SmartDialog.showToast('任务列表获取失败');
+      // SmartDialog.showToast('任务列表获取失败');
       rethrow;
     }
   }

lib/pages/discover/settlement_page.dart

@@ -2,6 +2,7 @@ import 'package:cached_network_image/cached_network_image.dart';
 import 'package:dating_touchme_app/components/page_appbar.dart';
 import 'package:dating_touchme_app/extension/ex_widget.dart';
 import 'package:dating_touchme_app/generated/assets.dart';
+import 'package:dating_touchme_app/pages/setting/match_task_page.dart';
 import 'package:dating_touchme_app/widget/live/today_task_dialog.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
@@ -85,13 +86,13 @@ class _SettlementPageState extends State<SettlementPage> {
                               ),
                               children: [
                                 TextSpan(
-                                  text: ((_roomController.consumption.value.todayLiveDurationMins ?? 0) / 60).toStringAsFixed(2),
+                                  text: "${_roomController.consumption.value.todayLiveDurationMins}",
                                   style: TextStyle(
                                     fontSize: 23.w,
                                   )
                                 ),
                                 TextSpan(
-                                  text: "小时",
+                                  text: "分钟",
                                     style: TextStyle(
                                       fontSize: 12.w,
                                     )
@@ -119,13 +120,13 @@ class _SettlementPageState extends State<SettlementPage> {
                                 ),
                                 children: [
                                   TextSpan(
-                                      text: ((_roomController.consumption.value.todayLiveDurationMins ?? 0) / 60).toStringAsFixed(2),
+                                      text: "${_roomController.consumption.value.todayLiveDurationMins}",
                                       style: TextStyle(
                                         fontSize: 23.w,
                                       )
                                   ),
                                   TextSpan(
-                                      text: "小时",
+                                      text: "分钟",
                                       style: TextStyle(
                                         fontSize: 12.w,
                                       )
@@ -225,31 +226,40 @@ class _SettlementPageState extends State<SettlementPage> {
               Assets.imagesSettlementToday,
               width: 325.w,
             ).onTap(() async {
-              // 隐藏键盘
-              FocusScope.of(context).unfocus();
-              // 隐藏 overlay
-              SmartDialog.dismiss();
-              _roomController.setDialogDismiss(true);
 
-              await _roomController.getTaskData();
+              try{
+                await _roomController.getTaskData();
 
-              SmartDialog.show(
-                alignment: Alignment.bottomCenter,
-                maskColor: TDTheme.of(context).fontGyColor2,
-                onDismiss: (){
-                  _roomController.setDialogDismiss(false);
-                },
+                FocusScope.of(context).unfocus();
+                // 隐藏 overlay
+                SmartDialog.dismiss();
+                _roomController.setDialogDismiss(true);
 
-                builder: (_) {
-                  return TodayTaskDialog();
-                },
-              );
+
+
+                SmartDialog.show(
+                  alignment: Alignment.bottomCenter,
+                  maskColor: TDTheme.of(context).fontGyColor2,
+                  onDismiss: (){
+                    _roomController.setDialogDismiss(false);
+                  },
+
+                  builder: (_) {
+                    return TodayTaskDialog();
+                  },
+                );
+              } catch (e){
+                SmartDialog.showToast('暂无任务');
+
+              }
             }),
             SizedBox(height: 7.w,),
             Image.asset(
               Assets.imagesSettlementMonth,
               width: 325.w,
-            ),
+            ).onTap(() {
+              Get.to(() => MatchTaskPage());
+            }),
             Spacer(),
             Container(
               width: 325.w,

lib/rtc/rtc_manager.dart

@@ -152,7 +152,11 @@ class RTCManager {
             );
 
             final roomController = Get.find<RoomController>();
-            roomController.sendChatMessage("新朋友来了");
+            print(roomController.currentRole);
+            print("roomController.currentRole");
+            if(roomController.currentRole != CurrentRole.broadcaster){
+              roomController.sendChatMessage("新朋友来了");
+            }
             Get.to(() => const LiveRoomPage(id: 0));
             }
           }

lib/widget/live/live_room_notice_chat_panel.dart

@@ -220,24 +220,33 @@ class _LiveRoomNoticeChatPanelState extends State<LiveRoomNoticeChatPanel> {
                 width: 70.w,
               ).onTap(() async {
                 // 隐藏键盘
-                FocusScope.of(context).unfocus();
-                // 隐藏 overlay
-                SmartDialog.dismiss();
-                roomController.setDialogDismiss(true);
-
-                await roomController.getTaskData();
-
-                SmartDialog.show(
-                  alignment: Alignment.bottomCenter,
-                  maskColor: TDTheme.of(context).fontGyColor2,
-                  onDismiss: (){
-                    roomController.setDialogDismiss(false);
-                  },
-
-                  builder: (_) {
-                    return TodayTaskDialog();
-                  },
-                );
+
+                try{
+                  await roomController.getTaskData();
+
+                  FocusScope.of(context).unfocus();
+                  // 隐藏 overlay
+                  SmartDialog.dismiss();
+                  roomController.setDialogDismiss(true);
+
+
+
+                  SmartDialog.show(
+                    alignment: Alignment.bottomCenter,
+                    maskColor: TDTheme.of(context).fontGyColor2,
+                    onDismiss: (){
+                      roomController.setDialogDismiss(false);
+                    },
+
+                    builder: (_) {
+                      return TodayTaskDialog();
+                    },
+                  );
+                } catch (e){
+                  SmartDialog.showToast('暂无任务');
+
+                }
+
               })
             ],
           ),