Steven преди 2 години
родител
ревизия
eb391cf0d7

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


+ 36 - 20
KulexiuForStudent/KulexiuForStudent.xcworkspace/xcuserdata/wangzhi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -510,8 +510,8 @@
             filePath = "KulexiuForStudent/Module/Live/Controller/LiveVideoRoomViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1119"
-            endingLineNumber = "1119"
+            startingLineNumber = "1120"
+            endingLineNumber = "1120"
             landmarkName = "-displayCloseView"
             landmarkType = "7">
          </BreakpointContent>
@@ -542,13 +542,13 @@
             filePath = "KulexiuForStudent/Module/Live/Controller/LiveVideoRoomViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1352"
-            endingLineNumber = "1352"
+            startingLineNumber = "1353"
+            endingLineNumber = "1353"
             landmarkName = "-didReceiveMessageNotification:"
             landmarkType = "7">
             <Locations>
                <Location
-                  uuid = "8CC6F8FD-6841-4923-8FDB-B8F040B84FB5 - 37facbaa101cbdb1"
+                  uuid = "8CC6F8FD-6841-4923-8FDB-B8F040B84FB5 - 37facbaa101cbd35"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
@@ -558,12 +558,12 @@
                   urlString = "file:///Users/wangzhi/DayaWorkspace/Klx_student/KulexiuForStudent/KulexiuForStudent/Module/Live/Controller/LiveVideoRoomViewController.m"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "1489"
-                  endingLineNumber = "1489"
+                  startingLineNumber = "1493"
+                  endingLineNumber = "1493"
                   offsetFromSymbolStart = "1184">
                </Location>
                <Location
-                  uuid = "8CC6F8FD-6841-4923-8FDB-B8F040B84FB5 - 37facbaa101cbdb1"
+                  uuid = "8CC6F8FD-6841-4923-8FDB-B8F040B84FB5 - 37facbaa101cbd35"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
@@ -573,8 +573,8 @@
                   urlString = "file:///Users/wangzhi/DayaWorkspace/Klx_student/KulexiuForStudent/KulexiuForStudent/Module/Live/Controller/LiveVideoRoomViewController.m"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "1489"
-                  endingLineNumber = "1489"
+                  startingLineNumber = "1493"
+                  endingLineNumber = "1493"
                   offsetFromSymbolStart = "1188">
                </Location>
             </Locations>
@@ -590,13 +590,13 @@
             filePath = "KulexiuForStudent/Module/Live/Controller/LiveVideoRoomViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1342"
-            endingLineNumber = "1342"
+            startingLineNumber = "1343"
+            endingLineNumber = "1343"
             landmarkName = "-didReceiveMessageNotification:"
             landmarkType = "7">
             <Locations>
                <Location
-                  uuid = "93ED4FCE-5D2E-4D6D-ACD7-640638F3C144 - 37facbaa101cbdb1"
+                  uuid = "93ED4FCE-5D2E-4D6D-ACD7-640638F3C144 - 37facbaa101cbd35"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
@@ -606,12 +606,12 @@
                   urlString = "file:///Users/wangzhi/DayaWorkspace/Klx_student/KulexiuForStudent/KulexiuForStudent/Module/Live/Controller/LiveVideoRoomViewController.m"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "1489"
-                  endingLineNumber = "1489"
+                  startingLineNumber = "1493"
+                  endingLineNumber = "1493"
                   offsetFromSymbolStart = "1184">
                </Location>
                <Location
-                  uuid = "93ED4FCE-5D2E-4D6D-ACD7-640638F3C144 - 37facbaa101cbdb1"
+                  uuid = "93ED4FCE-5D2E-4D6D-ACD7-640638F3C144 - 37facbaa101cbd35"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
@@ -621,8 +621,8 @@
                   urlString = "file:///Users/wangzhi/DayaWorkspace/Klx_student/KulexiuForStudent/KulexiuForStudent/Module/Live/Controller/LiveVideoRoomViewController.m"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "1489"
-                  endingLineNumber = "1489"
+                  startingLineNumber = "1493"
+                  endingLineNumber = "1493"
                   offsetFromSymbolStart = "1188">
                </Location>
             </Locations>
@@ -638,11 +638,27 @@
             filePath = "KulexiuForStudent/Module/Live/Controller/LiveVideoRoomViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1269"
-            endingLineNumber = "1269"
+            startingLineNumber = "1270"
+            endingLineNumber = "1270"
             landmarkName = "-sendLeaveMessageCallback:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "86DC858A-E760-4FAD-B72F-575EF97630F2"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "KulexiuForStudent/Module/Home/Controller/NewHomeViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1006"
+            endingLineNumber = "1006"
+            landmarkName = "-pagerView:mainTableViewDidScroll:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

+ 2 - 2
KulexiuForStudent/KulexiuForStudent/Module/Home/Controller/NewHomeViewController.m

@@ -141,7 +141,7 @@
 
 @property (nonatomic, strong) NSMutableArray *listViewArray;
 
-@property (nonatomic, assign) CGFloat headViewHeight;
+@property (nonatomic, assign) NSInteger headViewHeight;
 
 
 @property (nonatomic, strong) NSMutableArray *teacherArray;
@@ -994,7 +994,7 @@
 
 - (void)pagerView:(JXPagerView *)pagerView mainTableViewDidScroll:(UIScrollView *)scrollView {
     NSLog(@"sscroll content offset y %f", scrollView.contentOffset.y);
-    CGFloat height = self.headViewHeight;
+    NSInteger height = self.headViewHeight;
     CGFloat space = scrollView.contentOffset.y;
     if (space > 0) {
         self.navView.lineView.hidden = NO;

+ 6 - 0
KulexiuForStudent/KulexiuForStudent/Module/Home/View/HotLiveCourse/HomeHotLiveCourseView.m

@@ -30,6 +30,12 @@
     return 224.0f;
 }
 
+- (IBAction)moreLiveCourse:(id)sender {
+    if (self.callback) {
+        self.callback();
+    }
+}
+
 /*
 // Only override drawRect: if you perform custom drawing.
 // An empty implementation adversely affects performance during animation.

+ 3 - 0
KulexiuForStudent/KulexiuForStudent/Module/Home/View/HotLiveCourse/HomeHotLiveCourseView.xib

@@ -63,6 +63,9 @@
                     <state key="normal">
                         <color key="titleColor" red="0.46666666670000001" green="0.46666666670000001" blue="0.46666666670000001" alpha="0.84705882349999995" colorSpace="calibratedRGB"/>
                     </state>
+                    <connections>
+                        <action selector="moreLiveCourse:" destination="iN0-l3-epB" eventType="touchUpInside" id="cWY-e4-M0F"/>
+                    </connections>
                 </button>
                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="home_left" translatesAutoresizingMaskIntoConstraints="NO" id="MKo-QN-cJI">
                     <rect key="frame" x="14" y="33.5" width="4" height="18"/>

+ 5 - 0
KulexiuForStudent/KulexiuForStudent/Module/Home/View/HotVideoCourse/HomeHotVideoCourseView.m

@@ -29,6 +29,11 @@
 + (CGFloat)getViewHeight {
     return 224.0f;
 }
+- (IBAction)moreVideoCourse:(id)sender {
+    if (self.callback) {
+        self.callback();
+    }
+}
 
 /*
 // Only override drawRect: if you perform custom drawing.

+ 3 - 0
KulexiuForStudent/KulexiuForStudent/Module/Home/View/HotVideoCourse/HomeHotVideoCourseView.xib

@@ -63,6 +63,9 @@
                     <state key="normal">
                         <color key="titleColor" red="0.46666666670000001" green="0.46666666670000001" blue="0.46666666670000001" alpha="0.84705882349999995" colorSpace="calibratedRGB"/>
                     </state>
+                    <connections>
+                        <action selector="moreVideoCourse:" destination="iN0-l3-epB" eventType="touchUpInside" id="xej-nI-LqN"/>
+                    </connections>
                 </button>
                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="home_left" translatesAutoresizingMaskIntoConstraints="NO" id="tFO-hR-fSY">
                     <rect key="frame" x="14" y="33.5" width="4" height="18"/>

+ 4 - 2
KulexiuForStudent/KulexiuForStudent/Module/Live/Controller/LiveVideoRoomViewController.m

@@ -987,6 +987,7 @@ static int clickPraiseBtnTimes  = 0;
 
 - (void)resetConnectionStatus {
     if (self.micStatus == MICSTATUS_CONNECTING) {
+
         dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.0f * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
             [self connectHostWithStatus:NO];
         });
@@ -1443,6 +1444,9 @@ static int clickPraiseBtnTimes  = 0;
                 }
                 else if ([rcMessage.content isMemberOfClass:[KSRCPauseLiveMessage class]]) { // 主讲人暂停直播
                     [__blockSelf MBPShow:@"主讲人已暂停直播"];
+                    if (__blockSelf.micStatus == MICSTATUS_WAITING) {
+                        [__blockSelf sendSeatMessageApply:NO];
+                    }
                     [__blockSelf resetConnectionStatus];
                     [__blockSelf resetNetTips];
                     [__blockSelf closeAlertView];
@@ -1484,9 +1488,7 @@ static int clickPraiseBtnTimes  = 0;
                         [__blockSelf hideApplyingView];
                     }
                 }
-                
             }
-            
         }));
     }
 }