Browse Source

[new]优化账号被挤重登首页显示问题

zk 6 months ago
parent
commit
c1b4933c06

+ 3 - 1
lib/dialog/account_replace_dialog.dart

@@ -6,10 +6,12 @@ import 'package:get/get.dart';
 import 'package:get/get_core/src/get_main.dart';
 import 'package:get/get_core/src/get_main.dart';
 import 'package:location/module/main/main_page.dart';
 import 'package:location/module/main/main_page.dart';
 import 'package:location/resource/string.gen.dart';
 import 'package:location/resource/string.gen.dart';
+import 'package:location/router/app_pages.dart';
 import 'package:location/utils/common_expand.dart';
 import 'package:location/utils/common_expand.dart';
 
 
 import '../resource/assets.gen.dart';
 import '../resource/assets.gen.dart';
 import '../resource/colors.gen.dart';
 import '../resource/colors.gen.dart';
+import '../utils/common_util.dart';
 
 
 class AccountReplaceDialog {
 class AccountReplaceDialog {
   static const String _tag = 'AccountReplaceDialog';
   static const String _tag = 'AccountReplaceDialog';
@@ -105,7 +107,7 @@ class _AccountReplaceView extends StatelessWidget {
 
 
   void onKnowClick() {
   void onKnowClick() {
     //清空至首页
     //清空至首页
-    Get.offAll(() => MainPage());
+    backToSpecificPage(RoutePath.mainTab);
     AccountReplaceDialog.dismiss();
     AccountReplaceDialog.dismiss();
   }
   }
 }
 }

+ 4 - 2
lib/resource/string.gen.dart

@@ -108,7 +108,8 @@ class StringName {
   static String get friendEditBlockTitle => 'friend_edit_block_title'.tr; // 不给Ta看
   static String get friendEditBlockTitle => 'friend_edit_block_title'.tr; // 不给Ta看
   static String get blockedFriend => 'blocked_friend'.tr; // 已屏蔽该好友
   static String get blockedFriend => 'blocked_friend'.tr; // 已屏蔽该好友
   static String get blockFriendOff => 'block_friend_off'.tr; // 屏蔽好友已关闭
   static String get blockFriendOff => 'block_friend_off'.tr; // 屏蔽好友已关闭
-  static String get friendDelete => 'friend_delete'.tr; // 屏蔽好友
+  static String get friendDelete => 'friend_delete'.tr; // 删除好友
+  static String get blockFriends => 'block_friends'.tr; // 屏蔽好友
   static String get kindlyReminder => 'kindly_reminder'.tr; // 温馨提示
   static String get kindlyReminder => 'kindly_reminder'.tr; // 温馨提示
   static String get friendDeleteContent => 'friend_delete_content'.tr; // 互删好友后,双方将停止共享位置,清除相关定位记录并屏蔽,是否确认互删
   static String get friendDeleteContent => 'friend_delete_content'.tr; // 互删好友后,双方将停止共享位置,清除相关定位记录并屏蔽,是否确认互删
   static String get deleteSuccess => 'delete_success'.tr; // 删除成功
   static String get deleteSuccess => 'delete_success'.tr; // 删除成功
@@ -421,7 +422,8 @@ class StringMultiSource {
       'friend_edit_block_title': '不给Ta看',
       'friend_edit_block_title': '不给Ta看',
       'blocked_friend': '已屏蔽该好友',
       'blocked_friend': '已屏蔽该好友',
       'block_friend_off': '屏蔽好友已关闭',
       'block_friend_off': '屏蔽好友已关闭',
-      'friend_delete': '屏蔽好友',
+      'friend_delete': '删除好友',
+      'block_friends': '屏蔽好友',
       'kindly_reminder': '温馨提示',
       'kindly_reminder': '温馨提示',
       'friend_delete_content': '互删好友后,双方将停止共享位置,清除相关定位记录并屏蔽,是否确认互删',
       'friend_delete_content': '互删好友后,双方将停止共享位置,清除相关定位记录并屏蔽,是否确认互删',
       'delete_success': '删除成功',
       'delete_success': '删除成功',

+ 6 - 0
lib/utils/common_util.dart

@@ -1,4 +1,6 @@
 import 'package:flutter/services.dart';
 import 'package:flutter/services.dart';
+import 'package:get/get.dart';
+import 'package:get/get_core/src/get_main.dart';
 import 'package:location/resource/assets.gen.dart';
 import 'package:location/resource/assets.gen.dart';
 
 
 import '../data/consts/payment_type.dart';
 import '../data/consts/payment_type.dart';
@@ -70,3 +72,7 @@ void copyToClipboard(String content) {
   Clipboard.setData(ClipboardData(text: content));
   Clipboard.setData(ClipboardData(text: content));
 }
 }
 
 
+
+void backToSpecificPage(String targetRoute) {
+  Get.until((route) => Get.currentRoute == targetRoute);
+}