浏览代码

[fix]优化首页每日轨迹请求流程相关问题

zk 4 月之前
父节点
当前提交
6c96f37455

+ 2 - 1
lib/data/repositories/account_repository.dart

@@ -141,6 +141,8 @@ class AccountRepository {
     onRequestNotificationReport();
     //上报事件
     phoneEventRepository.startReportPhoneEvent();
+
+    TodayTrackHelper.getInstance().clear();
   }
 
   void logout() {
@@ -163,7 +165,6 @@ class AccountRepository {
 
     phoneEventRepository.stopReportPhoneEvent();
 
-    TodayTrackHelper.getInstance().clear();
   }
 
   void refreshMemberStatus() {

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

@@ -65,12 +65,12 @@ extension GetItInjectableX on _i174.GetIt {
     gh.factory<_i256.AboutController>(() => _i256.AboutController());
     gh.factory<_i923.BrowserController>(() => _i923.BrowserController());
     gh.factory<_i769.FeedBackController>(() => _i769.FeedBackController());
+    gh.factory<_i779.NewsReportController>(() => _i779.NewsReportController());
     gh.factory<_i108.PermissionSettingController>(
         () => _i108.PermissionSettingController());
     gh.factory<_i973.SplashController>(() => _i973.SplashController());
     gh.factory<_i756.TrackDetailController>(
         () => _i756.TrackDetailController());
-    gh.factory<_i779.NewsReportController>(() => _i779.NewsReportController());
     gh.singleton<_i361.Dio>(() => networkModule.createDefaultDio());
     gh.lazySingleton<_i772.InternetConnectionHelper>(
         () => _i772.InternetConnectionHelper());

+ 1 - 1
lib/module/main/main_controller.dart

@@ -535,7 +535,7 @@ class MainController extends BaseController {
   void _requestSelectedFriendTrack() {
     //查看当前选中的好友是否有记录数据
     final selectedFriend = _selectedFriend.value;
-    if (selectedFriend == null) {
+    if (selectedFriend == null || accountRepository.memberIsExpired()) {
       return;
     }
     todayTrackHelper.requestTodayTrackReport(selectedFriend.id);

+ 2 - 1
lib/module/main/main_page.dart

@@ -115,7 +115,8 @@ class MainPage extends BasePage<MainController> {
                   ? null
                   : controller
                       .todayTrackReportMap[controller.selectedFriend?.id];
-              if (todayTrack?.noMember.value == true) {
+              if (controller.memberStatusInfo.value == null ||
+                  controller.memberStatusInfo.value?.expired == true) {
                 return buildNoMemberView();
               } else if (todayTrack == null ||
                   todayTrack.isRequestSuccess.value == false) {

+ 0 - 5
lib/module/main/today_track_helper.dart

@@ -93,11 +93,6 @@ class TodayTrackHelper {
       bean.isRequestSuccess.value = true;
       bean.lastRequestTime = DateTime.now();
     }).catchError((error) {
-      if (error is ServerErrorException) {
-        if (error.code == ErrorCode.noMember) {
-          bean.noMember.value = true;
-        }
-      }
       ErrorHandler.toastError(error);
     }).whenComplete(() {
       bean.isRequesting = false;