Merge branch 'fix'

lib/pages/dynamics/widgets/up_panel.dart

@@ -88,9 +88,7 @@ class _UpPanelState extends State<UpPanel> {
               Container(
                 height: 90,
                 color: Theme.of(context).colorScheme.background,
-                child: Row(
-                  children: [
-                    Expanded(
+                child: Expanded(
                   child: ListView(
                     scrollDirection: Axis.horizontal,
                     controller: scrollController,
@@ -117,8 +115,6 @@ class _UpPanelState extends State<UpPanel> {
                     ],
                   ),
                 ),
-                  ],
-                ),
               ),
               Container(
                 height: 6,

lib/pages/video/detail/reply_new/view.dart

@@ -109,6 +109,8 @@ class _VideoReplyNewDialogState extends State<VideoReplyNewDialog>
   @override
   void didChangeMetrics() {
     super.didChangeMetrics();
+    final String routePath = Get.currentRoute;
+    if (mounted && routePath.startsWith('/video')) {
       WidgetsBinding.instance.addPostFrameCallback((_) {
         // 键盘高度
         final viewInsets = EdgeInsets.fromViewPadding(
@@ -125,17 +127,22 @@ class _VideoReplyNewDialogState extends State<VideoReplyNewDialog>
         });
       });
     }
+  }
 
   @override
   void dispose() {
     WidgetsBinding.instance.removeObserver(this);
     _replyContentController.dispose();
     replyContentFocusNode.removeListener(() {});
+    replyContentFocusNode.dispose();
     super.dispose();
   }
 
   @override
   Widget build(BuildContext context) {
+    double keyboardHeight = EdgeInsets.fromViewPadding(
+            View.of(context).viewInsets, View.of(context).devicePixelRatio)
+        .bottom;
     return Container(
       clipBehavior: Clip.hardEdge,
       decoration: BoxDecoration(

lib/pages/whisper_detail/view.dart

@@ -51,6 +51,8 @@ class _WhisperDetailPageState extends State<WhisperDetailPage>
   @override
   void didChangeMetrics() {
     super.didChangeMetrics();
+    final String routePath = Get.currentRoute;
+    if (mounted && routePath.startsWith('/whisper_detail')) {
       WidgetsBinding.instance.addPostFrameCallback((_) {
         // 键盘高度
         final viewInsets = EdgeInsets.fromViewPadding(
@@ -67,11 +69,13 @@ class _WhisperDetailPageState extends State<WhisperDetailPage>
         });
       });
     }
+  }
 
   @override
   void dispose() {
     WidgetsBinding.instance.removeObserver(this);
     replyContentFocusNode.removeListener(() {});
+    replyContentFocusNode.dispose();
     super.dispose();
   }