From 7d54bd1641a463e4c90ad788c1e884debedd77ec Mon Sep 17 00:00:00 2001
From: guozhigq <guozhigq@outlook.com>
Date: Mon, 25 Dec 2023 22:52:20 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=B8=AA=E4=BA=BA=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E6=97=A0=E9=99=90=E5=BE=AA=E7=8E=AF=20issues=20#340?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/pages/fan/controller.dart             | 2 ++
 lib/pages/fan/view.dart                   | 2 +-
 lib/pages/member_dynamics/controller.dart | 5 ++++-
 lib/pages/member_dynamics/view.dart       | 3 +--
 lib/pages/mine/controller.dart            | 8 ++++++++
 lib/pages/mine/view.dart                  | 2 +-
 6 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/lib/pages/fan/controller.dart b/lib/pages/fan/controller.dart
index 4f1d2ae8..8675ada7 100644
--- a/lib/pages/fan/controller.dart
+++ b/lib/pages/fan/controller.dart
@@ -15,6 +15,7 @@ class FansController extends GetxController {
   late String name;
   var userInfo;
   RxString loadingText = '加载中...'.obs;
+  RxBool isOwner = false.obs;
 
   @override
   void onInit() {
@@ -23,6 +24,7 @@ class FansController extends GetxController {
     mid = Get.parameters['mid'] != null
         ? int.parse(Get.parameters['mid']!)
         : userInfo.mid;
+    isOwner.value = mid == userInfo.mid;
     name = Get.parameters['name'] ?? userInfo.uname;
   }
 
diff --git a/lib/pages/fan/view.dart b/lib/pages/fan/view.dart
index 3eea5093..47372057 100644
--- a/lib/pages/fan/view.dart
+++ b/lib/pages/fan/view.dart
@@ -54,7 +54,7 @@ class _FansPageState extends State<FansPage> {
         centerTitle: false,
         titleSpacing: 0,
         title: Text(
-          '${_fansController.name}的粉丝',
+          _fansController.isOwner.value ? '我的粉丝' : '${_fansController.name}的粉丝',
           style: Theme.of(context).textTheme.titleMedium,
         ),
       ),
diff --git a/lib/pages/member_dynamics/controller.dart b/lib/pages/member_dynamics/controller.dart
index b6cd1b74..efc6104c 100644
--- a/lib/pages/member_dynamics/controller.dart
+++ b/lib/pages/member_dynamics/controller.dart
@@ -22,13 +22,16 @@ class MemberDynamicsController extends GetxController {
       offset = '';
       dynamicsList.clear();
     }
+    if (offset == '-1') {
+      return;
+    }
     var res = await MemberHttp.memberDynamic(
       offset: offset,
       mid: mid,
     );
     if (res['status']) {
       dynamicsList.addAll(res['data'].items);
-      offset = res['data'].offset;
+      offset = res['data'].offset != '' ? res['data'].offset : '-1';
       hasMore = res['data'].hasMore;
     }
     return res;
diff --git a/lib/pages/member_dynamics/view.dart b/lib/pages/member_dynamics/view.dart
index eb0b7ea6..a22c94e1 100644
--- a/lib/pages/member_dynamics/view.dart
+++ b/lib/pages/member_dynamics/view.dart
@@ -3,7 +3,6 @@ import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/pages/member_dynamics/index.dart';
 import 'package:pilipala/utils/utils.dart';
-import 'package:protobuf/protobuf.dart';
 
 import '../dynamics/widgets/dynamic_panel.dart';
 
@@ -35,7 +34,7 @@ class _MemberDynamicsPageState extends State<MemberDynamicsPage> {
         if (scrollController.position.pixels >=
             scrollController.position.maxScrollExtent - 200) {
           EasyThrottle.throttle(
-              'member_dynamics', const Duration(milliseconds: 500), () {
+              'member_dynamics', const Duration(milliseconds: 1000), () {
             _memberDynamicController.onLoad();
           });
         }
diff --git a/lib/pages/mine/controller.dart b/lib/pages/mine/controller.dart
index 2b53850b..d1e17a83 100644
--- a/lib/pages/mine/controller.dart
+++ b/lib/pages/mine/controller.dart
@@ -129,4 +129,12 @@ class MineController extends GetxController {
     }
     Get.toNamed('/fan?mid=${userInfo.value.mid}');
   }
+
+  pushDynamic() {
+    if (!userLogin.value) {
+      SmartDialog.showToast('账号未登录');
+      return;
+    }
+    Get.toNamed('/memberDynamics?mid=${userInfo.value.mid}');
+  }
 }
diff --git a/lib/pages/mine/view.dart b/lib/pages/mine/view.dart
index 274572af..06c375da 100644
--- a/lib/pages/mine/view.dart
+++ b/lib/pages/mine/view.dart
@@ -234,7 +234,7 @@ class _MinePageState extends State<MinePage> {
                   childAspectRatio: 1.67,
                   children: <Widget>[
                     InkWell(
-                      onTap: () {},
+                      onTap: () => _mineController.pushDynamic(),
                       borderRadius: StyleString.mdRadius,
                       child: Column(
                         mainAxisAlignment: MainAxisAlignment.center,