Steven 10 月之前
父節點
當前提交
619aa5fab4
共有 35 個文件被更改,包括 114 次插入19 次删除
  1. 1 1
      KulexiuForTeacher/KulexiuForTeacher.xcodeproj/xcshareddata/xcschemes/KulexiuForTeacher.xcscheme
  2. 9 4
      KulexiuForTeacher/KulexiuForTeacher/Module/Chat/BanList/View/GroupBanBodyView.m
  3. 6 4
      KulexiuForTeacher/KulexiuForTeacher/Module/Chat/Group/Controller/GroupMemberViewController.m
  4. 2 0
      KulexiuForTeacher/KulexiuForTeacher/Module/Chat/GroupNotice/Controller/GroupNoticeViewController.m
  5. 2 0
      KulexiuForTeacher/KulexiuForTeacher/Module/Chat/ShareMusic/Controller/ShareMusicViewController.m
  6. 14 6
      KulexiuForTeacher/KulexiuForTeacher/Module/Chat/View/ChatAddressBodyView.m
  7. 2 0
      KulexiuForTeacher/KulexiuForTeacher/Module/Course/Controller/CourseViewController.m
  8. 2 0
      KulexiuForTeacher/KulexiuForTeacher/Module/Home/EvaluateCourse/View/EvaluateCourseBodyView.m
  9. 2 0
      KulexiuForTeacher/KulexiuForTeacher/Module/Home/Homework/View/HomeworkBodyView.m
  10. 2 0
      KulexiuForTeacher/KulexiuForTeacher/Module/Home/Income/Controller/FreezeListViewController.m
  11. 2 0
      KulexiuForTeacher/KulexiuForTeacher/Module/Home/Income/Controller/MyIncomeViewController.m
  12. 2 0
      KulexiuForTeacher/KulexiuForTeacher/Module/Home/Income/Controller/NoRecordViewController.m
  13. 2 0
      KulexiuForTeacher/KulexiuForTeacher/Module/Home/Income/WithDraw/Controller/CashRecordViewController.m
  14. 2 0
      KulexiuForTeacher/KulexiuForTeacher/Module/Home/Music/View/MyMusicBodyView.m
  15. 2 0
      KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MyLessonBodyView.m
  16. 2 0
      KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MyMusicRoomBodyView.m
  17. 2 0
      KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MyVideoCourseBodyView.m
  18. 4 0
      KulexiuForTeacher/KulexiuForTeacher/Module/Home/NotiferMessage/Controller/NotiferMessageViewController.m
  19. 2 0
      KulexiuForTeacher/KulexiuForTeacher/Module/Home/ReceiveEvaluate/Controller/ReceiveEvaluateListController.m
  20. 2 0
      KulexiuForTeacher/KulexiuForTeacher/Module/Login/Model/UserInfoManager.m
  21. 2 0
      KulexiuForTeacher/KulexiuForTeacher/Module/Mine/AddressList/Controller/AddressListViewController.m
  22. 2 0
      KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Courseware/Controller/CoursewareViewController.m
  23. 2 0
      KulexiuForTeacher/KulexiuForTeacher/Module/Mine/DeviceCheck/DeviceCheckView.m
  24. 2 0
      KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Feedback/Controller/FeedbackListViewController.m
  25. 2 0
      KulexiuForTeacher/KulexiuForTeacher/Module/Mine/LiveCourse/View/MyLiveCourseBodyView.m
  26. 2 0
      KulexiuForTeacher/KulexiuForTeacher/Module/Mine/LiveList/View/LiveListBodyView.m
  27. 2 0
      KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MinePageCourseView.m
  28. 2 0
      KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MinePageMienBodyView.m
  29. 2 0
      KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MinePageVideoView.m
  30. 2 0
      KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Networking/Controller/NetworkingCheckController.m
  31. 8 3
      KulexiuForTeacher/KulexiuForTeacher/Module/Mine/ShareInChat/View/ShareChooseMainView.m
  32. 2 0
      KulexiuForTeacher/KulexiuForTeacher/Module/Mine/VideoCourse/View/VideoListBodyView.m
  33. 14 0
      KulexiuForTeacher/KulexiuForTeacher/Module/TXClassRoom/Controller/TXClassroomViewController.m
  34. 2 0
      KulexiuForTeacher/KulexiuForTeacher/Module/TXClassRoom/View/CoursewareView/CoursewareAlertView.m
  35. 4 1
      KulexiuForTeacher/KulexiuForTeacher/Module/TXLiveModule/Controller/TXLiveRoomViewController.m

+ 1 - 1
KulexiuForTeacher/KulexiuForTeacher.xcodeproj/xcshareddata/xcschemes/KulexiuForTeacher.xcscheme

@@ -93,7 +93,7 @@
       buildConfiguration = "Debug">
    </AnalyzeAction>
    <ArchiveAction
-      buildConfiguration = "Release"
+      buildConfiguration = "TEST"
       revealArchiveInOrganizer = "YES">
    </ArchiveAction>
 </Scheme>

+ 9 - 4
KulexiuForTeacher/KulexiuForTeacher/Module/Chat/BanList/View/GroupBanBodyView.m

@@ -81,7 +81,9 @@
 }
 
 - (void)endRefresh {
+    @weakObj(self);
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        @strongObj(self);
         [self.tableView.mj_header endRefreshing];
     });
 }
@@ -126,10 +128,13 @@
                 [sortArr addObject:firstLetter];
             }
         }
-        // 排序
-        [sortArr sortUsingComparator:^NSComparisonResult(id  _Nonnull obj1, id  _Nonnull obj2) {
-            return [obj1 compare:obj2 options:NSCaseInsensitiveSearch];
-        }];
+        if (sortArr) {
+            // 排序
+            [sortArr sortUsingComparator:^NSComparisonResult(id  _Nonnull obj1, id  _Nonnull obj2) {
+                return [obj1 compare:obj2 options:NSCaseInsensitiveSearch];
+            }];
+        }
+        
         // 将#移动到最后
         for (NSString *letterStr in sortArr) {
             if ([letterStr isEqualToString:@"#"]) {

+ 6 - 4
KulexiuForTeacher/KulexiuForTeacher/Module/Chat/Group/Controller/GroupMemberViewController.m

@@ -75,10 +75,12 @@
                 [sortArr addObject:firstLetter];
             }
         }
-        // 排序
-        [sortArr sortUsingComparator:^NSComparisonResult(id  _Nonnull obj1, id  _Nonnull obj2) {
-            return [obj1 compare:obj2 options:NSCaseInsensitiveSearch];
-        }];
+        if (sortArr) {
+            // 排序
+            [sortArr sortUsingComparator:^NSComparisonResult(id  _Nonnull obj1, id  _Nonnull obj2) {
+                return [obj1 compare:obj2 options:NSCaseInsensitiveSearch];
+            }];
+        }
         // 将#移动到最后
         for (NSString *letterStr in sortArr) {
             if ([letterStr isEqualToString:@"#"]) {

+ 2 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Chat/GroupNotice/Controller/GroupNoticeViewController.m

@@ -61,7 +61,9 @@
 }
 
 - (void)endRefresh {
+    @weakObj(self);
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        @strongObj(self);
         [self.tableView.mj_header endRefreshing];
         [self.tableView.mj_footer endRefreshing];
     });

+ 2 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Chat/ShareMusic/Controller/ShareMusicViewController.m

@@ -119,7 +119,9 @@
 }
 
 - (void)endRefresh {
+    @weakObj(self);
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        @strongObj(self);
         [self.tableView.mj_header endRefreshing];
         [self.tableView.mj_footer endRefreshing];
     });

+ 14 - 6
KulexiuForTeacher/KulexiuForTeacher/Module/Chat/View/ChatAddressBodyView.m

@@ -85,7 +85,9 @@
 }
 
 - (void)endRefresh {
+    @weakObj(self);
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        @strongObj(self);
         [self.tableView.mj_header endRefreshing];
     });
 }
@@ -172,9 +174,12 @@
                     [sortArr addObject:firstLetter];
                 }
             }
-            [sortArr sortUsingComparator:^NSComparisonResult(id  _Nonnull obj1, id  _Nonnull obj2) {
-                return [obj1 compare:obj2 options:NSCaseInsensitiveSearch];
-            }];
+            if (sortArr) {
+                // 排序
+                [sortArr sortUsingComparator:^NSComparisonResult(id  _Nonnull obj1, id  _Nonnull obj2) {
+                    return [obj1 compare:obj2 options:NSCaseInsensitiveSearch];
+                }];
+            }
             // 将#移动到最后
             for (NSString *letterStr in sortArr) {
                 if ([letterStr isEqualToString:@"#"]) {
@@ -220,9 +225,12 @@
                     [sortArr addObject:firstLetter];
                 }
             }
-            [sortArr sortUsingComparator:^NSComparisonResult(id  _Nonnull obj1, id  _Nonnull obj2) {
-                return [obj1 compare:obj2 options:NSCaseInsensitiveSearch];
-            }];
+            if (sortArr) {
+                // 排序
+                [sortArr sortUsingComparator:^NSComparisonResult(id  _Nonnull obj1, id  _Nonnull obj2) {
+                    return [obj1 compare:obj2 options:NSCaseInsensitiveSearch];
+                }];
+            }
             // 将#移动到最后
             for (NSString *letterStr in sortArr) {
                 if ([letterStr isEqualToString:@"#"]) {

+ 2 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Course/Controller/CourseViewController.m

@@ -207,7 +207,9 @@
 }
 
 - (void)endRefresh {
+    @weakObj(self);
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        @strongObj(self);
         [self.scrollView.mj_header endRefreshing];
     });
 }

+ 2 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Home/EvaluateCourse/View/EvaluateCourseBodyView.m

@@ -81,7 +81,9 @@
 
 
 - (void)endRefresh {
+    @weakObj(self);
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        @strongObj(self);
         [self.tableView.mj_header endRefreshing];
         [self.tableView.mj_footer endRefreshing];
     });

+ 2 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Home/Homework/View/HomeworkBodyView.m

@@ -85,7 +85,9 @@
 }
 
 - (void)endRefresh {
+    @weakObj(self);
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        @strongObj(self);
         [self.tableView.mj_header endRefreshing];
         [self.tableView.mj_footer endRefreshing];
     });

+ 2 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Home/Income/Controller/FreezeListViewController.m

@@ -105,7 +105,9 @@
 }
 
 - (void)endRefresh {
+    @weakObj(self);
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        @strongObj(self);
         [self.tableView.mj_header endRefreshing];
         [self.tableView.mj_footer endRefreshing];
     });

+ 2 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Home/Income/Controller/MyIncomeViewController.m

@@ -125,7 +125,9 @@
 }
 
 - (void)endRefresh {
+    @weakObj(self);
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        @strongObj(self);
         [self.tableView.mj_header endRefreshing];
         [self.tableView.mj_footer endRefreshing];
     });

+ 2 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Home/Income/Controller/NoRecordViewController.m

@@ -106,7 +106,9 @@
 }
 
 - (void)endRefresh {
+    @weakObj(self);
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        @strongObj(self);
         [self.tableView.mj_header endRefreshing];
         [self.tableView.mj_footer endRefreshing];
     });

+ 2 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Home/Income/WithDraw/Controller/CashRecordViewController.m

@@ -102,7 +102,9 @@
 }
 
 - (void)endRefresh {
+    @weakObj(self);
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        @strongObj(self);
         [self.tableView.mj_header endRefreshing];
         [self.tableView.mj_footer endRefreshing];
     });

+ 2 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Home/Music/View/MyMusicBodyView.m

@@ -75,7 +75,9 @@
 }
 
 - (void)endRefresh {
+    @weakObj(self);
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        @strongObj(self);
         [self.tableView.mj_header endRefreshing];
         [self.tableView.mj_footer endRefreshing];
     });

+ 2 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MyLessonBodyView.m

@@ -107,7 +107,9 @@
 }
 
 - (void)endRefresh {
+    @weakObj(self);
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        @strongObj(self);
         [self.tableView.mj_header endRefreshing];
         [self.tableView.mj_footer endRefreshing];
     });

+ 2 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MyMusicRoomBodyView.m

@@ -101,7 +101,9 @@
 }
 
 - (void)endRefresh {
+    @weakObj(self);
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        @strongObj(self);
         [self.tableView.mj_header endRefreshing];
         [self.tableView.mj_footer endRefreshing];
     });

+ 2 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MyVideoCourseBodyView.m

@@ -74,7 +74,9 @@
 }
 
 - (void)endRefresh {
+    @weakObj(self);
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        @strongObj(self);
         [self.collectionView.mj_header endRefreshing];
         [self.collectionView.mj_footer endRefreshing];
     });

+ 4 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Home/NotiferMessage/Controller/NotiferMessageViewController.m

@@ -65,7 +65,9 @@
     [KSNetworkingManager batchSetReadRequest:KS_POST success:^(NSDictionary * _Nonnull dic) {
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             [LOADING_MANAGER MBShowAUTOHidingInWindow:@"清除成功"];
+            @weakObj(self);
             dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.5f * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                @strongObj(self);
                 [self resetSourceAndRequest];
             });
             
@@ -158,7 +160,9 @@
 }
 
 - (void)endRefresh {
+    @weakObj(self);
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        @strongObj(self);
         [self.tableView.mj_header endRefreshing];
         [self.tableView.mj_footer endRefreshing];
     });

+ 2 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Home/ReceiveEvaluate/Controller/ReceiveEvaluateListController.m

@@ -81,7 +81,9 @@
 }
 
 - (void)endRefresh {
+    @weakObj(self);
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        @strongObj(self);
         [self.tableView.mj_header endRefreshing];
         [self.tableView.mj_footer endRefreshing];
     });

+ 2 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Login/Model/UserInfoManager.m

@@ -272,7 +272,9 @@
         return;
     }
     else {
+        @weakObj(self);
         dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.5f * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            @strongObj(self);
             isConnected = [self checkIMConnected];
             if (isConnected) {
                 if (self.IMConnCallback) {

+ 2 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/AddressList/Controller/AddressListViewController.m

@@ -72,7 +72,9 @@
 }
 
 - (void)endRefresh {
+    @weakObj(self);
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        @strongObj(self);
         [self.tableView.mj_header endRefreshing];
     });
 }

+ 2 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Courseware/Controller/CoursewareViewController.m

@@ -119,7 +119,9 @@
 
 #pragma mark --- viewModel delegate
 - (void)endRefresh {
+    @weakObj(self);
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        @strongObj(self);
         [self.tableView.mj_header endRefreshing];
         [self.tableView.mj_footer endRefreshing];
     });

+ 2 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/DeviceCheck/DeviceCheckView.m

@@ -216,7 +216,9 @@
         [self.titleLabel setText:@"扬声器故障"];
         self.twoPreButton.userInteractionEnabled = NO;
         self.twoNextButton.userInteractionEnabled = NO;
+        @weakObj(self);
         dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            @strongObj(self);
             [self checkNetWorkStatus];
             self.twoPreButton.userInteractionEnabled = YES;
             self.twoNextButton.userInteractionEnabled = YES;

+ 2 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Feedback/Controller/FeedbackListViewController.m

@@ -122,7 +122,9 @@
 }
 
 - (void)endRefresh {
+    @weakObj(self);
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        @strongObj(self);
         [self.tableView.mj_header endRefreshing];
         [self.tableView.mj_footer endRefreshing];
     });

+ 2 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/LiveCourse/View/MyLiveCourseBodyView.m

@@ -100,7 +100,9 @@
 }
 
 - (void)endRefresh {
+    @weakObj(self);
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        @strongObj(self);
         [self.tableView.mj_header endRefreshing];
         [self.tableView.mj_footer endRefreshing];
     });

+ 2 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/LiveList/View/LiveListBodyView.m

@@ -82,7 +82,9 @@
 }
 
 - (void)endRefresh {
+    @weakObj(self);
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        @strongObj(self);
         [self.tableView.mj_header endRefreshing];
         [self.tableView.mj_footer endRefreshing];
     });

+ 2 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MinePageCourseView.m

@@ -103,7 +103,9 @@
 }
 
 - (void)endRefresh {
+    @weakObj(self);
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        @strongObj(self);
         [self.tableView.mj_header endRefreshing];
         [self.tableView.mj_footer endRefreshing];
     });

+ 2 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MinePageMienBodyView.m

@@ -116,7 +116,9 @@
 }
 
 - (void)endRefresh {
+    @weakObj(self);
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        @strongObj(self);
         [self.tableView.mj_header endRefreshing];
     });
 }

+ 2 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MinePageVideoView.m

@@ -73,7 +73,9 @@
 }
 
 - (void)endRefresh {
+    @weakObj(self);
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        @strongObj(self);
         [self.collectionView.mj_header endRefreshing];
         [self.collectionView.mj_footer endRefreshing];
     });

+ 2 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Networking/Controller/NetworkingCheckController.m

@@ -77,7 +77,9 @@
     self.bodyView.fourImage.hidden = YES;
     
     [self updateProgress:0.25f duration:0.5f];
+    @weakObj(self);
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        @strongObj(self);
         self.bodyView.firstImage.hidden = NO;
         [self.bodyView.firstImage setImage:[UIImage imageNamed:@"check_success"]];
         [self checkStatusWithType:netType];

+ 8 - 3
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/ShareInChat/View/ShareChooseMainView.m

@@ -82,7 +82,9 @@
 }
 
 - (void)endRefresh {
+    @weakObj(self);
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        @strongObj(self);
         [self.tableView.mj_header endRefreshing];
     });
 }
@@ -170,9 +172,12 @@
                     [sortArr addObject:firstLetter];
                 }
             }
-            [sortArr sortUsingComparator:^NSComparisonResult(id  _Nonnull obj1, id  _Nonnull obj2) {
-                return [obj1 compare:obj2 options:NSCaseInsensitiveSearch];
-            }];
+            if (sortArr) {
+                // 排序
+                [sortArr sortUsingComparator:^NSComparisonResult(id  _Nonnull obj1, id  _Nonnull obj2) {
+                    return [obj1 compare:obj2 options:NSCaseInsensitiveSearch];
+                }];
+            }
             // 将#移动到最后
             for (NSString *letterStr in sortArr) {
                 if ([letterStr isEqualToString:@"#"]) {

+ 2 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/VideoCourse/View/VideoListBodyView.m

@@ -72,7 +72,9 @@
 }
 
 - (void)endRefresh {
+    @weakObj(self);
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        @strongObj(self);
         [self.collectionView.mj_header endRefreshing];
         [self.collectionView.mj_footer endRefreshing];
     });

+ 14 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/TXClassRoom/Controller/TXClassroomViewController.m

@@ -189,7 +189,9 @@
         // 切换到竖屏
         AppDelegate* delegate = (AppDelegate*)[UIApplication sharedApplication].delegate;
         delegate.allowAutoRotate = NO;
+        @weakObj(self);
         dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            @strongObj(self);
             if (IS_IPAD) {
                 self.zh_statusBarHidden = NO;
             }
@@ -337,7 +339,9 @@
 #pragma mark ----- 账号异地登陆
 - (void)leaveRoomAction {
     [LOADING_MANAGER MBShowAUTOHidingInWindow:@"该账号在其他设备上登录"];
+    @weakObj(self);
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.0f * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        @strongObj(self);
         self.isQuitRoom = YES;
         [[LoginHelper sharedInstance] logout];
         self.cancleAlert = YES;
@@ -350,7 +354,9 @@
 }
 
 - (void)quitRoomAction {
+    @weakObj(self);
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.0f * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        @strongObj(self);
         self.isQuitRoom = YES;
         [[LoginHelper sharedInstance] logout];
         self.cancleAlert = YES;
@@ -1153,7 +1159,9 @@
         self.isQuitRoom = YES;
         // 退出房间
         [self.tipsView showTipsMessage:@"课程已结束" inView:self.view];
+        @weakObj(self);
         dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            @strongObj(self);
             // 课程结束退出房间
             SealClassLog(@"ClassEnd!");
             [LOADING_MANAGER showHUD];
@@ -1300,7 +1308,9 @@
                     [[ClassroomService sharedService] displayTeacher];
                     [self.containerView containerViewRenderView:[ClassroomService sharedService].currentRoom.currentMember];
                     [self.videoListView showTeacherPrompt:YES];
+                    @weakObj(self);
                     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.3f * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                        @strongObj(self);
                         [self renderMainContainerView];
                     });
                 }
@@ -1512,7 +1522,9 @@
             [self resetPlayBeatAndAccompany];
             
             [LOADING_MANAGER showHUD];
+            @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];
                 button.selected = YES;
                 self.toolView.isVideoDisplay = NO;
@@ -1553,7 +1565,9 @@
             [[ClassroomService sharedService] displayTeacher];
             [self.containerView containerViewRenderView:[ClassroomService sharedService].currentRoom.currentMember];
             [self.videoListView showTeacherPrompt:YES];
+            @weakObj(self);
             dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.3f * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                @strongObj(self);
                 [self renderMainContainerView];
             });
             [self.whiteboardListView removeFromSuperview];

+ 2 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/TXClassRoom/View/CoursewareView/CoursewareAlertView.m

@@ -146,7 +146,9 @@
 }
 
 - (void)endRefresh {
+    @weakObj(self);
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        @strongObj(self);
         [self.tableView.mj_header endRefreshing];
         [self.tableView.mj_footer endRefreshing];
     });

+ 4 - 1
KulexiuForTeacher/KulexiuForTeacher/Module/TXLiveModule/Controller/TXLiveRoomViewController.m

@@ -581,8 +581,9 @@ typedef NS_ENUM(NSInteger, LIVEPAGE) {
 - (void)delyJoinRTCRoom {
     [self resetSeatContainer];
     [self.trtcCloud exitRoom];
+    @weakObj(self);
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.0f * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        
+        @strongObj(self);
         [self publishLocalStream];
     });
 }
@@ -2486,7 +2487,9 @@ typedef NS_ENUM(NSInteger, LIVEPAGE) {
     if (self.isLiveCourse) {
         [self.timeManager stopDurationTimer];
         [LOADING_MANAGER MBShowAUTOHidingInWindow:@"直播已结束"];
+        @weakObj(self);
         dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.0f * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            @strongObj(self);
             // 退出直播间
             [self quitRoomBackPreView:NO];
         });