feat: session secondary

Closes #837 Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>
2025-12-06 09:13:48 +08:00 · 2025-05-09 21:32:16 +08:00
parent dea29054e6
commit a282baf5a2
25 changed files with 814 additions and 543 deletions
--- a/lib/pages/whisper/controller.dart
+++ b/lib/pages/whisper/controller.dart
@@ -1,6 +1,6 @@
 import 'package:PiliPlus/grpc/bilibili/app/im/v1.pb.dart'
-    show SessionMainReply, Session, Offset, SessionPageType;
-import 'package:PiliPlus/grpc/grpc_repo.dart';
+    show Offset, Session, SessionId, SessionMainReply, SessionPageType;
+import 'package:PiliPlus/grpc/im.dart';
 import 'package:PiliPlus/http/loading_state.dart';
 import 'package:PiliPlus/http/msg.dart';
 import 'package:PiliPlus/models/msg/msgfeed_unread.dart';
@@ -74,7 +74,7 @@ class WhisperController

  @override
  Future<LoadingState<SessionMainReply>> customGetData() =>
-      MsgHttp.sessionMain(offset: offset);
+      ImGrpc.sessionMain(offset: offset);

  @override
  Future<void> onRefresh() {
@@ -94,13 +94,13 @@ class WhisperController
    }
  }

-  Future<void> onSetTop(int index, bool isTop, int? talkerId) async {
-    var res = await MsgHttp.setTop(
-      talkerId: talkerId,
-      opType: isTop ? 1 : 0,
-    );
+  Future<void> onSetTop(int index, bool isTop, SessionId sessionId) async {
+    var res = isTop
+        ? await ImGrpc.unpinSession(sessionId: sessionId)
+        : await ImGrpc.pinSession(sessionId: sessionId);
+
    if (res['status']) {
-      List<Session> list = (loadingState.value as Success).response;
+      List<Session> list = loadingState.value.data!;
      list[index].isPinned = isTop ? false : true;
      if (!isTop) {
        list.insert(0, list.removeAt(index));
@@ -121,7 +121,7 @@ class WhisperController
  }

  Future<void> onClearUnread() async {
-    final res = await GrpcRepo.clearUnread(
+    final res = await ImGrpc.clearUnread(
        pageType: SessionPageType.SESSION_PAGE_TYPE_HOME);
    if (res['status']) {
      if (loadingState.value is Success) {
--- a/lib/pages/whisper/view.dart
+++ b/lib/pages/whisper/view.dart
@@ -50,7 +50,13 @@ class _WhisperPageState extends State<WhisperPage> {
          physics: const AlwaysScrollableScrollPhysics(),
          slivers: [
            _buildTopItems,
-            Obx(() => _buildBody(_whisperController.loadingState.value)),
+            SliverPadding(
+              padding: EdgeInsets.only(
+                bottom: MediaQuery.paddingOf(context).bottom + 100,
+              ),
+              sliver:
+                  Obx(() => _buildBody(_whisperController.loadingState.value)),
+            ),
          ],
        ),
      ),
@@ -66,31 +72,26 @@ class _WhisperPageState extends State<WhisperPage> {
          },
        ),
      Success() => loadingState.response?.isNotEmpty == true
-          ? SliverPadding(
-              padding: EdgeInsets.only(
-                bottom: MediaQuery.paddingOf(context).bottom + 100,
-              ),
-              sliver: SliverList.separated(
-                itemCount: loadingState.response!.length,
-                itemBuilder: (context, index) {
-                  if (index == loadingState.response!.length - 1) {
-                    _whisperController.onLoadMore();
-                  }
-                  return WhisperSessionItem(
-                    item: loadingState.response![index],
-                    onSetTop: (isTop, talkerId) =>
-                        _whisperController.onSetTop(index, isTop, talkerId),
-                    onRemove: (talkerId) =>
-                        _whisperController.onRemove(index, talkerId),
-                    onTap: () => _whisperController.onTap(index),
-                  );
-                },
-                separatorBuilder: (context, index) => Divider(
-                  indent: 72,
-                  endIndent: 20,
-                  height: 1,
-                  color: Colors.grey.withOpacity(0.1),
-                ),
+          ? SliverList.separated(
+              itemCount: loadingState.response!.length,
+              itemBuilder: (context, index) {
+                if (index == loadingState.response!.length - 1) {
+                  _whisperController.onLoadMore();
+                }
+                return WhisperSessionItem(
+                  item: loadingState.response![index],
+                  onSetTop: (isTop, id) =>
+                      _whisperController.onSetTop(index, isTop, id),
+                  onRemove: (talkerId) =>
+                      _whisperController.onRemove(index, talkerId),
+                  onTap: () => _whisperController.onTap(index),
+                );
+              },
+              separatorBuilder: (context, index) => Divider(
+                indent: 72,
+                endIndent: 20,
+                height: 1,
+                color: Colors.grey.withOpacity(0.1),
              ),
            )
          : HttpError(
--- a/lib/pages/whisper/widgets/item.dart
+++ b/lib/pages/whisper/widgets/item.dart
@@ -3,11 +3,13 @@ import 'dart:convert';
 import 'package:PiliPlus/common/widgets/badge.dart';
 import 'package:PiliPlus/common/widgets/pendant_avatar.dart';
 import 'package:PiliPlus/grpc/bilibili/app/im/v1.pb.dart'
-    show Session, UnreadStyle;
+    show Session, SessionId, SessionPageType, SessionType, UnreadStyle;
 import 'package:PiliPlus/models/common/badge_type.dart';
+import 'package:PiliPlus/pages/whisper_secondary/view.dart';
 import 'package:PiliPlus/utils/extension.dart';
 import 'package:PiliPlus/utils/utils.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';

 class WhisperSessionItem extends StatelessWidget {
@@ -20,7 +22,7 @@ class WhisperSessionItem extends StatelessWidget {
  });

  final Session item;
-  final Function(bool isTop, int? talkerId) onSetTop;
+  final Function(bool isTop, SessionId id) onSetTop;
  final ValueChanged<int?> onRemove;
  final VoidCallback onTap;

@@ -49,27 +51,25 @@ class WhisperSessionItem extends StatelessWidget {
                    dense: true,
                    onTap: () {
                      Get.back();
-                      onSetTop(
-                        item.isPinned,
-                        item.id.privateId.talkerUid.toInt(),
-                      );
+                      onSetTop(item.isPinned, item.id);
                    },
                    title: Text(
                      item.isPinned ? '移除置顶' : '置顶',
                      style: const TextStyle(fontSize: 14),
                    ),
                  ),
-                  ListTile(
-                    dense: true,
-                    onTap: () {
-                      Get.back();
-                      onRemove(item.id.privateId.talkerUid.toInt());
-                    },
-                    title: const Text(
-                      '删除',
-                      style: TextStyle(fontSize: 14),
+                  if (item.id.privateId.hasTalkerUid())
+                    ListTile(
+                      dense: true,
+                      onTap: () {
+                        Get.back();
+                        onRemove(item.id.privateId.talkerUid.toInt());
+                      },
+                      title: const Text(
+                        '删除',
+                        style: TextStyle(fontSize: 14),
+                      ),
                    ),
-                  ),
                ],
              ),
            );
@@ -78,17 +78,54 @@ class WhisperSessionItem extends StatelessWidget {
      },
      onTap: () {
        onTap();
-        Get.toNamed(
-          '/whisperDetail',
-          parameters: {
-            'talkerId': item.id.privateId.talkerUid.toString(),
-            'name': item.sessionInfo.sessionName,
-            'face': item.sessionInfo.avatar.fallbackLayers.layers.first.resource
-                .resImage.imageSrc.remote.url,
-            if (item.sessionInfo.avatar.hasMid())
-              'mid': item.sessionInfo.avatar.mid.toString(),
-          },
-        );
+        if (item.id.privateId.hasTalkerUid()) {
+          Get.toNamed(
+            '/whisperDetail',
+            parameters: {
+              'talkerId': item.id.privateId.talkerUid.toString(),
+              'name': item.sessionInfo.sessionName,
+              'face': item.sessionInfo.avatar.fallbackLayers.layers.first
+                  .resource.resImage.imageSrc.remote.url,
+              if (item.sessionInfo.avatar.hasMid())
+                'mid': item.sessionInfo.avatar.mid.toString(),
+            },
+          );
+          return;
+        }
+
+        if (item.id.foldId.hasType()) {
+          SessionPageType? sessionPageType = switch (item.id.foldId.type) {
+            SessionType.SESSION_TYPE_UNKNOWN =>
+              SessionPageType.SESSION_PAGE_TYPE_UNKNOWN,
+            SessionType.SESSION_TYPE_GROUP =>
+              SessionPageType.SESSION_PAGE_TYPE_GROUP,
+            SessionType.SESSION_TYPE_GROUP_FOLD =>
+              SessionPageType.SESSION_PAGE_TYPE_GROUP,
+            SessionType.SESSION_TYPE_UNFOLLOWED =>
+              SessionPageType.SESSION_PAGE_TYPE_UNFOLLOWED,
+            SessionType.SESSION_TYPE_STRANGER =>
+              SessionPageType.SESSION_PAGE_TYPE_STRANGER,
+            SessionType.SESSION_TYPE_DUSTBIN =>
+              SessionPageType.SESSION_PAGE_TYPE_DUSTBIN,
+            SessionType.SESSION_TYPE_CUSTOMER_FOLD =>
+              SessionPageType.SESSION_PAGE_TYPE_CUSTOMER,
+            SessionType.SESSION_TYPE_AI_FOLD =>
+              SessionPageType.SESSION_PAGE_TYPE_AI,
+            SessionType.SESSION_TYPE_CUSTOMER_ACCOUNT =>
+              SessionPageType.SESSION_PAGE_TYPE_CUSTOMER,
+            _ => null,
+          };
+          if (sessionPageType != null) {
+            Get.to(
+              WhisperSecPage(
+                name: item.sessionInfo.sessionName,
+                sessionPageType: sessionPageType,
+              ),
+            );
+          } else {
+            SmartDialog.showToast(item.id.foldId.type.name);
+          }
+        }
      },
      leading: Builder(
        builder: (context) {