refa query follow up

Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>

lib/http/member.dart

@@ -544,9 +544,11 @@ class MemberHttp {
     if (res.data['code'] == 0) {
       return Success(
         FollowData(
-          list: (res.data['data'] as List?)
+          list:
-              ?.map<FollowItemModel>((e) => FollowItemModel.fromJson(e))
+              (res.data['data'] as List?)
-              .toList(),
+                  ?.map<FollowItemModel>((e) => FollowItemModel.fromJson(e))
+                  .toList() ??
+              <FollowItemModel>[],
         ),
       );
     } else {

lib/models/dynamics/up.dart

@@ -1,20 +1,21 @@
 class FollowUpModel {
   FollowUpModel({
     this.liveUsers,
-    this.upList,
+    required this.upList,
   });
 
-  String? errMsg;
   LiveUsers? liveUsers;
-  List<UpItem>? upList;
+  late List<UpItem> upList;
 
   FollowUpModel.fromJson(Map<String, dynamic> json) {
     liveUsers = json['live_users'] != null
         ? LiveUsers.fromJson(json['live_users'])
         : null;
-    upList = (json['up_list'] as List?)
+    upList =
-        ?.map<UpItem>((e) => UpItem.fromJson(e))
+        (json['up_list'] as List?)
-        .toList();
+            ?.map<UpItem>((e) => UpItem.fromJson(e))
+            .toList() ??
+        <UpItem>[];
   }
 }
 
@@ -38,54 +39,40 @@ class LiveUsers {
   }
 }
 
-sealed class UserItem {
+class LiveUserItem extends UpItem {
-  String? face;
-  bool? hasUpdate;
-  late int mid;
-  String? uname;
-
-  UserItem({
-    this.face,
-    this.hasUpdate,
-    int? mid,
-    this.uname,
-  }) : mid = mid ?? -1;
-}
-
-class LiveUserItem extends UserItem {
   bool? isReserveRecall;
   String? jumpUrl;
   int? roomId;
   String? title;
 
-  LiveUserItem.fromJson(Map<String, dynamic> json) {
+  LiveUserItem.fromJson(Map<String, dynamic> json)
+    : super(mid: json['mid'] ?? 0) {
     face = json['face'];
     isReserveRecall = json['is_reserve_recall'];
     jumpUrl = json['jump_url'];
-    mid = json['mid'] ?? -1;
     roomId = json['room_id'];
     title = json['title'];
     uname = json['uname'];
-    hasUpdate = false;
   }
 }
 
-class UpItem extends UserItem {
+class UpItem {
-  UpItem({
+  String? face;
-    super.face,
+  bool? hasUpdate;
-    super.hasUpdate,
+  late int mid;
-    // this.isReserveRecall,
+  String? uname;
-    super.mid,
-    super.uname,
-  });
 
-  // bool? isReserveRecall;
+  UpItem({
+    this.face,
+    this.hasUpdate,
+    required this.mid,
+    this.uname,
+  });
 
   UpItem.fromJson(Map<String, dynamic> json) {
     face = json['face'];
     hasUpdate = json['has_update'];
-    // isReserveRecall = json['is_reserve_recall'];
+    mid = json['mid'] ?? 0;
-    mid = json['mid'] ?? -1;
     uname = json['uname'];
   }
 }

lib/models_new/follow/data.dart

@@ -1,16 +1,18 @@
 import 'package:PiliPlus/models_new/follow/list.dart';
 
 class FollowData {
-  List<FollowItemModel>? list;
+  late List<FollowItemModel> list;
   int? reVersion;
   int? total;
 
-  FollowData({this.list, this.reVersion, this.total});
+  FollowData({required this.list, this.reVersion, this.total});
 
   factory FollowData.fromJson(Map<String, dynamic> json) => FollowData(
-    list: (json['list'] as List<dynamic>?)
+    list:
-        ?.map((e) => FollowItemModel.fromJson(e as Map<String, dynamic>))
+        (json['list'] as List<dynamic>?)
-        .toList(),
+            ?.map((e) => FollowItemModel.fromJson(e as Map<String, dynamic>))
+            .toList() ??
+        <FollowItemModel>[],
     reVersion: json['re_version'] as int?,
     total: json['total'] as int?,
   );

lib/models_new/follow/list.dart

@@ -1,13 +1,11 @@
+import 'package:PiliPlus/models/dynamics/up.dart';
 import 'package:PiliPlus/models/model_avatar.dart';
 
-class FollowItemModel {
+class FollowItemModel extends UpItem {
-  int? mid;
   int? attribute;
   int? mtime;
   dynamic tag;
   int? special;
-  String? uname;
-  String? face;
   String? sign;
   int? faceNft;
   BaseOfficialVerify? officialVerify;
@@ -18,13 +16,13 @@ class FollowItemModel {
   String? followTime;
 
   FollowItemModel({
-    this.mid,
+    required super.mid,
     this.attribute,
     this.mtime,
     this.tag,
     this.special,
-    this.uname,
+    super.uname,
-    this.face,
+    super.face,
     this.sign,
     this.faceNft,
     this.officialVerify,
@@ -37,7 +35,7 @@ class FollowItemModel {
 
   factory FollowItemModel.fromJson(Map<String, dynamic> json) =>
       FollowItemModel(
-        mid: json['mid'] as int?,
+        mid: json['mid'] as int? ?? 0,
         attribute: json['attribute'] as int?,
         mtime: json['mtime'] as int?,
         tag: json['tag'] as dynamic,

lib/pages/dynamics/controller.dart

@@ -5,7 +5,7 @@ import 'package:PiliPlus/http/follow.dart';
 import 'package:PiliPlus/http/loading_state.dart';
 import 'package:PiliPlus/models/common/dynamic/dynamics_type.dart';
 import 'package:PiliPlus/models/dynamics/up.dart';
-import 'package:PiliPlus/models_new/follow/list.dart';
+import 'package:PiliPlus/models_new/follow/data.dart';
 import 'package:PiliPlus/pages/common/common_controller.dart';
 import 'package:PiliPlus/pages/dynamics_tab/controller.dart';
 import 'package:PiliPlus/services/account_service.dart';
@@ -13,25 +13,30 @@ import 'package:PiliPlus/utils/extension.dart';
 import 'package:PiliPlus/utils/storage_pref.dart';
 import 'package:easy_debounce/easy_throttle.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 
 class DynamicsController extends GetxController
     with GetSingleTickerProviderStateMixin, ScrollOrRefreshMixin {
   @override
   final ScrollController scrollController = ScrollController();
-  String? offset = '';
+  late final TabController tabController = TabController(
-  Rx<FollowUpModel> upData = FollowUpModel().obs;
+    length: DynamicsTabType.values.length,
-  // 默认获取全部动态
+    vsync: this,
-  RxInt mid = (-1).obs;
+    initialIndex: Pref.defaultDynamicType,
-  late TabController tabController;
+  );
-  Set<int> tempBannedList = <int>{};
-  List<UpItem> hasUpdatedUps = <UpItem>[];
-  int allFollowedUpsPage = 1;
-  int allFollowedUpsTotal = 0;
 
+  late final RxInt mid = (-1).obs;
   late int currentMid = -1;
-  late bool showLiveItems = Pref.expandDynLivePanel;
+
+  Set<int> tempBannedList = <int>{};
+
+  final Rx<LoadingState<FollowUpModel>> upState =
+      LoadingState<FollowUpModel>.loading().obs;
+  late int _upPage = 1;
+  late bool _upEnd = false;
+  List<UpItem>? _cacheUpList;
+  late final showAllUp = Pref.dynamicsShowAllFollowedUp;
+  late bool showLiveUp = Pref.expandDynLivePanel;
 
   final upPanelPosition = Pref.upPanelPosition;
 
@@ -50,114 +55,98 @@ class DynamicsController extends GetxController
   @override
   void onInit() {
     super.onInit();
-    tabController = TabController(
+    if (showAllUp) {
-      length: DynamicsTabType.values.length,
+      scrollController.addListener(listener);
-      vsync: this,
+    }
-      initialIndex: Pref.defaultDynamicType,
-    );
-
     queryFollowUp();
   }
 
+  void listener() {
+    if (scrollController.position.pixels >=
+        scrollController.position.maxScrollExtent - 300) {
+      EasyThrottle.throttle(
+        'following',
+        const Duration(seconds: 1),
+        queryFollowing2,
+      );
+    }
+  }
+
   Future<void> queryFollowing2() async {
-    if (upData.value.upList != null &&
+    if (isQuerying) return;
-        upData.value.upList!.length >= allFollowedUpsTotal) {
+    isQuerying = true;
+    if (_upEnd) {
+      isQuerying = false;
       return;
     }
-    var res = await FollowHttp.followings(
+
+    final res = await FollowHttp.followings(
       vmid: accountService.mid,
-      pn: allFollowedUpsPage,
+      pn: _upPage,
       orderType: 'attention',
       ps: 50,
     );
+
     if (res.isSuccess) {
-      upData.value.upList ??= <UpItem>[];
+      _upPage++;
-      upData.value.upList!.addAll(
+      final list = res.data.list;
-        res.data.list!
+      if (list.isEmpty) {
-            .where((e) => hasUpdatedUps.every((e1) => e.mid != e1.mid))
+        _upEnd = true;
-            .map(
+      }
-              (FollowItemModel e) => UpItem(
+      upState
-                face: e.face,
+        ..value.data.upList.addAll(
-                mid: e.mid,
+          list..removeWhere((e) => _cacheUpList?.contains(e) == true),
-                uname: e.uname,
+        )
-                hasUpdate: false,
+        ..refresh();
-              ),
-            ),
-      );
-      allFollowedUpsPage += 1;
-      allFollowedUpsTotal = res.data.total!;
-      upData.refresh();
-    } else {
-      res.toast();
     }
+
+    isQuerying = false;
   }
 
   late bool isQuerying = false;
   Future<void> queryFollowUp() async {
     if (isQuerying) return;
     isQuerying = true;
+
     if (!accountService.isLogin.value) {
-      upData
+      upState.value = const Error(null);
-        ..value.errMsg = '账号未登录'
+      isQuerying = false;
-        ..refresh();
+      return;
     }
-    upData.value.errMsg = null;
+
-    if (Pref.dynamicsShowAllFollowedUp) {
+    final res = await Future.wait([
-      allFollowedUpsPage = 1;
+      DynamicsHttp.followUp(),
-      final f1 = DynamicsHttp.followUp();
+      if (showAllUp)
-      final f2 = FollowHttp.followings(
+        FollowHttp.followings(
-        vmid: accountService.mid,
+          vmid: accountService.mid,
-        pn: allFollowedUpsPage,
+          pn: _upPage,
-        orderType: 'attention',
+          orderType: 'attention',
-        ps: 50,
+          ps: 50,
-      );
+        ),
-      final res0 = await f1;
+    ]);
-      if (!res0.isSuccess) {
+
-        SmartDialog.showToast("获取关注动态失败：$res0");
+    final first = res.first;
-        upData
+    final second = res.getOrNull(1);
-          ..value.errMsg = (res0 as Error).errMsg
+    if (first.isSuccess) {
-          ..refresh();
+      FollowUpModel data = first.data as FollowUpModel;
-      } else {
+      if (second != null && second.isSuccess) {
-        upData
+        _cacheUpList = List<UpItem>.from(data.upList);
-          ..value.liveUsers = res0.data.liveUsers
+        FollowData data1 = second.data as FollowData;
-          ..refresh();
+        final list1 = data1.list;
-        hasUpdatedUps = res0.data.upList!;
+
-      }
+        _upPage++;
-      List<UpItem> allFollowedUps = <UpItem>[];
+        if (list1.isEmpty || list1.length >= (data1.total ?? 0)) {
-      final res1 = await f2;
+          _upEnd = true;
-      if (!res1.isSuccess) {
-        SmartDialog.showToast("获取关注列表失败：$res1");
-      } else {
-        allFollowedUps = res1.data.list!
-            .where((e) => hasUpdatedUps.every((e1) => e.mid != e1.mid))
-            .map(
-              (e) => UpItem(
-                face: e.face,
-                mid: e.mid,
-                uname: e.uname,
-                hasUpdate: false,
-              ),
-            )
-            .toList();
-        allFollowedUpsPage += 1;
-        allFollowedUpsTotal = res1.data.total!;
-      }
-      upData
-        ..value.upList = hasUpdatedUps + allFollowedUps
-        ..refresh();
-    } else {
-      var res = await DynamicsHttp.followUp();
-      if (res.isSuccess) {
-        upData.value = res.data;
-        if (upData.value.upList.isNullOrEmpty) {
-          mid.value = -1;
         }
-      } else {
+
-        upData
+        final list = data.upList;
-          ..value.errMsg = (res as Error).errMsg
+        list.addAll(list1..removeWhere((e) => list.contains(e)));
-          ..refresh();
       }
+      upState.value = Success(data);
+    } else {
+      upState.value = const Error(null);
     }
+
     isQuerying = false;
   }
 
@@ -177,6 +166,10 @@ class DynamicsController extends GetxController
 
   @override
   Future<void> onRefresh() async {
+    if (showAllUp) {
+      _upPage = 1;
+      _cacheUpList = null;
+    }
     queryFollowUp();
     await controller?.onRefresh();
   }
@@ -212,7 +205,9 @@ class DynamicsController extends GetxController
   @override
   void onClose() {
     tabController.dispose();
-    scrollController.dispose();
+    scrollController
+      ..removeListener(listener)
+      ..dispose();
     super.onClose();
   }
 }

lib/pages/dynamics/view.dart

@@ -1,12 +1,12 @@
 import 'package:PiliPlus/common/widgets/scroll_physics.dart';
+import 'package:PiliPlus/http/loading_state.dart';
 import 'package:PiliPlus/models/common/dynamic/dynamics_type.dart';
 import 'package:PiliPlus/models/common/dynamic/up_panel_position.dart';
+import 'package:PiliPlus/models/dynamics/up.dart';
 import 'package:PiliPlus/pages/dynamics/controller.dart';
 import 'package:PiliPlus/pages/dynamics/widgets/up_panel.dart';
 import 'package:PiliPlus/pages/dynamics_create/view.dart';
 import 'package:PiliPlus/pages/dynamics_tab/view.dart';
-import 'package:PiliPlus/utils/storage_pref.dart';
-import 'package:easy_debounce/easy_throttle.dart';
 import 'package:flutter/material.dart' hide DraggableScrollableSheet;
 import 'package:get/get.dart';
 
@@ -52,29 +52,6 @@ class _DynamicsPageState extends State<DynamicsPage>
     ),
   );
 
-  @override
-  void initState() {
-    super.initState();
-    if (Pref.dynamicsShowAllFollowedUp) {
-      _dynamicsController.scrollController.addListener(listener);
-    }
-  }
-
-  void listener() {
-    if (_dynamicsController.scrollController.position.pixels >=
-        _dynamicsController.scrollController.position.maxScrollExtent - 300) {
-      EasyThrottle.throttle('following', const Duration(seconds: 1), () {
-        _dynamicsController.queryFollowing2();
-      });
-    }
-  }
-
-  @override
-  void dispose() {
-    _dynamicsController.scrollController.removeListener(listener);
-    super.dispose();
-  }
-
   Widget upPanelPart(ThemeData theme) {
     bool isTop = upPanelPosition == UpPanelPosition.top;
     bool needBg = upPanelPosition.index > 1;
@@ -84,25 +61,28 @@ class _DynamicsPageState extends State<DynamicsPage>
       child: SizedBox(
         width: isTop ? null : 64,
         height: isTop ? 76 : null,
-        child: Obx(
+        child: Obx(() => _buildUpPanel(_dynamicsController.upState.value)),
-          () {
+      ),
-            final upData = _dynamicsController.upData.value;
+    );
-            if (upData.upList == null && upData.liveUsers == null) {
+  }
-              return const SizedBox.shrink();
+
-            } else if (upData.errMsg != null) {
+  Widget _buildUpPanel(LoadingState<FollowUpModel> upState) {
-              return Center(
+    return switch (upState) {
-                child: IconButton(
+      Loading() => const SizedBox.shrink(),
-                  icon: const Icon(Icons.refresh),
+      Success<FollowUpModel>() => UpPanel(
-                  onPressed: _dynamicsController.queryFollowUp,
+        dynamicsController: _dynamicsController,
-                ),
+      ),
-              );
+      Error() => Center(
-            } else {
+        child: IconButton(
-              return UpPanel(dynamicsController: _dynamicsController);
+          icon: const Icon(Icons.refresh),
-            }
+          onPressed: () {
+            _dynamicsController
+              ..upState.value = LoadingState<FollowUpModel>.loading()
+              ..queryFollowUp();
           },
         ),
       ),
-    );
+    };
   }
 
   @override

lib/pages/dynamics/widgets/up_panel.dart

@@ -30,8 +30,8 @@ class _UpPanelState extends State<UpPanel> {
       return const SizedBox.shrink();
     }
     final theme = Theme.of(context);
-    final upData = controller.upData.value;
+    final upData = controller.upState.value.data;
-    final List<UpItem>? upList = upData.upList;
+    final List<UpItem> upList = upData.upList;
     final List<LiveUserItem>? liveList = upData.liveUsers?.items;
     return CustomScrollView(
       scrollDirection: isTop ? Axis.horizontal : Axis.vertical,
@@ -41,7 +41,7 @@ class _UpPanelState extends State<UpPanel> {
         SliverToBoxAdapter(
           child: InkWell(
             onTap: () => setState(() {
-              controller.showLiveItems = !controller.showLiveItems;
+              controller.showLiveUp = !controller.showLiveUp;
             }),
             onLongPress: () => Get.to(const LiveFollowPage()),
             child: Container(
@@ -64,7 +64,7 @@ class _UpPanelState extends State<UpPanel> {
                       WidgetSpan(
                         alignment: PlaceholderAlignment.middle,
                         child: Icon(
-                          controller.showLiveItems
+                          controller.showLiveUp
                               ? Icons.expand_less
                               : Icons.expand_more,
                           size: 12,
@@ -75,7 +75,7 @@ class _UpPanelState extends State<UpPanel> {
                       WidgetSpan(
                         alignment: PlaceholderAlignment.middle,
                         child: Icon(
-                          controller.showLiveItems
+                          controller.showLiveUp
                               ? Icons.keyboard_arrow_right
                               : Icons.keyboard_arrow_left,
                           color: theme.colorScheme.primary,
@@ -88,7 +88,7 @@ class _UpPanelState extends State<UpPanel> {
             ),
           ),
         ),
-        if (controller.showLiveItems && liveList?.isNotEmpty == true)
+        if (controller.showLiveUp && liveList?.isNotEmpty == true)
           SliverList.builder(
             itemCount: liveList!.length,
             itemBuilder: (context, index) {
@@ -110,9 +110,9 @@ class _UpPanelState extends State<UpPanel> {
             ),
           ),
         ),
-        if (upList?.isNotEmpty == true)
+        if (upList.isNotEmpty == true)
           SliverList.builder(
-            itemCount: upList!.length,
+            itemCount: upList.length,
             itemBuilder: (context, index) {
               return upItemBuild(theme, upList[index]);
             },
@@ -122,7 +122,7 @@ class _UpPanelState extends State<UpPanel> {
     );
   }
 
-  void _onSelect(UserItem data) {
+  void _onSelect(UpItem data) {
     controller
       ..currentMid = data.mid
       ..onSelectUp(data.mid);
@@ -132,7 +132,7 @@ class _UpPanelState extends State<UpPanel> {
     setState(() {});
   }
 
-  Widget upItemBuild(ThemeData theme, UserItem data) {
+  Widget upItemBuild(ThemeData theme, UpItem data) {
     final currentMid = controller.currentMid;
     final isLive = data is LiveUserItem;
     bool isCurrent = isLive || currentMid == data.mid || currentMid == -1;
@@ -143,14 +143,14 @@ class _UpPanelState extends State<UpPanel> {
         onTap: () {
           feedBack();
           switch (data) {
+            case LiveUserItem():
+              Get.toNamed('/liveRoom?roomid=${data.roomId}');
             case UpItem():
               _onSelect(data);
               break;
-            case LiveUserItem():
-              Get.toNamed('/liveRoom?roomid=${data.roomId}');
           }
         },
-        onDoubleTap: isLive ? () => _onSelect(data) : null,
+        // onDoubleTap: isLive ? () => _onSelect(data) : null,
         onLongPress: data.mid == -1
             ? null
             : () => Get.toNamed('/member?mid=${data.mid}'),

lib/pages/follow/widgets/follow_item.dart

@@ -31,7 +31,7 @@ class FollowItem extends StatelessWidget {
           if (onSelect != null) {
             onSelect!.call(
               UserModel(
-                mid: item.mid!,
+                mid: item.mid,
                 name: item.uname!,
                 avatar: item.face!,
               ),