fix(*): fix unexpected issue causing immediate lockup

ZhuJHua · Jan 17, 2025 · dfd1078 · dfd1078
1 parent 95b877c
commit dfd1078
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/lib/pages/home/home_logic.dart b/lib/pages/home/home_logic.dart
@@ -104,7 +104,11 @@ class HomeLogic extends GetxController with GetTickerProviderStateMixin {
     //如果开启密码的同时开启了立即锁定，就直接跳转到锁屏页面
     if (PrefUtil.getValue<bool>('lock') == true &&
         PrefUtil.getValue<bool>('lockNow') == true) {
-      Get.toNamed(AppRoutes.lockPage, arguments: 'pause');
+      // 如果当前不在编辑，分享页面
+      if (Get.currentRoute != AppRoutes.editPage &&
+          Get.currentRoute != AppRoutes.sharePage) {
+        Get.toNamed(AppRoutes.lockPage, arguments: 'pause');
+      }
     }
   }
 

diff --git a/lib/pages/home/home_view.dart b/lib/pages/home/home_view.dart
@@ -220,7 +220,7 @@ class HomePage extends StatelessWidget {
             height: 56 +
                 8 +
                 56 +
-                ((46 + 8) * 3 - 56 - 8) * (logic.fabAnimation.value),
+                ((46 + 8) * 2 - 56 - 8) * (logic.fabAnimation.value),
             child: child,
           );
         },
@@ -229,13 +229,13 @@ class HomePage extends StatelessWidget {
           clipBehavior: Clip.none,
           children: [
             buildToTopButton(),
-            buildAnimatedActionButton(
-                label: 'Markdown',
-                onTap: () async {
-                  await logic.toEditPage(type: DiaryType.markdown);
-                },
-                iconData: FontAwesomeIcons.markdown,
-                index: 3),
+            // buildAnimatedActionButton(
+            //     label: 'Markdown',
+            //     onTap: () async {
+            //       await logic.toEditPage(type: DiaryType.markdown);
+            //     },
+            //     iconData: FontAwesomeIcons.markdown,
+            //     index: 3),
             buildAnimatedActionButton(
                 label: '纯文字',
                 onTap: () async {