Parcourir la source

[fix]好友同意时增加弹窗告知

zk il y a 8 mois
Parent
commit
9ebd53e725

BIN
assets/images/bg_urgent_contact_empty.webp


+ 4 - 0
assets/string/base/string.xml

@@ -202,6 +202,10 @@
     <string name="urgent_contact_once_click_help_desc">
         需要添加正确的紧急联系人手机号码,您的联系人将会收到短信以及APP消息通知
     </string>
+    <string name="message_add_friend_sure_content">
+        1.您同意添加该用户为好友,则视为您同意本应用合法收集储存和使用信息。\n2.并同意将您的位置、轨迹等信息分享给该好友。
+    </string>
+
     <string name="urgent_contact_has_been_added">对方已是您的紧急联系人</string>
     <string name="urgent_contact_add_desc">紧急情况,快速求助</string>
     <string name="urgent_contact_add_success">添加成功</string>

+ 15 - 0
lib/dialog/common_confirm_dialog_impl.dart

@@ -100,3 +100,18 @@ void showTraceNoDataDialog({required VoidCallback onConfirm}) {
       confirmText: StringName.gotIt,
       confirmOnTap: onConfirm);
 }
+
+void showAgreeAddFriendTipDialog({required VoidCallback onConfirm}) {
+  CommonConfirmDialog.show(
+      titleWidget: Text(StringName.kindlyReminder,
+          style: TextStyle(
+              fontSize: 17.sp,
+              color: '#333333'.color,
+              fontWeight: FontWeight.bold)),
+      descWidget: Text(
+        StringName.messageAddFriendSureContent,
+        style: TextStyle(fontSize: 14.sp, color: '#404040'.color),
+      ),
+      confirmText: StringName.gotIt,
+      confirmOnTap: onConfirm);
+}

+ 10 - 7
lib/module/news/pending_list/news_pending_list_controller.dart

@@ -9,6 +9,7 @@ import 'package:location/handler/error_handler.dart';
 import 'package:location/resource/string.gen.dart';
 import 'package:location/utils/toast_util.dart';
 
+import '../../../dialog/common_confirm_dialog_impl.dart';
 import '../../../utils/de_bounce.dart';
 
 @injectable
@@ -55,12 +56,14 @@ class NewsPendingListController extends BaseController {
   }
 
   onAgreeFriend(RequestFriendInfo item) {
-    _saveDebounce
-        .onClick(() => messageRepository.acceptFriendAccept(item.id).then((_) {
-              ToastUtil.show(StringName.messageFriendRequestAgreed);
-              refreshWaitingList();
-            }).catchError((error) {
-              ErrorHandler.toastError(error);
-            }));
+    showAgreeAddFriendTipDialog(onConfirm: () {
+      _saveDebounce.onClick(
+          () => messageRepository.acceptFriendAccept(item.id).then((_) {
+                ToastUtil.show(StringName.messageFriendRequestAgreed);
+                refreshWaitingList();
+              }).catchError((error) {
+                ErrorHandler.toastError(error);
+              }));
+    });
   }
 }

+ 1 - 1
lib/module/urgent_contact/urgent_contact_page.dart

@@ -174,7 +174,7 @@ class UrgentContactPage extends BasePage<UrgentContactController> {
           CommonView.buildAppBar(StringName.urgentContactTitle,
               backOnTap: controller.back),
           SizedBox(height: 40.h),
-          Assets.images.bgUrgentContactLogo.image(width: 268.w, height: 234.w),
+          Assets.images.bgUrgentContactEmpty.image(width: 268.w, height: 250.w),
           SizedBox(height: 37.h),
           Text(StringName.urgentContactOnceClickHelp,
               style: TextStyle(

+ 5 - 0
lib/resource/assets.gen.dart

@@ -48,6 +48,10 @@ class $AssetsImagesGen {
   AssetGenImage get bgUrgentContactAdd =>
       const AssetGenImage('assets/images/bg_urgent_contact_add.webp');
 
+  /// File path: assets/images/bg_urgent_contact_empty.webp
+  AssetGenImage get bgUrgentContactEmpty =>
+      const AssetGenImage('assets/images/bg_urgent_contact_empty.webp');
+
   /// File path: assets/images/bg_urgent_contact_logo.webp
   AssetGenImage get bgUrgentContactLogo =>
       const AssetGenImage('assets/images/bg_urgent_contact_logo.webp');
@@ -291,6 +295,7 @@ class $AssetsImagesGen {
         bgPageBackground,
         bgTrackLocationTie,
         bgUrgentContactAdd,
+        bgUrgentContactEmpty,
         bgUrgentContactLogo,
         bgUrgentContactPopup,
         iconAgreementClose,

+ 14 - 24
lib/resource/string.gen.dart

@@ -165,37 +165,26 @@ class StringName {
   static final String urgentContactBtnTxt = 'urgent_contact_btn_txt'.tr; // 添加紧急联系人
   static final String urgentContactOnceClickHelp = 'urgent_contact_once_click_help'.tr; // 使用一键求助
   static final String urgentContactOnceClickHelpDesc = 'urgent_contact_once_click_help_desc'.tr; // 需要添加正确的紧急联系人手机号码,您的联系人将会收到短信以及APP消息通知
+  static final String messageAddFriendSureContent = 'message_add_friend_sure_content'.tr; // 1.您同意添加该用户为好友,则视为您同意本应用合法收集储存和使用信息。\n2.并同意将您的位置、轨迹等信息分享给该好友。
   static final String urgentContactHasBeenAdded = 'urgent_contact_has_been_added'.tr; // 对方已是您的紧急联系人
   static final String urgentContactAddDesc = 'urgent_contact_add_desc'.tr; // 紧急情况,快速求助
   static final String urgentContactAddSuccess = 'urgent_contact_add_success'.tr; // 添加成功
   static final String urgentContactSubtitle = 'urgent_contact_subtitle'.tr; // 紧急联系人
   static final String urgentContactDefaultSelected = 'urgent_contact_default_selected'.tr; // 默认
   static final String urgentContactSendHelp = 'urgent_contact_send_help'.tr; // 一键发送求助
-  static final String urgentContactSetDefault =
-      'urgent_contact_set_default'.tr; // 设为默认
-  static final String urgentContactCancelDefault =
-      'urgent_contact_cancel_default'.tr; // 取消默认
-  static final String urgentContactSetDelete =
-      'urgent_contact_set_delete'.tr; // 删除
-  static final String urgentContactSetSuccess =
-      'urgent_contact_set_success'.tr; // 设置成功
-  static final String urgentContactCancelSuccess =
-      'urgent_contact_cancel_success'.tr; // 取消成功
-  static final String urgentContactDeleteSuccess =
-      'urgent_contact_delete_success'.tr; // 删除成功
-  static final String urgentContactSendAllHelp =
-      'urgent_contact_send_all_help'.tr; // 确认向您所有好友发送短信求助?
-  static final String urgentContactEmergencyHelp =
-      'urgent_contact_emergency_help'.tr; // 紧急求助
+  static final String urgentContactSetDefault = 'urgent_contact_set_default'.tr; // 设为默认
+  static final String urgentContactCancelDefault = 'urgent_contact_cancel_default'.tr; // 取消默认
+  static final String urgentContactSetDelete = 'urgent_contact_set_delete'.tr; // 删除
+  static final String urgentContactSetSuccess = 'urgent_contact_set_success'.tr; // 设置成功
+  static final String urgentContactCancelSuccess = 'urgent_contact_cancel_success'.tr; // 取消成功
+  static final String urgentContactDeleteSuccess = 'urgent_contact_delete_success'.tr; // 删除成功
+  static final String urgentContactSendAllHelp = 'urgent_contact_send_all_help'.tr; // 确认向您所有好友发送短信求助?
+  static final String urgentContactEmergencyHelp = 'urgent_contact_emergency_help'.tr; // 紧急求助
   static final String contactNoDefault = 'contact_no_default'.tr; // 未设置默认紧急联系人
-  static final String urgentContactHelpSendSuccess =
-      'urgent_contact_help_send_success'.tr; // 已成功发送求助信息
-  static final String urgentContactAddMaxTip =
-      'urgent_contact_add_max_tip'.tr; // 最多添加5人,请移除后再添加
-  static final String urgentContactEmsSendFail =
-      'urgent_contact_ems_send_fail'.tr; // 短信发送失败,请核实手机号码
-  static final String urgentContactEmsSendPartFail =
-      'urgent_contact_ems_send_part_fail'.tr; // 部分号码发送失败
+  static final String urgentContactHelpSendSuccess = 'urgent_contact_help_send_success'.tr; // 已成功发送求助信息
+  static final String urgentContactAddMaxTip = 'urgent_contact_add_max_tip'.tr; // 最多添加5人,请移除后再添加
+  static final String urgentContactEmsSendFail = 'urgent_contact_ems_send_fail'.tr; // 短信发送失败,请核实手机号码
+  static final String urgentContactEmsSendPartFail = 'urgent_contact_ems_send_part_fail'.tr; // 部分号码发送失败
 }
 class StringMultiSource {
   StringMultiSource._();
@@ -364,6 +353,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.并同意将您的位置、轨迹等信息分享给该好友。',
       'urgent_contact_has_been_added': '对方已是您的紧急联系人',
       'urgent_contact_add_desc': '紧急情况,快速求助',
       'urgent_contact_add_success': '添加成功',