[new]合并文件

lib/di/get_it.config.dart

@@ -56,29 +56,29 @@ 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.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<_i240.TrackRepository>(
+        () => _i240.TrackRepository(gh<_i243.AtmobApi>()));
     gh.lazySingleton<_i983.UrgentContactRepository>(
         () => _i983.UrgentContactRepository(gh<_i243.AtmobApi>()));
     gh.factory<_i1008.LoginController>(
@@ -121,10 +121,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>(),

lib/resource/string.gen.dart

@@ -256,6 +256,21 @@ class StringName {
   static String get dialogNetErrorDesc => 'dialog_net_error_desc'.tr; // 请检查您的网络连接并重试
   static String get dialogNetErrorAgain => 'dialog_net_error_again'.tr; // 重试
   static String get mineUpdateAvatarSuccess => 'mine_update_avatar_success'.tr; // 设置成功
+  static String get todaySimpleTrack => 'today_simple_track'.tr; // 当日行动轨迹
+  static String get todaySimpleTrackStart =>
+      'today_simple_track_start'.tr; // 起点
+  static String get todaySimpleTrackError =>
+      'today_simple_track_error'.tr; // 异常
+  static String get accountReplaceTitle =>
+      'account_replace_title'.tr; // 您的账号已在另一台设备登录
+  static String get accountReplaceDesc =>
+      'account_replace_desc'.tr; // 建议重新登录或切换其他账号
+  static String get accountReplaceBtnTxt =>
+      'account_replace_btn_txt'.tr; // 我知道了
+  static String get accountPleaseSelectAvatar =>
+      'account_please_select_avatar'.tr; // 请选择头像
+  static String get accountSelectAvatarBtnTxt =>
+      'account_select_avatar_btn_txt'.tr; // 立即更换
 }
 class StringMultiSource {
   StringMultiSource._();
@@ -515,6 +530,14 @@ class StringMultiSource {
       'dialog_net_error_desc': '请检查您的网络连接并重试',
       'dialog_net_error_again': '重试',
       'mine_update_avatar_success': '设置成功',
+      'today_simple_track': '当日行动轨迹',
+      'today_simple_track_start': '起点',
+      'today_simple_track_error': '异常',
+      'account_replace_title': '您的账号已在另一台设备登录',
+      'account_replace_desc': '建议重新登录或切换其他账号',
+      'account_replace_btn_txt': '我知道了',
+      'account_please_select_avatar': '请选择头像',
+      'account_select_avatar_btn_txt': '立即更换',
     },
   };
 }