From 38fa8a10b77db4275efdfd0adbe2b3e60e7629eb Mon Sep 17 00:00:00 2001
From: bggRGjQaUbCoE <githubaccount56556@proton.me>
Date: Mon, 14 Apr 2025 15:41:41 +0800
Subject: [PATCH] opt: emote panel

Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>
---
 lib/pages/emote/view.dart              | 13 ++++++-------
 lib/pages/live_emote/view.dart         | 13 ++++++-------
 lib/pages/live_room/send_dm_panel.dart |  4 ----
 lib/pages/live_room/view.dart          |  6 ++++++
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/lib/pages/emote/view.dart b/lib/pages/emote/view.dart
index 3dfb2ee6..6aeb34c6 100644
--- a/lib/pages/emote/view.dart
+++ b/lib/pages/emote/view.dart
@@ -117,18 +117,17 @@ class _EmotePanelState extends State<EmotePanel>
                 SizedBox(height: MediaQuery.of(context).padding.bottom),
               ],
             )
-          : _errorWidget,
-      Error() => _errorWidget,
+          : _errorWidget(),
+      Error() => _errorWidget(loadingState.errMsg),
       LoadingState() => throw UnimplementedError(),
     };
   }
 
-  Widget get _errorWidget => Center(
-        child: IconButton(
-          onPressed: () {
-            _emotePanelController.onReload();
-          },
+  Widget _errorWidget([String? errMsg]) => Center(
+        child: TextButton.icon(
+          onPressed: _emotePanelController.onReload,
           icon: Icon(Icons.refresh),
+          label: Text(errMsg ?? '没有数据'),
         ),
       );
 }
diff --git a/lib/pages/live_emote/view.dart b/lib/pages/live_emote/view.dart
index bfcb44e9..d25e88ff 100644
--- a/lib/pages/live_emote/view.dart
+++ b/lib/pages/live_emote/view.dart
@@ -131,18 +131,17 @@ class _LiveEmotePanelState extends State<LiveEmotePanel>
                 SizedBox(height: MediaQuery.of(context).padding.bottom),
               ],
             )
-          : _errorWidget,
-      Error() => _errorWidget,
+          : _errorWidget(),
+      Error() => _errorWidget(loadingState.errMsg),
       LoadingState() => throw UnimplementedError(),
     };
   }
 
-  Widget get _errorWidget => Center(
-        child: IconButton(
-          onPressed: () {
-            _emotePanelController.onReload();
-          },
+  Widget _errorWidget([String? errMsg]) => Center(
+        child: TextButton.icon(
+          onPressed: _emotePanelController.onReload,
           icon: Icon(Icons.refresh),
+          label: Text(errMsg ?? '没有数据'),
         ),
       );
 }
diff --git a/lib/pages/live_room/send_dm_panel.dart b/lib/pages/live_room/send_dm_panel.dart
index 2200f178..137dacd8 100644
--- a/lib/pages/live_room/send_dm_panel.dart
+++ b/lib/pages/live_room/send_dm_panel.dart
@@ -220,10 +220,6 @@ class _ReplyPageState extends CommonPublishPageState<LiveSendDmPanel> {
     emoticonOptions,
     emoticonUnique,
   }) async {
-    if (!liveRoomController.isLogin) {
-      SmartDialog.showToast('未登录');
-      return;
-    }
     final res = await LiveHttp.sendLiveMsg(
       roomId: liveRoomController.roomId,
       msg: message,
diff --git a/lib/pages/live_room/view.dart b/lib/pages/live_room/view.dart
index f2399fa1..73d90691 100644
--- a/lib/pages/live_room/view.dart
+++ b/lib/pages/live_room/view.dart
@@ -13,6 +13,7 @@ import 'package:canvas_danmaku/canvas_danmaku.dart';
 import 'package:floating/floating.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:PiliPlus/common/widgets/network_img_layer.dart';
 import 'package:PiliPlus/plugin/pl_player/index.dart';
@@ -552,6 +553,7 @@ class _LiveRoomPageState extends State<LiveRoomPage>
             Expanded(
               child: GestureDetector(
                 onTap: onSendDanmaku,
+                behavior: HitTestBehavior.opaque,
                 child: Text(
                   '发送弹幕',
                   style: TextStyle(color: _color),
@@ -569,6 +571,10 @@ class _LiveRoomPageState extends State<LiveRoomPage>
       );
 
   void onSendDanmaku([bool fromEmote = false]) {
+    if (!_liveRoomController.isLogin) {
+      SmartDialog.showToast('账号未登录');
+      return;
+    }
     Get.generalDialog(
       barrierLabel: '',
       barrierDismissible: true,