老师端更换全局loading

KulexiuForTeacher/KulexiuForTeacher.xcodeproj/project.pbxproj

@@ -262,7 +262,6 @@
 		BC0A22BA2847523E0065C1AB /* MemberListCell.m in Sources */ = {isa = PBXBuildFile; fileRef = BC0A22B42847523E0065C1AB /* MemberListCell.m */; };
 		BC0A22C0284752900065C1AB /* WhiteboardListCell.m in Sources */ = {isa = PBXBuildFile; fileRef = BC0A22BE284752900065C1AB /* WhiteboardListCell.m */; };
 		BC0A22C1284752900065C1AB /* WhiteboardListView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC0A22BF284752900065C1AB /* WhiteboardListView.m */; };
-		BC0A22C528475E060065C1AB /* SongListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BC0A22C428475E060065C1AB /* SongListViewController.m */; };
 		BC0D951D2AC2868400E54D3F /* KSWebLoadRefreshView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC0D951B2AC2868400E54D3F /* KSWebLoadRefreshView.m */; };
 		BC0D951E2AC2868400E54D3F /* KSWebLoadRefreshView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC0D951C2AC2868400E54D3F /* KSWebLoadRefreshView.xib */; };
 		BC106B252A8F44F8000759A9 /* TXLiveRoomViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BC106B242A8F44F8000759A9 /* TXLiveRoomViewController.m */; };
@@ -1690,8 +1689,6 @@
 		BC0A22BD284752900065C1AB /* WhiteboardListView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WhiteboardListView.h; sourceTree = "<group>"; };
 		BC0A22BE284752900065C1AB /* WhiteboardListCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WhiteboardListCell.m; sourceTree = "<group>"; };
 		BC0A22BF284752900065C1AB /* WhiteboardListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WhiteboardListView.m; sourceTree = "<group>"; };
-		BC0A22C328475E060065C1AB /* SongListViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SongListViewController.h; sourceTree = "<group>"; };
-		BC0A22C428475E060065C1AB /* SongListViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SongListViewController.m; sourceTree = "<group>"; };
 		BC0D951A2AC2868400E54D3F /* KSWebLoadRefreshView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KSWebLoadRefreshView.h; sourceTree = "<group>"; };
 		BC0D951B2AC2868400E54D3F /* KSWebLoadRefreshView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KSWebLoadRefreshView.m; sourceTree = "<group>"; };
 		BC0D951C2AC2868400E54D3F /* KSWebLoadRefreshView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = KSWebLoadRefreshView.xib; sourceTree = "<group>"; };
@@ -4790,8 +4787,6 @@
 			children = (
 				BC8A2CF628476C2F00122BBE /* MusicScoreViewController.h */,
 				BC8A2CF728476C3000122BBE /* MusicScoreViewController.m */,
-				BC0A22C328475E060065C1AB /* SongListViewController.h */,
-				BC0A22C428475E060065C1AB /* SongListViewController.m */,
 			);
 			path = ClassroomSong;
 			sourceTree = "<group>";
@@ -8808,7 +8803,6 @@
 				BC319C582CE7318800E1AF50 /* MineVipProgramHeadView.m in Sources */,
 				BC48C3B4282931C000EE65C5 /* ReceiveEvaluateCell.m in Sources */,
 				BC3BF6362B9ED1F600831494 /* StateView.m in Sources */,
-				BC0A22C528475E060065C1AB /* SongListViewController.m in Sources */,
 				BC38C47D2AFA1F4B00ABFCC2 /* MineWorksViewController.m in Sources */,
 				BC71DF1B2A89F470003F165E /* IACircularSlider.m in Sources */,
 				BCE6A09A27F83E8E00C97704 /* MinePageVideoCell.m in Sources */,

KulexiuForTeacher/KulexiuForTeacher/Common/Base/WebView/KSBaseWKWebViewController.m

@@ -67,8 +67,6 @@ typedef NS_ENUM(NSInteger, CHOOSETYPE) {
 
 @property (nonatomic, strong) KSMediaManager *mediaManager;
 
-@property (strong, nonatomic) MBProgressHUD *HUD;
-
 @property (nonatomic, assign) CHOOSETYPE fileChooseType;
 
 @property (nonatomic, strong) NSString *bucketName;
@@ -1603,29 +1601,6 @@ typedef NS_ENUM(NSInteger, CHOOSETYPE) {
 
 #pragma mark -- 上传图片
 
-- (void)hudTipWillShow:(BOOL)willShow{
-    if (willShow) {
-        [self resignFirstResponder];
-        UIWindow *keyWindow = [UIApplication sharedApplication].keyWindow;
-        if (!_HUD) {
-            _HUD = [MBProgressHUD showHUDAddedTo:keyWindow animated:YES];
-            _HUD.mode = MBProgressHUDModeDeterminateHorizontalBar;
-            _HUD.label.attributedText = [self getAttrStringWithText:@"正在上传视频文件..."];
-            _HUD.contentColor = [UIColor whiteColor];
-            _HUD.bezelView.style = MBProgressHUDBackgroundStyleSolidColor;
-            _HUD.bezelView.backgroundColor = HexRGBAlpha(0x000000, 0.8);
-            _HUD.removeFromSuperViewOnHide = YES;
-            
-        }else{
-            _HUD.progress = 0;
-            [keyWindow addSubview:_HUD];
-            [_HUD showAnimated:YES];
-        }
-    }else{
-        [_HUD hideAnimated:YES];
-    }
-}
-
 - (NSMutableAttributedString *)getAttrStringWithText:(NSString *)text {
     if (![NSString isEmptyString:text]) {
         NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
@@ -1638,7 +1613,7 @@ typedef NS_ENUM(NSInteger, CHOOSETYPE) {
     }
 }
 - (void)uploadImageArray:(NSMutableArray *)imageArray bucket:(NSString *)bucket {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     NSMutableArray *imageDataArray = [NSMutableArray array];
     for (UIImage *image in imageArray) {
         NSData *imgData = [UIImage turnsImaegDataByImage:image];
@@ -1646,7 +1621,7 @@ typedef NS_ENUM(NSInteger, CHOOSETYPE) {
     }
     [UPLOAD_MANAGER configWithfilePath:@"/user/"];
     [UPLOAD_MANAGER mutilUploadImage:imageDataArray fileName:@"complainImg" successCallback:^(NSMutableArray * _Nonnull fileUrlArray) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         NSMutableArray *urlArray = [NSMutableArray array];
         for (NSString *url in fileUrlArray) {
             [urlArray addObject:url];
@@ -1658,7 +1633,7 @@ typedef NS_ENUM(NSInteger, CHOOSETYPE) {
             self.chooseFileParm = nil;
         }
     } faliure:^(NSError * _Nullable error, NSString * _Nullable descMessaeg) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if (![NSString isEmptyString:descMessaeg]) {
             [LOADING_MANAGER MBShowAUTOHidingInWindow:descMessaeg];
         }
@@ -1693,23 +1668,21 @@ typedef NS_ENUM(NSInteger, CHOOSETYPE) {
 
 - (void)submitUrlWith:(NSString *)imgUrl videoUrl:(NSString *)videoUrl {
     // 上传视频
-    [self hudTipWillShow:YES];
     NSURL *uploadFileUrl = [NSURL fileURLWithPath:videoUrl];
     NSData *fileData = [NSData dataWithContentsOfURL:uploadFileUrl];
     NSString *suffix = [NSString stringWithFormat:@".%@",[uploadFileUrl pathExtension]];
     [UPLOAD_MANAGER videoUpload:fileData fileName:@"video" fileSuffix:suffix progress:^(int64_t bytesWritten, int64_t totalBytes) {
+        int progress = (int)(bytesWritten / totalBytes * 100);
+        __block NSString *tipsMessage = [NSString stringWithFormat:@"上传中 %d%%",progress];
         dispatch_main_async_safe(^{
-            // 显示进度
-            if (self.HUD) {
-                self.HUD.progress = bytesWritten / totalBytes;// progress是回调进度
-            }
+            [LOADING_MANAGER.loadingView setDisplayText:tipsMessage];
         });
     } successCallback:^(NSMutableArray * _Nonnull fileUrlArray) {
-        [self hudTipWillShow:NO];
+        [LOADING_MANAGER removeCustomLoading];
         NSString *fileUrl = [fileUrlArray lastObject];
         [self videoUploadCallback:fileUrl firstFrameImg:imgUrl];
     } faliure:^(NSError * _Nullable error, NSString * _Nullable descMessaeg) {
-        [self hudTipWillShow:NO];
+        [LOADING_MANAGER removeCustomLoading];
         if (![NSString isEmptyString:descMessaeg]) {
             [LOADING_MANAGER MBShowAUTOHidingInWindow:descMessaeg];
         }
@@ -1917,14 +1890,14 @@ typedef NS_ENUM(NSInteger, CHOOSETYPE) {
 
 - (void)uploadFile:(NSString *)fileName fileUrl:(NSString *)fileUrl {
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        [LOADING_MANAGER showHUD];
+        [LOADING_MANAGER showCustomLoading:@"加载中..."];
         NSString *suffix = [NSString stringWithFormat:@".%@",[[fileName componentsSeparatedByString:@"."] lastObject]];
         NSData *fileData = [NSData dataWithContentsOfURL:[NSURL fileURLWithPath:fileUrl]];
         [UPLOAD_MANAGER configWithfilePath:@"/user/"];
         [UPLOAD_MANAGER uploadFile:fileData fileName:@"file" fileSuffix:suffix progress:^(int64_t bytesWritten, int64_t totalBytes) {
             
         } successCallback:^(NSMutableArray * _Nonnull fileUrlArray) {
-            [LOADING_MANAGER removeHUD];
+            [LOADING_MANAGER removeCustomLoading];
             NSString *fileUrl = [fileUrlArray lastObject];
             if (self.chooseFileParm) { // 回调
                 [self.chooseFileParm setValue:fileUrl forKey:@"fileUrl"];
@@ -1932,7 +1905,7 @@ typedef NS_ENUM(NSInteger, CHOOSETYPE) {
                 self.chooseFileParm = nil;
             }
         } faliure:^(NSError * _Nullable error, NSString * _Nullable descMessaeg) {
-            [LOADING_MANAGER removeHUD];
+            [LOADING_MANAGER removeCustomLoading];
             if (![NSString isEmptyString:descMessaeg]) {
                 [LOADING_MANAGER MBShowAUTOHidingInWindow:descMessaeg];
             }

KulexiuForTeacher/KulexiuForTeacher/Common/LoadingManager/KSCustomLoadingView.m

@@ -43,6 +43,9 @@
 
 - (void)showLoadingView {
     UIWindow *windows = [NSObject getKeyWindow];
+    if ([windows.subviews containsObject:self]) {
+        return;
+    }
     [windows addSubview:self];
     [self mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.right.top.bottom.mas_equalTo(windows);

KulexiuForTeacher/KulexiuForTeacher/Common/Tools/Custom/KSMediaManager.m

@@ -196,14 +196,12 @@
 //
 //        NSLog(@"原视频大小：%@",[NSString stringWithFormat:@"%.2fM",(CGFloat)size/(1024*1024)]);
         dispatch_main_sync_safe(^{
-            [LOADING_MANAGER MBShowInWindow:@"视频导出中..."];
+            [LOADING_MANAGER showCustomLoading:@"上传中..."];
         });
         dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
             
             [[TZImageManager manager] getVideoOutputPathWithAsset:asset presetName:self.presentName success:^(NSString *outputPath) {
-                dispatch_main_sync_safe(^{
-                    [LOADING_MANAGER removeHUDNoDelay];
-                });
+                
                 NSLog(@"视频导出到本地完成,沙盒路径为:%@",outputPath);
                 NSData *outputData = [NSData dataWithContentsOfURL:[NSURL fileURLWithPath:outputPath]]; //压缩后的视频
                 NSLog(@"导出后的视频：%@",[NSString stringWithFormat:@"%.2fM",(CGFloat)outputData.length/(1024*1024)]);
@@ -217,7 +215,7 @@
                 
             } failure:^(NSString *errorMessage, NSError *error) {
                 dispatch_main_sync_safe(^{
-                    [LOADING_MANAGER removeHUDNoDelay];
+                    [LOADING_MANAGER removeCustomLoading];
                     [LOADING_MANAGER MBShowAUTOHidingInWindow:@"视频导出失败"];
                 });
                 NSLog(@"视频导出失败:%@,error:%@",errorMessage, error);
@@ -363,13 +361,11 @@
                 [tzImagePickerVc hideProgressHUD];
                 if (!error) {
                     dispatch_main_async_safe(^{
-                        [LOADING_MANAGER MBShowInWindow:@"视频处理中..."];
+                        [LOADING_MANAGER showCustomLoading:@"上传中..."];
                     });
                     [[TZImageManager manager] getVideoOutputPathWithAsset:asset presetName:self.presentName success:^(NSString *outputPath) {
                         // NSData *data = [NSData dataWithContentsOfFile:outputPath];
-                        dispatch_main_async_safe(^{
-                            [LOADING_MANAGER removeHUD];
-                        });
+                        
                         NSLog(@"视频导出到本地完成,沙盒路径为:%@",outputPath);
                         // Export completed, send video here, send by outputPath or NSData
                         // 导出完成，在这里写上传代码，通过路径或者通过NSData上传
@@ -383,7 +379,7 @@
                         
                     } failure:^(NSString *errorMessage, NSError *error) {
                         dispatch_main_async_safe(^{
-                            [LOADING_MANAGER removeHUD];
+                            [LOADING_MANAGER removeCustomLoading];
                             [LOADING_MANAGER MBShowAUTOHidingInWindow:@"视频导出失败"];
                         });
                         

KulexiuForTeacher/KulexiuForTeacher/Module/Chat/Controller/CreateFansGroupViewController.m

@@ -51,9 +51,9 @@
 
 - (void)submitAction:(NSString *)groupName desc:(NSString *)desc {
     [self configSubmitButtonEnable:NO];
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager imGroupCreate:KS_POST name:groupName introduce:desc success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             if (self.callback) {
                 self.callback();
@@ -68,7 +68,7 @@
         }
         [self configSubmitButtonEnable:YES];
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         [self configSubmitButtonEnable:YES];
     }];
 }

KulexiuForTeacher/KulexiuForTeacher/Module/Chat/Controller/KSChatUserDetailViewController.m

@@ -92,7 +92,7 @@
 }
 
 - (void)requestUserMessage {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager queryUserById:KS_GET rongCloudUserId:self.rongCloudId success:^(NSDictionary * _Nonnull dic) {
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             self.userInfo = [[ChatUserInfo alloc] initWithDictionary:[dic ks_dictionaryValueForKey:@"data"]];
@@ -103,14 +103,14 @@
         }
         
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 
 - (void)requestRecentPractice {
     
     [KSNetworkingManager queryUserRecentRequest:KS_GET userId:[NSString stringWithFormat:@"%.0f",self.userInfo.userId] success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         NSLog(@"%@", [dic mj_JSONString]);
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             NSArray *sourceArray = [[dic ks_dictionaryValueForKey:@"data"] ks_arrayValueForKey:@"rows"];
@@ -120,7 +120,7 @@
             
         }
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Chat/Controller/TenantGroup/TenantCreateGroupViewController.m

@@ -84,9 +84,9 @@
     for (TenantStuModel *model in self.memberArray) {
         [studentIds addObject:model.imUserId];
     }
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager tenantImGroupCreateRequest:KS_POST name:name introduce:desc studentIdArray:studentIds type:type success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             [LOADING_MANAGER KSShowMsg:@"创建群聊成功" promptCompletion:^{
                 [self backAction];
@@ -97,7 +97,7 @@
         }
         [self configSubmitButtonEnable:YES];
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         [self configSubmitButtonEnable:YES];
 
     }];

KulexiuForTeacher/KulexiuForTeacher/Module/Chat/Group/Controller/GroupApplyViewController.m

@@ -69,8 +69,9 @@
         return;
     }
     NSString *audioIds = [memberIdArray componentsJoinedByString:@","];
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager imGroupMemberAuditRequest:KS_POST groupId:self.groupId auditStatus:isApprove auditIds:audioIds success:^(NSDictionary * _Nonnull dic) {
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             [LOADING_MANAGER KSShowMsg:@"操作成功" promptCompletion:^{
                 if (self.isChooseAll) {
@@ -86,7 +87,7 @@
             [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
-        
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 

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

@@ -316,9 +316,9 @@
     for (TenantStuModel *model in array) {
         [stuIdArray addObject:model.imUserId];
     }
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager tenantImGroupAddMemberRequest:KS_POST groupId:self.groupId studentIdArray:stuIdArray success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             [self requestData];
         }
@@ -326,7 +326,7 @@
             [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Chat/Group/Controller/KSChatComplainController.m

@@ -86,7 +86,7 @@
         return;
     }
     NSString *content = self.bodyView.inputText.text;
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     NSMutableArray *imageDataArray = [NSMutableArray array];
     for (UIImage *image in self.imageArray) {
         NSData *imgData = [UIImage turnsImaegDataByImage:image];
@@ -101,7 +101,7 @@
         NSString *attachments = [urlArray componentsJoinedByString:@","];
         [self uplodMessage:attachments content:content];
     } faliure:^(NSError * _Nullable error, NSString * _Nullable descMessaeg) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if (![NSString isEmptyString:descMessaeg]) {
             [LOADING_MANAGER MBShowAUTOHidingInWindow:descMessaeg];
         }
@@ -112,7 +112,7 @@
     NSString *type = self.fromGroup ? @"GROUP" : @"PERSON";
     
     [KSNetworkingManager sysImComplaintRequest:KS_POST type:type fileUrl:attachments memo:content targetId:self.targetId success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             
             [LOADING_MANAGER KSShowMsg:@"已收到您的投诉，我们会认真审核并处理" promptCompletion:^{
@@ -123,7 +123,7 @@
             [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
     
 }

KulexiuForTeacher/KulexiuForTeacher/Module/Chat/GroupNotice/Controller/GroupNoticeEditController.m

@@ -49,9 +49,9 @@
     if (_isModify) {
         NSString *title = self.bodyView.titleView.text;
         NSString *content = self.bodyView.contentArea.text;
-        [LOADING_MANAGER showHUD];
+        [LOADING_MANAGER showCustomLoading:@"加载中..."];
         [KSNetworkingManager imGroupNoticeUpdateRequest:KS_POST groupId:self.groupId title:title content:content isTop:[NSString stringWithFormat:@"%d",self.bodyView.isOn] noticeID:self.noticeID success:^(NSDictionary * _Nonnull dic) {
-            [LOADING_MANAGER removeHUD];
+            [LOADING_MANAGER removeCustomLoading];
             if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
                 [LOADING_MANAGER KSShowMsg:@"修改成功" promptCompletion:^{
                     [self.navigationController popViewControllerAnimated:YES];
@@ -61,15 +61,15 @@
                 [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
             }
         } faliure:^(NSError * _Nonnull error) {
-            [LOADING_MANAGER removeHUD];
+            [LOADING_MANAGER removeCustomLoading];
         }];
     }
     else {
         NSString *title = self.bodyView.titleView.text;
         NSString *content = self.bodyView.contentArea.text;
-        [LOADING_MANAGER showHUD];
+        [LOADING_MANAGER showCustomLoading:@"加载中..."];
         [KSNetworkingManager imGroupNoticeCreateRequest:KS_POST groupId:self.groupId title:title content:content isTop:[NSString stringWithFormat:@"%d",self.bodyView.isOn] success:^(NSDictionary * _Nonnull dic) {
-            [LOADING_MANAGER removeHUD];
+            [LOADING_MANAGER removeCustomLoading];
             if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
                 [LOADING_MANAGER KSShowMsg:@"发布成功" promptCompletion:^{
                     [self.navigationController popViewControllerAnimated:YES];
@@ -79,7 +79,7 @@
                 [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
             }
         } faliure:^(NSError * _Nonnull error) {
-            [LOADING_MANAGER removeHUD];
+            [LOADING_MANAGER removeCustomLoading];
         }];
         
     }

KulexiuForTeacher/KulexiuForTeacher/Module/Chat/GroupNotice/Controller/GroupNoticeViewController.m

@@ -87,9 +87,9 @@
 }
 
 - (void)requestData {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager queryNoticeListRequest:KS_POST groupId:self.groupId page:[NSString stringWithFormat:@"%zd", self.pages] rows:[NSString stringWithFormat:@"%zd", self.rows] success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         [self endRefresh];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             // 赋值
@@ -108,7 +108,7 @@
         [self.tableView reloadData];
         [self changePromptLabelState];
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         [self endRefresh];
         if (self.networkAvaiable == NO) {
             [self setPromptString:@"暂无网络" imageName:@"no_networking" inView:self.tableView];
@@ -172,9 +172,9 @@
 
 - (void)deleteNotice:(id)source {
     GroupNoticeModel *model = source;
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager imGroupNoticeDelRequest:KS_POST noticeID:[NSString stringWithFormat:@"%.0f",model.internalBaseClassIdentifier] success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             [LOADING_MANAGER KSShowMsg:@"删除成功" promptCompletion:^{
                 [self resetParamenter];
@@ -185,7 +185,7 @@
             [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 
@@ -226,9 +226,9 @@
     else {
         isTop = @"1";
     }
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager imGroupNoticeUpdateRequest:KS_POST groupId:self.groupId title:model.title content:model.content isTop:isTop noticeID:[NSString stringWithFormat:@"%.0f",model.internalBaseClassIdentifier] success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             [self resetParamenter];
             [self requestData];
@@ -237,7 +237,7 @@
             [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Chat/ShareMusic/Controller/ShareMusicViewController.m

@@ -128,9 +128,9 @@
 }
 
 - (void)requestData {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager musicListRequest:KS_POST auditStatus:@"PASS" page:self.pages rows:self.rows search:self.searchKey subjectIds:@"" success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         [self endRefresh];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             NSArray *sourceArray = [[dic ks_dictionaryValueForKey:@"data"] ks_arrayValueForKey:@"rows"];
@@ -148,7 +148,7 @@
         [self.tableView reloadData];
         [self changePromptLabelState];
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         [self endRefresh];
         if (self.networkAvaiable == NO) {
             [self setPromptString:@"暂无网络" imageName:@"no_networking" inView:self.tableView];

KulexiuForTeacher/KulexiuForTeacher/Module/Course/AccompanyCourse/Controller/AccompanyCourseGroupViewController.m

@@ -263,9 +263,9 @@
 }
 
 - (void)submitAction:(NSString *)planString {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager updateCoursePlanRequset:KS_POST courseGroupId:self.courseGroupId coursePlan:planString success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             [self requestCourseInfo];
         }
@@ -274,7 +274,7 @@
         }
         
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Course/AccompanyCourse/Controller/AccompanyDetailViewController.m

@@ -68,6 +68,12 @@
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
     [self requestCourseInfoMessage];
+    [self configStatusViewColorWhite:YES];
+}
+
+- (void)viewWillDisappear:(BOOL)animated {
+    [super viewWillDisappear:animated];
+    [self configStatusViewColorWhite:NO];
 }
 
 - (void)requestRoomConfig {
@@ -272,9 +278,9 @@
         [LOADING_MANAGER MBShowAUTOHidingInWindow:@"请输入评价内容"];
         return;
     }
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager teacherCourseRepliedRequest:KS_POST courseScheduleId:self.courseId courseGroupId:self.courseGroupId studentId:self.studentId teacherReplied:content success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             [LOADING_MANAGER MBShowAUTOHidingInWindow:@"评价成功"];
             [self requestCourseInfoMessage];
@@ -283,7 +289,7 @@
             [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 
@@ -303,9 +309,9 @@
 }
 
 - (void)arrangeAction:(NSString *)homeworkContent {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager homeworkDecorateRequest:KS_POST content:homeworkContent courseScheduleId:self.courseId success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             [LOADING_MANAGER MBShowAUTOHidingInWindow:@"布置成功"];
             [self requestCourseInfoMessage];
@@ -314,7 +320,7 @@
             [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 
@@ -338,9 +344,9 @@
 }
 
 - (void)commentAction:(NSString *)commentMessage {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager homeworkReviewRequest:KS_POST courseScheduleId:self.courseId studentId:self.studentId review:commentMessage success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             [LOADING_MANAGER MBShowAUTOHidingInWindow:@"点评成功"];
             [self requestCourseInfoMessage];
@@ -349,7 +355,7 @@
             [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Course/AccompanyCourse/View/AccompanyArrangeCell.xib

@@ -12,14 +12,14 @@
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="150" id="KGk-i7-Jjw" customClass="AccompanyArrangeCell">
-            <rect key="frame" x="0.0" y="0.0" width="375" height="150"/>
+            <rect key="frame" x="0.0" y="0.0" width="375" height="152"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
-                <rect key="frame" x="0.0" y="0.0" width="375" height="150"/>
+                <rect key="frame" x="0.0" y="0.0" width="375" height="152"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gA1-Yl-rTq">
-                        <rect key="frame" x="14" y="0.0" width="347" height="138"/>
+                        <rect key="frame" x="14" y="0.0" width="347" height="140"/>
                         <subviews>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="accell_left" translatesAutoresizingMaskIntoConstraints="NO" id="zvH-rj-MgD">
                                 <rect key="frame" x="12" y="14" width="3" height="12"/>
@@ -104,7 +104,7 @@
                                             <constraint firstAttribute="height" constant="14" id="S3q-9F-uoV"/>
                                         </constraints>
                                     </imageView>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="布置作业" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2ic-2e-bQu" userLabel="3">
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="布置作业" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2ic-2e-bQu">
                                         <rect key="frame" x="22" y="11.5" width="56" height="17"/>
                                         <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/>
                                         <color key="textColor" red="0.1764705882352941" green="0.7803921568627451" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -137,7 +137,7 @@
                             <constraint firstItem="qyk-Yf-gN8" firstAttribute="top" secondItem="gA1-Yl-rTq" secondAttribute="top" constant="10" id="4N8-Kg-hha"/>
                             <constraint firstAttribute="trailing" secondItem="vf1-Yo-J7O" secondAttribute="trailing" constant="12" id="C9V-eH-geC"/>
                             <constraint firstItem="vf1-Yo-J7O" firstAttribute="leading" secondItem="gA1-Yl-rTq" secondAttribute="leading" constant="12" id="NWC-5K-8kt"/>
-                            <constraint firstAttribute="bottom" secondItem="vf1-Yo-J7O" secondAttribute="bottom" constant="10" id="T6p-ud-tLL"/>
+                            <constraint firstAttribute="bottom" secondItem="vf1-Yo-J7O" secondAttribute="bottom" constant="12" id="T6p-ud-tLL"/>
                             <constraint firstItem="zvH-rj-MgD" firstAttribute="leading" secondItem="gA1-Yl-rTq" secondAttribute="leading" constant="12" id="ad3-xv-Xlz"/>
                             <constraint firstItem="qyk-Yf-gN8" firstAttribute="centerY" secondItem="zvH-rj-MgD" secondAttribute="centerY" id="dYy-51-vic"/>
                             <constraint firstAttribute="trailing" secondItem="6qK-hE-EmI" secondAttribute="trailing" constant="12" id="dau-g2-5J6"/>

KulexiuForTeacher/KulexiuForTeacher/Module/Course/AccompanyCourse/View/AccompanyEvaluateCell.xib

@@ -12,14 +12,14 @@
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="196" id="KGk-i7-Jjw" customClass="AccompanyEvaluateCell">
-            <rect key="frame" x="0.0" y="0.0" width="354" height="150"/>
+            <rect key="frame" x="0.0" y="0.0" width="354" height="152"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
-                <rect key="frame" x="0.0" y="0.0" width="354" height="150"/>
+                <rect key="frame" x="0.0" y="0.0" width="354" height="152"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3vN-Vj-itp">
-                        <rect key="frame" x="14" y="0.0" width="326" height="138"/>
+                        <rect key="frame" x="14" y="0.0" width="326" height="140"/>
                         <subviews>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="accell_left" translatesAutoresizingMaskIntoConstraints="NO" id="lLF-ft-OTS">
                                 <rect key="frame" x="12" y="14" width="3" height="12"/>
@@ -137,7 +137,7 @@
                             <constraint firstItem="ksa-Jo-b55" firstAttribute="centerY" secondItem="lLF-ft-OTS" secondAttribute="centerY" id="4cQ-qj-M1R"/>
                             <constraint firstItem="UuA-Bs-h8B" firstAttribute="leading" secondItem="3vN-Vj-itp" secondAttribute="leading" constant="12" id="4kZ-bC-zD8"/>
                             <constraint firstItem="lLF-ft-OTS" firstAttribute="leading" secondItem="3vN-Vj-itp" secondAttribute="leading" constant="12" id="B3T-Uw-Liq"/>
-                            <constraint firstAttribute="bottom" secondItem="UuA-Bs-h8B" secondAttribute="bottom" constant="10" id="PEn-6P-tRY"/>
+                            <constraint firstAttribute="bottom" secondItem="UuA-Bs-h8B" secondAttribute="bottom" constant="12" id="PEn-6P-tRY"/>
                             <constraint firstItem="UuA-Bs-h8B" firstAttribute="top" secondItem="ksa-Jo-b55" secondAttribute="bottom" constant="10" id="dfO-BO-Wpw"/>
                             <constraint firstAttribute="trailing" secondItem="UJk-HT-rTs" secondAttribute="trailing" constant="11" id="eK6-jh-Ydy"/>
                             <constraint firstAttribute="trailing" secondItem="UuA-Bs-h8B" secondAttribute="trailing" constant="12" id="jWf-Oo-FS8"/>

KulexiuForTeacher/KulexiuForTeacher/Module/Course/AccompanyCourse/View/AccompanyHomeworkCell.m

@@ -9,6 +9,8 @@
 
 @interface AccompanyHomeworkCell ()
 
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *containerHeight;
+
 @property (weak, nonatomic) IBOutlet UIView *emptyView;
 
 @property (weak, nonatomic) IBOutlet UILabel *emptyDescLabel;
@@ -34,6 +36,7 @@
     [self.videoContainer removeAllSubViews];
     if (homeworkExpire) {
         self.emptyView.hidden = NO;
+        self.containerHeight.constant = 88.0f;
         NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
         [paragraphStyle setLineSpacing:4];//调整行间距
         NSMutableAttributedString *attr = [[NSMutableAttributedString alloc] initWithString:@"作业已过期无法查看！" attributes:@{NSParagraphStyleAttributeName:paragraphStyle,NSFontAttributeName:[UIFont systemFontOfSize:13.0f],NSForegroundColorAttributeName:HexRGB(0x999999)}];
@@ -42,10 +45,12 @@
     else {
         if (hasSubmit) {
             self.emptyView.hidden = YES;
+            self.containerHeight.constant = 76.0f;
             [self configVideoViewWithSource:fileArray];
         }
         else {
             self.emptyView.hidden = NO;
+            self.containerHeight.constant = 88.0f;
             NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
             [paragraphStyle setLineSpacing:4];//调整行间距
             NSMutableAttributedString *attr = [[NSMutableAttributedString alloc] initWithString:@"学员尚未上传作业视频" attributes:@{NSParagraphStyleAttributeName:paragraphStyle,NSFontAttributeName:[UIFont systemFontOfSize:13.0f],NSForegroundColorAttributeName:HexRGB(0x999999)}];
@@ -56,18 +61,19 @@
 }
 
 - (void)configVideoViewWithSource:(NSMutableArray *)fileArray {
-    CGFloat maxWidth = kScreenWidth - 24 - 24;
+    CGFloat maxWidth = KPortraitWidth - 14 * 2 - 12 * 2;
+    CGFloat leftSpace = 0.0f;
     CGFloat space = 10;
-    CGFloat width = (maxWidth - space * 2) / 3.0f;
+    CGFloat width = (maxWidth - space * 2 - leftSpace * 2) / 3.0f;
     CGFloat height = 72.0f;
     for (NSInteger i = 0; i < fileArray.count; i++) {
         if (i > 2) {
             return;
         }
-        CGFloat positionX = i * (width + space);
+        CGFloat positionX = leftSpace + i * (width + space);
         NSString *videoUrl = fileArray[i];
         HomeworkVideoView *videoView = [HomeworkVideoView shareInstance];
-        videoView.frame = CGRectMake(positionX, 0, width, height);
+        videoView.frame = CGRectMake(positionX, 2, width, height);
         videoView.tag = i+1000;
         MJWeakSelf
         [videoView displayVideoUrl:videoUrl callback:^(NSInteger viewIndex) {

KulexiuForTeacher/KulexiuForTeacher/Module/Course/AccompanyCourse/View/AccompanyHomeworkCell.xib

@@ -12,14 +12,14 @@
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="150" id="KGk-i7-Jjw" customClass="AccompanyHomeworkCell">
-            <rect key="frame" x="0.0" y="0.0" width="364" height="150"/>
+            <rect key="frame" x="0.0" y="0.0" width="364" height="152"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
-                <rect key="frame" x="0.0" y="0.0" width="364" height="150"/>
+                <rect key="frame" x="0.0" y="0.0" width="364" height="152"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dtq-Yd-b5t">
-                        <rect key="frame" x="14" y="0.0" width="336" height="138"/>
+                        <rect key="frame" x="14" y="0.0" width="336" height="140"/>
                         <subviews>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="accell_left" translatesAutoresizingMaskIntoConstraints="NO" id="1fO-1K-g2U">
                                 <rect key="frame" x="12" y="14" width="3" height="12"/>
@@ -78,7 +78,7 @@
                                 <constraints>
                                     <constraint firstAttribute="trailing" secondItem="O89-iL-xU2" secondAttribute="trailing" id="HQp-bb-AtX"/>
                                     <constraint firstItem="O89-iL-xU2" firstAttribute="leading" secondItem="0zy-PX-mCI" secondAttribute="leading" id="S2b-yI-RdW"/>
-                                    <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="88" id="ZyR-89-1K1"/>
+                                    <constraint firstAttribute="height" constant="88" id="ZyR-89-1K1"/>
                                     <constraint firstItem="O89-iL-xU2" firstAttribute="top" secondItem="0zy-PX-mCI" secondAttribute="top" id="bRR-gO-HrZ"/>
                                     <constraint firstAttribute="bottom" secondItem="O89-iL-xU2" secondAttribute="bottom" id="lUa-1z-WaZ"/>
                                 </constraints>
@@ -92,7 +92,7 @@
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
                             <constraint firstItem="0zy-PX-mCI" firstAttribute="leading" secondItem="EwC-zg-aiZ" secondAttribute="leading" id="6qS-1K-oIf"/>
-                            <constraint firstAttribute="bottom" secondItem="0zy-PX-mCI" secondAttribute="bottom" constant="10" id="F6N-7x-aaL"/>
+                            <constraint firstAttribute="bottom" secondItem="0zy-PX-mCI" secondAttribute="bottom" constant="12" id="F6N-7x-aaL"/>
                             <constraint firstItem="sJu-iK-25U" firstAttribute="top" secondItem="dtq-Yd-b5t" secondAttribute="top" constant="10" id="YnU-KO-22q"/>
                             <constraint firstItem="sJu-iK-25U" firstAttribute="leading" secondItem="1fO-1K-g2U" secondAttribute="trailing" constant="5" id="eUo-qr-eCq"/>
                             <constraint firstItem="0zy-PX-mCI" firstAttribute="leading" secondItem="dtq-Yd-b5t" secondAttribute="leading" constant="12" id="hOV-oC-FPR"/>
@@ -121,6 +121,7 @@
             <viewLayoutGuide key="safeArea" id="aW0-zy-SZf"/>
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <connections>
+                <outlet property="containerHeight" destination="ZyR-89-1K1" id="Y9w-dp-rDm"/>
                 <outlet property="emptyDescLabel" destination="xV1-w2-nqO" id="A9e-cY-VSi"/>
                 <outlet property="emptyView" destination="0zy-PX-mCI" id="3KA-n7-M42"/>
                 <outlet property="videoContainer" destination="EwC-zg-aiZ" id="5RL-eg-4SG"/>

KulexiuForTeacher/KulexiuForTeacher/Module/Course/AccompanyCourse/View/AccompanyRemarkCell.xib

@@ -12,14 +12,14 @@
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="150" id="KGk-i7-Jjw" customClass="AccompanyRemarkCell">
-            <rect key="frame" x="0.0" y="0.0" width="375" height="150"/>
+            <rect key="frame" x="0.0" y="0.0" width="375" height="152"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
-                <rect key="frame" x="0.0" y="0.0" width="375" height="150"/>
+                <rect key="frame" x="0.0" y="0.0" width="375" height="152"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qyw-41-OgZ">
-                        <rect key="frame" x="14" y="0.0" width="347" height="138"/>
+                        <rect key="frame" x="14" y="0.0" width="347" height="140"/>
                         <subviews>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="accell_left" translatesAutoresizingMaskIntoConstraints="NO" id="Nmt-3B-GQh">
                                 <rect key="frame" x="12" y="14" width="3" height="12"/>
@@ -136,7 +136,7 @@
                             <constraint firstItem="ZfR-Jo-QQv" firstAttribute="centerY" secondItem="Lof-Tc-krl" secondAttribute="centerY" id="UaP-aW-gTG"/>
                             <constraint firstItem="ehC-4r-0Vt" firstAttribute="top" secondItem="ZfR-Jo-QQv" secondAttribute="bottom" id="bV3-FA-Wmf"/>
                             <constraint firstItem="ehC-4r-0Vt" firstAttribute="top" secondItem="Lof-Tc-krl" secondAttribute="bottom" constant="10" id="c4A-7V-3jf"/>
-                            <constraint firstAttribute="bottom" secondItem="ehC-4r-0Vt" secondAttribute="bottom" constant="10" id="ghc-VL-2mE"/>
+                            <constraint firstAttribute="bottom" secondItem="ehC-4r-0Vt" secondAttribute="bottom" constant="12" id="ghc-VL-2mE"/>
                             <constraint firstItem="ehC-4r-0Vt" firstAttribute="leading" secondItem="qyw-41-OgZ" secondAttribute="leading" constant="12" id="lg4-q3-Py7"/>
                         </constraints>
                         <userDefinedRuntimeAttributes>

KulexiuForTeacher/KulexiuForTeacher/Module/Course/AccompanyCourse/View/AccompanyStudentEvaCell.xib

@@ -12,14 +12,14 @@
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="174" id="KGk-i7-Jjw" customClass="AccompanyStudentEvaCell">
-            <rect key="frame" x="0.0" y="0.0" width="375" height="150"/>
+            <rect key="frame" x="0.0" y="0.0" width="375" height="152"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
-                <rect key="frame" x="0.0" y="0.0" width="375" height="150"/>
+                <rect key="frame" x="0.0" y="0.0" width="375" height="152"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Yyc-jU-e8w">
-                        <rect key="frame" x="14" y="0.0" width="347" height="138"/>
+                        <rect key="frame" x="14" y="0.0" width="347" height="140"/>
                         <subviews>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="accell_left" translatesAutoresizingMaskIntoConstraints="NO" id="ltT-kf-P7C">
                                 <rect key="frame" x="12" y="14" width="3" height="12"/>
@@ -145,7 +145,7 @@
                             <constraint firstItem="CS9-1I-B48" firstAttribute="leading" secondItem="Yyc-jU-e8w" secondAttribute="leading" constant="12" id="Gq6-4H-5L7"/>
                             <constraint firstItem="9CO-NU-fBc" firstAttribute="centerY" secondItem="dMT-VK-l9k" secondAttribute="centerY" id="MIb-jS-DNJ"/>
                             <constraint firstAttribute="trailing" secondItem="CS9-1I-B48" secondAttribute="trailing" constant="12" id="Nlt-hE-n6i"/>
-                            <constraint firstAttribute="bottom" secondItem="CS9-1I-B48" secondAttribute="bottom" constant="10" id="Qcs-io-hc9"/>
+                            <constraint firstAttribute="bottom" secondItem="CS9-1I-B48" secondAttribute="bottom" constant="12" id="Qcs-io-hc9"/>
                             <constraint firstItem="CS9-1I-B48" firstAttribute="top" secondItem="9CO-NU-fBc" secondAttribute="bottom" id="Yue-o1-bKx"/>
                             <constraint firstItem="ltT-kf-P7C" firstAttribute="leading" secondItem="Yyc-jU-e8w" secondAttribute="leading" constant="12" id="gf9-Gz-x7R"/>
                             <constraint firstItem="ay0-L4-b3f" firstAttribute="centerY" secondItem="dMT-VK-l9k" secondAttribute="centerY" id="jIr-kE-YQZ"/>

KulexiuForTeacher/KulexiuForTeacher/Module/Course/Controller/CourseViewController.m

@@ -361,9 +361,7 @@
 
 #pragma mark --- 获取当日课程
 - (void)getCourseByDate:(NSString *)date {
-    [LOADING_MANAGER showHUD];
     [KSNetworkingManager queryCourseForDay:KS_POST classDate:date success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             // 配置信息
             NSDictionary *config = [[dic ks_dictionaryValueForKey:@"data"] ks_dictionaryValueForKey:@"sysConfig"];
@@ -392,7 +390,6 @@
         [self.tableView reloadData];
         [self changePromptLabelState];
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
     }];
 }
 
@@ -590,9 +587,9 @@
             return;
         }
     }
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager courseAdjustRequst:KS_POST courseId:model.courseId classDate:classDate startTime:chooseTime endTime:endTime success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             [LOADING_MANAGER KSShowMsg:@"调整成功" promptCompletion:^{
                 [self loadMonthCourse:self.chooseMonth];
@@ -605,7 +602,7 @@
             [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Course/MusicRoom/Controller/MusicRoomGroupViewController.m

@@ -302,9 +302,9 @@
 }
 
 - (void)submitAction:(NSString *)planString {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager updateCoursePlanRequset:KS_POST courseGroupId:self.courseGroupId coursePlan:planString success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             [self requestCourseInfo];
         }
@@ -313,7 +313,7 @@
         }
         
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Course/MusicRoom/Controller/MusicRoomViewController.m

@@ -90,6 +90,12 @@
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
     [self requestCourseInfoMessage];
+    [self configStatusViewColorWhite:YES];
+}
+
+- (void)viewWillDisappear:(BOOL)animated {
+    [super viewWillDisappear:animated];
+    [self configStatusViewColorWhite:NO];
 }
 
 - (void)requestCourseInfoMessage {
@@ -113,9 +119,9 @@
 }
 
 - (void)requestStudentList {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager musicRoomDetailRequest:KS_POST courseId:self.courseId success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             self.detailModel = [[MusicRoomDetailModel alloc] initWithDictionary:[dic ks_dictionaryValueForKey:@"data"]];
             self.studentArray = [NSMutableArray arrayWithArray:self.detailModel.studentHomeworkList.records];
@@ -126,7 +132,7 @@
         }
         [self.tableView reloadData];
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 
@@ -239,9 +245,9 @@
 }
 
 - (void)arrangeAction:(NSString *)homeworkContent {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager homeworkDecorateRequest:KS_POST content:homeworkContent courseScheduleId:self.courseId success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             [LOADING_MANAGER MBShowAUTOHidingInWindow:@"布置成功"];
             [self requestCourseInfoMessage];
@@ -250,7 +256,7 @@
             [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Course/VIPCourse/Controller/VIPCourseGroupViewController.m

@@ -258,9 +258,9 @@
 }
 
 - (void)submitAction:(NSString *)planString {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager updateCoursePlanRequset:KS_POST courseGroupId:self.courseGroupId coursePlan:planString success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             [self requestCourseInfo];
         }
@@ -269,7 +269,7 @@
         }
         
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 /*

KulexiuForTeacher/KulexiuForTeacher/Module/Course/VIPCourse/Controller/VipCouseDetailViewController.m

@@ -280,9 +280,9 @@
         [LOADING_MANAGER MBShowAUTOHidingInWindow:@"请输入评价内容"];
         return;
     }
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager teacherCourseRepliedRequest:KS_POST courseScheduleId:self.courseId courseGroupId:self.courseGroupId studentId:self.studentId teacherReplied:content success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             [LOADING_MANAGER MBShowAUTOHidingInWindow:@"评价成功"];
             [self requestCourseInfoMessage];
@@ -291,7 +291,7 @@
             [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 
@@ -311,9 +311,9 @@
 }
 
 - (void)arrangeAction:(NSString *)homeworkContent {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager homeworkDecorateRequest:KS_POST content:homeworkContent courseScheduleId:self.courseId success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             [LOADING_MANAGER MBShowAUTOHidingInWindow:@"布置成功"];
             [self requestCourseInfoMessage];
@@ -322,7 +322,7 @@
             [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 
@@ -347,9 +347,9 @@
 }
 
 - (void)commentAction:(NSString *)commentMessage {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager homeworkReviewRequest:KS_POST courseScheduleId:self.courseId studentId:self.studentId review:commentMessage success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             [LOADING_MANAGER MBShowAUTOHidingInWindow:@"点评成功"];
             [self requestCourseInfoMessage];
@@ -358,7 +358,7 @@
             [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Course/VIPCourse/View/ProgramCourseGroupBodyView.m

@@ -263,9 +263,7 @@
     else {
         NSString *tipsString = [NSString stringWithFormat:@"课程还未开始，请在上课前%zd分钟进入", self.joinRoomBeforeTime];
         [LOADING_MANAGER MBShowAUTOHidingInWindow:tipsString];
-    }
-    
-    [self joinClassRoom:model];
+    }    
 }
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {

KulexiuForTeacher/KulexiuForTeacher/Module/Home/Controller/HomeViewController.m

@@ -759,7 +759,7 @@
 
 
 - (void)requestHomeMessage {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [self requestUserInfo];
 }
 
@@ -774,7 +774,7 @@
     [self requestAwardMessage];
     
     dispatch_group_notify(self.requestGroup, dispatch_get_main_queue(), ^{
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         [self.scrollView.mj_header endRefreshing];
         [self refreshView];
     });
@@ -951,9 +951,9 @@
 }
 
 - (void)setDefaultSubject:(NSString *)subjectId {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager defaultSubjectRequest:KS_POST subjectId:subjectId success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             // 请求数据
             [self requestHomeMessage];
@@ -962,7 +962,7 @@
             [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
     
 }

KulexiuForTeacher/KulexiuForTeacher/Module/Home/EvaluateCourse/Controller/EvaluateDetailViewController.m

@@ -43,9 +43,8 @@
 }
 
 - (void)requestData {
-    [LOADING_MANAGER showHUD];
+    
     [KSNetworkingManager selectRepliedRequest:KS_POST courseGroupId:self.courseGroupId courseScheduleId:self.courseId studentId:self.studentId success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             self.detailModel = [[EvaluateDetailModel alloc] initWithDictionary:[dic ks_dictionaryValueForKey:@"data"]];
         }
@@ -55,7 +54,6 @@
         }
         [self.tableView reloadData];
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
     }];
 }
 
@@ -98,9 +96,9 @@
         [LOADING_MANAGER MBShowAUTOHidingInWindow:@"请输入评价内容"];
         return;
     }
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager teacherCourseRepliedRequest:KS_POST courseScheduleId:self.courseId courseGroupId:self.courseGroupId studentId:self.studentId teacherReplied:content success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             [LOADING_MANAGER MBShowAUTOHidingInWindow:@"评价成功"];
             [self requestData];
@@ -109,7 +107,7 @@
             [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Home/Homework/Controller/HomeworkDetailViewController.m

@@ -45,7 +45,6 @@
     [super viewDidLoad];
     // Do any additional setup after loading the view.
     self.ks_prefersNavigationBarHidden = YES;
-    [self allocTitle:@"布置作业"];
     [self requestCourseMessage];
 }
 
@@ -72,9 +71,9 @@
 }
 
 - (void)requestCourseMessage {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager homeworkDetailRequest:KS_GET courseId:self.courseId studentId:self.studentId  success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             self.detailModel = [[HomeworkDetailModel alloc] initWithDictionary:[dic ks_dictionaryValueForKey:@"data"]];
             [self evaluateViewDisplay];
@@ -83,7 +82,7 @@
             [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 
@@ -189,9 +188,9 @@
 }
 
 - (void)evaluateAction:(NSString *)evaluateContent {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager homeworkReviewRequest:KS_POST courseScheduleId:self.courseId studentId:self.studentId review:evaluateContent success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             [LOADING_MANAGER MBShowAUTOHidingInWindow:@"点评成功"];
             [self requestCourseMessage];
@@ -200,14 +199,14 @@
             [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 
 - (void)arrangeAction:(NSString *)homeworkContent {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager homeworkDecorateRequest:KS_POST content:homeworkContent courseScheduleId:self.courseId success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             [LOADING_MANAGER MBShowAUTOHidingInWindow:@"布置成功"];
             [self requestCourseMessage];
@@ -216,7 +215,7 @@
             [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Home/Homework/Controller/HomeworkListViewController.m

@@ -56,7 +56,6 @@
     }];
     
     self.headHeight = CGFLOAT_MIN;
-    [self.scrollView removeFromSuperview];
     
     _categoryView = [[JXCategoryTitleView alloc] initWithFrame:CGRectMake(0, navHeight, KPortraitWidth, self.headHeight)];
     self.categoryView.titles = self.titles;
@@ -96,8 +95,6 @@
 - (void)viewDidAppear:(BOOL)animated {
     [super viewDidAppear:animated];
     self.navigationController.interactivePopGestureRecognizer.enabled = (self.categoryView.selectedIndex == 0);
-    // 页面Disappear 启用
-    [IQKeyboardManager sharedManager].enable = YES;
 }
 
 - (void)viewWillDisappear:(BOOL)animated {

KulexiuForTeacher/KulexiuForTeacher/Module/Home/Homework/Controller/MusicRoomHomeworkStudentController.m

@@ -45,9 +45,9 @@
 }
 
 - (void)requestData {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager musicRoomDetailRequest:KS_POST courseId:self.courseId success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             self.detailModel = [[MusicRoomDetailModel alloc] initWithDictionary:[dic ks_dictionaryValueForKey:@"data"]];
             self.studentArray = [NSMutableArray arrayWithArray:self.detailModel.studentHomeworkList.records];
@@ -57,7 +57,7 @@
         }
         [self.tableView reloadData];
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 #pragma mark ----- tablb data source

KulexiuForTeacher/KulexiuForTeacher/Module/Home/Homework/View/HomeworkListCell.xib

@@ -11,7 +11,7 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="74" id="KGk-i7-Jjw" customClass="HomeworkListCell">
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="123" id="KGk-i7-Jjw" customClass="HomeworkListCell">
             <rect key="frame" x="0.0" y="0.0" width="468" height="123"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">

KulexiuForTeacher/KulexiuForTeacher/Module/Home/Homework/View/HomeworkSortView.m

@@ -22,7 +22,7 @@
 - (void)awakeFromNib {
     [super awakeFromNib];
     self.searchField.delegate = self;
-    self.searchField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:@"请输入课程组名称" attributes:@{NSForegroundColorAttributeName:HexRGBAlpha(0x000000, 0.4),NSFontAttributeName:[UIFont systemFontOfSize:14.0f]}];
+    self.searchField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:@"请输入学生名称" attributes:@{NSForegroundColorAttributeName:HexRGBAlpha(0x000000, 0.4),NSFontAttributeName:[UIFont systemFontOfSize:14.0f]}];
 }
 
 + (instancetype)shareInstance {

KulexiuForTeacher/KulexiuForTeacher/Module/Home/Homework/View/HomeworkVideoView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -44,7 +44,7 @@
                     </constraints>
                     <userDefinedRuntimeAttributes>
                         <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                            <real key="value" value="10"/>
+                            <real key="value" value="5"/>
                         </userDefinedRuntimeAttribute>
                     </userDefinedRuntimeAttributes>
                 </view>

KulexiuForTeacher/KulexiuForTeacher/Module/Home/Income/Controller/FreezeListViewController.m

@@ -132,9 +132,9 @@
 
 
 - (void)requestData {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager userAccountPageRequest:KS_POST paymentStatus:@"OUT" searchDate:self.searchDate bizType:self.bizType postStatus:@"FROZEN" page:self.pages rows:self.rows success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         [self endRefresh];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             NSArray *sourceArray = [[dic ks_dictionaryValueForKey:@"data"] ks_arrayValueForKey:@"rows"];
@@ -154,7 +154,7 @@
         [self.tableView reloadData];
         [self changePromptLabelState];
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         [self endRefresh];
         if (self.networkAvaiable == NO) {
             [self setPromptString:@"暂无网络" imageName:@"no_networking" inView:self.tableView];

KulexiuForTeacher/KulexiuForTeacher/Module/Home/Income/Controller/IncomeCountViewController.m

@@ -130,9 +130,9 @@
 
 - (void)requestData {
     NSString *timeType = self.isYear ? @"YEAR" : @"MONTH";
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager accountTotalRequest:KS_POST dateTime:self.chooseDate timeType:timeType success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             NSDictionary *returnValue = [dic ks_dictionaryValueForKey:@"data"];
             self.topView.totalSalary.text = [NSString formatMoneyDoubleNum:[returnValue ks_floatValueForKey:@"totalInAmount"]];
@@ -155,7 +155,7 @@
             [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Home/Income/Controller/MyIncomeViewController.m

@@ -153,9 +153,9 @@
 
 
 - (void)requestData {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager userAccountPageRequest:KS_POST paymentStatus:@"IN" searchDate:self.searchDate bizType:self.bizType postStatus:@"RECORDED" page:self.pages rows:self.rows success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         [self endRefresh];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             NSArray *sourceArray = [[dic ks_dictionaryValueForKey:@"data"] ks_arrayValueForKey:@"rows"];
@@ -175,7 +175,7 @@
         [self.tableView reloadData];
         [self changePromptLabelState];
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         [self endRefresh];
         if (self.networkAvaiable == NO) {
             [self setPromptString:@"暂无网络" imageName:@"no_networking" inView:self.tableView];

KulexiuForTeacher/KulexiuForTeacher/Module/Home/Income/Controller/NoRecordViewController.m

@@ -133,9 +133,9 @@
 
 
 - (void)requestData {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager userAccountPageRequest:KS_POST paymentStatus:@"IN" searchDate:self.searchDate bizType:self.bizType postStatus:@"WAIT" page:self.pages rows:self.rows success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         [self endRefresh];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             NSArray *sourceArray = [[dic ks_dictionaryValueForKey:@"data"] ks_arrayValueForKey:@"rows"];
@@ -155,7 +155,7 @@
         [self.tableView reloadData];
         [self changePromptLabelState];
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         [self endRefresh];
         if (self.networkAvaiable == NO) {
             [self setPromptString:@"暂无网络" imageName:@"no_networking" inView:self.tableView];

KulexiuForTeacher/KulexiuForTeacher/Module/Home/Income/WithDraw/Controller/CashRecordViewController.m

@@ -111,9 +111,9 @@
 }
 
 - (void)requestData {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager withdrawalPageRequest:KS_POST searchDate:self.searchDate status:self.statusType page:self.pages rows:self.rows success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         [self endRefresh];
         NSLog(@"%@",[dic mj_JSONString]);
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
@@ -133,7 +133,7 @@
         [self.tableView reloadData];
         [self changePromptLabelState];
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         [self endRefresh];
         if (self.networkAvaiable == NO) {
             [self setPromptString:@"暂无网络" imageName:@"no_networking" inView:self.tableView];

KulexiuForTeacher/KulexiuForTeacher/Module/Home/Income/WithDraw/Controller/WithdrawViewController.m

@@ -110,9 +110,9 @@ typedef NS_ENUM(NSInteger, SIGN_STATUS) {
 }
 
 - (void)requestData {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager getWithdrawalInfoRequest:KS_POST success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             self.drawModel = [[WithdrawModel alloc] initWithDictionary:[dic ks_dictionaryValueForKey:@"data"]];
         }
@@ -121,7 +121,7 @@ typedef NS_ENUM(NSInteger, SIGN_STATUS) {
         }
         [self evaluateSource];
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 
@@ -220,9 +220,9 @@ typedef NS_ENUM(NSInteger, SIGN_STATUS) {
         return;
     }
     
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager withdrawalRequest:KS_POST amountWithdrawal:[amountString doubleValue] bankCardId:[NSString stringWithFormat:@"%.0f",self.drawModel.userBankCard.userBankCardIdentifier] success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             [self showSuccessView];
         }
@@ -230,7 +230,7 @@ typedef NS_ENUM(NSInteger, SIGN_STATUS) {
             [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Home/Music/Controller/MyMusicViewController.m

@@ -112,9 +112,9 @@
 }
 
 - (void)shareButtonClick { // 获取分享数据
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager queryMusicShareMessageRequest:KS_GET success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             NSDictionary *resultDic = [dic ks_dictionaryValueForKey:@"data"];
             MusicShareModel *model = [[MusicShareModel alloc] initWithDictionary:resultDic];
@@ -129,7 +129,7 @@
             [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Home/NotiferMessage/Controller/NotiferMessageViewController.m

@@ -170,9 +170,7 @@
     });
 }
 - (void)requestData {
-    [LOADING_MANAGER showHUD];
     [KSNetworkingManager sysMessageListRequest:KS_POST group:self.groupType page:self.pages rows:self.rows success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
         [self endRefresh];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             // rows
@@ -192,7 +190,6 @@
         [self changePromptLabelState];
 
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
         [self endRefresh];
         if (self.networkAvaiable == NO) {
             [self setPromptString:@"暂无网络" imageName:@"no_networking" inView:self.tableView];

KulexiuForTeacher/KulexiuForTeacher/Module/Home/ReceiveEvaluate/Controller/ReceiveEvaluateListController.m

@@ -91,9 +91,9 @@
 }
 
 - (void)requestData {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager myReceiveRepliedRequest:KS_POST classMonth:self.chooseDate search:self.searchKey page:self.pages rows:self.rows success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         [self endRefresh];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             NSArray *sourceArray = [[dic ks_dictionaryValueForKey:@"data"] ks_arrayValueForKey:@"rows"];
@@ -113,7 +113,7 @@
         [self.tableView reloadData];
         [self changePromptLabelState];
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         [self endRefresh];
         if (self.networkAvaiable == NO) {
             [self setPromptString:@"暂无网络" imageName:@"no_networking" inView:self.tableView];

KulexiuForTeacher/KulexiuForTeacher/Module/Live/Controller/CreateLiveViewController.m

@@ -110,7 +110,7 @@
         [LOADING_MANAGER MBShowAUTOHidingInWindow:@"请上传直播封面图"];
         return;
     }
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     UIImage *coverImage = [self.imageArray lastObject];
     NSData *imgData = [UIImage turnsImaegDataByImage:coverImage];
     NSString *fileName = @"image";
@@ -119,7 +119,7 @@
         NSString *avatarUrl = [fileUrlArray lastObject];
         [self uploadCoverImage:avatarUrl liveTilte:title content:content];
     } faliure:^(NSError * _Nullable error, NSString *descMessaeg) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if (![NSString isEmptyString:descMessaeg]) {
             [LOADING_MANAGER MBShowAUTOHidingInWindow:descMessaeg];
         }
@@ -131,7 +131,7 @@
 - (void)uploadCoverImage:(NSString *)coverImageUrl liveTilte:(NSString *)title content:(NSString *)content {
    
     [KSNetworkingManager liveRoomCreateTempLiveRoom:KS_POST coverPic:coverImageUrl liveRemark:content roomTitle:title liveTime:[self.chooseTime integerValue] success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             NSString *roomId = [dic ks_stringValueForKey:@"data"];
             [self previewViewWithRoomId:roomId liveDesc:content];
@@ -140,7 +140,7 @@
             [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Login/Controller/FirstSettingViewController.m

@@ -91,9 +91,9 @@
         [LOADING_MANAGER MBShowAUTOHidingInWindow:@"请设置性别"];
         return;
     }
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager setPasswordRequest:KS_POST username:nickName password:pwdCode userSex:self.userSex token:self.access_token success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             UserDefaultSet(self.phone, PHONEKEY);
             UserDefaultSet(self.access_token, TokenKey);
@@ -107,7 +107,7 @@
             [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
     
 }

KulexiuForTeacher/KulexiuForTeacher/Module/Login/Controller/PasswordLoginController.m

@@ -64,9 +64,9 @@
             [LOADING_MANAGER MBShowAUTOHidingInWindow:@"手机号码输入有误"];
             return;
         }
-        [LOADING_MANAGER showHUD];
+        [LOADING_MANAGER showCustomLoading:@"加载中..."];
         [KSNetworkingManager LoginRequest:KS_POST phone:[parm ks_stringValueForKey:@"phone"] password:[parm ks_stringValueForKey:@"password"] success:^(NSDictionary * _Nonnull dic) {
-            [LOADING_MANAGER removeHUD];
+            [LOADING_MANAGER removeCustomLoading];
             if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
                 NSDictionary *result = [dic ks_dictionaryValueForKey:@"data"];
                 // 保存用户类型
@@ -87,7 +87,7 @@
                 [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
             }
         } faliure:^(NSError * _Nonnull error) {
-            [LOADING_MANAGER removeHUD];
+            [LOADING_MANAGER removeCustomLoading];
         }];
     }
 }

KulexiuForTeacher/KulexiuForTeacher/Module/Login/Controller/VefiCodeLoginController.m

@@ -97,9 +97,9 @@
 
 // 发送短信 校验图形验证码
 - (void)veriImageCodeWithParm:(NSDictionary *)parm checkView:(VeriCheckView *)checkView {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager sendSmsRequest:KS_POST mobile:[parm ks_stringValueForKey:@"phone"] type:@"LOGIN" code:[parm ks_stringValueForKey:@"code"] success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             [checkView hiddView];
             [LOADING_MANAGER MBShowAUTOHidingInWindow:@"验证码已发送"];
@@ -109,7 +109,7 @@
             [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 - (void)codeButtonCountDown {
@@ -148,9 +148,9 @@
 
 - (void)loginAction:(NSString *)code {
     
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager smsLoginRequest:KS_POST phone:self.phoneNo smsCode:code success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             NSDictionary *result = [dic ks_dictionaryValueForKey:@"data"];
             // 保存用户类型
@@ -178,7 +178,7 @@
             [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/AddressList/Controller/AddressDetailViewController.m

@@ -39,9 +39,9 @@
 }
 
 - (void)queryAddressDetail {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager queryAddressDetailRequst:KS_GET addressId:self.addressId success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200) {
             [self evaluateUI:[dic ks_dictionaryValueForKey:@"data"]];
         }
@@ -49,7 +49,7 @@
             [LOADING_MANAGER MBShowAUTOHidingInWindow:[dic ks_stringValueForKey:@"message"]];
         }
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 
@@ -136,9 +136,9 @@
         return;
     }
     if (self.modifyAddress) {
-        [LOADING_MANAGER showHUD];
+        [LOADING_MANAGER showCustomLoading:@"加载中..."];
         [KSNetworkingManager updateAddressRequest:KS_POST addressId:self.addressId name:self.bodyView.nameField.text phoneNumber:phoneNo defaultStatus:self.bodyView.isOn detailAddress:self.bodyView.detailAddress.text province:self.province city:self.city region:self.region postCode:self.cityCode success:^(NSDictionary * _Nonnull dic) {
-            [LOADING_MANAGER removeHUD];
+            [LOADING_MANAGER removeCustomLoading];
             if ([dic ks_integerValueForKey:@"code"] == 200) {
                 [LOADING_MANAGER KSShowMsg:@"修改成功" promptCompletion:^{
                     [self backAction];
@@ -148,13 +148,13 @@
                 [LOADING_MANAGER MBShowAUTOHidingInWindow:[dic ks_stringValueForKey:@"message"]];
             }
         } faliure:^(NSError * _Nonnull error) {
-            [LOADING_MANAGER removeHUD];
+            [LOADING_MANAGER removeCustomLoading];
         }];
     }
     else {
-        [LOADING_MANAGER showHUD];
+        [LOADING_MANAGER showCustomLoading:@"加载中..."];
         [KSNetworkingManager addAddressRequest:KS_POST name:self.bodyView.nameField.text phoneNumber:phoneNo defaultStatus:self.bodyView.isOn detailAddress:self.bodyView.detailAddress.text province:self.province city:self.city region:self.region postCode:self.cityCode success:^(NSDictionary * _Nonnull dic) {
-            [LOADING_MANAGER removeHUD];
+            [LOADING_MANAGER removeCustomLoading];
             if ([dic ks_integerValueForKey:@"code"] == 200) {
                 
                 [LOADING_MANAGER KSShowMsg:@"新增成功" promptCompletion:^{
@@ -165,7 +165,7 @@
                 [LOADING_MANAGER MBShowAUTOHidingInWindow:[dic ks_stringValueForKey:@"message"]];
             }
         } faliure:^(NSError * _Nonnull error) {
-            [LOADING_MANAGER removeHUD];
+            [LOADING_MANAGER removeCustomLoading];
         }];
     }
 }

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/AddressList/Controller/AddressListViewController.m

@@ -80,9 +80,9 @@
 }
 
 - (void)requestData {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager companyAddressListRequest:KS_GET success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         [self endRefresh];
         if ([dic ks_integerValueForKey:@"code"] == 200) {
             NSArray *listArray = [dic ks_arrayValueForKey:@"data"];
@@ -97,7 +97,7 @@
         [self.tableView reloadData];
         [self changePromptLabelState];
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         [self endRefresh];
         if (self.networkAvaiable == NO) {
             [self setPromptString:@"暂无网络" imageName:@"no_networking" inView:self.tableView];
@@ -166,17 +166,18 @@
 }
 
 - (void)deleteAddress:(NSString *)addressId {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager deleteAddressRequest:KS_POST addressId:addressId success:^(NSDictionary * _Nonnull dic) {
         if ([dic ks_integerValueForKey:@"code"] == 200) {
             [LOADING_MANAGER MBShowAUTOHidingInWindow:@"删除成功"];
             [self refreshAndRequestData];
         }
         else {
+            [LOADING_MANAGER removeCustomLoading];
             [LOADING_MANAGER MBShowAUTOHidingInWindow:[dic ks_stringValueForKey:@"message"]];
         }
     } faliure:^(NSError * _Nonnull error) {
-        
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/BankCard/Controller/BandCardViewController.m

@@ -32,10 +32,9 @@
 }
 
 - (void)requestBankName {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager queryBankList:KS_POST success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             self.dataArray = [NSMutableArray array];
             NSArray *sourceArray = [dic ks_arrayValueForKey:@"data"];
@@ -51,7 +50,7 @@
             [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 
@@ -128,9 +127,9 @@
         [LOADING_MANAGER MBShowAUTOHidingInWindow:@"请输入银行预留手机号"];
         return;
     }
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager bankCardRequest:KS_POST name:self.bodyView.nameField.text bankCard:self.bodyView.cardNoField.text bankName:self.bodyView.bankNameField.text bankCode:self.bankId idCardNo:self.bodyView.idCardField.text phone:self.bodyView.phoneField.text success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             [self showResultViewSuccess:YES errorMessage:nil];
         }
@@ -138,7 +137,7 @@
             [self showResultViewSuccess:NO errorMessage:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/BankCard/Controller/MyBankCardViewController.m

@@ -57,8 +57,9 @@
 }
 
 - (void)requestCardMessage {
+    
     [KSNetworkingManager queryBankCardMessage:KS_POST success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             NSArray *sourceArray = [[dic ks_dictionaryValueForKey:@"data"] ks_arrayValueForKey:@"rows"];
             if (sourceArray.count == 0) {
@@ -76,7 +77,7 @@
             
         }
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        
     }];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/BankCard/Controller/UnbindCardViewController.m

@@ -58,9 +58,9 @@
 
 
 - (void)unbindSubmit {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager unBindCardRequest:KS_POST cardId:self.cardId idCardNo:self.bodyView.cardField.text name:self.bodyView.nameField.text success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             [self showResultViewSuccess:YES errorMsg:nil];
         }
@@ -68,7 +68,7 @@
             [self showResultViewSuccess:NO errorMsg:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Controller/MineViewController.m

@@ -89,14 +89,14 @@
 }
 
 - (void)requestData {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     
     [self requsetUserMessage];
     [self requestUserMemo];
     [self queryAmountDetail];
     
     dispatch_group_notify(self.requestGroup, dispatch_get_main_queue(), ^{
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         [self refreshDisplayView];
     });
 }

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Courseware/ViewModel/CoursewareViewModel.m

@@ -32,9 +32,9 @@
 }
 
 - (void)requestData {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager courseCoursewareRequest:KS_POST status:1 searchKey:self.searchKey page:self.pages rows:self.rows success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         [self endRefresh];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             NSArray *dataArray = [[dic ks_dictionaryValueForKey:@"data"] ks_arrayValueForKey:@"rows"];
@@ -57,7 +57,7 @@
 
 
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         [self endRefresh];
     }];
     
@@ -94,9 +94,9 @@
         return;
     }
     NSString *ids = [arrayList componentsJoinedByString:@","];
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager courseCoursewareRemoveRequest:KS_POST ids:ids success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             [LOADING_MANAGER KSShowMsg:@"删除成功" promptCompletion:^{
                 [self refreshAndRequest];
@@ -107,7 +107,7 @@
         }
         
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/CreateStyle/Controller/InstrumentChooseViewController.m

@@ -94,9 +94,9 @@
 }
 
 - (void)requestInstrumentMessage {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager querySubjectAllRequest:KS_GET success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             [self evaluateSource:[dic ks_arrayValueForKey:@"data"]];
         }
@@ -104,7 +104,7 @@
             [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         
     }];
 }

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/CreateStyle/Controller/MyStyleViewController.m

@@ -53,8 +53,6 @@
 
 @property (nonatomic, strong) KSMediaManager *mediaManager;
 
-@property (strong, nonatomic) MBProgressHUD *HUD;
-
 @property (nonatomic, assign) NSInteger chooseFileIndex;
 
 @property (nonatomic, assign) BOOL hasModifyVideoImage;
@@ -131,9 +129,9 @@
 }
 
 - (void)requestMyStyleRefreshTimeFlag:(BOOL)refreshTimeFlag {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager queryTeacherStyleRequest:KS_GET success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             NSDictionary *result = [dic ks_dictionaryValueForKey:@"data"];
             NSString *subjectIds = [result ks_stringValueForKey:@"subjectId"];
@@ -156,7 +154,7 @@
         }
         [self.tableView reloadData];
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 
@@ -222,9 +220,9 @@
         [videoArray addObject:parm];
     }
     
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager saveTeacherStyleRequest:KS_POST styleVideo:videoArray subjectId:subjectIds subjectName:subjectNames introduction:self.content success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             self.hasModify = NO;
             NSString *descMessage = (hasNewVideoSubmit || self.hasModifyVideoImage) ? @"提交成功，请耐心等待审核" : @"保存成功";
@@ -238,7 +236,7 @@
             [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 
@@ -473,20 +471,19 @@
 
 #pragma mark --- 上传视频文件
 - (void)uploadVideoWithUrl:(NSString *)videoUrl coverUrl:(NSString *)coverUrl {
-    [self hudTipWillShow:YES];
+    
     NSURL *fileUrl = [NSURL fileURLWithPath:videoUrl];
     NSData *fileData = [NSData dataWithContentsOfURL:fileUrl];
     NSString *suffix = [NSString stringWithFormat:@".%@",[fileUrl pathExtension]];
     [UPLOAD_MANAGER configWithfilePath:@"/user/"];
     [UPLOAD_MANAGER videoUpload:fileData fileName:@"video" fileSuffix:suffix progress:^(int64_t bytesWritten, int64_t totalBytes) {
+        int progress = (int)(bytesWritten / totalBytes * 100);
+        __block NSString *tipsMessage = [NSString stringWithFormat:@"上传中 %d%%",progress];
         dispatch_main_async_safe(^{
-            // 显示进度
-            if (self.HUD) {
-                self.HUD.progress = bytesWritten / totalBytes;// progress是回调进度
-            }
+            [LOADING_MANAGER.loadingView setDisplayText:tipsMessage];
         });
         } successCallback:^(NSMutableArray * _Nonnull fileUrlArray) {
-            [self hudTipWillShow:NO];
+            [LOADING_MANAGER removeCustomLoading];
             NSString *fileUrl = [fileUrlArray lastObject];
             // 删除文件
             [self removeVideoWithPath:videoUrl];
@@ -497,7 +494,7 @@
             [self.videoArray addObject:model];
             [self.tableView reloadData];
         } faliure:^(NSError * _Nullable error, NSString * _Nullable descMessaeg) {
-            [self hudTipWillShow:NO];
+            [LOADING_MANAGER removeCustomLoading];
             if (![NSString isEmptyString:descMessaeg]) {
                 [LOADING_MANAGER MBShowAUTOHidingInWindow:descMessaeg];
             }
@@ -658,27 +655,6 @@
     return _videoPageArray;
 }
 
-- (void)hudTipWillShow:(BOOL)willShow{
-    if (willShow) {
-        [self resignFirstResponder];
-        UIWindow *keyWindow = [UIApplication sharedApplication].keyWindow;
-        if (!_HUD) {
-            _HUD = [MBProgressHUD showHUDAddedTo:keyWindow animated:YES];
-            _HUD.removeFromSuperViewOnHide = YES;
-            _HUD.mode = MBProgressHUDModeDeterminateHorizontalBar;
-            _HUD.label.attributedText = [self getAttrStringWithText:@"正在上传视频文件..."];
-            _HUD.contentColor = [UIColor whiteColor];
-            _HUD.bezelView.style = MBProgressHUDBackgroundStyleSolidColor;
-            _HUD.bezelView.backgroundColor = HexRGBAlpha(0x000000, 0.8);
-        }else{
-            _HUD.progress = 0;
-            [keyWindow addSubview:_HUD];
-            [_HUD showAnimated:YES];
-        }
-    }else{
-        [_HUD hideAnimated:YES];
-    }
-}
 
 - (NSMutableAttributedString *)getAttrStringWithText:(NSString *)text {
     if (![NSString isEmptyString:text]) {
@@ -780,9 +756,9 @@
 
 - (void)modifyUserMessage:(NSString *)imgUrl gender:(NSString *)gender {
     NSString *userName = nil;
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager modifyTeacherMessage:KS_POST avatal:imgUrl gender:gender username:userName success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             [LOADING_MANAGER MBShowAUTOHidingInWindow:@"修改成功"];
             if (![NSString isEmptyString:imgUrl]) {
@@ -794,7 +770,7 @@
             [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/Controller/MineVipProgramViewController.m

@@ -137,7 +137,7 @@
 }
 
 - (void)requestData {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     self.subjectNames = [NSMutableArray array];
     self.subjectIds = [NSMutableArray array];
     self.timeArray = [NSMutableArray array];
@@ -145,7 +145,7 @@
     [self queryTeacherSubject];
     [self requsetConfig];
     dispatch_group_notify(self.requestGroup, dispatch_get_main_queue(), ^{
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         [self.settingView configSubjectNameArray:self.subjectNames subjectIds:self.subjectIds durationArray:self.timeArray minPrice:self.minPrice maxPrice:self.maxPrice];
     });
 }
@@ -195,9 +195,9 @@
         [LOADING_MANAGER MBShowAUTOHidingInWindow:tipsDesc];
     }
     
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager teacherSubjectPriceSaveRequest:KS_POST courseType:@"VIP" subjectName:subjectName subjectId:subjectId subjectPrice:price courseMinutes:duration success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUDNoDelay];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             [LOADING_MANAGER KSShowProgressMsg:@"创建成功" promptCompletion:^{
                 [self backAction];
@@ -207,7 +207,7 @@
             [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/StyleVideo/Controller/MyStyleVideoListController.m

@@ -49,9 +49,9 @@
 
 
 - (void)requestMyStyle {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager queryTeacherStyleRequest:KS_GET success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             NSDictionary *result = [dic ks_dictionaryValueForKey:@"data"];
             self.userName = [result ks_stringValueForKey:@"username"];
@@ -68,7 +68,7 @@
         }
         [self.collectionView reloadData];
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/AccompanyCourse/MinePageAccompanyCourseView.m

@@ -243,9 +243,9 @@
 }
 
 - (void)removeProgram:(NSString *)programId {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager teacherSubjectPriceDeleteRequest:KS_POST programId:programId success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             [self refreshAndRequestData];
         }
@@ -253,7 +253,7 @@
             [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/VipCourse/MinePageVIPCourseView.m

@@ -242,9 +242,9 @@
 }
 
 - (void)removeProgram:(NSString *)programId {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager teacherSubjectPriceDeleteRequest:KS_POST programId:programId success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             [self refreshAndRequestData];
         }
@@ -252,7 +252,7 @@
             [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Setting/Controller/ModifyNameViewController.m

@@ -74,9 +74,9 @@
         return;
     }
     if (![NSString isEmptyString:self.groupId]) {
-        [LOADING_MANAGER showHUD];
+        [LOADING_MANAGER showCustomLoading:@"加载中..."];
         [KSNetworkingManager imGroupModify:KS_POST name:self.bodyView.nameField.text groupId:self.groupId success:^(NSDictionary * _Nonnull dic) {
-            [LOADING_MANAGER removeHUD];
+            [LOADING_MANAGER removeCustomLoading];
             if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
                 [LOADING_MANAGER KSShowMsg:@"修改成功" promptCompletion:^{
                     if (self.callback) {
@@ -90,7 +90,7 @@
                 [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
             }
         } faliure:^(NSError * _Nonnull error) {
-            [LOADING_MANAGER removeHUD];
+            [LOADING_MANAGER removeCustomLoading];
         }];
         
     }
@@ -98,9 +98,9 @@
         
         NSString *avatal = nil;
         NSString *gendar = nil;
-        [LOADING_MANAGER showHUD];
+        [LOADING_MANAGER showCustomLoading:@"加载中..."];
         [KSNetworkingManager modifyTeacherMessage:KS_POST avatal:avatal gender:gendar username:self.bodyView.nameField.text success:^(NSDictionary * _Nonnull dic) {
-            [LOADING_MANAGER removeHUD];
+            [LOADING_MANAGER removeCustomLoading];
             if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
                 UserDefaultSetObjectForKey(self.bodyView.nameField.text, NicknameKey);
 
@@ -115,7 +115,7 @@
                 [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
             }
         } faliure:^(NSError * _Nonnull error) {
-            [LOADING_MANAGER removeHUD];
+            [LOADING_MANAGER removeCustomLoading];
         }];
     }
 }

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Setting/Controller/ModifyPhoneChangeController.m

@@ -62,9 +62,9 @@
 #pragma mark --- 修改手机号
 - (void)modifyPhoneWithParm:(NSDictionary *)parm {
     
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager updatePhoneRequest:KS_POST oldPhone:self.prePhone authCode:[parm ks_stringValueForKey:@"code"] newPhone:[parm ks_stringValueForKey:@"phone"] success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             
             [LOADING_MANAGER KSShowMsg:@"修改成功" promptCompletion:^{
@@ -78,7 +78,7 @@
         }
         
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
     
 }
@@ -102,9 +102,9 @@
 }
 
 - (void)veriImageCodeWithParm:(NSDictionary *)parm checkView:(VeriCheckView *)checkView {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager sendSmsRequest:KS_POST mobile:[parm ks_stringValueForKey:@"phone"] type:@"PHONE" code:[parm ks_stringValueForKey:@"code"] success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             [checkView hiddView];
             [LOADING_MANAGER MBShowAUTOHidingInWindow:@"验证码已发送"];
@@ -114,7 +114,7 @@
             [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Setting/Controller/ModifyPhoneCheckController.m

@@ -45,9 +45,9 @@
         [LOADING_MANAGER MBShowAUTOHidingInWindow:@"手机号码输入有误"];
         return;
     }
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager checkUserRequest:KS_GET phone:phoneNo password:password success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             [self nextChangeViewWithWithPhone:phoneNo];
         }
@@ -55,7 +55,7 @@
             [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Setting/Controller/ModifyViewController.m

@@ -59,9 +59,9 @@
 
 #pragma mark -- 修改密码
 - (void)modifyPassword:(NSDictionary *)parm {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager updatePasswordRequest:KS_POST authCode:[parm ks_stringValueForKey:@"code"] mobile:[parm ks_stringValueForKey:@"phone"] newPassword:[parm ks_stringValueForKey:@"password"] success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             [LOADING_MANAGER KSShowMsg:@"修改成功" promptCompletion:^{
                 [self toLoginView];
@@ -71,7 +71,7 @@
             [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 
@@ -93,9 +93,9 @@
 }
 
 - (void)veriImageCodeWithParm:(NSDictionary *)parm checkView:(VeriCheckView *)checkView {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager sendSmsRequest:KS_POST mobile:[parm ks_stringValueForKey:@"phone"] type:@"PASSWD" code:[parm ks_stringValueForKey:@"code"] success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             [checkView hiddView];
             [LOADING_MANAGER MBShowAUTOHidingInWindow:@"验证码已发送"];
@@ -105,7 +105,7 @@
             [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Setting/Controller/SettingViewController.m

@@ -201,9 +201,9 @@
  
  */
 - (void)checkUnbindStatus {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager unbindTenantDetailRequest:KS_GET success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             NSDictionary *parm = [dic ks_dictionaryValueForKey:@"data"];
             if (parm) {
@@ -218,7 +218,7 @@
             [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Setting/Controller/TenantUnbindDetailViewController.m

@@ -65,8 +65,9 @@
     return _bottomView;
 }
 - (void)cancleUnbind {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager unbindTenantCancelRequest:KS_POST success:^(NSDictionary * _Nonnull dic) {
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             [LOADING_MANAGER KSShowMsg:@"撤回成功" promptCompletion:^{
                 [self backAction];
@@ -76,7 +77,7 @@
             [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
-        
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Setting/Controller/UnbindTenantViewController.m

@@ -102,8 +102,9 @@
 - (void)submitAction {
     NSString *reson = self.bodyView.inputTextView.text;
     NSString *code = self.bodyView.codeField.text;
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager tenantUnbindRequest:KS_POST reson:reson code:code success:^(NSDictionary * _Nonnull dic) {
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             [LOADING_MANAGER KSShowMsg:@"提交成功" promptCompletion:^{
                 [self toUnbindDetailView:reson];
@@ -113,7 +114,7 @@
             [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
-        
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 
@@ -149,9 +150,9 @@
 }
 
 - (void)veriImageCodeWithParm:(NSDictionary *)parm checkView:(VeriCheckView *)checkView {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager sendSmsRequest:KS_POST mobile:[parm ks_stringValueForKey:@"phone"] type:@"SMS" code:[parm ks_stringValueForKey:@"code"] success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             [checkView hiddView];
             [LOADING_MANAGER MBShowAUTOHidingInWindow:@"验证码已发送"];
@@ -161,7 +162,7 @@
             [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Setting/Controller/UserAuthViewController.m

@@ -69,9 +69,9 @@
         [LOADING_MANAGER MBShowAUTOHidingInWindow:@"请阅读并同意用户注册协议"];
         return;
     }
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager realNameAuthRequest:KS_POST idCardNo:self.bodyView.cardField.text realName:self.bodyView.nameField.text success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             [LOADING_MANAGER KSShowMsg:@"认证成功" promptCompletion:^{
                 [self backAction];
@@ -85,7 +85,7 @@
             [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Setting/Controller/UserSettingViewController.m

@@ -208,9 +208,9 @@
 
 - (void)modifyUserMessage:(NSString *)imgUrl gender:(NSString *)gender {
     NSString *userName = nil;
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager modifyTeacherMessage:KS_POST avatal:imgUrl gender:gender username:userName success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             [LOADING_MANAGER MBShowAUTOHidingInWindow:@"修改成功"];
             if (![NSString isEmptyString:imgUrl]) {
@@ -223,7 +223,7 @@
             [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Setting/DeleteAccount/Controller/AccountDeleteViewController.m

@@ -91,9 +91,9 @@
 
 #pragma mark ----- 删除账号
 - (void)deleteAccount:(NSString *)code {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager logoffRequest:KS_GET smsCode:code success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             [LOADING_MANAGER KSShowMsg:@"注销成功,感谢您的使用" promptCompletion:^{
                 [self successDeleteBack];
@@ -108,7 +108,7 @@
             [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 
@@ -136,9 +136,9 @@
 }
 
 - (void)veriImageCodeWithParm:(NSDictionary *)parm checkView:(VeriCheckView *)checkView {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager sendSmsRequest:KS_POST mobile:[parm ks_stringValueForKey:@"phone"] type:@"LOGOFF" code:[parm ks_stringValueForKey:@"code"] success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             [checkView hiddView];
             [LOADING_MANAGER MBShowAUTOHidingInWindow:@"验证码已发送"];
@@ -148,7 +148,7 @@
             [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
 
     }];
 }

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Setting/PasswordModify/ForgetPasswordViewController.m

@@ -61,9 +61,9 @@
 
 
 - (void)checkCode:(NSString *)code {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager checkVerityCodeRequest:KS_POST code:code success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             [self modifyPasswordAction];
         }
@@ -71,7 +71,7 @@
             [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         
     }];
 }
@@ -95,9 +95,9 @@
 }
 
 - (void)veriImageCodeWithParm:(NSDictionary *)parm checkView:(VeriCheckView *)checkView {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager sendSmsRequest:KS_POST mobile:[parm ks_stringValueForKey:@"phone"] type:@"PASSWD" code:[parm ks_stringValueForKey:@"code"] success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             [checkView hiddView];
             [LOADING_MANAGER MBShowAUTOHidingInWindow:@"验证码已发送"];
@@ -107,7 +107,7 @@
             [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
 
     }];
 }

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Setting/PasswordModify/NewPwdModifyViewController.m

@@ -60,9 +60,9 @@
 }
 
 - (void)updatePassword:(NSString *)password code:(NSString *)code {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager setPasswordRequest:KS_POST password:password code:code success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             [LOADING_MANAGER KSShowMsg:@"修改成功" promptCompletion:^{
                 [self toLoginView];
@@ -72,7 +72,7 @@
             [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         
     }];
 }
@@ -94,9 +94,9 @@
 }
 
 - (void)veriImageCodeWithParm:(NSDictionary *)parm checkView:(VeriCheckView *)checkView {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager sendSmsRequest:KS_POST mobile:[parm ks_stringValueForKey:@"phone"] type:@"PASSWD" code:[parm ks_stringValueForKey:@"code"] success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             [checkView hiddView];
             [LOADING_MANAGER MBShowAUTOHidingInWindow:@"验证码已发送"];
@@ -106,7 +106,7 @@
             [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
 
     }];
 }

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Setting/PasswordModify/PasswordCheckViewController.m

@@ -56,10 +56,10 @@
 }
 
 - (void)passwordCheck:(NSString *)password {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     
     [KSNetworkingManager checkPasswordRequest:KS_POST password:password success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             [self modifyPasswordAction];
         }
@@ -67,7 +67,7 @@
             [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/ShareInChat/View/ShareChooseMainView.m

@@ -111,13 +111,13 @@
                 [self evaluateMessge];
             }
             else {
-                [LOADING_MANAGER removeHUD];
+                [LOADING_MANAGER removeCustomLoading];
                 [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
                 [self changePromptLabelStateWithArray:self.studentArray];
                 
             }
         } faliure:^(NSError * _Nonnull error) {
-            [LOADING_MANAGER removeHUD];
+            [LOADING_MANAGER removeCustomLoading];
             [self endRefresh];
             if (self.networkAvaiable == NO) {
                 [self setPromptString:@"暂无网络" imageName:@"no_networking" inView:self.tableView];
@@ -206,7 +206,7 @@
             self.sourceIndexArray = sortArr;
             // 主线程刷新
             dispatch_async(dispatch_get_main_queue(), ^{
-                [LOADING_MANAGER removeHUD];
+                [LOADING_MANAGER removeCustomLoading];
                 self.tableView.sc_indexViewDataSource = self.sourceIndexArray;
                 [self.tableView reloadData];
                 [self changePromptLabelStateWithArray:self.studentArray];

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Works/View/MineWorksBodyView.m

@@ -459,9 +459,9 @@
         }
     }
     NSString *musicId = [draftArray componentsJoinedByString:@","];
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager userMusicRemoveRequest:KS_POST musicId:musicId success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200) {
             [LOADING_MANAGER KSShowMsg:@"删除成功" promptCompletion:^{
                 [self refreshAndRequestData];
@@ -471,7 +471,7 @@
             [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/TXClassRoom/ClassroomSong/MusicScoreViewController.m

@@ -99,21 +99,7 @@
 }
 
 - (void)requestMessage {
-//    [LOADING_MANAGER showHUD];
-//    [KSRequestManager resourceRepositoryQuery:KS_GET subjectId:self.subjectId success:^(NSDictionary * _Nonnull dic) {
-//        [LOADING_MANAGER removeHUD];
-//        if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
-//            NSArray *sourceArray = [dic ks_arrayValueForKey:@"data"];
-//            [self configSourceArray:sourceArray nodeIndex:0];
-//            [self evaluateSource];
-//        }
-//        else {
-//            [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
-//        }
-//        
-//    } faliure:^(NSError * _Nonnull error) {
-//        [LOADING_MANAGER removeHUD];
-//    }];
+
 }
 
 - (void)evaluateSource {

KulexiuForTeacher/KulexiuForTeacher/Module/TXClassRoom/ClassroomSong/SongListViewController.h

@@ -1,20 +0,0 @@
-//
-//  SongListViewController.h
-//  KulexiuForTeacher
-//
-//  Created by 王智 on 2022/6/1.
-//
-
-#import "KSBaseViewController.h"
-
-typedef void(^SongChooseCallback)(NSString * _Nonnull songId, NSString * _Nonnull songName, NSString * _Nullable songUrl, NSString * _Nullable accompanyUrl);
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface SongListViewController : KSBaseViewController
-
-- (void)chooseSongCallback:(SongChooseCallback)callback;
-
-@end
-
-NS_ASSUME_NONNULL_END

KulexiuForTeacher/KulexiuForTeacher/Module/TXClassRoom/ClassroomSong/SongListViewController.m

@@ -1,175 +0,0 @@
-//
-//  SongListViewController.m
-//  KulexiuForTeacher
-//
-//  Created by 王智 on 2022/6/1.
-//
-
-#import "SongListViewController.h"
-#import "AppDelegate.h"
-#import <UIDevice+TFDevice.h>
-//#import "KSSoundPlayCell.h"
-
-@interface SongListViewController ()<UITableViewDelegate, UITableViewDataSource>
-
-@property (nonatomic, strong) UITableView *tableView;
-
-//@property (nonatomic, strong) SongSearchView *searchView;
-
-@property (nonatomic, strong) NSString *searchKey;
-
-@end
-
-@implementation SongListViewController
-
-//- (void)viewDidLoad {
-//    [super viewDidLoad];
-//    // Do any additional setup after loading the view.
-//    
-//    AppDelegate* delegate = (AppDelegate*)[UIApplication sharedApplication].delegate;
-//    delegate.allowAutoRotate = YES;
-//    [UIDevice switchNewOrientation:UIInterfaceOrientationLandscapeRight inController:self];
-//    
-//    [self allocTitle:@"教学伴奏"];
-//    [self configUI];
-//    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(leaveRoomAction) name:@"classroomLogout" object:nil];
-//    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(leaveRoomAction) name:@"classroomQuit" object:nil];
-//}
-//
-//
-//- (void)rightBtnClick {
-//    [self.navigationController dismissViewControllerAnimated:YES completion:nil];
-//}
-//
-//- (void)configUI {
-//    [self.view addSubview:self.tableView];
-//
-//    [self setPromptString:@"暂无曲目" imageName:@"wd_img_zwsj" inView:self.tableView];
-//    MJWeakSelf;
-//    self.tableView.mj_header = [KSGifRefreshHeader headerWithRefreshingBlock:^{
-//        [weakSelf resetAndRequest];
-//    }];
-//    
-//    self.tableView.mj_footer = [KSGifRefreshFooter footerWithRefreshingBlock:^{
-//        if (weakSelf.isLoadMore) {
-//            weakSelf.pages += 1;
-//            [weakSelf requestData];
-//        }
-//        else {
-//            [weakSelf.tableView.mj_footer endRefreshingWithNoMoreData];
-//        }
-//    }];
-//}
-//
-//- (void)viewWillDisappear:(BOOL)animated {
-//    [super viewWillDisappear:animated];
-//    [[NSNotificationCenter defaultCenter] removeObserver:self];
-//}
-//
-//- (void)resetAndRequest {
-//    [self resetParamenter];
-//    [self requestData];
-//}
-//
-//- (void)requestData {
-//    [LOADING_MANAGER showHUD];
-//    [KSRequestManager accompanyQueryPageLimitRequest:KS_GET categoriesId:self.categoryId subjectId:self.subjectId type:self.ownerType search:self.searchKey page:[NSString stringWithFormat:@"%zd",self.pages] rows:[NSString stringWithFormat:@"%zd",self.rows] success:^(NSDictionary * _Nonnull dic) {
-//        [LOADING_MANAGER removeHUD];
-//        [self endRefresh];
-//        if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
-//            // 赋值
-//            NSArray *sourceArray = [[dic ks_dictionaryValueForKey:@"data"] ks_arrayValueForKey:@"rows"];
-//            for (NSDictionary *parm in sourceArray) {
-//                SongListModel *model = [[SongListModel alloc] initWithDictionary:parm];
-//                [self.dataArray addObject:model];
-//            }
-//            if (sourceArray.count < self.rows) {
-//                self.isLoadMore = NO;
-//            }
-//        }
-//        else {
-//            [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
-//        }
-//        [self.tableView reloadData];
-//
-//    } faliure:^(NSError * _Nonnull error) {
-//        [LOADING_MANAGER removeHUD];
-//        [self endRefresh];
-//        
-//        [self.dataArray removeAllObjects];
-//        [self.tableView reloadData];
-//    }];
-//}
-//
-//- (void)resetParamenter {
-//    self.isLoadMore = YES;
-//    self.pages = 1;
-//    self.rows = 10;
-//    self.dataArray = [NSMutableArray array];
-//    [self.tableView.mj_footer resetNoMoreData];
-//    [self.tableView reloadData];
-//}
-//- (void)endRefresh {
-//    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-//        [self.tableView.mj_header endRefreshing];
-//        [self.tableView.mj_footer endRefreshing];
-//    });
-//}
-//
-//- (void)viewWillAppear:(BOOL)animated {
-//    [super viewWillAppear:animated];
-//    AppDelegate* delegate = (AppDelegate*)[UIApplication sharedApplication].delegate;
-//    delegate.allowAutoRotate = YES;
-//    [UIDevice switchNewOrientation:UIInterfaceOrientationLandscapeRight inController:self];
-//    
-//    [self resetAndRequest];
-//}
-//
-//- (void)leaveRoomAction {
-//    [self.navigationController dismissViewControllerAnimated:YES completion:nil];
-//}
-//
-//- (void)dealloc {
-//    [[NSNotificationCenter defaultCenter] removeObserver:self];
-//}
-//
-//#pragma mark ---- table data source
-//- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
-//    return 1;
-//}
-//
-//- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
-//    return self.dataArray.count;
-//}
-//
-//- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
-//
-//    SongListModel *model = self.dataArray[indexPath.row];
-//    KSSoundPlayCell *cell = [tableView dequeueReusableCellWithIdentifier:@"KSSoundPlayCell"];
-//    cell.isChoose = self.isChooseSong;
-//    [cell configCellWithSource:model indexPath:indexPath callback:^(BOOL isPlay, id  _Nonnull source, NSIndexPath * _Nonnull cellIndexPath) {
-//    }];
-//    
-//    return cell;
-//}
-//
-//- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
-//    SongListModel *model = self.dataArray[indexPath.row];
-//    if (self.callback) {
-//        NSString *songId = model.internalBaseClassIdentifier;
-//        self.callback(songId, model.examSongName, model.url, model.mp3Url);
-//        [self.navigationController dismissViewControllerAnimated:YES completion:nil];
-//    }
-//}
-
-/*
-#pragma mark - Navigation
-
-// In a storyboard-based application, you will often want to do a little preparation before navigation
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
-    // Get the new view controller using [segue destinationViewController].
-    // Pass the selected object to the new view controller.
-}
-*/
-
-@end

KulexiuForTeacher/KulexiuForTeacher/Module/TXClassRoom/Controller/TXClassroomViewController.m

@@ -39,7 +39,6 @@
 
 #import "TXTeachToolView.h"
 #import "AccompanyProgressView.h"
-#import "SongListViewController.h"
 #import "CustomNavViewController.h"
 #import "KSCloseCourseView.h"
 
@@ -501,7 +500,7 @@
         
     } confirm:^{
         weakSelf.isQuitRoom = YES;
-        [LOADING_MANAGER showHUD];
+        [LOADING_MANAGER showCustomLoading:@"加载中..."];
         [[LoginHelper sharedInstance] logout];
     }];
 }
@@ -621,7 +620,7 @@
 }
 
 - (void)dismissClassroom {
-    [LOADING_MANAGER removeHUD];
+    [LOADING_MANAGER removeCustomLoading];
     [ClassroomService sharedService].currentRoom = nil;
     [self changeOrientation:NO];
     [self.timeManager stopDurationTimer];
@@ -701,7 +700,7 @@
 
 - (void)errorDidOccur:(ErrorCode)code {
     NSLog(@"errorDidOccur %@",@(code));
-    [LOADING_MANAGER removeHUD];
+    [LOADING_MANAGER removeCustomLoading];
     if (code != ErrorCodeSuccess) {
         if (code == ErrorCodeOverMaxUserCount) {
             [self.tipsView showTipsMessage:@"超过人数限制" inView:self.view];
@@ -1148,7 +1147,7 @@
             @strongObj(self);
             // 课程结束退出房间
             SealClassLog(@"ClassEnd!");
-            [LOADING_MANAGER showHUD];
+            [LOADING_MANAGER showCustomLoading:@"加载中..."];
             [[LoginHelper sharedInstance] logout];
             [self.titleView clearUnreadMessage];
             
@@ -1505,11 +1504,11 @@
             // 停止伴奏和节拍器
             [self resetPlayBeatAndAccompany];
             
-            [LOADING_MANAGER showHUD];
+            [LOADING_MANAGER showCustomLoading:@"加载中..."];
             @weakObj(self);
             dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2.0f * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
                 @strongObj(self);
-                [LOADING_MANAGER removeHUD];
+                [LOADING_MANAGER removeCustomLoading];
                 button.selected = YES;
                 self.toolView.isVideoDisplay = NO;
                 if ([ClassroomService sharedService].currentRoom.randomNumeric == 0) {
@@ -1933,7 +1932,7 @@
 
 
 - (void)submitCloseMessge:(NSString *)message {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     // 先上传图片
     NSMutableArray *imageDataArray = [NSMutableArray array];
     for (UIImage *image in self.imageArray) {
@@ -1951,7 +1950,7 @@
         NSString *attachments = [urlArray componentsJoinedByString:@","];
         [self feedbackAction:attachments message:message];
     } faliure:^(NSError * _Nullable error, NSString * _Nullable descMessaeg) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if (![NSString isEmptyString:descMessaeg]) {
             [self.tipsView showTipsMessage:descMessaeg inView:self.view];
         }

KulexiuForTeacher/KulexiuForTeacher/Module/TXClassRoom/Model/OnlineClassManager.m

@@ -46,7 +46,7 @@
 - (void)joinRoom {
     // 进入房间重置默认值
     [LocalRenderManager shareInstance].hadRenderMainView = NO;
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [self login:NO];
 }
 
@@ -54,7 +54,7 @@
 - (void)classroomDidJoin:(Classroom *)classroom {
     
     if ([self.baseCtrl.navigationController.topViewController isKindOfClass:[self.baseCtrl class]]) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         
         // 加入RTC成功反馈给后端
         [self notiferIsSuccess:YES];
@@ -65,7 +65,7 @@
 
 
 - (void)classroomDidJoinFailCode:(NSNumber *)code errorMessage:(nonnull NSString *)message {
-    [LOADING_MANAGER removeHUD];
+    [LOADING_MANAGER removeCustomLoading];
     NSString *tipsMessage = [NSString isEmptyString:message] ? [NSString stringWithFormat:@"加入房间失败,请重试.错误码:%@",code] : message;
     [self notiferIsSuccess:NO];
     [KSNormalAlertView ks_showAlertWithTitle:tipsMessage confirmTitle:@"确定" confirm:^{
@@ -75,7 +75,7 @@
 
 // 加入RTC房间失败回调
 - (void)classroomDidJoinFailRTC:(NSNumber *)code {
-    [LOADING_MANAGER removeHUD];
+    [LOADING_MANAGER removeCustomLoading];
     [self notiferIsSuccess:NO];
 
 }
@@ -87,7 +87,7 @@
 
 - (void)classroomDidOverMaxUserCount {
     [self notiferIsSuccess:NO];
-    [LOADING_MANAGER removeHUD];
+    [LOADING_MANAGER removeCustomLoading];
     [KSNormalAlertView ks_showAlertWithTitle:@"教室人数已满!" confirmTitle:@"确认" confirm:^{
     }];
 }

KulexiuForTeacher/KulexiuForTeacher/Module/TXClassRoom/View/CoursewareView/CoursewareAlertView.m

@@ -114,9 +114,9 @@
 }
 
 - (void)requestData {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [KSNetworkingManager courseCoursewareRequest:KS_POST status:1 searchKey:self.searchKey page:self.pages rows:self.rows success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         [self endRefresh];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             NSArray *dataArray = [[dic ks_dictionaryValueForKey:@"data"] ks_arrayValueForKey:@"rows"];
@@ -133,7 +133,7 @@
         }
         [self refreshTable];
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         [self endRefresh];
     }];
     

KulexiuForTeacher/KulexiuForTeacher/Module/TXClassRoom/View/NewWhiteboard/KSNewWhiteBoard.m

@@ -785,7 +785,7 @@
     }
     else {
         self.isJoinRoom = YES;
-        [LOADING_MANAGER showHUD];
+        [LOADING_MANAGER showCustomLoading:@"加载中..."];
     }
 }
 // 离开房间
@@ -825,7 +825,7 @@
 - (void)removeLoadig {
     self.isLoadingSource = NO;
     if (self.isJoinRoom) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         [self loadRequest];
     }
 }
@@ -855,9 +855,9 @@
 - (void)refreshWebViewAction {
     // 如果链接为空
     if ([NSString isEmptyString:self.url]) {
-        [LOADING_MANAGER showHUD];
+        [LOADING_MANAGER showCustomLoading:@"加载中..."];
         [WhiteUtils getRoomTokenWithRoomId:self.roomId completionHandler:^(NSString * _Nullable uuid, NSString * _Nullable roomToken, NSString * _Nonnull randomRoom, NSString * _Nullable randomNumeric, NSError * _Nullable error) {
-            [LOADING_MANAGER removeHUD];
+            [LOADING_MANAGER removeCustomLoading];
             if (!error) {
                 NSString *url = [NSString stringWithFormat:@"%@%@?roomId=%@&userId=%@&clientType=TEACHER#room=%@,%@", hostURL, @"/whiteboard/",self.roomId,UserDefault(UIDKey),randomRoom,randomNumeric];
                 self.url = url;
@@ -872,9 +872,12 @@
 }
 
 - (void)refreshRequest {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [self loadRequest];
-    [LOADING_MANAGER removeHUD];
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5f * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        [LOADING_MANAGER removeCustomLoading];
+    });
+    
 }
 
 - (CoursewareAlertView *)coursewareChooseView {

KulexiuForTeacher/KulexiuForTeacher/Module/TXLiveModule/Controller/TXLiveRoomViewController.m

@@ -326,10 +326,10 @@ typedef NS_ENUM(NSInteger, LIVEPAGE) {
         [self startPublishStream];
     }
     else {
-        [LOADING_MANAGER showHUD];
+        [LOADING_MANAGER showCustomLoading:@"加载中..."];
         MJWeakSelf;
         [KSEnterLiveroomManager queryLiveroomConfig:self.roomId callback:^(NSDictionary * _Nullable parm) {
-            [LOADING_MANAGER removeHUD];
+            [LOADING_MANAGER removeCustomLoading];
             if (parm != nil) {
                 [weakSelf setupLiveroomConfig:parm];
                 [weakSelf createLivePageViewDisplay];
@@ -2047,9 +2047,9 @@ typedef NS_ENUM(NSInteger, LIVEPAGE) {
 
 // 连麦状态 1:开启控制 0 关闭控制
 - (void)sendMicControlStatusRequest:(NSInteger)isOpen {
-    [LOADING_MANAGER showHUD];
+    [LOADING_MANAGER showCustomLoading:@"加载中..."];
     [LiveModuleService updateRoomControlMicStatusRequest:KS_POST isOpen:isOpen roomId:self.roomId success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             if (isOpen) {
                 self.seatActionView.isForbiddenApply = YES;
@@ -2065,7 +2065,7 @@ typedef NS_ENUM(NSInteger, LIVEPAGE) {
             [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
+        [LOADING_MANAGER removeCustomLoading];
     }];
 }