Browse Source

fix:优化推送跳转。

zhoukun 5 months ago
parent
commit
a622653267

+ 8 - 8
lib/di/get_it.config.dart

@@ -57,14 +57,14 @@ 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<_i108.PermissionSettingController>(
         () => _i108.PermissionSettingController());
-    gh.factory<_i973.SplashController>(() => _i973.SplashController());
-    gh.factory<_i756.TrackDetailController>(
-        () => _i756.TrackDetailController());
     gh.singleton<_i361.Dio>(() => networkModule.createDefaultDio());
     gh.lazySingleton<_i220.AtmobLocationClient>(
         () => _i220.AtmobLocationClient());
@@ -78,10 +78,10 @@ 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<_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<_i983.UrgentContactRepository>(
@@ -117,10 +117,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>(),

+ 18 - 15
lib/push_notification/ios_push_notification_service.dart

@@ -79,21 +79,24 @@ class IosPushNotificationService {
 
   ///处理推送各种点击
   static void handleNotificationPushChick(Map<String,dynamic> pushDict) {
-    int skipType = pushDict["skipType"];
-    TrackRepository trackRepository = TrackRepository.getInstance();
-    trackRepository.locationTrackDailyDialogs().then((trackResponse) {
-      if ((trackResponse.trackDailyList ?? []).isNotEmpty) {
-         if ((trackResponse.trackDailyList ?? []).length == 1) {
-           onViewTraceClic((trackResponse.trackDailyList ?? []).first);
-         } else {
-           TrackChooseFriendDialog.show(trackDailyList: trackResponse.trackDailyList,onSelectItem: (selectInfo) {
-             onViewTraceClic(selectInfo);
-           });
-         }
-      }
-    }).catchError((error) {
-      ErrorHandler.toastError(error);
-    });
+    String skipType = pushDict["functionType"];
+    if (skipType == "daily_track") {
+      TrackRepository trackRepository = TrackRepository.getInstance();
+      trackRepository.locationTrackDailyDialogs().then((trackResponse) {
+        //print("trackResponsesfsfsd---${trackResponse}");
+        if ((trackResponse.trackDailyList ?? []).isNotEmpty) {
+          if ((trackResponse.trackDailyList ?? []).length == 1) {
+            onViewTraceClic((trackResponse.trackDailyList ?? []).first);
+          } else {
+            TrackChooseFriendDialog.show(trackDailyList: trackResponse.trackDailyList,onSelectItem: (selectInfo) {
+              onViewTraceClic(selectInfo);
+            });
+          }
+        }
+      }).catchError((error) {
+        ErrorHandler.toastError(error);
+      });
+    }
   }
 
   static void onViewTraceClic(UserInfo userInfo) {

+ 16 - 32
lib/resource/string.gen.dart

@@ -271,40 +271,24 @@ class StringName {
   static String get trackDetailMobile => 'track_detail_mobile'.tr; // 移动网络
   static String get trackDetailError => 'track_detail_error'.tr; // 当前对方定位丢失
   static String get trackDetailTimeProportion => 'track_detail_time_proportion'.tr; // 地点占比时长
-  static String get trackDetailNoData =>
-      'track_detail_no_data'.tr; // 当前暂无其他更新信息
+  static String get trackDetailNoData => 'track_detail_no_data'.tr; // 当前暂无其他更新信息
   static String get trackDetailSeeError => 'track_detail_see_error'.tr; // 查看原因
-  static String get dialogTrackErrorTitle =>
-      'dialog_track_error_title'.tr; // 定位规则
-  static String get dialogTrackErrorTip1 =>
-      'dialog_track_error_tip1'.tr; // 定位权限问题
-  static String get dialogTrackErrorTip2 =>
-      'dialog_track_error_tip2'.tr; // 手机关机
-  static String get dialogTrackErrorTip3 =>
-      'dialog_track_error_tip3'.tr; // 卸载app
-  static String get dialogTrackErrorTip1Desc =>
-      'dialog_track_error_tip1_desc'.tr; // 请检查对方定位权限是否为始终允许
-  static String get dialogTrackErrorTip2Desc =>
-      'dialog_track_error_tip2_desc'.tr; // 尝试给TA打电话,确认手机是否关机
-  static String get dialogTrackErrorTip3Desc =>
-      'dialog_track_error_tip3_desc'.tr; // 若对方卸载app,轨迹行程待TA重新下载恢复定位后,将会重新展示TA行程
-  static String get dialogTrackErrorBtnTxt =>
-      'dialog_track_error_btn_txt'.tr; // 我知道了
-  static String get trackDetailDailySummary =>
-      'track_detail_daily_summary'.tr; // 行为总结
-  static String get trackDetailDailySummaryShare =>
-      'track_detail_daily_summary_share'.tr; // 分享报告
-  static String get trackDetailDailySummaryGetFail =>
-      'track_detail_daily_summary_get_fail'.tr; // 行为总结获取失败
-  static String get trackDailySummaryPhone =>
-      'track_daily_summary_phone'.tr; // 手机情况
-  static String get trackDailySummaryStay =>
-      'track_daily_summary_stay'.tr; // 停留最长
-  static String get trackDailySummarytrack =>
-      'track_daily_summary_track'.tr; // 轨迹情况
+  static String get dialogTrackErrorTitle => 'dialog_track_error_title'.tr; // 定位规则
+  static String get dialogTrackErrorTip1 => 'dialog_track_error_tip1'.tr; // 定位权限问题
+  static String get dialogTrackErrorTip2 => 'dialog_track_error_tip2'.tr; // 手机关机
+  static String get dialogTrackErrorTip3 => 'dialog_track_error_tip3'.tr; // 卸载app
+  static String get dialogTrackErrorTip1Desc => 'dialog_track_error_tip1_desc'.tr; // 请检查对方定位权限是否为始终允许
+  static String get dialogTrackErrorTip2Desc => 'dialog_track_error_tip2_desc'.tr; // 尝试给TA打电话,确认手机是否关机
+  static String get dialogTrackErrorTip3Desc => 'dialog_track_error_tip3_desc'.tr; // 若对方卸载app,轨迹行程待TA重新下载恢复定位后,将会重新展示TA行程
+  static String get dialogTrackErrorBtnTxt => 'dialog_track_error_btn_txt'.tr; // 我知道了
+  static String get trackDetailDailySummary => 'track_detail_daily_summary'.tr; // 行为总结
+  static String get trackDetailDailySummaryShare => 'track_detail_daily_summary_share'.tr; // 分享报告
+  static String get trackDetailDailySummaryGetFail => 'track_detail_daily_summary_get_fail'.tr; // 行为总结获取失败
+  static String get trackDailySummaryPhone => 'track_daily_summary_phone'.tr; // 手机情况
+  static String get trackDailySummaryStay => 'track_daily_summary_stay'.tr; // 停留最长
+  static String get trackDailySummarytrack => 'track_daily_summary_track'.tr; // 轨迹情况
   static String get trackDailyCallPhone => 'track_daily_call_phone'.tr; // 联系TA
-  static String get trackDailySkipCallPhoneFail =>
-      'track_daily_skip_call_phone_fail'.tr; // 跳转拨号界面失败
+  static String get trackDailySkipCallPhoneFail => 'track_daily_skip_call_phone_fail'.tr; // 跳转拨号界面失败
 }
 class StringMultiSource {
   StringMultiSource._();

+ 8 - 0
pubspec.lock

@@ -664,6 +664,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.1.2"
+  image:
+    dependency: "direct main"
+    description:
+      name: image
+      sha256: "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.5.4"
   image_size_getter:
     dependency: transitive
     description: