4 Commity ed704922d7 ... 623f30be36

Autor SHA1 Wiadomość Data
  “HeShaoZe” 623f30be36 [fix]取消购买显示toast 2 miesięcy temu
  “HeShaoZe” a72b01f7c0 [fix]首次打开‘我’显示英文,部分文案图片替换 2 miesięcy temu
  zk 8e149d2e06 [fix]解决ios添加好友会员页返回键盘输入遮盖的问题 2 miesięcy temu
  “HeShaoZe” 8f00af500c ios 2 miesięcy temu

BIN
assets/images/icon_main_add_friend_ios.webp


Plik diff jest za duży
+ 575 - 859
lib/data/api/atmob_api.g.dart


+ 1 - 1
lib/data/repositories/account_repository.dart

@@ -60,7 +60,7 @@ class AccountRepository {
 
   final Rx<UserInfo> mineUserInfo = Rx<UserInfo>(UserInfo(
       id: Constants.mineLocationId,
-      phoneNumber: StringName.locationMine,
+      phoneNumber: "我",
       isMine: true));
 
   AccountRepository(this.atmobApi) {

+ 11 - 10
lib/di/get_it.config.dart

@@ -1,3 +1,4 @@
+// dart format width=80
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
 // **************************************************************************
@@ -64,15 +65,15 @@ extension GetItInjectableX on _i174.GetIt {
       environmentFilter,
     );
     final networkModule = _$NetworkModule();
+    gh.factory<_i973.SplashController>(() => _i973.SplashController());
+    gh.factory<_i756.TrackDetailController>(
+        () => _i756.TrackDetailController());
     gh.factory<_i256.AboutController>(() => _i256.AboutController());
-    gh.factory<_i923.BrowserController>(() => _i923.BrowserController());
     gh.factory<_i769.FeedBackController>(() => _i769.FeedBackController());
+    gh.factory<_i923.BrowserController>(() => _i923.BrowserController());
     gh.factory<_i779.NewsReportController>(() => _i779.NewsReportController());
     gh.factory<_i108.PermissionSettingController>(
         () => _i108.PermissionSettingController());
-    gh.factory<_i973.SplashController>(() => _i973.SplashController());
-    gh.factory<_i756.TrackDetailController>(
-        () => _i756.TrackDetailController());
     gh.singleton<_i361.Dio>(() => networkModule.createDefaultDio());
     gh.lazySingleton<_i772.InternetConnectionHelper>(
         () => _i772.InternetConnectionHelper());
@@ -86,14 +87,14 @@ extension GetItInjectableX on _i174.GetIt {
         .provideAtmobStreamApi(gh<_i361.Dio>(instanceName: 'stream')));
     gh.lazySingleton<_i20.AccountRepository>(
         () => _i20.AccountRepository(gh<_i243.AtmobApi>()));
-    gh.lazySingleton<_i850.ContactRepository>(
-        () => _i850.ContactRepository(gh<_i243.AtmobApi>()));
+    gh.lazySingleton<_i274.PhoneEventRepository>(
+        () => _i274.PhoneEventRepository(gh<_i243.AtmobApi>()));
     gh.lazySingleton<_i1053.FriendsRepository>(
         () => _i1053.FriendsRepository(gh<_i243.AtmobApi>()));
+    gh.lazySingleton<_i850.ContactRepository>(
+        () => _i850.ContactRepository(gh<_i243.AtmobApi>()));
     gh.lazySingleton<_i791.MessageRepository>(
         () => _i791.MessageRepository(gh<_i243.AtmobApi>()));
-    gh.lazySingleton<_i274.PhoneEventRepository>(
-        () => _i274.PhoneEventRepository(gh<_i243.AtmobApi>()));
     gh.lazySingleton<_i983.UrgentContactRepository>(
         () => _i983.UrgentContactRepository(gh<_i243.AtmobApi>()));
     gh.lazySingleton<_i220.AtmobLocationClient>(
@@ -129,10 +130,10 @@ extension GetItInjectableX on _i174.GetIt {
               gh<_i983.UrgentContactRepository>(),
               gh<_i20.AccountRepository>(),
             ));
-    gh.factory<_i897.AddFriendDialogController>(
-        () => _i897.AddFriendDialogController(gh<_i1053.FriendsRepository>()));
     gh.factory<_i492.FriendSettingController>(
         () => _i492.FriendSettingController(gh<_i1053.FriendsRepository>()));
+    gh.factory<_i897.AddFriendDialogController>(
+        () => _i897.AddFriendDialogController(gh<_i1053.FriendsRepository>()));
     gh.lazySingleton<_i814.MemberRepository>(() => _i814.MemberRepository(
           gh<_i243.AtmobApi>(),
           gh<_i20.AccountRepository>(),

+ 6 - 4
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) {

+ 1 - 1
lib/module/add_friend/add_friend_page.dart

@@ -102,7 +102,7 @@ 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,

+ 3 - 2
lib/module/main/main_page.dart

@@ -330,8 +330,9 @@ 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)),
             )
           ],
         ),

+ 3 - 3
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;
     }
   }
 

+ 4 - 0
lib/module/member/member_controller.dart

@@ -456,6 +456,10 @@ class MemberController extends BaseController implements PaymentStatusCallback {
     } else {
       LoadingDialog.hide();
       print('购买失败: ${result['error']}');
+      if (Platform.isIOS) {
+        ToastUtil.show("支付失败,请稍后重试");
+        return;
+      }
       showBackPaymentFailureDialog();
     }
   }

+ 4 - 4
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;
     }
   }
 

+ 22 - 1
lib/resource/assets.gen.dart

@@ -1,3 +1,5 @@
+// dart format width=80
+
 /// GENERATED CODE - DO NOT MODIFY BY HAND
 /// *****************************************************
 ///  FlutterGen
@@ -5,7 +7,7 @@
 
 // coverage:ignore-file
 // ignore_for_file: type=lint
-// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use
+// ignore_for_file: deprecated_member_use,directives_ordering,implicit_dynamic_list_literal,unnecessary_import
 
 import 'package:flutter/widgets.dart';
 
@@ -283,6 +285,10 @@ class $AssetsImagesGen {
   AssetGenImage get iconMainAddFriend =>
       const AssetGenImage('assets/images/icon_main_add_friend.webp');
 
+  /// File path: assets/images/icon_main_add_friend_ios.webp
+  AssetGenImage get iconMainAddFriendIos =>
+      const AssetGenImage('assets/images/icon_main_add_friend_ios.webp');
+
   /// File path: assets/images/icon_main_friend_guard.webp
   AssetGenImage get iconMainFriendGuard =>
       const AssetGenImage('assets/images/icon_main_friend_guard.webp');
@@ -826,6 +832,7 @@ class $AssetsImagesGen {
         iconLogo,
         iconLogoMax,
         iconMainAddFriend,
+        iconMainAddFriendIos,
         iconMainFriendGuard,
         iconMainFriendGuardAndroid,
         iconMainHelp,
@@ -962,12 +969,14 @@ class AssetGenImage {
     this._assetName, {
     this.size,
     this.flavors = const {},
+    this.animation,
   });
 
   final String _assetName;
 
   final Size? size;
   final Set<String> flavors;
+  final AssetGenImageAnimation? animation;
 
   Image image({
     Key? key,
@@ -1037,3 +1046,15 @@ class AssetGenImage {
 
   String get keyName => _assetName;
 }
+
+class AssetGenImageAnimation {
+  const AssetGenImageAnimation({
+    required this.isAnimation,
+    required this.duration,
+    required this.frames,
+  });
+
+  final bool isAnimation;
+  final Duration duration;
+  final int frames;
+}

+ 2 - 1
lib/resource/colors.gen.dart

@@ -1,3 +1,4 @@
+// dart format width=80
 /// GENERATED CODE - DO NOT MODIFY BY HAND
 /// *****************************************************
 ///  FlutterGen
@@ -5,7 +6,7 @@
 
 // coverage:ignore-file
 // ignore_for_file: type=lint
-// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use
+// ignore_for_file: deprecated_member_use,directives_ordering,implicit_dynamic_list_literal,unnecessary_import
 
 import 'package:flutter/painting.dart';
 import 'package:flutter/material.dart';

+ 2 - 1
lib/resource/fonts.gen.dart

@@ -1,3 +1,4 @@
+// dart format width=80
 /// GENERATED CODE - DO NOT MODIFY BY HAND
 /// *****************************************************
 ///  FlutterGen
@@ -5,7 +6,7 @@
 
 // coverage:ignore-file
 // ignore_for_file: type=lint
-// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use
+// ignore_for_file: deprecated_member_use,directives_ordering,implicit_dynamic_list_literal,unnecessary_import
 
 class FontFamily {
   FontFamily._();

+ 13 - 26
lib/resource/string.gen.dart

@@ -19,8 +19,7 @@ class StringName {
   static String get friendAddIosTitle => 'friend_add_ios_title'.tr; // 查找好友
   static String get friendAddDesc => 'friend_add_desc'.tr; // 查看实时定位,开启轨迹守护
   static String get friendAddFromPhone => 'friend_add_from_phone'.tr; // 添加手机号
-  static String get friendAddFromPhoneIos =>
-      'friend_add_from_phone_ios'.tr; // 查找手机号
+  static String get friendAddFromPhoneIos => 'friend_add_from_phone_ios'.tr; // 查找手机号
   static String get friendAddPhoneEtHint => 'friend_add_phone_et_hint'.tr; // 请输入手机号
   static String get friendAddAddressBook => 'friend_add_address_book'.tr; // 通讯录
   static String get friendAddFromWx => 'friend_add_from_wx'.tr; // 通过微信添加
@@ -98,8 +97,7 @@ class StringName {
   static String get dialogAddFriendTitle => 'dialog_add_friend_title'.tr; // 实时定位轨迹
   static String get dialogAddFriendDesc => 'dialog_add_friend_desc'.tr; // 去添加Ta的手机号码
   static String get dialogAddFriendBtn => 'dialog_add_friend_btn'.tr; // 立即添加
-  static String get dialogAddFriendBtnIos =>
-      'dialog_add_friend_btn_ios'.tr; // 立即查找
+  static String get dialogAddFriendBtnIos => 'dialog_add_friend_btn_ios'.tr; // 立即查找
   static String get dialogRecordLocation => 'dialog_record_location'.tr; // 记录轨迹
   static String get dialogRecordLocationHasPermission => 'dialog_record_location_has_permission'.tr; // 开启定位权限
   static String get dialogRecordLocationNotRequest => 'dialog_record_location_not_request'.tr; // 暂不开启
@@ -130,8 +128,7 @@ class StringName {
   static String get goRequestContactsPermission => 'go_request_contacts_permission'.tr; // 去申请
   static String get requestContactsContent => 'request_contacts_content'.tr; // 申请“通讯录权限”为了更便利读取通信录联系人信息,无需再手动输入
   static String get permissionRequestFail => 'permission_request_fail'.tr; // 权限申请失败
-  static String get friendAddExplain => 'friend_add_explain'
-      .tr; // 1.对方同意或授权后才可定位。\n2.如果您的好友还没有下载该应用,建议您邀请他们下载安装。\n3.通过同意添加该用户为您的好友,即表示您同意本软件合法地收集、存储和使用您的信息,并将位置等信息与该好友分享。
+  static String get friendAddExplain => 'friend_add_explain'.tr; // 1.对方同意或授权后才可定位。\n2.如果您的好友还没有下载该应用,建议您邀请他们下载安装。\n3.通过同意添加该用户为您的好友,即表示您同意本软件合法地收集、存储和使用您的信息,并将位置等信息与该好友分享。
   static String get dialogNotLogin => 'dialog_not_login'.tr; // 登录之后才可以发送好友申请
   static String get dialogGoLogin => 'dialog_go_login'.tr; // 去登录
   static String get inviteFriends => 'invite_friends'.tr; // 邀请好友
@@ -182,8 +179,7 @@ class StringName {
   static String get urgentContactBtnTxt => 'urgent_contact_btn_txt'.tr; // 添加紧急联系人
   static String get urgentContactOnceClickHelp => 'urgent_contact_once_click_help'.tr; // 使用一键求助
   static String get urgentContactOnceClickHelpDesc => 'urgent_contact_once_click_help_desc'.tr; // 需要添加正确的紧急联系人手机号码,您的联系人将会收到短信以及APP消息通知
-  static String get messageAddFriendSureContent => 'message_add_friend_sure_content'
-      .tr; // 1.您同意或授权后才会将定位位置、轨迹等信息分享给该好友。\n2.您同意添加该用户为好友,则视为您同意本应用合法收集储存和使用信息。
+  static String get messageAddFriendSureContent => 'message_add_friend_sure_content'.tr; // 1.您同意或授权后才会将定位位置、轨迹等信息分享给该好友。\n2.您同意添加该用户为好友,则视为您同意本应用合法收集储存和使用信息。
   static String get urgentContactHasBeenAdded => 'urgent_contact_has_been_added'.tr; // 对方已是您的紧急联系人
   static String get urgentContactAddDesc => 'urgent_contact_add_desc'.tr; // 紧急情况,快速求助
   static String get urgentContactAddSuccess => 'urgent_contact_add_success'.tr; // 添加成功
@@ -240,8 +236,7 @@ class StringName {
   static String get memberUserEvaluate => 'member_user_evaluate'.tr; // 用户评价
   static String get memberTips => 'member_tips'.tr; // 本应用功能仅限于家庭成员和亲人朋友之间使用,根据相关法规和隐私协议规定,共享位置功能需要对方下载得到好友授权同意才能正常使用。
   static String get memberContinuePay => 'member_continue_pay'.tr; // 继续支付
-  static String get memberContinuePayIos =>
-      'member_continue_pay_ios'.tr; // 解锁更多权益
+  static String get memberContinuePayIos => 'member_continue_pay_ios'.tr; // 解锁更多权益
   static String get memberPleaseChoiceGoods => 'member_please_choice_goods'.tr; // 请选择支付商品
   static String get memberPleaseChoicePayment => 'member_please_choice_payment'.tr; // 请选择支付方式
   static String get payLoading => 'pay_loading'.tr; // 请求中...
@@ -330,17 +325,12 @@ class StringName {
   static String get trackStayShareLogoDesc => 'track_stay_share_logo_desc'.tr; // 为你重要的朋友保驾护航
   static String get trackStayShareAnalysis => 'track_stay_share_analysis'.tr; // loca分析中,请稍等..
   static String get memberActivityTitle => 'member_activity_title'.tr; // 超值优惠
-  static String get memberActivityNoPayway =>
-      'member_activity_no_payway'.tr; // 暂无支付方式
-  static String get memberActivityFunTitle =>
-      'member_activity_fun_title'.tr; // 功能介绍
-  static String get memberActivityCountdown =>
-      'member_activity_countdown'.tr; // 优惠活动倒计时
-  static String get memberActivitySpeciallyPreferential =>
-      'member_activity_specially_preferential'.tr; // 限时特惠
+  static String get memberActivityNoPayway => 'member_activity_no_payway'.tr; // 暂无支付方式
+  static String get memberActivityFunTitle => 'member_activity_fun_title'.tr; // 功能介绍
+  static String get memberActivityCountdown => 'member_activity_countdown'.tr; // 优惠活动倒计时
+  static String get memberActivitySpeciallyPreferential => 'member_activity_specially_preferential'.tr; // 限时特惠
   static String get memberActivityToBuy => 'member_activity_to_buy'.tr; // 去使用
-  static String get memberIosPayDesc => 'member_ios_pay_desc'
-      .tr; // 1.订阅后会从您的iunes账户中扣除相关费用。如需取消续订,请在当前订阅周期结束前,至少24小时内通过手机“账户设置”的订阅管理关闭自动续费功能。 \n2.未成年人请在监护者的陪同下进行购买。 \n3.购买后不支持退款,请仔细审阅《隐私权政策》《用户协议》和《会员协议》。
+  static String get memberIosPayDesc => 'member_ios_pay_desc'.tr; // 1.订阅后会从您的iunes账户中扣除相关费用。如需取消续订,请在当前订阅周期结束前,至少24小时内通过手机“账户设置”的订阅管理关闭自动续费功能。 \n2.未成年人请在监护者的陪同下进行购买。 \n3.购买后不支持退款,请仔细审阅《隐私权政策》《用户协议》和《会员协议》。
 }
 class StringMultiSource {
   StringMultiSource._();
@@ -472,8 +462,7 @@ class StringMultiSource {
       'go_request_contacts_permission': '去申请',
       'request_contacts_content': '申请“通讯录权限”为了更便利读取通信录联系人信息,无需再手动输入',
       'permission_request_fail': '权限申请失败',
-      'friend_add_explain':
-          '1.对方同意或授权后才可定位。\n2.如果您的好友还没有下载该应用,建议您邀请他们下载安装。\n3.通过同意添加该用户为您的好友,即表示您同意本软件合法地收集、存储和使用您的信息,并将位置等信息与该好友分享。',
+      'friend_add_explain': '1.对方同意或授权后才可定位。\n2.如果您的好友还没有下载该应用,建议您邀请他们下载安装。\n3.通过同意添加该用户为您的好友,即表示您同意本软件合法地收集、存储和使用您的信息,并将位置等信息与该好友分享。',
       'dialog_not_login': '登录之后才可以发送好友申请',
       'dialog_go_login': '去登录',
       'invite_friends': '邀请好友',
@@ -524,8 +513,7 @@ class StringMultiSource {
       'urgent_contact_btn_txt': '添加紧急联系人',
       'urgent_contact_once_click_help': '使用一键求助',
       'urgent_contact_once_click_help_desc': '需要添加正确的紧急联系人手机号码,您的联系人将会收到短信以及APP消息通知',
-      'message_add_friend_sure_content':
-          '1.您同意或授权后才会将定位位置、轨迹等信息分享给该好友。\n2.您同意添加该用户为好友,则视为您同意本应用合法收集储存和使用信息。',
+      'message_add_friend_sure_content': '1.您同意或授权后才会将定位位置、轨迹等信息分享给该好友。\n2.您同意添加该用户为好友,则视为您同意本应用合法收集储存和使用信息。',
       'urgent_contact_has_been_added': '对方已是您的紧急联系人',
       'urgent_contact_add_desc': '紧急情况,快速求助',
       'urgent_contact_add_success': '添加成功',
@@ -676,8 +664,7 @@ class StringMultiSource {
       'member_activity_countdown': '优惠活动倒计时',
       'member_activity_specially_preferential': '限时特惠',
       'member_activity_to_buy': '去使用',
-      'member_ios_pay_desc':
-          '1.订阅后会从您的iunes账户中扣除相关费用。如需取消续订,请在当前订阅周期结束前,至少24小时内通过手机“账户设置”的订阅管理关闭自动续费功能。 \n2.未成年人请在监护者的陪同下进行购买。 \n3.购买后不支持退款,请仔细审阅《隐私权政策》《用户协议》和《会员协议》。',
+      'member_ios_pay_desc': '1.订阅后会从您的iunes账户中扣除相关费用。如需取消续订,请在当前订阅周期结束前,至少24小时内通过手机“账户设置”的订阅管理关闭自动续费功能。 \n2.未成年人请在监护者的陪同下进行购买。 \n3.购买后不支持退款,请仔细审阅《隐私权政策》《用户协议》和《会员协议》。',
     },
   };
 }

+ 17 - 17
pubspec.yaml

@@ -35,17 +35,17 @@ dependencies:
   get: 4.7.2
 
   # 网络
-  dio: 5.7.0
+  dio: ^5.8.0+1
   pretty_dio_logger: 1.4.0
-  retrofit: 4.4.1
+  retrofit: ^4.6.0
   json_annotation: 4.9.0
 
   #获取设备信息
-  device_info_plus: 10.1.2
+  device_info_plus: ^11.5.0
   android_id: 0.4.0
 
   # 包信息
-  package_info_plus: 8.1.1
+  package_info_plus: ^8.3.0
 
   # 隐私追踪
   app_tracking_transparency: ^2.0.5
@@ -54,13 +54,13 @@ dependencies:
   flutter_screenutil: 5.9.3
 
   # 弹窗
-  flutter_smart_dialog: 4.9.8
+  flutter_smart_dialog: ^4.9.8+8
 
   #数据存储
   mmkv: 2.2.2
 
   #权限申请
-  permission_handler: 11.3.1
+  permission_handler: ^12.0.1
 
   #上、下拉刷新
   pull_to_refresh: 2.0.0
@@ -73,7 +73,7 @@ dependencies:
   injectable: 2.5.0
 
   #日期格式化等
-  intl: 0.19.0
+  intl: ^0.20.2
 
   #webview
   flutter_inappwebview: ^6.1.5
@@ -98,7 +98,7 @@ dependencies:
   flutter_cupertino_datetime_picker: ^3.0.0
 
   #拨号
-  url_launcher: 6.3.1
+  url_launcher: ^6.3.2
 
   #并发
   synchronized: ^3.3.0+2
@@ -170,12 +170,12 @@ dependencies:
   map_amap_android:
     path: plugins/map_amap_android
 
-#  map_mapkit_ios:
-#    path: plugins/map_mapkit_ios
+  #  map_mapkit_ios:
+  #    path: plugins/map_mapkit_ios
 
   map_amap_ios:
     path: plugins/map_amap_ios
-  
+
   ######################地图########################
 
   #日志打印
@@ -215,15 +215,15 @@ dev_dependencies:
 
   retrofit_generator: '>=8.0.0 <10.0.0'
 
-  build_runner: 2.4.13
+  build_runner: ^2.5.4
 
-  json_serializable: 6.9.0
+  json_serializable: ^6.9.5
 
-  flutter_gen_runner: 5.9.0
+  flutter_gen_runner: ^5.10.0
 
-  flutter_lints: ^5.0.0
+  flutter_lints: ^6.0.0
 
-  injectable_generator: 2.6.2
+  injectable_generator: ^2.7.0
 
   string_get_runner:
     git:
@@ -278,4 +278,4 @@ flutter:
 wechat_kit:
   ios: no_pay # 默认 pay
   app_id: wxd423dc54a6fd1640
-  universal_link: https://ssdw.myaskai.cn/
+  universal_link: https://ssdw.myaskai.cn/