1.5.1上线版本

KulexiuForStudent/KulexiuForStudent.xcodeproj/project.pbxproj

@@ -8447,7 +8447,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = KulexiuForStudent/KulexiuForStudent.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.5.0;
+				CURRENT_PROJECT_VERSION = 1.5.1;
 				DEVELOPMENT_TEAM = B2AP53HHTU;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = YES;
@@ -8503,7 +8503,7 @@
 					"$(PROJECT_DIR)/KulexiuForStudent/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.5/SocialLibraries/Sina/SinaSDK",
 					"$(PROJECT_DIR)/KulexiuForStudent/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.5/UMSocialSDKPlugin",
 				);
-				MARKETING_VERSION = 1.5.0;
+				MARKETING_VERSION = 1.5.1;
 				MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
 				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++17";
 				PRODUCT_BUNDLE_IDENTIFIER = com.Colexiu.KulexiuForStudent;
@@ -8526,7 +8526,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = KulexiuForStudent/KulexiuForStudent.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.5.0;
+				CURRENT_PROJECT_VERSION = 1.5.1;
 				DEVELOPMENT_TEAM = B2AP53HHTU;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = YES;
@@ -8582,7 +8582,7 @@
 					"$(PROJECT_DIR)/KulexiuForStudent/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.5/SocialLibraries/Sina/SinaSDK",
 					"$(PROJECT_DIR)/KulexiuForStudent/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.5/UMSocialSDKPlugin",
 				);
-				MARKETING_VERSION = 1.5.0;
+				MARKETING_VERSION = 1.5.1;
 				MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
 				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++17";
 				PRODUCT_BUNDLE_IDENTIFIER = com.Colexiu.KulexiuForStudent;

KulexiuForStudent/KulexiuForStudent/InstitutionModule/Home/Controller/TenantDarkViewController.m

@@ -220,6 +220,7 @@
     self.navView.tenantName.text = [NSString returnNoNullStringWithString:self.mineInfo.tenantName];
     if (self.tenantAlbumStatus == 0) {
         [self showEmptyView];
+        [self.pagerView reloadData];
     }
     else {
         [self hideEmptyView];

KulexiuForStudent/KulexiuForStudent/InstitutionModule/TabbarController/InstitutionTabBarController.m

@@ -85,6 +85,14 @@
     }
 }
 
+- (void)tabBarSelectedWithIndex:(NSInteger)index {
+    if (index == 2) { // 跳转到聊天
+        index = 1;
+    }
+    [self setSelectedIndex:index];
+    UIViewController *controller = [self.viewControllers objectAtIndex:index];
+    [self changeBgColorWithTabBarController:self selectViewController:controller];
+}
 
 #pragma mark ----- UITabBarControllerDelegate
 

KulexiuForStudent/KulexiuForStudent/Module/Chat/Group/Controller/GroupSettingViewController.m

@@ -98,7 +98,7 @@
         [self refreshUI];
         
     } faliure:^(NSError * _Nonnull error) {
-        
+        [self refreshUI];
     }];
 }
 
@@ -232,8 +232,7 @@
         [LOADING_MANAGER removeHUD];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             [LOADING_MANAGER KSShowMsg:@"你已退出该群聊" promptCompletion:^{
-                [self removeCurrentConversation];
-                [self.navigationController popToRootViewControllerAnimated:YES];
+                [self quitIMGroup];
             }];
         }
         else {
@@ -244,7 +243,21 @@
     }];
 }
 
-- (void)removeCurrentConversation {
+- (void)backRootView {
+    [self.navigationController popToRootViewControllerAnimated:YES];
+}
+
+- (void)quitIMGroup {
+    [[V2TIMManager sharedInstance] quitGroup:self.groupId succ:^{
+        [self clearConversation];
+        [self backRootView];
+    } fail:^(int code, NSString *desc) {
+        [self clearConversation];
+        [self backRootView];
+    }];
+}
+
+- (void)clearConversation {
     MJWeakSelf;
     NSString *conversationID = [NSString stringWithFormat:@"group_%@", self.groupId];
     [[V2TIMManager sharedInstance] deleteConversation:conversationID

KulexiuForStudent/KulexiuForStudent/Module/Home/View/HomePageView/HomePageBodyView.m

@@ -180,7 +180,7 @@
     if ([NSString isEmptyString:liveRoomId]) {
         return;
     }
-    [LOADING_MANAGER MBShowInWindow:@""];
+    [LOADING_MANAGER showHUD];
     [KSEnterLiveroomManager joinLiveWithRoomId:liveRoomId inController:(CustomNavViewController *)self.naviController callback:^{
         [LOADING_MANAGER removeHUD];
     }];

KulexiuForStudent/KulexiuForStudent/Module/Live/Model/LiveModuleService.m

@@ -21,7 +21,6 @@
     NSString *url = [NSString stringWithFormat:@"%@%@", hostURL, @"/api-student/imLiveBroadcastRoom/queryRoom"];
     NSMutableDictionary *parm = [NSMutableDictionary dictionary];
     [parm setValue:roomId forKey:@"roomUid"];
-    [parm setValue:UserDefault(UIDKey) forKey:@"userId"];
     [KSNetworkingManager LiveRoomRequest:get url:url parms:parm success:success faliure:faliure];
 }
 

KulexiuForStudent/KulexiuForStudent/Module/Mine/Scan/Controller/KSScanViewController.m

@@ -54,6 +54,10 @@
     }];
 }
 
+- (void)stopScan {
+    [self.scanManager stopScanning];
+}
+
 - (void)configUI {
     UIImageView *imageView = [[UIImageView alloc] initWithFrame:CGRectMake((KPortraitWidth - 255) / 2.0f, (KPortraitHeight - 255) / 2.0f, 255, 255)];
     CGRect qrViweFrame = imageView.frame;
@@ -100,6 +104,7 @@
 
 - (void)dealWithCheckSource:(NSString *)result {
     if (result) {
+        [self stopScan];
         if ([result containsString:hostURL]) {
             KSBaseWKWebViewController *webCtrl = [[KSBaseWKWebViewController alloc] init];
             webCtrl.url = result;

KulexiuForStudent/KulexiuForStudent/Module/TXClassRoom/Service/TXClassroom/ClassroomService.m

@@ -544,6 +544,7 @@ isAudience:(BOOL)audience
                 mem.joinTime = msg.timestamp;
                 mem.cameraEnable = msg.camera;
                 mem.microphoneEnable = msg.microphone;
+                mem.handUpOn = msg.handUpOn;
                 if ([self.currentRoom addMemeber:mem]) {
                     [self.classroomDelegate memberDidJoin:mem];
                 }