From 0d8d02a0279b789b54b92cce675ea9ce20eee440 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=AD=90=E8=B4=A4?= Date: Fri, 30 Jan 2026 11:55:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=9B=B4=E6=92=AD=E9=97=B4?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/controller/discover/room_controller.dart | 7 ++- lib/pages/discover/settlement_page.dart | 52 +++++++++++-------- lib/rtc/rtc_manager.dart | 6 ++- .../live/live_room_notice_chat_panel.dart | 45 +++++++++------- 4 files changed, 68 insertions(+), 42 deletions(-) diff --git a/lib/controller/discover/room_controller.dart b/lib/controller/discover/room_controller.dart index d51a596..a1c6df8 100644 --- a/lib/controller/discover/room_controller.dart +++ b/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; } } diff --git a/lib/pages/discover/settlement_page.dart b/lib/pages/discover/settlement_page.dart index 2717a34..2efc56d 100644 --- a/lib/pages/discover/settlement_page.dart +++ b/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 { ), 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 { ), 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 { 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, diff --git a/lib/rtc/rtc_manager.dart b/lib/rtc/rtc_manager.dart index f8e9544..c2b9a0d 100644 --- a/lib/rtc/rtc_manager.dart +++ b/lib/rtc/rtc_manager.dart @@ -152,7 +152,11 @@ class RTCManager { ); final roomController = Get.find(); - roomController.sendChatMessage("新朋友来了"); + print(roomController.currentRole); + print("roomController.currentRole"); + if(roomController.currentRole != CurrentRole.broadcaster){ + roomController.sendChatMessage("新朋友来了"); + } Get.to(() => const LiveRoomPage(id: 0)); } } diff --git a/lib/widget/live/live_room_notice_chat_panel.dart b/lib/widget/live/live_room_notice_chat_panel.dart index b29cdde..bf360d8 100644 --- a/lib/widget/live/live_room_notice_chat_panel.dart +++ b/lib/widget/live/live_room_notice_chat_panel.dart @@ -220,24 +220,33 @@ class _LiveRoomNoticeChatPanelState extends State { 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('暂无任务'); + + } + }) ], ),