assets/string/base/string.xml

@@ -126,7 +126,7 @@
     <string name="friend_edit_block_title">不给Ta看</string>
     <string name="blocked_friend">已屏蔽该好友</string>
     <string name="block_friend_off">屏蔽好友已关闭</string>
-    <string name="friend_delete">删除好友</string>
+    <string name="friend_delete">屏蔽好友</string>
     <string name="kindly_reminder">温馨提示</string>
     <string name="friend_delete_content">
         互删好友后，双方将停止共享位置，清除相关定位记录并屏蔽，是否确认互删

lib/data/consts/constants.dart

@@ -1,7 +1,7 @@
 class Constants {
   Constants._();
 
-  static const String env = envDev;
+  static const String env = envProd;
 
   static const String envDev = 'dev';
 

lib/module/mine/mine_controller.dart

@@ -156,13 +156,6 @@ class MineController extends BaseController {
 
   ///会员倒计时到期弹出提示窗
   void promptWindowPopsCountdownExpires() {
-    memberRepository
-        .memberTrailInfo()
-        .then((infoRespons) {
-      MineExpirationReminderDialog.show(infoResponse: infoRespons,onDic: () {
-        onMemberCardClick();
-      });
-      //MineExpirationReminderDialog.show(infoResponse: infoResponse);
-    }).catchError((){});
+
   }
 }

lib/module/mine/mine_countdown_timer_manager.dart

@@ -17,6 +17,8 @@ class MineCountdownTimerManager {
   final Map<String, StreamController<String>> _streamControllers = {};
   final Map<String, Completer<void>> _completers = {};
 
+  var areShowAlartView = true;
+
   /// 启动倒计时
   Future<void> startCountdown({
     required String key, // 倒计时唯一标识
@@ -57,16 +59,28 @@ class MineCountdownTimerManager {
         _completers[key]?.complete();
         _completers.remove(key);
 
-        ///弹出提示框
-        MemberRepository memberRepository = MemberRepository.getInstance();
-        memberRepository
-            .memberTrailInfo()
-            .then((infoRespons) {
-          MineExpirationReminderDialog.show(infoResponse: infoRespons,onDic: () {
-            MemberPage.start(enterTyp: MemberPageType.afeterTrialMemberEnter);
+        if (areShowAlartView) {
+          areShowAlartView = false;
+          ///弹出提示框
+          MemberRepository memberRepository = MemberRepository.getInstance();
+          memberRepository
+              .memberTrailInfo()
+              .then((infoRespons) {
+            MineExpirationReminderDialog.show(infoResponse: infoRespons,
+                onDic: () {
+                  areShowAlartView = true;
+                  MemberPage.start(enterTyp: MemberPageType.afeterTrialMemberEnter);
+                },
+                cancelOnTap: () {
+                  areShowAlartView = true;
+                }
+            );
+            //MineExpirationReminderDialog.show(infoResponse: infoResponse);
+          }).catchError((){
+            areShowAlartView = true;
           });
-          //MineExpirationReminderDialog.show(infoResponse: infoResponse);
-        }).catchError((){});
+        }
+
       } else {
         // 发送更新通知
         String formattedTime = formatDuration(newRemaining);

lib/module/mine/mine_expiration_reminder_dialog.dart

@@ -30,6 +30,9 @@ class MineExpirationReminderDialog {
                 infoResponse: infoResponse,
                 cancelOnTap: () {
                   Get.back();
+                  if (cancelOnTap != null) {
+                    cancelOnTap();
+                  }
                 },
                 confirmOnTap: onDic)
           ],

lib/module/news/news_controller.dart

@@ -36,8 +36,6 @@ class NewsController extends BaseController {
 
   RxList<MessageInfo> messageList = RxList();
 
-  RxInt isLongTapIndex = RxInt(-1);
-
   NewsController(this.messageRepository);
 
   @override
@@ -152,6 +150,6 @@ class NewsController extends BaseController {
   ///用户是否在长安
   void onUserIsLongEventClick(int longIndex) {
     print("longIndexsfsdfs---${longIndex}");
-    isLongTapIndex.value = longIndex;
+    onReportEventClick();
   }
 }

lib/module/news/news_page.dart

@@ -192,15 +192,15 @@ class NewsPage extends BasePage<NewsController> {
     final item = controller.messageList[index];
     return GestureDetector(
       onLongPress: () {
-        controller.onUserIsLongEventClick(index);
+        if (item.type == 3 || item.type == 4) {
+          controller.onUserIsLongEventClick(index);
+        }
       },
-      child: Obx(() {
-        return buildMessageInfoItem(
-            item, (info) => controller.onMessageFunClick(info),
-            isShowReportButton: (controller.isLongTapIndex.value == index) && Platform.isIOS && (item.type == 3 || item.type == 4),
-            onReportEvent: (item.type == 3 || item.type == 4) ? controller.onReportEventClick : null
-        );
-      }),
+      child: buildMessageInfoItem(
+          item, (info) => controller.onMessageFunClick(info),
+          isShowReportButton: Platform.isIOS && (item.type == 3),
+          onReportEvent: (item.type == 3) ? controller.onReportEventClick : null
+      ),
     );
   }
 

lib/resource/assets.gen.dart

@@ -35,7 +35,8 @@ class $AssetsImagesGen {
 
   /// File path: assets/images/bg_dialog_location_permission_ios.webp
   AssetGenImage get bgDialogLocationPermissionIos => const AssetGenImage(
-      'assets/images/bg_dialog_location_permission_ios.webp');
+    'assets/images/bg_dialog_location_permission_ios.webp',
+  );
 
   /// File path: assets/images/bg_dialog_track_error.webp
   AssetGenImage get bgDialogTrackError =>
@@ -271,7 +272,8 @@ class $AssetsImagesGen {
 
   /// File path: assets/images/icon_main_refresh_friend_location.webp
   AssetGenImage get iconMainRefreshFriendLocation => const AssetGenImage(
-      'assets/images/icon_main_refresh_friend_location.webp');
+    'assets/images/icon_main_refresh_friend_location.webp',
+  );
 
   /// File path: assets/images/icon_main_refresh_mine_location.webp
   AssetGenImage get iconMainRefreshMineLocation =>
@@ -287,7 +289,8 @@ class $AssetsImagesGen {
 
   /// File path: assets/images/icon_member_comment_very_satisfied.webp
   AssetGenImage get iconMemberCommentVerySatisfied => const AssetGenImage(
-      'assets/images/icon_member_comment_very_satisfied.webp');
+    'assets/images/icon_member_comment_very_satisfied.webp',
+  );
 
   /// File path: assets/images/icon_member_contact_click_help.webp
   AssetGenImage get iconMemberContactClickHelp =>
@@ -295,7 +298,8 @@ class $AssetsImagesGen {
 
   /// File path: assets/images/icon_member_contact_click_help_close.webp
   AssetGenImage get iconMemberContactClickHelpClose => const AssetGenImage(
-      'assets/images/icon_member_contact_click_help_close.webp');
+    'assets/images/icon_member_contact_click_help_close.webp',
+  );
 
   /// File path: assets/images/icon_member_fun5.webp
   AssetGenImage get iconMemberFun5 =>
@@ -323,11 +327,13 @@ class $AssetsImagesGen {
 
   /// File path: assets/images/icon_member_ordinary_product_normal.webp
   AssetGenImage get iconMemberOrdinaryProductNormal => const AssetGenImage(
-      'assets/images/icon_member_ordinary_product_normal.webp');
+    'assets/images/icon_member_ordinary_product_normal.webp',
+  );
 
   /// File path: assets/images/icon_member_ordinary_product_select.webp
   AssetGenImage get iconMemberOrdinaryProductSelect => const AssetGenImage(
-      'assets/images/icon_member_ordinary_product_select.webp');
+    'assets/images/icon_member_ordinary_product_select.webp',
+  );
 
   /// File path: assets/images/icon_member_payment_completed.webp
   AssetGenImage get iconMemberPaymentCompleted =>
@@ -347,11 +353,13 @@ class $AssetsImagesGen {
 
   /// File path: assets/images/icon_member_special_products_normal.webp
   AssetGenImage get iconMemberSpecialProductsNormal => const AssetGenImage(
-      'assets/images/icon_member_special_products_normal.webp');
+    'assets/images/icon_member_special_products_normal.webp',
+  );
 
   /// File path: assets/images/icon_member_special_products_select.webp
   AssetGenImage get iconMemberSpecialProductsSelect => const AssetGenImage(
-      'assets/images/icon_member_special_products_select.webp');
+    'assets/images/icon_member_special_products_select.webp',
+  );
 
   /// File path: assets/images/icon_member_vip_back.webp
   AssetGenImage get iconMemberVipBack =>
@@ -403,7 +411,8 @@ class $AssetsImagesGen {
 
   /// File path: assets/images/icon_mine_fun_permission_setting.webp
   AssetGenImage get iconMineFunPermissionSetting => const AssetGenImage(
-      'assets/images/icon_mine_fun_permission_setting.webp');
+    'assets/images/icon_mine_fun_permission_setting.webp',
+  );
 
   /// File path: assets/images/icon_mine_fun_share.webp
   AssetGenImage get iconMineFunShare =>
@@ -431,19 +440,23 @@ class $AssetsImagesGen {
 
   /// File path: assets/images/icon_mine_trial_expiration_header.webp
   AssetGenImage get iconMineTrialExpirationHeader => const AssetGenImage(
-      'assets/images/icon_mine_trial_expiration_header.webp');
+    'assets/images/icon_mine_trial_expiration_header.webp',
+  );
 
   /// File path: assets/images/icon_mine_trial_expiration_pause_bg.webp
   AssetGenImage get iconMineTrialExpirationPauseBg => const AssetGenImage(
-      'assets/images/icon_mine_trial_expiration_pause_bg.webp');
+    'assets/images/icon_mine_trial_expiration_pause_bg.webp',
+  );
 
   /// File path: assets/images/icon_mine_trial_expiration_question.webp
   AssetGenImage get iconMineTrialExpirationQuestion => const AssetGenImage(
-      'assets/images/icon_mine_trial_expiration_question.webp');
+    'assets/images/icon_mine_trial_expiration_question.webp',
+  );
 
   /// File path: assets/images/icon_mine_trial_expiration_recommend.webp
   AssetGenImage get iconMineTrialExpirationRecommend => const AssetGenImage(
-      'assets/images/icon_mine_trial_expiration_recommend.webp');
+    'assets/images/icon_mine_trial_expiration_recommend.webp',
+  );
 
   /// File path: assets/images/icon_mine_trial_expiration_up.webp
   AssetGenImage get iconMineTrialExpirationUp =>
@@ -515,7 +528,8 @@ class $AssetsImagesGen {
 
   /// File path: assets/images/icon_track_detail_time_base_arrow.webp
   AssetGenImage get iconTrackDetailTimeBaseArrow => const AssetGenImage(
-      'assets/images/icon_track_detail_time_base_arrow.webp');
+    'assets/images/icon_track_detail_time_base_arrow.webp',
+  );
 
   /// File path: assets/images/icon_track_error.webp
   AssetGenImage get iconTrackError =>
@@ -595,19 +609,23 @@ class $AssetsImagesGen {
 
   /// File path: assets/images/img_dialog_location_always_tip_1.webp
   AssetGenImage get imgDialogLocationAlwaysTip1 => const AssetGenImage(
-      'assets/images/img_dialog_location_always_tip_1.webp');
+    'assets/images/img_dialog_location_always_tip_1.webp',
+  );
 
   /// File path: assets/images/img_dialog_location_always_tip_2.webp
   AssetGenImage get imgDialogLocationAlwaysTip2 => const AssetGenImage(
-      'assets/images/img_dialog_location_always_tip_2.webp');
+    'assets/images/img_dialog_location_always_tip_2.webp',
+  );
 
   /// File path: assets/images/img_dialog_location_always_tip_3.webp
   AssetGenImage get imgDialogLocationAlwaysTip3 => const AssetGenImage(
-      'assets/images/img_dialog_location_always_tip_3.webp');
+    'assets/images/img_dialog_location_always_tip_3.webp',
+  );
 
   /// File path: assets/images/img_member_first_week_discount_container.webp
   AssetGenImage get imgMemberFirstWeekDiscountContainer => const AssetGenImage(
-      'assets/images/img_member_first_week_discount_container.webp');
+    'assets/images/img_member_first_week_discount_container.webp',
+  );
 
   /// File path: assets/images/img_member_header_ad_1.webp
   AssetGenImage get imgMemberHeaderAd1 =>
@@ -631,7 +649,8 @@ class $AssetsImagesGen {
 
   /// File path: assets/images/img_member_user_cancels_container.webp
   AssetGenImage get imgMemberUserCancelsContainer => const AssetGenImage(
-      'assets/images/img_member_user_cancels_container.webp');
+    'assets/images/img_member_user_cancels_container.webp',
+  );
 
   /// File path: assets/images/img_track_ai_analyse.webp
   AssetGenImage get imgTrackAiAnalyse =>
@@ -647,162 +666,162 @@ class $AssetsImagesGen {
 
   /// List of all assets
   List<AssetGenImage> get values => [
-        bgAddFriendDialog,
-        bgCheckLocationPermission,
-        bgDialogLocationPermissionIos,
-        bgDialogTrackError,
-        bgFriendItem,
-        bgLocationAnalyse,
-        bgLocationAnalyseAi,
-        bgLoginHeadContainer,
-        bgMemberHeader,
-        bgMineMemberCard,
-        bgPageBackground,
-        bgTrackLocationTie,
-        bgTrackPieChat,
-        bgUrgentContactAdd,
-        bgUrgentContactEmpty,
-        bgUrgentContactLogo,
-        bgUrgentContactPopup,
-        iconAccountReplaceLogo,
-        iconAddFriendBackGround,
-        iconAgreementClose,
-        iconAlipayPayment,
-        iconAlipayScanPayment,
-        iconAppleRecoverSubscribe,
-        iconAvatarClose,
-        iconAvatarSelected,
-        iconBlackBack,
-        iconCallPhone,
-        iconCbSelected,
-        iconCbUnSelect,
-        iconCheckboxSelected,
-        iconCheckboxUnSelect,
-        iconDefaultFriendAvatar,
-        iconDefaultMineAvatar,
-        iconDialogAddFriend,
-        iconDialogClose,
-        iconDialogClose2,
-        iconDialogNetError,
-        iconEvaluate1,
-        iconEvaluate2,
-        iconEvaluate3,
-        iconEvaluate4,
-        iconEvaluate5,
-        iconExperiment,
-        iconFriendEdit,
-        iconFriendEditArrow,
-        iconFriendNews,
-        iconFriendSettingCopy,
-        iconGuard,
-        iconLoginAddressBook,
-        iconLoginClose,
-        iconLoginGoWxArrow,
-        iconLoginPhone,
-        iconLoginWx,
-        iconLogo,
-        iconLogoMax,
-        iconMainAddFriend,
-        iconMainFriendGuard,
-        iconMainHelp,
-        iconMainMapClock,
-        iconMainMine,
-        iconMainNews,
-        iconMainRefreshFriendLocation,
-        iconMainRefreshMineLocation,
-        iconMainTrackArrow,
-        iconMemberAvatar,
-        iconMemberCommentVerySatisfied,
-        iconMemberContactClickHelp,
-        iconMemberContactClickHelpClose,
-        iconMemberFun5,
-        iconMemberFun1,
-        iconMemberFun2,
-        iconMemberFun3,
-        iconMemberFun4,
-        iconMemberFun6,
-        iconMemberOrdinaryProductNormal,
-        iconMemberOrdinaryProductSelect,
-        iconMemberPaymentCompleted,
-        iconMemberRetainClose,
-        iconMemberSettlementBg,
-        iconMemberSettlementConfirm,
-        iconMemberSpecialProductsNormal,
-        iconMemberSpecialProductsSelect,
-        iconMemberVipBack,
-        iconMemberVipMiddleBg,
-        iconMemberVipMore,
-        iconMemberVipReceiveArrow,
-        iconMemberVipSign,
-        iconMessageFriendHelp,
-        iconMineFunAbout,
-        iconMineFunAccountFeedback,
-        iconMineFunArrow,
-        iconMineFunCustomerService,
-        iconMineFunExitAccount,
-        iconMineFunLogoutAccount,
-        iconMineFunPermissionSetting,
-        iconMineFunShare,
-        iconMineLogged,
-        iconMineNoLogin,
-        iconMineSmallVip,
-        iconMineTrialExpirationBg,
-        iconMineTrialExpirationHave,
-        iconMineTrialExpirationHeader,
-        iconMineTrialExpirationPauseBg,
-        iconMineTrialExpirationQuestion,
-        iconMineTrialExpirationRecommend,
-        iconMineTrialExpirationUp,
-        iconMineTrialExpirationVip,
-        iconMineUnlockVip,
-        iconMineUrgentContact,
-        iconNetMobile,
-        iconNetWifi,
-        iconNews,
-        iconNewsItem,
-        iconNewsReport,
-        iconNewsReportAgree,
-        iconSplashTitle,
-        iconTrackAiInterpretation,
-        iconTrackAnalyseRefresh,
-        iconTrackDailyDoubt,
-        iconTrackDailyReport,
-        iconTrackDailySummary,
-        iconTrackDailySummaryArrow,
-        iconTrackDetailTimeBaseArrow,
-        iconTrackError,
-        iconTrackLocation,
-        iconTrackLocationNow,
-        iconTrackMoving,
-        iconTrackSearch,
-        iconTrackSearchClear,
-        iconTrackSelectTimeArrow,
-        iconTrackStay,
-        iconTrackUnlock,
-        iconTrackUnlockNoPermission,
-        iconUrgentAdd,
-        iconUrgentContactAdd,
-        iconUrgentContactDialPhone,
-        iconUrgentContactMore,
-        iconUrgentContactTipBg,
-        iconVip,
-        iconWechatPayment,
-        iconWechatScanPayment,
-        iconWhiteBack,
-        imgDialogLocationAlwaysTip1,
-        imgDialogLocationAlwaysTip2,
-        imgDialogLocationAlwaysTip3,
-        imgMemberFirstWeekDiscountContainer,
-        imgMemberHeaderAd1,
-        imgMemberHeaderAd2,
-        imgMemberHeaderAd3,
-        imgMemberHeaderAd4,
-        imgMemberRetainContainer,
-        imgMemberUserCancelsContainer,
-        imgTrackAiAnalyse,
-        imgTrackNoData,
-        imgTrackNoMemberTips
-      ];
+    bgAddFriendDialog,
+    bgCheckLocationPermission,
+    bgDialogLocationPermissionIos,
+    bgDialogTrackError,
+    bgFriendItem,
+    bgLocationAnalyse,
+    bgLocationAnalyseAi,
+    bgLoginHeadContainer,
+    bgMemberHeader,
+    bgMineMemberCard,
+    bgPageBackground,
+    bgTrackLocationTie,
+    bgTrackPieChat,
+    bgUrgentContactAdd,
+    bgUrgentContactEmpty,
+    bgUrgentContactLogo,
+    bgUrgentContactPopup,
+    iconAccountReplaceLogo,
+    iconAddFriendBackGround,
+    iconAgreementClose,
+    iconAlipayPayment,
+    iconAlipayScanPayment,
+    iconAppleRecoverSubscribe,
+    iconAvatarClose,
+    iconAvatarSelected,
+    iconBlackBack,
+    iconCallPhone,
+    iconCbSelected,
+    iconCbUnSelect,
+    iconCheckboxSelected,
+    iconCheckboxUnSelect,
+    iconDefaultFriendAvatar,
+    iconDefaultMineAvatar,
+    iconDialogAddFriend,
+    iconDialogClose,
+    iconDialogClose2,
+    iconDialogNetError,
+    iconEvaluate1,
+    iconEvaluate2,
+    iconEvaluate3,
+    iconEvaluate4,
+    iconEvaluate5,
+    iconExperiment,
+    iconFriendEdit,
+    iconFriendEditArrow,
+    iconFriendNews,
+    iconFriendSettingCopy,
+    iconGuard,
+    iconLoginAddressBook,
+    iconLoginClose,
+    iconLoginGoWxArrow,
+    iconLoginPhone,
+    iconLoginWx,
+    iconLogo,
+    iconLogoMax,
+    iconMainAddFriend,
+    iconMainFriendGuard,
+    iconMainHelp,
+    iconMainMapClock,
+    iconMainMine,
+    iconMainNews,
+    iconMainRefreshFriendLocation,
+    iconMainRefreshMineLocation,
+    iconMainTrackArrow,
+    iconMemberAvatar,
+    iconMemberCommentVerySatisfied,
+    iconMemberContactClickHelp,
+    iconMemberContactClickHelpClose,
+    iconMemberFun5,
+    iconMemberFun1,
+    iconMemberFun2,
+    iconMemberFun3,
+    iconMemberFun4,
+    iconMemberFun6,
+    iconMemberOrdinaryProductNormal,
+    iconMemberOrdinaryProductSelect,
+    iconMemberPaymentCompleted,
+    iconMemberRetainClose,
+    iconMemberSettlementBg,
+    iconMemberSettlementConfirm,
+    iconMemberSpecialProductsNormal,
+    iconMemberSpecialProductsSelect,
+    iconMemberVipBack,
+    iconMemberVipMiddleBg,
+    iconMemberVipMore,
+    iconMemberVipReceiveArrow,
+    iconMemberVipSign,
+    iconMessageFriendHelp,
+    iconMineFunAbout,
+    iconMineFunAccountFeedback,
+    iconMineFunArrow,
+    iconMineFunCustomerService,
+    iconMineFunExitAccount,
+    iconMineFunLogoutAccount,
+    iconMineFunPermissionSetting,
+    iconMineFunShare,
+    iconMineLogged,
+    iconMineNoLogin,
+    iconMineSmallVip,
+    iconMineTrialExpirationBg,
+    iconMineTrialExpirationHave,
+    iconMineTrialExpirationHeader,
+    iconMineTrialExpirationPauseBg,
+    iconMineTrialExpirationQuestion,
+    iconMineTrialExpirationRecommend,
+    iconMineTrialExpirationUp,
+    iconMineTrialExpirationVip,
+    iconMineUnlockVip,
+    iconMineUrgentContact,
+    iconNetMobile,
+    iconNetWifi,
+    iconNews,
+    iconNewsItem,
+    iconNewsReport,
+    iconNewsReportAgree,
+    iconSplashTitle,
+    iconTrackAiInterpretation,
+    iconTrackAnalyseRefresh,
+    iconTrackDailyDoubt,
+    iconTrackDailyReport,
+    iconTrackDailySummary,
+    iconTrackDailySummaryArrow,
+    iconTrackDetailTimeBaseArrow,
+    iconTrackError,
+    iconTrackLocation,
+    iconTrackLocationNow,
+    iconTrackMoving,
+    iconTrackSearch,
+    iconTrackSearchClear,
+    iconTrackSelectTimeArrow,
+    iconTrackStay,
+    iconTrackUnlock,
+    iconTrackUnlockNoPermission,
+    iconUrgentAdd,
+    iconUrgentContactAdd,
+    iconUrgentContactDialPhone,
+    iconUrgentContactMore,
+    iconUrgentContactTipBg,
+    iconVip,
+    iconWechatPayment,
+    iconWechatScanPayment,
+    iconWhiteBack,
+    imgDialogLocationAlwaysTip1,
+    imgDialogLocationAlwaysTip2,
+    imgDialogLocationAlwaysTip3,
+    imgMemberFirstWeekDiscountContainer,
+    imgMemberHeaderAd1,
+    imgMemberHeaderAd2,
+    imgMemberHeaderAd3,
+    imgMemberHeaderAd4,
+    imgMemberRetainContainer,
+    imgMemberUserCancelsContainer,
+    imgTrackAiAnalyse,
+    imgTrackNoData,
+    imgTrackNoMemberTips,
+  ];
 }
 
 class Assets {
@@ -813,11 +832,7 @@ class Assets {
 }
 
 class AssetGenImage {
-  const AssetGenImage(
-    this._assetName, {
-    this.size,
-    this.flavors = const {},
-  });
+  const AssetGenImage(this._assetName, {this.size, this.flavors = const {}});
 
   final String _assetName;
 
@@ -877,15 +892,8 @@ class AssetGenImage {
     );
   }
 
-  ImageProvider provider({
-    AssetBundle? bundle,
-    String? package,
-  }) {
-    return AssetImage(
-      _assetName,
-      bundle: bundle,
-      package: package,
-    );
+  ImageProvider provider({AssetBundle? bundle, String? package}) {
+    return AssetImage(_assetName, bundle: bundle, package: package);
   }
 
   String get path => _assetName;

lib/resource/string.gen.dart

@@ -108,7 +108,7 @@ class StringName {
   static String get friendEditBlockTitle => 'friend_edit_block_title'.tr; // 不给Ta看
   static String get blockedFriend => 'blocked_friend'.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 kindlyReminder => 'kindly_reminder'.tr; // 温馨提示
   static String get friendDeleteContent => 'friend_delete_content'.tr; // 互删好友后，双方将停止共享位置，清除相关定位记录并屏蔽，是否确认互删
   static String get deleteSuccess => 'delete_success'.tr; // 删除成功
@@ -309,9 +309,7 @@ class StringName {
   static String get permissionNotificationSettingSubtitle => 'permission_notification_setting_subtitle'.tr; // 开启通知栏权限，可随时查看好友“每日轨迹”
   static String get trackNoDoubtDesc => 'track_no_doubt_desc'.tr; // 未授权原因：\n 1.可能是自己/TA手机解锁权限尚未开启，请在个人中心设置中开启权限\n 2.可能是TA手机尚未开启本软件
   static String get trackNoStayData => 'track_no_stay_data'.tr; // 暂无停留数据
-  static String get locationPermissionRefuseDesc =>
-      'location_permission_refuse_desc'
-          .tr; // 我们需要您的定位权限，以提供更准确的位置服务，如果未开启，可能会影响功能使用（如实时定位、轨迹记录等）。
+  static String get locationPermissionRefuseDesc => 'location_permission_refuse_desc'.tr; // 我们需要您的定位权限，以提供更准确的位置服务，如果未开启，可能会影响功能使用（如实时定位、轨迹记录等）。
 }
 class StringMultiSource {
   StringMultiSource._();
@@ -423,7 +421,7 @@ class StringMultiSource {
       'friend_edit_block_title': '不给Ta看',
       'blocked_friend': '已屏蔽该好友',
       'block_friend_off': '屏蔽好友已关闭',
-      'friend_delete': '删除好友',
+      'friend_delete': '屏蔽好友',
       'kindly_reminder': '温馨提示',
       'friend_delete_content': '互删好友后，双方将停止共享位置，清除相关定位记录并屏蔽，是否确认互删',
       'delete_success': '删除成功',
@@ -624,8 +622,7 @@ class StringMultiSource {
       'permission_notification_setting_subtitle': '开启通知栏权限，可随时查看好友“每日轨迹”',
       'track_no_doubt_desc': '未授权原因：\n 1.可能是自己/TA手机解锁权限尚未开启，请在个人中心设置中开启权限\n 2.可能是TA手机尚未开启本软件',
       'track_no_stay_data': '暂无停留数据',
-      'location_permission_refuse_desc':
-          '我们需要您的定位权限，以提供更准确的位置服务，如果未开启，可能会影响功能使用（如实时定位、轨迹记录等）。',
+      'location_permission_refuse_desc': '我们需要您的定位权限，以提供更准确的位置服务，如果未开启，可能会影响功能使用（如实时定位、轨迹记录等）。',
     },
   };
 }

plugins/map_mapkit_ios/example/pubspec.lock

@@ -5,10 +5,10 @@ packages:
     dependency: transitive
     description:
       name: async
-      sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63
+      sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb"
       url: "https://pub.dev"
     source: hosted
-    version: "2.12.0"
+    version: "2.13.0"
   boolean_selector:
     dependency: transitive
     description:
@@ -53,10 +53,10 @@ packages:
     dependency: transitive
     description:
       name: fake_async
-      sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc"
+      sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.2"
+    version: "1.3.3"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -79,10 +79,10 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec
+      sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.8"
+    version: "10.0.9"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
@@ -219,10 +219,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14"
+      sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02
       url: "https://pub.dev"
     source: hosted
-    version: "14.3.1"
+    version: "15.0.0"
 sdks:
   dart: ">=3.7.2 <4.0.0"
   flutter: ">=3.18.0-18.0.pre.54"