[new]处理合并问题

lib/data/api/atmob_api.g.dart

@@ -1625,6 +1625,44 @@ class _AtmobApi implements AtmobApi {
   }
 
   @override
+  Future<BaseResponse<TrackDailySummaryResponse>> trackDailySummary(
+    QueryTrackRequest request,
+    RequestOptions options,
+  ) async {
+    final _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _headers = <String, dynamic>{};
+    final _data = <String, dynamic>{};
+    _data.addAll(request.toJson());
+    final newOptions = newRequestOptions(options);
+    newOptions.extra.addAll(_extra);
+    newOptions.headers.addAll(_dio.options.headers);
+    newOptions.headers.addAll(_headers);
+    final _options = newOptions.copyWith(
+      method: 'POST',
+      baseUrl: _combineBaseUrls(
+        _dio.options.baseUrl,
+        baseUrl,
+      ),
+      queryParameters: queryParameters,
+      path: '/s/v1/location/track/daily/summary',
+    )..data = _data;
+    final _result = await _dio.fetch<Map<String, dynamic>>(_options);
+    late BaseResponse<TrackDailySummaryResponse> _value;
+    try {
+      _value = BaseResponse<TrackDailySummaryResponse>.fromJson(
+        _result.data!,
+        (json) =>
+            TrackDailySummaryResponse.fromJson(json as Map<String, dynamic>),
+      );
+    } on Object catch (e, s) {
+      errorLogger?.logError(e, s, _options);
+      rethrow;
+    }
+    return _value;
+  }
+
+  @override
   Future<BaseResponse<dynamic>> notificationReport(
       NotificationReportRequest request) async {
     final _extra = <String, dynamic>{};

lib/data/repositories/track_repository.dart

@@ -11,6 +11,7 @@ import '../../utils/sse_parse_util.dart';
 import '../api/request/query_track_request.dart';
 import '../api/response/location_track_days_response.dart';
 import '../api/response/query_track_response.dart';
+import '../api/response/track_daily_dialogs_response.dart';
 import '../api/response/track_daily_summary_response.dart';
 import '../bean/track_daily_bean.dart';
 import '../bean/track_days.dart';
@@ -92,7 +93,7 @@ class TrackRepository {
   }
 
   ///每日轨迹弹框报告-中台
-  Future<TrackDailyDialogsResponse>locationTrackDailyDialogs() {
+  Future<TrackDailyDialogsResponse> locationTrackDailyDialogs() {
     return atmobApi
         .locationTrackDailyDialogs(AppBaseRequest())
         .then(HttpHandler.handle(true))
@@ -101,7 +102,6 @@ class TrackRepository {
     });
   }
 
-
   Future<TrackDailySummaryResponse> trackDailySummary(
       {required int? startTime,
       required int? endTime,

lib/di/get_it.config.dart

@@ -13,6 +13,7 @@ import 'package:get_it/get_it.dart' as _i174;
 import 'package:injectable/injectable.dart' as _i526;
 
 import '../data/api/atmob_api.dart' as _i243;
+import '../data/api/atmob_stream_api.dart' as _i329;
 import '../data/repositories/account_repository.dart' as _i20;
 import '../data/repositories/config_repository.dart' as _i825;
 import '../data/repositories/contact_repository.dart' as _i850;
@@ -56,27 +57,31 @@ 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<_i769.FeedBackController>(() => _i769.FeedBackController());
     gh.factory<_i923.BrowserController>(() => _i923.BrowserController());
+    gh.factory<_i769.FeedBackController>(() => _i769.FeedBackController());
     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());
     gh.singleton<_i243.AtmobApi>(
         () => networkModule.provideAtmobApi(gh<_i361.Dio>()));
-    gh.lazySingleton<_i240.TrackRepository>(
-        () => _i240.TrackRepository(gh<_i243.AtmobApi>()));
+    gh.singleton<_i361.Dio>(
+      () => networkModule.createStreamDio(),
+      instanceName: 'stream',
+    );
+    gh.singleton<_i329.AtmobStreamApi>(() => networkModule
+        .provideAtmobStreamApi(gh<_i361.Dio>(instanceName: 'stream')));
     gh.lazySingleton<_i20.AccountRepository>(
         () => _i20.AccountRepository(gh<_i243.AtmobApi>()));
-    gh.lazySingleton<_i1053.FriendsRepository>(
-        () => _i1053.FriendsRepository(gh<_i243.AtmobApi>()));
     gh.lazySingleton<_i850.ContactRepository>(
         () => _i850.ContactRepository(gh<_i243.AtmobApi>()));
+    gh.lazySingleton<_i1053.FriendsRepository>(
+        () => _i1053.FriendsRepository(gh<_i243.AtmobApi>()));
     gh.lazySingleton<_i791.MessageRepository>(
         () => _i791.MessageRepository(gh<_i243.AtmobApi>()));
     gh.lazySingleton<_i983.UrgentContactRepository>(
@@ -93,16 +98,15 @@ extension GetItInjectableX on _i174.GetIt {
           gh<_i20.AccountRepository>(),
           gh<_i1053.FriendsRepository>(),
         ));
-    gh.factory<_i518.TrackController>(() => _i518.TrackController(
-          gh<_i240.TrackRepository>(),
-          gh<_i1053.FriendsRepository>(),
-          gh<_i20.AccountRepository>(),
-        ));
     gh.factory<_i433.NewsPendingListController>(
         () => _i433.NewsPendingListController(
               gh<_i791.MessageRepository>(),
               gh<_i1053.FriendsRepository>(),
             ));
+    gh.lazySingleton<_i240.TrackRepository>(() => _i240.TrackRepository(
+          gh<_i243.AtmobApi>(),
+          gh<_i329.AtmobStreamApi>(),
+        ));
     gh.factory<_i955.AddUrgentContactController>(
         () => _i955.AddUrgentContactController(
               gh<_i983.UrgentContactRepository>(),
@@ -113,10 +117,10 @@ extension GetItInjectableX on _i174.GetIt {
               gh<_i983.UrgentContactRepository>(),
               gh<_i20.AccountRepository>(),
             ));
-    gh.factory<_i492.FriendSettingController>(
-        () => _i492.FriendSettingController(gh<_i1053.FriendsRepository>()));
     gh.factory<_i897.AddFriendDialogController>(
         () => _i897.AddFriendDialogController(gh<_i1053.FriendsRepository>()));
+    gh.factory<_i492.FriendSettingController>(
+        () => _i492.FriendSettingController(gh<_i1053.FriendsRepository>()));
     gh.lazySingleton<_i814.MemberRepository>(() => _i814.MemberRepository(
           gh<_i243.AtmobApi>(),
           gh<_i20.AccountRepository>(),
@@ -137,6 +141,11 @@ extension GetItInjectableX on _i174.GetIt {
         ));
     gh.lazySingleton<_i779.PaymentStatusManager>(
         () => _i779.PaymentStatusManager(gh<_i814.MemberRepository>()));
+    gh.factory<_i518.TrackController>(() => _i518.TrackController(
+          gh<_i240.TrackRepository>(),
+          gh<_i1053.FriendsRepository>(),
+          gh<_i20.AccountRepository>(),
+        ));
     gh.factory<_i269.MemberController>(() => _i269.MemberController(
           gh<_i20.AccountRepository>(),
           gh<_i814.MemberRepository>(),

lib/resource/assets.gen.dart

@@ -108,6 +108,10 @@ class $AssetsImagesGen {
   AssetGenImage get iconBlackBack =>
       const AssetGenImage('assets/images/icon_black_back.webp');
 
+  /// File path: assets/images/icon_call_phone.webp
+  AssetGenImage get iconCallPhone =>
+      const AssetGenImage('assets/images/icon_call_phone.webp');
+
   /// File path: assets/images/icon_cb_selected.webp
   AssetGenImage get iconCbSelected =>
       const AssetGenImage('assets/images/icon_cb_selected.webp');
@@ -424,6 +428,14 @@ class $AssetsImagesGen {
   AssetGenImage get iconTrackDailyReport =>
       const AssetGenImage('assets/images/icon_track_daily_report.webp');
 
+  /// File path: assets/images/icon_track_daily_summary.webp
+  AssetGenImage get iconTrackDailySummary =>
+      const AssetGenImage('assets/images/icon_track_daily_summary.webp');
+
+  /// File path: assets/images/icon_track_daily_summary_arrow.webp
+  AssetGenImage get iconTrackDailySummaryArrow =>
+      const AssetGenImage('assets/images/icon_track_daily_summary_arrow.webp');
+
   /// 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');
@@ -566,6 +578,7 @@ class $AssetsImagesGen {
         iconAvatarClose,
         iconAvatarSelected,
         iconBlackBack,
+        iconCallPhone,
         iconCbSelected,
         iconCbUnSelect,
         iconCheckboxSelected,
@@ -645,6 +658,8 @@ class $AssetsImagesGen {
         iconNewsItem,
         iconSplashTitle,
         iconTrackDailyReport,
+        iconTrackDailySummary,
+        iconTrackDailySummaryArrow,
         iconTrackDetailTimeBaseArrow,
         iconTrackError,
         iconTrackLocation,

lib/resource/string.gen.dart

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