From 04c90830bbe4d06a3c80ecb4886abf02d0f91893 Mon Sep 17 00:00:00 2001
From: guozhigq <guozhigq@outlook.com>
Date: Wed, 19 Jul 2023 19:55:39 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=9B=B4=E6=92=AD=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/models/member/info.dart        | 3 +++
 lib/pages/dynamics/controller.dart | 9 +++++----
 lib/pages/dynamics/view.dart       | 2 +-
 lib/pages/liveRoom/view.dart       | 7 +++++--
 lib/pages/member/view.dart         | 1 +
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/lib/models/member/info.dart b/lib/models/member/info.dart
index 72ee462a..789131ee 100644
--- a/lib/models/member/info.dart
+++ b/lib/models/member/info.dart
@@ -71,6 +71,7 @@ class LiveRoom {
     this.cover,
     this.roomId,
     this.roundStatus,
+    this.watchedShow,
   });
 
   int? roomStatus;
@@ -80,6 +81,7 @@ class LiveRoom {
   String? cover;
   int? roomId;
   int? roundStatus;
+  Map? watchedShow;
 
   LiveRoom.fromJson(Map<String, dynamic> json) {
     roomStatus = json['roomStatus'];
@@ -89,5 +91,6 @@ class LiveRoom {
     cover = json['cover'];
     roomId = json['roomid'];
     roundStatus = json['roundStatus'];
+    watchedShow = json['watched_show'];
   }
 }
diff --git a/lib/pages/dynamics/controller.dart b/lib/pages/dynamics/controller.dart
index 87f6da06..4f291454 100644
--- a/lib/pages/dynamics/controller.dart
+++ b/lib/pages/dynamics/controller.dart
@@ -57,9 +57,9 @@ class DynamicsController extends GetxController {
     );
     if (res['status']) {
       if (type == 'init') {
-        dynamicsList!.value = res['data'].items;
+        dynamicsList.value = res['data'].items;
       } else {
-        dynamicsList!.addAll(res['data'].items);
+        dynamicsList.addAll(res['data'].items);
       }
       offset = res['data'].offset;
       page++;
@@ -69,7 +69,7 @@ class DynamicsController extends GetxController {
 
   onSelectType(value) async {
     dynamicsType.value = filterTypeList[value - 1]['value'];
-    dynamicsList!.value = [DynamicItemModel()];
+    dynamicsList.value = [DynamicItemModel()];
     page = 1;
     initialValue.value = value;
     await queryFollowDynamic();
@@ -128,6 +128,7 @@ class DynamicsController extends GetxController {
           'mid': author.mid,
           'face': author.face,
           'roomid': liveRcmd.roomId,
+          'watched_show': liveRcmd.watchedShow,
         });
         Get.toNamed('/liveRoom?roomid=${liveItem.roomId}', arguments: {
           'liveItem': liveItem,
@@ -151,7 +152,7 @@ class DynamicsController extends GetxController {
 
   onSelectUp(mid) async {
     dynamicsType.value = DynamicsType.values[0];
-    dynamicsList!.value = [DynamicItemModel()];
+    dynamicsList.value = [DynamicItemModel()];
     page = 1;
     queryFollowDynamic();
   }
diff --git a/lib/pages/dynamics/view.dart b/lib/pages/dynamics/view.dart
index a0eaae4d..0319f59b 100644
--- a/lib/pages/dynamics/view.dart
+++ b/lib/pages/dynamics/view.dart
@@ -234,7 +234,7 @@ class _DynamicsPageState extends State<DynamicsPage>
                   Map data = snapshot.data;
                   if (data['status']) {
                     List<DynamicItemModel> list =
-                        _dynamicsController.dynamicsList!;
+                        _dynamicsController.dynamicsList;
                     return Obx(
                       () => list.length == 1
                           ? skeleton()
diff --git a/lib/pages/liveRoom/view.dart b/lib/pages/liveRoom/view.dart
index 73718eca..9bfd079b 100644
--- a/lib/pages/liveRoom/view.dart
+++ b/lib/pages/liveRoom/view.dart
@@ -70,8 +70,11 @@ class _LiveRoomPageState extends State<LiveRoomPage> {
                   style: const TextStyle(fontSize: 14),
                 ),
                 const SizedBox(height: 1),
-                Text(_liveRoomController.liveItem.watchedShow['text_large'],
-                    style: const TextStyle(fontSize: 12)),
+                if (_liveRoomController.liveItem.watchedShow != null)
+                  Text(
+                      _liveRoomController.liveItem.watchedShow['text_large'] ??
+                          '',
+                      style: const TextStyle(fontSize: 12)),
               ],
             ),
           ],
diff --git a/lib/pages/member/view.dart b/lib/pages/member/view.dart
index e1d82f08..3025416e 100644
--- a/lib/pages/member/view.dart
+++ b/lib/pages/member/view.dart
@@ -303,6 +303,7 @@ class _MemberPageState extends State<MemberPage>
                             'uname': memberInfo.name,
                             'face': memberInfo.face,
                             'roomid': memberInfo.liveRoom.roomId,
+                            'watched_show': memberInfo.liveRoom.watchedShow,
                           });
                           Get.toNamed(
                             '/liveRoom?roomid=${memberInfo.liveRoom.roomId}',