lib/data/repositories/account_repository.dart

@@ -59,9 +59,7 @@ class AccountRepository {
   late final PhoneEventRepository phoneEventRepository;
 
   final Rx<UserInfo> mineUserInfo = Rx<UserInfo>(UserInfo(
-      id: Constants.mineLocationId,
-      phoneNumber: StringName.locationMine,
-      isMine: true));
+      id: Constants.mineLocationId, phoneNumber: "我", isMine: true));
 
   AccountRepository(this.atmobApi) {
     AtmobLog.d(tag, '$tag....init');

lib/module/add_friend/add_friend_dialog_controller.dart

@@ -67,9 +67,10 @@ class AddFriendDialogController extends BaseController {
   void _requestAddFriend() {
     AccountRepository accountRepository = AccountRepository.getInstance();
     if (accountRepository.memberIsExpired()) {
-      AddFriendLocateResultDialog.show(confirmOnTap: () {
+      AddFriendLocateResultDialog.show(confirmOnTap: () async {
         FocusScope.of(Get.context!).unfocus();
-        MemberPage.start(enterTyp: MemberPageType.addFriendToEnter);
+        await MemberPage.start(enterTyp: MemberPageType.addFriendToEnter);
+        hideKeyboard(Get.context!);
       });
     } else {
       friendsRepository.addFriendRequest(phone).then((_) {
@@ -77,9 +78,10 @@ class AddFriendDialogController extends BaseController {
         Get.back();
       }).catchError((error) {
         if (accountRepository.memberIsExpired()) {
-          AddFriendLocateResultDialog.show(confirmOnTap: () {
+          AddFriendLocateResultDialog.show(confirmOnTap: () async {
             FocusScope.of(Get.context!).unfocus();
-            MemberPage.start(enterTyp: MemberPageType.addFriendToEnter);
+            await MemberPage.start(enterTyp: MemberPageType.addFriendToEnter);
+            hideKeyboard(Get.context!);
           });
         } else {
           if (error is ServerErrorException) {

lib/module/add_friend/add_friend_page.dart

@@ -102,7 +102,10 @@ class AddFriendPage extends BaseView<AddFriendDialogController> {
             SizedBox(width: 15.w),
             Assets.images.iconLoginWx.image(width: 25.w),
             SizedBox(width: 15.w),
-            Text(StringName.friendAddFromWx,
+            Text(
+                Platform.isIOS
+                    ? StringName.friendAddFromWxIos
+                    : StringName.friendAddFromWx,
                 style: TextStyle(
                     fontWeight: FontWeight.bold,
                     color: ColorName.primaryTextColor,

lib/module/main/main_page.dart

@@ -356,8 +356,11 @@ class MainPage extends BasePage<MainController> {
               },
               child: Container(
                   margin: EdgeInsets.only(right: 16.w, left: 8.w),
-                  child: Assets.images.iconMainAddFriend
-                      .image(width: 60.w, height: 60.w)),
+                  child: Platform.isIOS
+                      ? Assets.images.iconMainAddFriendIos
+                          .image(width: 60.w, height: 60.w)
+                      : Assets.images.iconMainAddFriend
+                          .image(width: 60.w, height: 60.w)),
             )
           ],
         ),

lib/module/member/activity/member_activity_page.dart

@@ -25,11 +25,11 @@ import 'member_activity_controller.dart';
 class MemberActivityPage extends BasePage<MemberActivityController> {
   const MemberActivityPage({super.key});
 
-  static void start({bool isOffAll = false}) {
+  static Future<bool> start({bool isOffAll = false}) async {
     if (isOffAll) {
-      Get.offAllNamed(RoutePath.memberActivity);
+      return await Get.offAllNamed(RoutePath.memberActivity) == true;
     } else {
-      Get.toNamed(RoutePath.memberActivity);
+      return await Get.toNamed(RoutePath.memberActivity) == true;
     }
   }
 

lib/module/member/member_controller.dart

@@ -626,9 +626,6 @@ class MemberController extends BaseController implements PaymentStatusCallback {
   }
 
   void errorPayToast(int? errno) {
-    if (errno == null) {
-      return;
-    }
     if (errno == AgilePayCode.payCodeNotSupport) {
       ToastUtil.show(StringName.payNotSupport);
     } else if (errno == AgilePayCode.payCodeCancelError) {

lib/module/member/member_page.dart

@@ -49,12 +49,12 @@ class MemberPage extends BasePage<MemberController> {
 
   late MemberPageType? pageType = MemberPageType.universalAccessEnter;
 
-  static void start(
-      {MemberPageType? enterTyp = MemberPageType.universalAccessEnter}) {
+  static Future<bool> start(
+      {MemberPageType? enterTyp = MemberPageType.universalAccessEnter}) async {
     if (enterTyp == MemberPageType.activity) {
-      MemberActivityPage.start();
+      return await MemberActivityPage.start() == true;
     } else {
-      Get.toNamed(RoutePath.member, arguments: enterTyp);
+      return await Get.toNamed(RoutePath.member, arguments: enterTyp) == true;
     }
   }
 

pubspec.lock

@@ -136,10 +136,10 @@ packages:
     dependency: transitive
     description:
       name: build
-      sha256: cef23f1eda9b57566c81e2133d196f8e3df48f244b317368d65c5943d91148f0
+      sha256: "51dc711996cbf609b90cbe5b335bbce83143875a9d58e4b5c6d3c4f684d3dda7"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.4.2"
+    version: "2.5.4"
   build_config:
     dependency: transitive
     description:
@@ -160,26 +160,26 @@ packages:
     dependency: transitive
     description:
       name: build_resolvers
-      sha256: b9e4fda21d846e192628e7a4f6deda6888c36b5b69ba02ff291a01fd529140f0
+      sha256: ee4257b3f20c0c90e72ed2b57ad637f694ccba48839a821e87db762548c22a62
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.4.4"
+    version: "2.5.4"
   build_runner:
     dependency: "direct dev"
     description:
       name: build_runner
-      sha256: "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d"
+      sha256: "382a4d649addbfb7ba71a3631df0ec6a45d5ab9b098638144faf27f02778eb53"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.4.13"
+    version: "2.5.4"
   build_runner_core:
     dependency: transitive
     description:
       name: build_runner_core
-      sha256: f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0
+      sha256: "85fbbb1036d576d966332a3f5ce83f2ce66a40bea1a94ad2d5fc29a19a0d3792"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "7.3.2"
+    version: "9.1.2"
   built_collection:
     dependency: transitive
     description:
@@ -312,10 +312,10 @@ packages:
     dependency: transitive
     description:
       name: dart_style
-      sha256: "7306ab8a2359a48d22310ad823521d723acfed60ee1f7e37388e8986853b6820"
+      sha256: "27eb0ae77836989a3bc541ce55595e8ceee0992807f14511552a898ddd0d88ac"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.3.8"
+    version: "3.0.1"
   dartx:
     dependency: transitive
     description:
@@ -336,10 +336,10 @@ packages:
     dependency: "direct main"
     description:
       name: device_info_plus
-      sha256: a7fd703482b391a87d60b6061d04dfdeab07826b96f9abd8f5ed98068acc0074
+      sha256: "98f28b42168cc509abc92f88518882fd58061ea372d7999aecc424345c7bff6a"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "10.1.2"
+    version: "11.5.0"
   device_info_plus_platform_interface:
     dependency: transitive
     description:
@@ -352,10 +352,10 @@ packages:
     dependency: "direct main"
     description:
       name: dio
-      sha256: "5598aa796bbf4699afd5c67c0f5f6e2ed542afc956884b9cd58c306966efc260"
+      sha256: d90ee57923d1828ac14e492ca49440f65477f4bb1263575900be731a3dac66a9
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "5.7.0"
+    version: "5.9.0"
   dio_web_adapter:
     dependency: transitive
     description:
@@ -461,18 +461,18 @@ packages:
     dependency: transitive
     description:
       name: flutter_gen_core
-      sha256: "53890b653738f34363d9f0d40f82104c261716bd551d3ba65f648770b6764c21"
+      sha256: eda54fdc5de08e7eeea663eb8442aafc8660b5a13fda4e0c9e572c64e50195fb
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "5.9.0"
+    version: "5.11.0"
   flutter_gen_runner:
     dependency: "direct dev"
     description:
       name: flutter_gen_runner
-      sha256: de70b42eb5329f712c8b041069d081ad5fb5109f32d6d1ea9c1b39596786215d
+      sha256: "669bf8b7a9b4acbdcb7fcc5e12bf638aca19acedf43341714cbca3bf3a219521"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "5.9.0"
+    version: "5.11.0"
   flutter_inappwebview:
     dependency: "direct main"
     description:
@@ -569,10 +569,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_smart_dialog
-      sha256: "3d376ba47f64391cc657f706815b32dd6ff2e0f80553a5c9f33b812ba7c59462"
+      sha256: "0852df132cb03fd8fc5144eb404c31eb7eb50c22aecb1cc2504f2f598090d756"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "4.9.8"
+    version: "4.9.8+9"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -764,10 +764,10 @@ packages:
     dependency: "direct dev"
     description:
       name: injectable_generator
-      sha256: af403d76c7b18b4217335e0075e950cd0579fd7f8d7bd47ee7c85ada31680ba1
+      sha256: b04673a4c88b3a848c0c77bf58b8309f9b9e064d9fe1df5450c8ee1675eaea1a
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.6.2"
+    version: "2.7.0"
   internet_connection_checker:
     dependency: "direct main"
     description:
@@ -812,10 +812,10 @@ packages:
     dependency: "direct dev"
     description:
       name: json_serializable
-      sha256: c2fcb3920cf2b6ae6845954186420fca40bc0a8abcc84903b7801f17d7050d7c
+      sha256: c50ef5fc083d5b5e12eef489503ba3bf5ccc899e487d691584699b4bdefeea8c
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "6.9.0"
+    version: "6.9.5"
   leak_tracker:
     dependency: transitive
     description:
@@ -1026,10 +1026,10 @@ packages:
     dependency: "direct main"
     description:
       name: package_info_plus
-      sha256: da8d9ac8c4b1df253d1a328b7bf01ae77ef132833479ab40763334db13b91cce
+      sha256: "16eee997588c60225bda0488b6dcfac69280a6b7a3cf02c741895dd370a02968"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "8.1.1"
+    version: "8.3.1"
   package_info_plus_platform_interface:
     dependency: transitive
     description:
@@ -1106,18 +1106,18 @@ packages:
     dependency: "direct main"
     description:
       name: permission_handler
-      sha256: "18bf33f7fefbd812f37e72091a15575e72d5318854877e0e4035a24ac1113ecb"
+      sha256: bc917da36261b00137bbc8896bf1482169cd76f866282368948f032c8c1caae1
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "11.3.1"
+    version: "12.0.1"
   permission_handler_android:
     dependency: transitive
     description:
       name: permission_handler_android
-      sha256: d3971dcdd76182a0c198c096b5db2f0884b0d4196723d21a866fc4cdea057ebc
+      sha256: "1e3bc410ca1bf84662104b100eb126e066cb55791b7451307f9708d4007350e6"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "12.1.0"
+    version: "13.0.1"
   permission_handler_apple:
     dependency: transitive
     description:
@@ -1202,10 +1202,10 @@ packages:
     dependency: transitive
     description:
       name: protobuf
-      sha256: "68645b24e0716782e58948f8467fd42a880f255096a821f9e7d0ec625b00c84d"
+      sha256: de9c9eb2c33f8e933a42932fe1dc504800ca45ebc3d673e6ed7f39754ee4053e
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "3.1.0"
+    version: "4.2.0"
   pub_semver:
     dependency: transitive
     description:
@@ -1266,18 +1266,18 @@ packages:
     dependency: "direct main"
     description:
       name: retrofit
-      sha256: "3c9885ef3dbc5dc4b3fb0a40c972ab52e4dad04d52dac9bba24dfa76cf100451"
+      sha256: "84d70114a5b6bae5f4c1302335f9cb610ebeb1b02023d5e7e87697aaff52926a"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "4.4.1"
+    version: "4.6.0"
   retrofit_generator:
     dependency: "direct dev"
     description:
       name: retrofit_generator
-      sha256: f76fdb2b66854690d5a332e7364d7561fc9dc2b3c924d7956ab8070495e21f6a
+      sha256: "65d28d3a7b4db485f1c73fee8ee32f552ef23ee4ecb68ba491f39d80b73bdcbf"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "9.1.5"
+    version: "9.2.0"
   rxdart:
     dependency: transitive
     description:
@@ -1327,10 +1327,10 @@ packages:
     dependency: transitive
     description:
       name: source_gen
-      sha256: "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832"
+      sha256: "35c8150ece9e8c8d263337a265153c3329667640850b9304861faea59fc98f6b"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.5.0"
+    version: "2.0.0"
   source_helper:
     dependency: transitive
     description:
@@ -1496,10 +1496,10 @@ packages:
     dependency: "direct main"
     description:
       name: url_launcher
-      sha256: "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603"
+      sha256: f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "6.3.1"
+    version: "6.3.2"
   url_launcher_android:
     dependency: transitive
     description:
@@ -1696,10 +1696,10 @@ packages:
     dependency: transitive
     description:
       name: win32_registry
-      sha256: "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852"
+      sha256: "6f1b564492d0147b330dd794fee8f512cec4977957f310f9951b5f9d83618dae"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.1.5"
+    version: "2.1.0"
   xdg_directories:
     dependency: transitive
     description: