ninggege。ad up

jiaPei.xcodeproj/project.pbxproj

@@ -11732,7 +11732,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				"CODE_SIGN_RESOURCE_RULES_PATH[sdk=*]" = "";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2122023121101;
+				CURRENT_PROJECT_VERSION = 2122023121402;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = K7T6CU5SW5;
 				ENABLE_BITCODE = NO;
@@ -11814,7 +11814,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2122023121101;
+				CURRENT_PROJECT_VERSION = 2122023121402;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = K7T6CU5SW5;
 				ENABLE_BITCODE = NO;

jiaPei/Modules/HomePageModule/ViewModel/HomePage/RQHomePageViewModel.m

@@ -83,17 +83,19 @@
 /// 获取网络的用户数据 用于比对
 - (RACSignal *)requestReLoginSignal {
     return [[RACSignal createSignal:^RACDisposable * _Nullable(id<RACSubscriber>  _Nonnull subscriber) {
-        if (RQStringIsNotEmpty([SAMKeychain rawLogin]) && RQStringIsNotEmpty([SAMKeychain rawLoginPassword]) && RQ_USER_MANAGER.currentUser) {
-            RQ_USER_MANAGER.currentUser.channel = RQUserLoginChannelTypeAutoLogin;
-            [[RQ_HTTP_Service studentLoginWithLoginCode:[SAMKeychain rawLogin] password:[SAMKeychain rawLoginPassword]] subscribeNext:^(RQUserModel *userModel) {
-//                [RQ_USER_MANAGER saveUser:userModel];//更新保存
-                [subscriber sendNext:userModel];
-            } error:^(NSError * _Nullable error) {
-                [subscriber sendError:error];
-            } completed:^{
-                [subscriber sendCompleted];
-            }];
+        if(![RQ_USER_MANAGER.currentUser.nickName containsString:@"游客"]){
+            if (RQStringIsNotEmpty([SAMKeychain rawLogin]) && RQStringIsNotEmpty([SAMKeychain rawLoginPassword]) && RQ_USER_MANAGER.currentUser) {
+                RQ_USER_MANAGER.currentUser.channel = RQUserLoginChannelTypeAutoLogin;
+                [[RQ_HTTP_Service studentLoginWithLoginCode:[SAMKeychain rawLogin] password:[SAMKeychain rawLoginPassword]] subscribeNext:^(RQUserModel *userModel) {
+                    [subscriber sendNext:userModel];
+                } error:^(NSError * _Nullable error) {
+                    [subscriber sendError:error];
+                } completed:^{
+                    [subscriber sendCompleted];
+                }];
+            }
         }
+         
         return [RACDisposable disposableWithBlock:^{
             /// 取消任务
         }];

jiaPei/Modules/TimeModule/ViewModel/RQTimeViewModel.m

@@ -59,8 +59,9 @@
         timeSingle3ItemViewModel.icon = @"我的学时";
         timeSingle3ItemViewModel.title = @"我的学时";
         
-        group1.itemViewModels = RQ_USER_MANAGER.isCykh? @[timeSingle1ItemViewModel, timeSingle2ItemViewModel, timeSingle3ItemViewModel] : @[timeSingle1ItemViewModel, timeSingle3ItemViewModel];
-        
+        //2023-12-13 日 ， 从业计时不在开启
+//        group1.itemViewModels = RQ_USER_MANAGER.isCykh? @[timeSingle1ItemViewModel, timeSingle2ItemViewModel, timeSingle3ItemViewModel] : @[timeSingle1ItemViewModel, timeSingle3ItemViewModel];
+        group1.itemViewModels = @[timeSingle1ItemViewModel, timeSingle3ItemViewModel];
         RQCommonGroupViewModel *group2 = [RQCommonGroupViewModel groupViewModel];
         RQTimeRuleItemViewModel *timeRuleItemViewModel = [[RQTimeRuleItemViewModel alloc] init];
         group2.itemViewModels = @[timeRuleItemViewModel];