Merge remote-tracking branch 'upstream/main'

2025-12-06 09:13:48 +08:00 · 2024-02-26 09:26:46 +08:00
parent 0aaac5870d 835ea0a9ff
commit f2805553ec
40 changed files with 1929 additions and 357 deletions
--- a/lib/pages/whisper_detail/controller.dart
+++ b/lib/pages/whisper_detail/controller.dart
@@ -1,7 +1,11 @@
+import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
+import 'package:hive/hive.dart';
 import 'package:PiliPalaX/http/msg.dart';
 import 'package:PiliPalaX/models/msg/session.dart';
+import '../../utils/feed_back.dart';
+import '../../utils/storage.dart';

 class WhisperDetailController extends GetxController {
  late int talkerId;
@@ -11,6 +15,8 @@ class WhisperDetailController extends GetxController {
  RxList<MessageItem> messageList = <MessageItem>[].obs;
  //表情转换图片规则
  List<dynamic>? eInfos;
+  final TextEditingController replyContentController = TextEditingController();
+  Box userInfoCache = GStrorage.userInfo;

  @override
  void onInit() {
@@ -36,6 +42,7 @@ class WhisperDetailController extends GetxController {
    }
  }

+  // 消息标记已读
  Future ackSessionMsg() async {
    if (messageList.isEmpty) {
      return;
@@ -44,10 +51,33 @@ class WhisperDetailController extends GetxController {
      talkerId: talkerId,
      ackSeqno: messageList.last.msgSeqno,
    );
-    if (res['status']) {
-      SmartDialog.showToast("已读成功");
-    } else {
+    if (!res['status']) {
      SmartDialog.showToast(res['msg']);
    }
  }
+
+  Future sendMsg() async {
+    feedBack();
+    String message = replyContentController.text;
+    final userInfo = userInfoCache.get('userInfoCache');
+    if (userInfo == null) {
+      SmartDialog.showToast('请先登录');
+      return;
+    }
+    if (message == '') {
+      SmartDialog.showToast('请输入内容');
+      return;
+    }
+    var result = await MsgHttp.sendMsg(
+      senderUid: userInfo.mid,
+      receiverId: int.parse(mid),
+      content: {'content': message},
+      msgType: 1,
+    );
+    if (result['status']) {
+      SmartDialog.showToast('发送成功');
+    } else {
+      SmartDialog.showToast(result['msg']);
+    }
+  }
 }
--- a/lib/pages/whisper_detail/view.dart
+++ b/lib/pages/whisper_detail/view.dart
@@ -1,9 +1,13 @@
+import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
+
+import 'package:hive/hive.dart';
 import 'package:PiliPalaX/common/widgets/network_img_layer.dart';
+import 'package:PiliPalaX/pages/emote/index.dart';
 import 'package:PiliPalaX/pages/whisper_detail/controller.dart';
 import 'package:PiliPalaX/utils/feed_back.dart';
-
+import '../../utils/storage.dart';
 import 'widget/chat_item.dart';

 class WhisperDetailPage extends StatefulWidget {
@@ -13,14 +17,62 @@ class WhisperDetailPage extends StatefulWidget {
  State<WhisperDetailPage> createState() => _WhisperDetailPageState();
 }

-class _WhisperDetailPageState extends State<WhisperDetailPage> {
+class _WhisperDetailPageState extends State<WhisperDetailPage>
+    with WidgetsBindingObserver {
  final WhisperDetailController _whisperDetailController =
      Get.put(WhisperDetailController());
+  late TextEditingController _replyContentController;
+  final FocusNode replyContentFocusNode = FocusNode();
+  final _debouncer = Debouncer(milliseconds: 200); // 设置延迟时间
+  late double emoteHeight = 0.0;
+  double keyboardHeight = 0.0; // 键盘高度
+  String toolbarType = 'input';
+  Box userInfoCache = GStrorage.userInfo;

  @override
  void initState() {
    super.initState();
+    WidgetsBinding.instance.addObserver(this);
    _whisperDetailController.querySessionMsg();
+    _replyContentController = _whisperDetailController.replyContentController;
+    _focuslistener();
+  }
+
+  _focuslistener() {
+    replyContentFocusNode.addListener(() {
+      if (replyContentFocusNode.hasFocus) {
+        setState(() {
+          toolbarType = 'input';
+        });
+      }
+    });
+  }
+
+  @override
+  void didChangeMetrics() {
+    super.didChangeMetrics();
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      // 键盘高度
+      final viewInsets = EdgeInsets.fromViewPadding(
+          View.of(context).viewInsets, View.of(context).devicePixelRatio);
+      _debouncer.run(() {
+        if (mounted) {
+          if (keyboardHeight == 0) {
+            setState(() {
+              emoteHeight = keyboardHeight =
+                  keyboardHeight == 0.0 ? viewInsets.bottom : keyboardHeight;
+            });
+          }
+        }
+      });
+    });
+  }
+
+  @override
+  void dispose() {
+    WidgetsBinding.instance.removeObserver(this);
+    replyContentFocusNode.removeListener(() {});
+    super.dispose();
  }

  @override
@@ -88,26 +140,35 @@ class _WhisperDetailPageState extends State<WhisperDetailPage> {
          ),
        ),
      ),
-      body: Obx(() {
-        List messageList = _whisperDetailController.messageList;
-        if (messageList.isEmpty) {
-          return const Center(
-            child: CircularProgressIndicator(),
+      body: GestureDetector(
+        onTap: () {
+          FocusScope.of(context).unfocus();
+          setState(() {
+            keyboardHeight = 0;
+          });
+        },
+        child: Obx(() {
+          List messageList = _whisperDetailController.messageList;
+          if (messageList.isEmpty) {
+            return const Center(
+              child: CircularProgressIndicator(),
+            );
+          }
+          return ListView.builder(
+            itemCount: messageList.length,
+            shrinkWrap: true,
+            reverse: true,
+            itemBuilder: (_, int i) {
+              return ChatItem(
+                  item: messageList[i], e_infos: _whisperDetailController.eInfos);
+            },
          );
-        }
-        return ListView.builder(
-          itemCount: messageList.length,
-          shrinkWrap: true,
-          reverse: true,
-          itemBuilder: (_, int i) {
-            return ChatItem(
-                item: messageList[i], e_infos: _whisperDetailController.eInfos);
-          },
-        );
-      }),
+        }),
+      ),
+      // resizeToAvoidBottomInset: true,
      bottomNavigationBar: Container(
        width: double.infinity,
-        height: MediaQuery.of(context).padding.bottom + 70,
+        height: MediaQuery.of(context).padding.bottom + 70 + keyboardHeight,
        padding: EdgeInsets.only(
          left: 8,
          right: 12,
@@ -122,48 +183,102 @@ class _WhisperDetailPageState extends State<WhisperDetailPage> {
            ),
          ),
        ),
-        child: Row(
-          mainAxisAlignment: MainAxisAlignment.center,
-          crossAxisAlignment: CrossAxisAlignment.start,
+        child: Column(
          children: [
-            // IconButton(
-            //   onPressed: () {},
-            //   icon: Icon(
-            //     Icons.add_circle_outline,
-            //     color: Theme.of(context).colorScheme.outline,
-            //   ),
-            // ),
-            IconButton(
-              onPressed: () {},
-              icon: Icon(
-                Icons.emoji_emotions_outlined,
-                color: Theme.of(context).colorScheme.outline,
-              ),
-            ),
-            Expanded(
-              child: Container(
-                height: 45,
-                decoration: BoxDecoration(
-                  color:
-                      Theme.of(context).colorScheme.primary.withOpacity(0.08),
-                  borderRadius: BorderRadius.circular(40.0),
-                ),
-                child: TextField(
-                  readOnly: true,
-                  style: Theme.of(context).textTheme.titleMedium,
-                  decoration: const InputDecoration(
-                    border: InputBorder.none, // 移除默认边框
-                    hintText: '开发中 ...', // 提示文本
-                    contentPadding: EdgeInsets.symmetric(
-                        horizontal: 16.0, vertical: 12.0), // 内边距
+            Row(
+              mainAxisAlignment: MainAxisAlignment.center,
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                // IconButton(
+                //   onPressed: () {},
+                //   icon: Icon(
+                //     Icons.add_circle_outline,
+                //     color: Theme.of(context).colorScheme.outline,
+                //   ),
+                // ),
+                IconButton(
+                  onPressed: () {
+                    // if (toolbarType == 'input') {
+                    //   setState(() {
+                    //     toolbarType = 'emote';
+                    //   });
+                    // }
+                    // FocusScope.of(context).unfocus();
+                  },
+                  icon: Icon(
+                    Icons.emoji_emotions_outlined,
+                    color: Theme.of(context).colorScheme.outline,
                  ),
                ),
+                Expanded(
+                  child: Container(
+                    height: 45,
+                    decoration: BoxDecoration(
+                      color: Theme.of(context)
+                          .colorScheme
+                          .primary
+                          .withOpacity(0.08),
+                      borderRadius: BorderRadius.circular(40.0),
+                    ),
+                    child: TextField(
+                      readOnly: true,
+                      style: Theme.of(context).textTheme.titleMedium,
+                      controller: _replyContentController,
+                      autofocus: false,
+                      focusNode: replyContentFocusNode,
+                      decoration: const InputDecoration(
+                        border: InputBorder.none, // 移除默认边框
+                        hintText: '开发中 ...', // 提示文本
+                        contentPadding: EdgeInsets.symmetric(
+                            horizontal: 16.0, vertical: 12.0), // 内边距
+                      ),
+                    ),
+                  ),
+                ),
+                IconButton(
+                  // onPressed: _whisperDetailController.sendMsg,
+                  onPressed: null,
+                  icon: Icon(
+                    Icons.send,
+                    color: Theme.of(context).colorScheme.outline,
+                  ),
+                ),
+                // const SizedBox(width: 16),
+              ],
+            ),
+            AnimatedSize(
+              curve: Curves.easeInOut,
+              duration: const Duration(milliseconds: 300),
+              child: SizedBox(
+                width: double.infinity,
+                height: toolbarType == 'input' ? keyboardHeight : emoteHeight,
+                child: EmotePanel(
+                  onChoose: (package, emote) => {},
+                ),
              ),
            ),
-            const SizedBox(width: 16),
          ],
        ),
      ),
    );
  }
 }
+
+typedef DebounceCallback = void Function();
+
+class Debouncer {
+  DebounceCallback? callback;
+  final int? milliseconds;
+  Timer? _timer;
+
+  Debouncer({this.milliseconds});
+
+  run(DebounceCallback callback) {
+    if (_timer != null) {
+      _timer!.cancel();
+    }
+    _timer = Timer(Duration(milliseconds: milliseconds!), () {
+      callback();
+    });
+  }
+}
--- a/lib/pages/whisper_detail/widget/chat_item.dart
+++ b/lib/pages/whisper_detail/widget/chat_item.dart
@@ -358,7 +358,9 @@ class ChatItem extends StatelessWidget {
              ));
        default:
          return Text(
-            content['content'] ?? content.toString(),
+            content != null && content != ''
+                ? (content['content'] ?? content.toString())
+                : '不支持的消息类型',
            style: TextStyle(
              letterSpacing: 0.6,
              height: 1.5,