Steven 3 лет назад
Родитель
Сommit
8dc46b36a5

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


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

@@ -23,22 +23,6 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "6C8F310D-3DDD-4BA9-94AE-FF9EE9C5DA14"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KulexiuForTeacher/Module/Live/View/SeatListView/LiveMemberSeatCell.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "43"
-            endingLineNumber = "43"
-            landmarkName = "-configCellWithSource:isApply:callback:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
             uuid = "ACDBE2BD-DEF9-4FDF-BD1E-B43504F15607"
             shouldBeEnabled = "No"
             ignoreCount = "0"
@@ -78,8 +62,8 @@
             filePath = "KulexiuForTeacher/Module/Live/Controller/LiveRoomViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1618"
-            endingLineNumber = "1618"
+            startingLineNumber = "1632"
+            endingLineNumber = "1632"
             landmarkName = "-pauseLiveActionBack:"
             landmarkType = "7">
          </BreakpointContent>
@@ -94,9 +78,9 @@
             filePath = "KulexiuForTeacher/Module/Live/Controller/LiveRoomViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "635"
-            endingLineNumber = "635"
-            landmarkName = "-IMConnetedCallback"
+            startingLineNumber = "643"
+            endingLineNumber = "643"
+            landmarkName = "-configIMConnect"
             landmarkType = "7">
             <Locations>
                <Location
@@ -267,5 +251,21 @@
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "EA9FEA48-4616-4094-BBE4-66F574A0FB75"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "KulexiuForTeacher/Module/Live/Controller/LiveRoomViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "510"
+            endingLineNumber = "510"
+            landmarkName = "-appBecomeActive"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

+ 1 - 3
KulexiuForTeacher/KulexiuForTeacher/Module/Home/View/HomeAuthAlertView.m

@@ -53,9 +53,7 @@
 
 - (IBAction)vefiAction:(id)sender {
     if (self.callback) {
-        if (self.isFinish == NO) {
-            self.callback();
-        }
+        self.callback();
     }
     [self removeFromSuperview];
 }

+ 1 - 1
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/LiveCourse/View/MyLiveCourseBodyView.m

@@ -223,7 +223,7 @@
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
     // 直播课程组详情
     LiveCourseModel *model = self.dataArray[indexPath.row];
-    if (self.selectIndex == 4) {
+    if (self.selectIndex == 5) {
         [self editLiveCourseWithGroupId:[NSString stringWithFormat:@"%.0f",model.courseGroupId]];
         
     }

+ 27 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/Controller/MinePageViewController.m

@@ -314,6 +314,33 @@
     }
     return [gestureRecognizer isKindOfClass:[UIPanGestureRecognizer class]] && [otherGestureRecognizer isKindOfClass:[UIPanGestureRecognizer class]];
 }
+
+- (void)pagerView:(JXPagerView *)pagerView mainTableViewDidScroll:(UIScrollView *)scrollView {
+    
+    NSLog(@"sscroll content offset y %f", scrollView.contentOffset.y);
+    CGFloat height = [self.topView getViewHeight];
+    CGFloat space = scrollView.contentOffset.y;
+    if (space > 100) {
+        CGFloat rate = (space - 100) / (height - 100);
+        NSLog(@"rate ---------%f",rate);
+        self.headView.topView.backgroundColor = HexRGBAlpha(0xffffff, rate);
+        if (rate == 1) {
+            [self.headView.backImage setImage:[UIImage imageNamed:@"back_black"]];
+            self.headView.topTitle.textColor = HexRGB(0x333333);
+        }
+        else {
+            [self.headView.backImage setImage:[UIImage imageNamed:@"back_white"]];
+            self.headView.topTitle.textColor = HexRGB(0xffffff);
+        }
+    }
+    else {
+        self.headView.topView.backgroundColor = [UIColor clearColor];
+        [self.headView.backImage setImage:[UIImage imageNamed:@"back_white"]];
+        self.headView.topTitle.textColor = HexRGB(0xffffff);
+    }
+}
+
+
 #pragma mark --- lazying
 - (MinePageHeadView *)headView {
     if (!_headView) {

+ 5 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MinePageHeadView.h

@@ -12,6 +12,11 @@ typedef void(^MinePageBack)(void);
 NS_ASSUME_NONNULL_BEGIN
 
 @interface MinePageHeadView : UIView
+@property (weak, nonatomic) IBOutlet UIImageView *backImage;
+
+@property (weak, nonatomic) IBOutlet UILabel *topTitle;
+
+@property (weak, nonatomic) IBOutlet UIView *topView;
 
 @property (weak, nonatomic) IBOutlet UIImageView *bgView;
 

+ 3 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MinePageHeadView.xib

@@ -83,7 +83,10 @@
             <nil key="simulatedBottomBarMetrics"/>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
             <connections>
+                <outlet property="backImage" destination="7zL-CV-PVX" id="Rh5-bw-0od"/>
                 <outlet property="bgView" destination="thf-Z9-Jzc" id="bcT-kn-PMh"/>
+                <outlet property="topTitle" destination="4go-Bw-8sZ" id="PK9-Z6-G7j"/>
+                <outlet property="topView" destination="emY-nQ-Sbn" id="Scs-7L-BfX"/>
                 <outlet property="viewHeight" destination="1wg-e6-kqA" id="79o-QW-2Js"/>
             </connections>
             <point key="canvasLocation" x="311.59420289855075" y="-117.85714285714285"/>

+ 3 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MinePageTopView.xib

@@ -343,6 +343,9 @@
                         <userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
                             <real key="value" value="2"/>
                         </userDefinedRuntimeAttribute>
+                        <userDefinedRuntimeAttribute type="color" keyPath="borderColor">
+                            <color key="value" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        </userDefinedRuntimeAttribute>
                     </userDefinedRuntimeAttributes>
                 </imageView>
                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mine_nomal" translatesAutoresizingMaskIntoConstraints="NO" id="O4w-5f-Puh">

+ 3 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/View/MineHeadView.xib

@@ -29,6 +29,9 @@
                                 <userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
                                     <real key="value" value="2"/>
                                 </userDefinedRuntimeAttribute>
+                                <userDefinedRuntimeAttribute type="color" keyPath="borderColor">
+                                    <color key="value" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                </userDefinedRuntimeAttribute>
                             </userDefinedRuntimeAttributes>
                         </imageView>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="游客" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QPn-ge-mEt">