Auto scroll the console to end position

Muska-Ami · Sep 5, 2024 · 7d580f4 · 7d580f4
1 parent 794ca05
commit 7d580f4
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 12 deletions.
diff --git a/RELEASE_CHANGELOG.md b/RELEASE_CHANGELOG.md
@@ -7,6 +7,7 @@
 ### GUI
 
 - 修改了 Frpc 下载的处理逻辑
+- 打开终端默认自动滚动到底部
 
 ### CLI
 

diff --git a/nyalcf_core/lib/network/dio/other/sign_other.dart b/nyalcf_core/lib/network/dio/other/sign_other.dart
@@ -94,6 +94,7 @@ class OtherSign {
       );
 
       Map<String, dynamic> resJson = resData.data;
+      Logger.debug(resJson);
       // final String msg = resJson['message'];
       if (resJson['status'] == 200) {
         // int getTraffic =

diff --git a/nyalcf_gui/nyalcf_ui/lib/views/panel/console.dart b/nyalcf_gui/nyalcf_ui/lib/views/panel/console.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 
+import 'package:nyalcf_core_extend/utils/widget/after_layout.dart';
 import 'package:nyalcf_ui/controllers/console_controller.dart';
 import 'package:nyalcf_ui/controllers/frpc_controller.dart';
 import 'package:nyalcf_ui/controllers/user_controller.dart';
@@ -98,9 +99,14 @@ class PanelConsole extends StatelessWidget {
                           child: Container(
                             margin: const EdgeInsets.all(10.0),
                             child: Obx(
-                              () => ListView(
-                                controller: scrollController,
-                                children: _cCtr.processOut,
+                              () => AfterLayout(
+                                callback: (RenderAfterLayout ral) =>
+                                    scrollController.jumpTo(scrollController
+                                        .position.maxScrollExtent),
+                                child: ListView(
+                                  controller: scrollController,
+                                  children: _cCtr.processOut,
+                                ),
                               ),
                             ),
                           ),

diff --git a/nyalcf_gui/nyalcf_ui/lib/views/panel/console_full.dart b/nyalcf_gui/nyalcf_ui/lib/views/panel/console_full.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 
+import 'package:nyalcf_core_extend/utils/widget/after_layout.dart';
 import 'package:nyalcf_ui/controllers/console_controller.dart';
 import 'package:nyalcf_ui/controllers/user_controller.dart';
 import 'package:nyalcf_inject_extend/nyalcf_inject_extend.dart';
@@ -55,12 +56,16 @@ class PanelConsoleFull extends StatelessWidget {
             color: Colors.grey.shade900,
             child: Obx(() => SizedBox(
                   height: MediaQuery.of(context).size.height - 56,
-                  child: ListView(
-                    controller: scrollController,
-                    padding: const EdgeInsets.all(10),
-                    physics: const AlwaysScrollableScrollPhysics(),
-                    shrinkWrap: true,
-                    children: _cCtr.processOut,
+                  child: AfterLayout(
+                    callback: (RenderAfterLayout ral) => scrollController
+                        .jumpTo(scrollController.position.maxScrollExtent),
+                    child: ListView(
+                      controller: scrollController,
+                      padding: const EdgeInsets.all(10),
+                      physics: const AlwaysScrollableScrollPhysics(),
+                      shrinkWrap: true,
+                      children: _cCtr.processOut,
+                    ),
                   ),
                 )),
           ),

diff --git a/nyalcf_gui/nyalcf_ui/lib/views/panel/home.dart b/nyalcf_gui/nyalcf_ui/lib/views/panel/home.dart
@@ -98,6 +98,7 @@ class PanelHome extends StatelessWidget {
                                     _uCtr.user.value, _uCtr.token.value);
                                 if (checkSignRes.status) {
                                   checkSignRes as SignResponse;
+                                  Logger.debug(checkSignRes.signed);
                                   if (!checkSignRes.signed) {
                                     final doSignRes = await OtherSign().doSign(
                                         _uCtr.user.value, _uCtr.token.value);

diff --git a/nyalcf_gui/nyalcf_ui/lib/views/tokenmode/panel.dart b/nyalcf_gui/nyalcf_ui/lib/views/tokenmode/panel.dart
@@ -2,6 +2,7 @@ import 'package:bitsdojo_window/bitsdojo_window.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 
+import 'package:nyalcf_core_extend/utils/widget/after_layout.dart';
 import 'package:nyalcf_ui/controllers/console_controller.dart';
 import 'package:nyalcf_core_extend/storages/prefs/token_mode_prefs.dart';
 import 'package:nyalcf_core/utils/frpc/path_provider.dart';
@@ -199,9 +200,13 @@ class _TokenModePanelState extends State {
                 height: MediaQuery.of(context).size.height - 270,
                 child: Container(
                   margin: const EdgeInsets.all(10.0),
-                  child: ListView(
-                    controller: scrollController,
-                    children: _cCtr.processOut,
+                  child: AfterLayout(
+                    callback: (RenderAfterLayout ral) => scrollController
+                        .jumpTo(scrollController.position.maxScrollExtent),
+                    child: ListView(
+                      controller: scrollController,
+                      children: _cCtr.processOut,
+                    ),
                   ),
                 ),
               ),
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,7 @@ @@
     ### GUI
     - 修改了 Frpc 下载的处理逻辑
+    - 打开终端默认自动滚动到底部
     ### CLI
@@ Expand Down @@