up

jiaPei.xcodeproj/project.pbxproj

@@ -11726,7 +11726,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				"CODE_SIGN_RESOURCE_RULES_PATH[sdk=*]" = "";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2092023101201;
+				CURRENT_PROJECT_VERSION = 2102023101802;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = K7T6CU5SW5;
 				ENABLE_BITCODE = NO;
@@ -11763,7 +11763,7 @@
 					"$(PROJECT_DIR)/jiaPei/Vendor/BaiDuFaceSDK/BDFaceSDK/lib",
 					"$(PROJECT_DIR)/jiaPei/Vendor/QiNiu_IMSDK/Vendors/Voice",
 				);
-				MARKETING_VERSION = 2.0.9;
+				MARKETING_VERSION = 2.1.0;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = (
 					"$(inherited)",
@@ -11808,7 +11808,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2092023101201;
+				CURRENT_PROJECT_VERSION = 2102023101802;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = K7T6CU5SW5;
 				ENABLE_BITCODE = NO;
@@ -11845,7 +11845,7 @@
 					"$(PROJECT_DIR)/jiaPei/Vendor/BaiDuFaceSDK/BDFaceSDK/lib",
 					"$(PROJECT_DIR)/jiaPei/Vendor/QiNiu_IMSDK/Vendors/Voice",
 				);
-				MARKETING_VERSION = 2.0.9;
+				MARKETING_VERSION = 2.1.0;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = (
 					"$(inherited)",

jiaPei/Modules/TimeModule/Controller/RQTimeViewController.m

@@ -21,13 +21,16 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
-    [[RQ_HTTP_Service getUserinfoWithUserId:RQ_USER_MANAGER.currentUser._id] subscribeNext:^(RQUserModel *userModel) {
-        if(userModel){
-            [RQ_USER_MANAGER saveUser:userModel];//更新保存
-        }
-    } error:^(NSError * _Nullable error) {
-    } completed:^{
-    }];
+    if(RQ_USER_MANAGER.currentUser.stuNum == nil ||
+        [RQ_USER_MANAGER.currentUser.stuNum isEqualToString:@""]){
+        [[RQ_HTTP_Service getUserinfoWithUserId:RQ_USER_MANAGER.currentUser._id] subscribeNext:^(RQUserModel *userModel) {
+            if(userModel){
+                RQ_USER_MANAGER.currentUser.stuNum = userModel.stuNum;
+            }
+        } error:^(NSError * _Nullable error) {
+        } completed:^{
+        }];
+    }
 }
 
 #pragma mark - OverrideMethods

jiaPei/NewTheory/NYBasetjTimeVC.m

@@ -334,7 +334,9 @@ typedef enum {
     }
     
     NSMutableArray *arr=[NSMutableArray array];
-    [arr property:RQ_USER_MANAGER.currentUser.outId forKey:@"outId"];
+    if([@"3310" isEqualToString:RQ_USER_MANAGER.currentUser.city]){
+        [arr property:RQ_USER_MANAGER.currentUser.outId forKey:@"outId"];
+    }
     [arr property:RQ_USER_MANAGER.currentUser.city  forKey:@"dqbh"];
 
     

jiaPei/PeriodVC.m

@@ -381,7 +381,9 @@ typedef enum {
     }
     
     NSMutableArray *arr=[NSMutableArray array];
-    [arr property:RQ_USER_MANAGER.currentUser.outId forKey:@"outId"];
+    if([@"3310" isEqualToString:RQ_USER_MANAGER.currentUser.city]){
+        [arr property:RQ_USER_MANAGER.currentUser.outId forKey:@"outId"];
+    }
     [arr property:RQ_USER_MANAGER.currentUser.city  forKey:@"dqbh"];
 
     

jiaPei/Utils/Manager/UserManager/RQUserManager.m

@@ -233,11 +233,11 @@ static id rq_userManager = nil;
 
 - (void)beginObserveUser {
 	_isObserve = YES;
-	[[RACSignal combineLatest:@[[RACObserve(self.currentUser, nickName) distinctUntilChanged], [RACObserve(self.currentUser, userName) distinctUntilChanged], [RACObserve(self.currentUser, sex) distinctUntilChanged], [RACObserve(self.currentUser, birthday) distinctUntilChanged], [RACObserve(self.currentUser, carType) distinctUntilChanged], [RACObserve(self.currentUser, email) distinctUntilChanged], [RACObserve(self.currentUser, address) distinctUntilChanged], [RACObserve(self.currentUser, password) distinctUntilChanged]] reduce:^(NSString *nickName, NSString *userName, NSString *sex, NSString *birthday, NSString *carType, NSString *email, NSString *address, NSString *password) {
-		return self.currentUser;
-	}] subscribeNext:^(RQUserModel  *userModel) {
-		[self updateUserData];
-	}];
+    [[RACSignal combineLatest:@[[RACObserve(self.currentUser, nickName) distinctUntilChanged], [RACObserve(self.currentUser, userName) distinctUntilChanged], [RACObserve(self.currentUser, sex) distinctUntilChanged], [RACObserve(self.currentUser, birthday) distinctUntilChanged], [RACObserve(self.currentUser, carType) distinctUntilChanged], [RACObserve(self.currentUser, email) distinctUntilChanged], [RACObserve(self.currentUser, address) distinctUntilChanged], [RACObserve(self.currentUser, password) distinctUntilChanged]] reduce:^(NSString *nickName, NSString *userName, NSString *sex, NSString *birthday, NSString *carType, NSString *email, NSString *address, NSString *password) {
+        return self.currentUser;
+    }] subscribeNext:^(RQUserModel  *userModel) {
+        [self updateUserData];
+    }];
 }
 
 /// 比对本地网络数据