Steven 3 rokov pred
rodič
commit
7f694bc5c1

BIN
KulexiuForTeacher/KulexiuForTeacher.xcworkspace/xcuserdata/wangzhi.xcuserdatad/UserInterfaceState.xcuserstate


+ 18 - 50
KulexiuForTeacher/KulexiuForTeacher.xcworkspace/xcuserdata/wangzhi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -186,8 +186,8 @@
             filePath = "KulexiuForTeacher/Common/Base/KSBaseWKWebViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1201"
-            endingLineNumber = "1201"
+            startingLineNumber = "1203"
+            endingLineNumber = "1203"
             landmarkName = "-documentPicker:didPickDocumentAtURL:"
             landmarkType = "7">
          </BreakpointContent>
@@ -747,22 +747,6 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "4820E9FB-92BA-420F-9FD5-484C57635B50"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KulexiuForTeacher/Module/Live/Controller/LiveRoomViewController.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "467"
-            endingLineNumber = "467"
-            landmarkName = "-judgeAutoClose"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
             uuid = "A69885F4-2897-4F2A-B71D-D2D2C7E56B98"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
@@ -875,38 +859,6 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "314A1800-5434-452D-B489-CCF5DE5F1D5F"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KulexiuForTeacher/Common/Base/KSBaseWKWebViewController.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "583"
-            endingLineNumber = "583"
-            landmarkName = "-chooseFileWithType:maxNumber:bucket:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "214D9110-EB2F-40D9-91D1-2CB0E5D5FDCB"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KulexiuForTeacher/Module/Live/Controller/LiveRoomViewController.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1299"
-            endingLineNumber = "1299"
-            landmarkName = "-quitClassroomNotifer"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
             uuid = "4462B807-FAFE-4E5A-9F0D-450B5EE4A345"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
@@ -984,5 +936,21 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "9DA8A578-7E23-47BC-B362-75955662F866"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "KulexiuForTeacher/Module/Live/Controller/LiveRoomViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "677"
+            endingLineNumber = "677"
+            landmarkName = "-liveroomQuit"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

+ 2 - 0
KulexiuForTeacher/KulexiuForTeacher/Common/Base/KSBaseWKWebViewController.m

@@ -64,6 +64,7 @@ typedef NS_ENUM(NSInteger, CHOOSETYPE) {
 
 @property (nonatomic, assign) BOOL isFirstLoad;
 
+
 @end
 
 @implementation KSBaseWKWebViewController
@@ -74,6 +75,7 @@ typedef NS_ENUM(NSInteger, CHOOSETYPE) {
     self.ks_prefersNavigationBarHidden = YES; // 隐藏导航栏,其他事件额外处理
     [self initWebView];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(operationDealCallbackMessage:) name:DEALCALLBACKNOTICIFATION object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(backLoginView) name:@"liveroomBackRefresh" object:nil];
     self.isFirstLoad = YES;
 }
 

+ 1 - 1
KulexiuForTeacher/KulexiuForTeacher/Common/Base/KSNetworkingManager.m

@@ -1193,7 +1193,7 @@
     [parm setValue:coverPic forKey:@"coverPic"];
     [parm setValue:liveRemark forKey:@"liveRemark"];
     [parm setValue:roomTitle forKey:@"roomTitle"];
-    [parm setValue:@(5) forKey:@"liveTime"];
+    [parm setValue:@(liveTime) forKey:@"liveTime"];
     [self request:post andWithUrl:url and:parm success:success faliure:faliure];
 }
 

+ 7 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Live/Controller/CreateLiveViewController.m

@@ -28,6 +28,13 @@
     [self configUI];
 }
 
+- (void)viewWillAppear:(BOOL)animated {
+    [super viewWillAppear:animated];
+    if ([self checkIsLoginToLoginView:YES]) {
+    
+    }
+}
+
 - (void)configUI {
     self.bodyView = [CreateLiveBodyView shareInstance];
     [self.scrollView addSubview:self.bodyView];

+ 2 - 2
KulexiuForTeacher/KulexiuForTeacher/Module/Live/Controller/LiveRoomViewController.m

@@ -664,7 +664,7 @@ typedef NS_ENUM(NSInteger, LIVEPAGE) {
     [self quitRoomBackPreView:NO];
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.5f * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
         
-        [[NSNotificationCenter defaultCenter] postNotificationName:@"backLoginView" object:nil];
+        [[NSNotificationCenter defaultCenter] postNotificationName:@"liveroomBackRefresh" object:nil];
     });
 }
 
@@ -675,7 +675,7 @@ typedef NS_ENUM(NSInteger, LIVEPAGE) {
     self.isOtherLogin = YES;
     [self quitRoomBackPreView:NO];
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.0f * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        [[NSNotificationCenter defaultCenter] postNotificationName:@"backLoginView" object:nil];
+        [[NSNotificationCenter defaultCenter] postNotificationName:@"liveroomBackRefresh" object:nil];
     });
 }
  

+ 17 - 5
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/LiveList/Controller/LiveListViewController.m

@@ -21,6 +21,8 @@
 
 @property (nonatomic, strong) NSMutableArray *subjectList;
 
+//@property (nonatomic, assign) BOOL cancleRequest;
+
 @end
 
 @implementation LiveListViewController
@@ -34,6 +36,7 @@
     [self configUI];
 }
 
+
 - (void)createRightButton {
     [self rightButtonTitle:@"创建直播"];
 }
@@ -77,13 +80,17 @@
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
     self.navigationController.interactivePopGestureRecognizer.enabled = YES;
-    if (self.listViewArray.count > self.categoryView.selectedIndex) {
-        id value = self.listViewArray[self.categoryView.selectedIndex];
-        if ([value isKindOfClass:[LiveListBodyView class]]) {
-            LiveListBodyView *listView = (LiveListBodyView *)value;
-            [listView beginFirstRefresh];
+    if ([self checkIsLoginToLoginView:YES]) {
+        
+        if (self.listViewArray.count > self.categoryView.selectedIndex) {
+            id value = self.listViewArray[self.categoryView.selectedIndex];
+            if ([value isKindOfClass:[LiveListBodyView class]]) {
+                LiveListBodyView *listView = (LiveListBodyView *)value;
+                [listView beginFirstRefresh];
+            }
         }
     }
+    
 }
 
 
@@ -160,6 +167,11 @@
     }
     return _listViewArray;
 }
+
+
+- (void)dealloc {
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
 /*
 #pragma mark - Navigation
 

+ 1 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/LiveList/View/UnderwayLiveCell.m

@@ -46,6 +46,7 @@
     NSDate *endDate = [formater dateFromString:endTime];
     [formater setDateFormat:@"yyyy/MM/dd HH:mm"];
     self.endTimeLabel.text = [NSString returnNoNullStringWithString:[formater stringFromDate:endDate]];
+    [self.liveImage startAnimating];
 }