首页UI细节调整

KulexiuForStudent/KulexiuForStudent.xcworkspace/xcuserdata/wangzhi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -526,8 +526,8 @@
             filePath = "KulexiuForStudent/Module/Home/Controller/NewHomeViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1227"
-            endingLineNumber = "1227"
+            startingLineNumber = "1248"
+            endingLineNumber = "1248"
             landmarkName = "-homeNavAction:"
             landmarkType = "7">
          </BreakpointContent>

KulexiuForStudent/KulexiuForStudent/Module/Home/Controller/NewHomeViewController.m

@@ -286,14 +286,15 @@
 }
 
 - (void)refreshHeadHeight {
-    self.headViewHeight = self.bannerViewHeight + self.buttonViewHeight + self.noticeViewHeight + self.courseViewHeight + self.albumViewHeight + self.musicViewHeight + self.talentViewHeight + self.liveViewHeight + self.videoViewHeight;
+    CGFloat bottomSpace = 20.0f;
+    self.headViewHeight = self.bannerViewHeight + self.buttonViewHeight + self.noticeViewHeight + self.courseViewHeight + self.albumViewHeight + self.musicViewHeight + self.talentViewHeight + self.liveViewHeight + self.videoViewHeight + bottomSpace;
     [self.pagerView reloadData];
 }
 
 - (void)configUI {
     [self configHeadView];
     
-    _categoryView = [[JXCategoryTitleView alloc] initWithFrame:CGRectMake(0, kNaviBarHeight, kScreenWidth, 50)];
+    _categoryView = [[JXCategoryTitleView alloc] initWithFrame:CGRectMake(0, kNaviBarHeight, kScreenWidth, 44)];
     self.categoryView.backgroundColor = [UIColor clearColor];
     self.categoryView.titles = self.titles;
     self.categoryView.delegate = self;
@@ -722,7 +723,7 @@
 
 - (void)refreshViewLocation {
     // 如果有课程和公告 且有按钮
-    CGFloat buttonViewDefaultHeight = self.buttonArray.count > 5 ? [HomeButtonView getViewHeight] : [HomeButtonView getViewHeight] - 10;
+    CGFloat buttonViewDefaultHeight = self.buttonArray.count > 5 ? [HomeButtonView getViewHeight] : [HomeButtonView getViewHeight] - 20;
     
     if (self.noticeTitleArray.count && self.recentCourseModel && self.buttonArray.count) {
         self.noticeViewHeight = [PublicNoticeView getViewHeight];
@@ -933,7 +934,7 @@
 }
 
 - (NSUInteger)heightForPinSectionHeaderInPagerView:(JXPagerView *)pagerView {
-    return 50;
+    return 44;
 }
 
 - (NSInteger)numberOfListsInPagerView:(JXPagerView *)pagerView {
@@ -990,6 +991,26 @@
     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.headViewHeight;
+    CGFloat space = scrollView.contentOffset.y;
+    if (space > 0) {
+        self.navView.lineView.hidden = NO;
+    }
+    else {
+        self.navView.lineView.hidden = YES;
+
+    }
+    if (space >= height) {
+        self.categoryView.backgroundColor = [UIColor whiteColor];
+    }
+    else {
+        self.categoryView.backgroundColor = [UIColor clearColor];
+    }
+}
+
 #pragma mark - TYCyclePagerViewDataSource代理
 - (NSInteger)numberOfItemsInPagerView:(TYCyclePagerView *)pageView {
     return self.bannerArray.count;
@@ -1176,13 +1197,13 @@
         return CGSizeMake(KPortraitWidth * 0.83, 240);
     }
     else if (collectionView == self.talentCollectionView) {
-        return CGSizeMake(110, 146);
+        return CGSizeMake(110, 150);
     }
     else if (collectionView == self.videoCollectionView) {
-        return CGSizeMake((KPortraitWidth - 28 - 11) / 2.0f, 153);
+        return CGSizeMake((KPortraitWidth - 28 - 11) / 2.0f, 157);
     }
     else {
-        return CGSizeMake((KPortraitWidth - 28 - 11) / 2.0f, 153);
+        return CGSizeMake((KPortraitWidth - 28 - 11) / 2.0f, 157);
     }
 }
 

KulexiuForStudent/KulexiuForStudent/Module/Home/View/HomeNav/HomeNavSearchView.h

@@ -22,6 +22,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (weak, nonatomic) IBOutlet UIView *dotView;
 
+@property (weak, nonatomic) IBOutlet UIView *lineView;
+
 + (instancetype)shareInstance;
 
 - (void)homeNavSearchAction:(HomeNavSearchCallback)callback;

KulexiuForStudent/KulexiuForStudent/Module/Home/View/HomeNav/HomeNavSearchView.xib

@@ -108,6 +108,13 @@
                         <action selector="scanAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="bLx-hp-jSo"/>
                     </connections>
                 </button>
+                <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fSS-ji-8gy">
+                    <rect key="frame" x="0.0" y="87" width="414" height="1"/>
+                    <color key="backgroundColor" red="0.97647058823529409" green="0.97647058823529409" blue="0.97647058823529409" alpha="1" colorSpace="calibratedRGB"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="1" id="f6Z-bS-ANj"/>
+                    </constraints>
+                </view>
             </subviews>
             <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <constraints>
@@ -116,11 +123,14 @@
                 <constraint firstItem="Ppo-1q-gi4" firstAttribute="centerY" secondItem="gIj-iP-RBu" secondAttribute="centerY" id="6Lc-jj-Nxz"/>
                 <constraint firstAttribute="bottom" secondItem="Zhb-6r-b1M" secondAttribute="bottom" constant="5" id="6yI-GK-Ap7"/>
                 <constraint firstItem="Zhb-6r-b1M" firstAttribute="centerY" secondItem="A0l-AI-PtC" secondAttribute="centerY" id="Ars-4w-xec"/>
+                <constraint firstAttribute="bottom" secondItem="fSS-ji-8gy" secondAttribute="bottom" id="GZX-o3-PJi"/>
+                <constraint firstItem="fSS-ji-8gy" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="Ooh-Mz-IHy"/>
                 <constraint firstAttribute="trailing" secondItem="Zhb-6r-b1M" secondAttribute="trailing" constant="6" id="cUx-Pf-S6e"/>
                 <constraint firstItem="nBF-8h-DYQ" firstAttribute="top" secondItem="Zhb-6r-b1M" secondAttribute="top" constant="8" id="dCc-0Q-exj"/>
                 <constraint firstItem="A0l-AI-PtC" firstAttribute="leading" secondItem="Ppo-1q-gi4" secondAttribute="trailing" constant="8" id="eHb-Mb-igF"/>
                 <constraint firstItem="Zhb-6r-b1M" firstAttribute="leading" secondItem="A0l-AI-PtC" secondAttribute="trailing" id="o7j-29-Kuq"/>
                 <constraint firstAttribute="trailing" secondItem="nBF-8h-DYQ" secondAttribute="trailing" constant="12" id="ohe-LD-x1V"/>
+                <constraint firstAttribute="trailing" secondItem="fSS-ji-8gy" secondAttribute="trailing" id="rB4-29-FiN"/>
                 <constraint firstItem="Ppo-1q-gi4" firstAttribute="leading" secondItem="gIj-iP-RBu" secondAttribute="trailing" constant="17" id="vZv-cq-kip"/>
             </constraints>
             <nil key="simulatedTopBarMetrics"/>
@@ -128,6 +138,7 @@
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
             <connections>
                 <outlet property="dotView" destination="nBF-8h-DYQ" id="H3g-ir-TQZ"/>
+                <outlet property="lineView" destination="fSS-ji-8gy" id="8c0-pD-uma"/>
             </connections>
             <point key="canvasLocation" x="128.98550724637681" y="-177.45535714285714"/>
         </view>

KulexiuForStudent/KulexiuForStudent/Module/Home/View/HotAlbum/HomeHotAlbumView.xib

@@ -14,7 +14,7 @@
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="i48-Hd-WKl">
-                    <rect key="frame" x="349" y="32" width="45" height="18"/>
+                    <rect key="frame" x="355" y="32" width="45" height="18"/>
                     <color key="backgroundColor" red="0.94901960784313721" green="0.94901960784313721" blue="0.94901960784313721" alpha="1" colorSpace="calibratedRGB"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="18" id="J1Q-HM-3AQ"/>
@@ -26,7 +26,7 @@
                     </userDefinedRuntimeAttributes>
                 </view>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="更多" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zgK-R6-zz8">
-                    <rect key="frame" x="355" y="34" width="25" height="14.5"/>
+                    <rect key="frame" x="361" y="34" width="25" height="14.5"/>
                     <fontDescription key="fontDescription" type="system" pointSize="12"/>
                     <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
                     <nil key="highlightedColor"/>
@@ -41,7 +41,7 @@
                     <nil key="highlightedColor"/>
                 </label>
                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="home_more" translatesAutoresizingMaskIntoConstraints="NO" id="OkW-qe-3Kq">
-                    <rect key="frame" x="383" y="37" width="6" height="8"/>
+                    <rect key="frame" x="389" y="37" width="6" height="8"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="6" id="PEX-ax-k36"/>
                         <constraint firstAttribute="height" constant="8" id="QOU-bK-jTl"/>
@@ -55,7 +55,7 @@
                     </constraints>
                 </view>
                 <button opaque="NO" tag="1008" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kIU-g4-ctC">
-                    <rect key="frame" x="355" y="26" width="34" height="30"/>
+                    <rect key="frame" x="361" y="26" width="34" height="30"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="30" id="l3w-24-Jol"/>
                     </constraints>
@@ -79,7 +79,7 @@
             <constraints>
                 <constraint firstItem="OkW-qe-3Kq" firstAttribute="centerY" secondItem="u9G-3b-Wgt" secondAttribute="centerY" id="0C2-jz-ybg"/>
                 <constraint firstItem="OkW-qe-3Kq" firstAttribute="trailing" secondItem="i48-Hd-WKl" secondAttribute="trailing" constant="-5" id="5eI-th-d1c"/>
-                <constraint firstAttribute="trailing" secondItem="i48-Hd-WKl" secondAttribute="trailing" constant="20" id="61L-Vw-Zhd"/>
+                <constraint firstAttribute="trailing" secondItem="i48-Hd-WKl" secondAttribute="trailing" constant="14" id="61L-Vw-Zhd"/>
                 <constraint firstAttribute="trailing" secondItem="bvf-n0-Khb" secondAttribute="trailing" id="Hzs-4d-CyT"/>
                 <constraint firstItem="OkW-qe-3Kq" firstAttribute="trailing" secondItem="kIU-g4-ctC" secondAttribute="trailing" id="Jbh-O6-QXS"/>
                 <constraint firstItem="bvf-n0-Khb" firstAttribute="top" secondItem="u9G-3b-Wgt" secondAttribute="bottom" constant="2" id="M9Y-eb-zMS"/>

KulexiuForStudent/KulexiuForStudent/Module/Home/View/HotLiveCourse/HomeHotLiveCell.xib

@@ -12,16 +12,16 @@
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="gTV-IL-0wX" customClass="HomeHotLiveCell">
-            <rect key="frame" x="0.0" y="0.0" width="240" height="155"/>
+            <rect key="frame" x="0.0" y="0.0" width="240" height="157"/>
             <autoresizingMask key="autoresizingMask"/>
             <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
-                <rect key="frame" x="0.0" y="0.0" width="240" height="155"/>
+                <rect key="frame" x="0.0" y="0.0" width="240" height="157"/>
                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                 <subviews>
                     <view contentMode="scaleAspectFit" translatesAutoresizingMaskIntoConstraints="NO" id="lc6-Bv-qBL">
-                        <rect key="frame" x="2" y="2" width="236" height="151"/>
+                        <rect key="frame" x="2" y="2" width="236" height="153"/>
                         <subviews>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="8qF-78-gZ4">
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="8qF-78-gZ4">
                                 <rect key="frame" x="0.0" y="0.0" width="236" height="95"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="95" id="w9J-f7-oTD"/>
@@ -63,13 +63,16 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" text="小酷老师" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1Xi-wQ-A7O">
-                                <rect key="frame" x="11" y="128" width="49.5" height="15"/>
+                                <rect key="frame" x="11" y="128" width="49.5" height="17"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="17" id="ZXQ-Ji-6m5"/>
+                                </constraints>
                                 <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                 <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="tVF-Pj-Vlw">
-                                <rect key="frame" x="151" y="133.5" width="4" height="4"/>
+                                <rect key="frame" x="151" y="134.5" width="4" height="4"/>
                                 <color key="backgroundColor" red="1" green="0.53725490200000003" blue="0.0039215686269999999" alpha="1" colorSpace="calibratedRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="4" id="dKn-jh-6Re"/>
@@ -82,7 +85,7 @@
                                 </userDefinedRuntimeAttributes>
                             </view>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1422人在学" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="inb-f4-5Eo">
-                                <rect key="frame" x="159" y="128" width="65" height="15"/>
+                                <rect key="frame" x="159" y="129" width="65" height="15"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                 <color key="textColor" red="1" green="0.53725490200000003" blue="0.0039215686269999999" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>

KulexiuForStudent/KulexiuForStudent/Module/Home/View/HotLiveCourse/HomeHotLiveCourseView.m

@@ -27,7 +27,7 @@
 }
 
 + (CGFloat)getViewHeight {
-    return 220.0f;
+    return 224.0f;
 }
 
 /*

KulexiuForStudent/KulexiuForStudent/Module/Home/View/HotLiveCourse/HomeHotLiveCourseView.xib

@@ -10,8 +10,8 @@
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="HomeHotLiveCourseView">
-            <rect key="frame" x="0.0" y="0.0" width="700" height="240"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <rect key="frame" x="0.0" y="0.0" width="700" height="224"/>
+            <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="CPc-xV-zzJ">
                     <rect key="frame" x="641" y="33.5" width="45" height="18"/>
@@ -35,10 +35,10 @@
                     <nil key="highlightedColor"/>
                 </label>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="MZv-C6-cpr">
-                    <rect key="frame" x="0.0" y="67" width="700" height="153"/>
+                    <rect key="frame" x="0.0" y="67" width="700" height="157"/>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="153" id="ZcH-5F-lmM"/>
+                        <constraint firstAttribute="height" constant="157" id="ZcH-5F-lmM"/>
                     </constraints>
                 </view>
                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="home_more" translatesAutoresizingMaskIntoConstraints="NO" id="np5-vb-hbP">

KulexiuForStudent/KulexiuForStudent/Module/Home/View/HotTalent/HomeHotTalentCell.m

@@ -18,6 +18,7 @@
 @property (weak, nonatomic) IBOutlet UIView *liveView;
 
 @property (weak, nonatomic) IBOutlet UIView *liveColorView;
+@property (weak, nonatomic) IBOutlet UILabel *tipsLabel;
 
 @end
 
@@ -26,6 +27,21 @@
 - (void)awakeFromNib {
     [super awakeFromNib];
     // Initialization code
+    CAGradientLayer *layer = [self createGradientLayerFromColor:HexRGB(0xFF8B39) startPoint:CGPointMake(0.83, 0.55) endColor:HexRGB(0xFF4046) endPoint:CGPointMake(0.14, 1) bounds:self.liveColorView.bounds];
+    layer.cornerRadius = 7.0f;
+    layer.masksToBounds = YES;
+    [self.liveColorView.layer addSublayer:layer];
+    [self.liveColorView bringSubviewToFront:self.tipsLabel];
+}
+
+- (CAGradientLayer *)createGradientLayerFromColor:(UIColor *)fromColor startPoint:(CGPoint)startPoint endColor:(UIColor *)endColor endPoint:(CGPoint)endPoint bounds:(CGRect)bounds {
+    CAGradientLayer *gradientLayer = [CAGradientLayer layer];
+    gradientLayer.colors = @[(__bridge id)fromColor.CGColor, (__bridge id)endColor.CGColor];
+    gradientLayer.startPoint = startPoint;
+    gradientLayer.endPoint = endPoint;
+    gradientLayer.frame = bounds;
+    gradientLayer.locations = @[@(0),@(1.0f)];
+    return gradientLayer;
 }
 
 - (void)configWithSource:(TalentTeacherModel *)sourceModel {

KulexiuForStudent/KulexiuForStudent/Module/Home/View/HotTalent/HomeHotTalentCell.xib

@@ -40,7 +40,7 @@
                                 </userDefinedRuntimeAttributes>
                             </imageView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="月半二水" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PcD-yn-vxS">
-                                <rect key="frame" x="12" y="93" width="82" height="20"/>
+                                <rect key="frame" x="12" y="91" width="82" height="20"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="20" id="vjY-V4-Dql"/>
                                 </constraints>
@@ -49,7 +49,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="中国音乐学院" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="S4c-t1-3Yg">
-                                <rect key="frame" x="12" y="117" width="82" height="17"/>
+                                <rect key="frame" x="12" y="115" width="82" height="17"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="17" id="L6R-xr-JHX"/>
                                 </constraints>
@@ -70,7 +70,7 @@
                                                 <nil key="highlightedColor"/>
                                             </label>
                                         </subviews>
-                                        <color key="backgroundColor" systemColor="systemPinkColor"/>
+                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="33" id="3DD-Nv-ZYj"/>
                                             <constraint firstItem="r9C-td-aZd" firstAttribute="centerX" secondItem="CQV-RL-RU6" secondAttribute="centerX" id="CL3-oS-WR7"/>
@@ -108,7 +108,7 @@
                             <constraint firstItem="0eq-MB-HnX" firstAttribute="centerY" secondItem="AqF-It-spJ" secondAttribute="bottom" id="4hu-TR-QAu"/>
                             <constraint firstItem="AqF-It-spJ" firstAttribute="top" secondItem="QRJ-mO-zJO" secondAttribute="top" constant="17" id="8eB-CE-wKm"/>
                             <constraint firstItem="S4c-t1-3Yg" firstAttribute="top" secondItem="PcD-yn-vxS" secondAttribute="bottom" constant="4" id="F0j-4p-Fhl"/>
-                            <constraint firstItem="PcD-yn-vxS" firstAttribute="top" secondItem="0eq-MB-HnX" secondAttribute="bottom" constant="9" id="L3T-P9-iJy"/>
+                            <constraint firstItem="PcD-yn-vxS" firstAttribute="top" secondItem="0eq-MB-HnX" secondAttribute="bottom" constant="7" id="L3T-P9-iJy"/>
                             <constraint firstAttribute="trailing" secondItem="PcD-yn-vxS" secondAttribute="trailing" constant="12" id="N7b-Za-5rX"/>
                             <constraint firstItem="S4c-t1-3Yg" firstAttribute="leading" secondItem="QRJ-mO-zJO" secondAttribute="leading" constant="12" id="Rii-NH-CrS"/>
                             <constraint firstItem="PcD-yn-vxS" firstAttribute="leading" secondItem="QRJ-mO-zJO" secondAttribute="leading" constant="12" id="fs8-JQ-NPs"/>
@@ -138,6 +138,7 @@
                 <outlet property="liveView" destination="0eq-MB-HnX" id="G0f-AD-yCi"/>
                 <outlet property="teacherAvatar" destination="AqF-It-spJ" id="KPT-vM-DYm"/>
                 <outlet property="teacherName" destination="PcD-yn-vxS" id="nnY-pL-e95"/>
+                <outlet property="tipsLabel" destination="r9C-td-aZd" id="RUZ-dR-920"/>
             </connections>
             <point key="canvasLocation" x="169.56521739130437" y="113.83928571428571"/>
         </collectionViewCell>
@@ -147,8 +148,5 @@
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>
-        <systemColor name="systemPinkColor">
-            <color red="1" green="0.17647058823529413" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-        </systemColor>
     </resources>
 </document>

KulexiuForStudent/KulexiuForStudent/Module/Home/View/HotTalent/HomeHotTalentView.m

@@ -31,7 +31,7 @@
 }
 
 + (CGFloat)getViewHeight {
-    return 212;
+    return 216;
 }
 /*
 // Only override drawRect: if you perform custom drawing.

KulexiuForStudent/KulexiuForStudent/Module/Home/View/HotTalent/HomeHotTalentView.xib

@@ -23,10 +23,10 @@
                     <nil key="highlightedColor"/>
                 </label>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TvN-a5-fF0">
-                    <rect key="frame" x="0.0" y="66" width="623" height="146"/>
+                    <rect key="frame" x="0.0" y="66" width="623" height="150"/>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="146" id="Iwn-9Q-bda"/>
+                        <constraint firstAttribute="height" constant="150" id="Iwn-9Q-bda"/>
                     </constraints>
                 </view>
                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="home_left" translatesAutoresizingMaskIntoConstraints="NO" id="yk3-O1-fKs">

KulexiuForStudent/KulexiuForStudent/Module/Home/View/HotVideoCourse/HomeHotVideoCell.xib

@@ -21,7 +21,7 @@
                     <view contentMode="scaleAspectFit" translatesAutoresizingMaskIntoConstraints="NO" id="Z9Y-DS-o2S">
                         <rect key="frame" x="2" y="2" width="164" height="149"/>
                         <subviews>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="wTC-8E-ugs">
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="wTC-8E-ugs">
                                 <rect key="frame" x="0.0" y="0.0" width="164" height="95"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="95" id="1MD-pj-b6f"/>

KulexiuForStudent/KulexiuForStudent/Module/Home/View/HotVideoCourse/HomeHotVideoCourseView.m

@@ -27,7 +27,7 @@
 }
 
 + (CGFloat)getViewHeight {
-    return 220.0f;
+    return 224.0f;
 }
 
 /*

KulexiuForStudent/KulexiuForStudent/Module/Home/View/HotVideoCourse/HomeHotVideoCourseView.xib

@@ -10,7 +10,7 @@
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="HomeHotVideoCourseView">
-            <rect key="frame" x="0.0" y="0.0" width="414" height="220"/>
+            <rect key="frame" x="0.0" y="0.0" width="414" height="224"/>
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ImZ-xL-12C">
@@ -35,10 +35,10 @@
                     <nil key="highlightedColor"/>
                 </label>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Kff-dl-GsO">
-                    <rect key="frame" x="0.0" y="67" width="414" height="153"/>
+                    <rect key="frame" x="0.0" y="67" width="414" height="157"/>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="153" id="drX-7K-Af3"/>
+                        <constraint firstAttribute="height" constant="157" id="drX-7K-Af3"/>
                     </constraints>
                 </view>
                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="home_more" translatesAutoresizingMaskIntoConstraints="NO" id="QNi-gh-Evy">

KulexiuForStudent/KulexiuForStudent/Module/Live/Controller/LiveVideoRoomViewController.m

@@ -1929,7 +1929,7 @@ static int clickPraiseBtnTimes  = 0;
         case LIVEROOMACTION_CHAT: // 聊天
         {
             if (self.blacklistFlag == YES) {
-                [self MBPShow:@"您已被管理员禁言"];
+                [self MBPShow:@"您已被老师禁言"];
                 return;
             }
 //            if (self.enableChat) { // 判断是否全员禁言
@@ -1937,7 +1937,7 @@ static int clickPraiseBtnTimes  = 0;
                 [_inputBar setInputBarStatus:KSBottomBarStatusKeyboard];
 //            }
 //            else {
-//                [self MBPShow:@"管理员关闭聊天"];
+//                [self MBPShow:@"老师关闭聊天"];
 //            }
         }
             break;
@@ -1960,7 +1960,7 @@ static int clickPraiseBtnTimes  = 0;
             }
             else {
                  if (self.blacklistFlag == YES) {
-                    [self MBPShow:@"您已被管理员禁言"];
+                    [self MBPShow:@"您已被老师禁言"];
                      return;
                 }
                 if (self.isCreaterInRoom == NO) {
@@ -1973,7 +1973,7 @@ static int clickPraiseBtnTimes  = 0;
                     [self displaySeatApplyView];
                 }
                 else {
-                    [self MBPShow:@"管理员关闭连麦申请"];
+                    [self MBPShow:@"老师关闭连麦申请"];
                 }
             }
         }
@@ -2162,7 +2162,7 @@ static int clickPraiseBtnTimes  = 0;
 
 - (void)refreshBottomChatStatus {
     if (self.bottomView) {
-        NSString *tipsTitle = self.blacklistFlag ? @"您已被管理员禁言" : @"快来互动吧！";
+        NSString *tipsTitle = self.blacklistFlag ? @"您已被老师禁言" : @"快来互动吧！";
         self.bottomView.tipsLabel.text = tipsTitle;
     }
 }

KulexiuForStudent/KulexiuForStudent/Module/Live/LiveRoomMessage/KSLiveBlockUser.m

@@ -12,6 +12,9 @@
 - (NSData *)encode {
     NSMutableDictionary *mutableDict = [NSMutableDictionary dictionary];
     [mutableDict setObject:self.userId forKey:@"userId"];
+    if (self.senderUserInfo) {
+        [mutableDict setObject:[self encodeUserInfo:self.senderUserInfo] forKey:@"user"];
+    }
     return [NSJSONSerialization dataWithJSONObject:mutableDict options:kNilOptions error:nil];
 }
 
@@ -21,6 +24,8 @@
     NSDictionary *json = [[NSDictionary alloc] initWithDictionary:dictionary];
     if (json == nil) return;
     self.userId = [[json dictionaryValueForKey:@"content"] stringValueForKey:@"userId"];
+    NSDictionary *userinfoDic = dictionary[@"user"];
+    [self decodeUserInfo:userinfoDic];
 }
 
 + (NSString *)getObjectName {

KulexiuForStudent/KulexiuForStudent/Module/Live/LiveRoomMessage/KSLiveChatroomDownSeat.m

@@ -22,7 +22,9 @@
     } else {
         [mutableDict setObject:@"" forKey:@"audienceId"];
     }
-    
+    if (self.senderUserInfo) {
+        [mutableDict setObject:[self encodeUserInfo:self.senderUserInfo] forKey:@"user"];
+    }
     return [NSJSONSerialization dataWithJSONObject:mutableDict options:kNilOptions error:nil];
 }
 
@@ -34,6 +36,8 @@
     
     self.audienceName = [json stringValueForKey:@"audienceName"];
     self.audienceId = [json stringValueForKey:@"audienceId"];
+    NSDictionary *userinfoDic = dictionary[@"user"];
+    [self decodeUserInfo:userinfoDic];
 }
 
 + (NSString *)getObjectName {

KulexiuForStudent/KulexiuForStudent/Module/Live/LiveRoomMessage/KSLiveChatroomEnter.m

@@ -21,6 +21,9 @@
     } else {
         [multableDict setObject:@"" forKey:@"userName"];
     }
+    if (self.senderUserInfo) {
+        [multableDict setObject:[self encodeUserInfo:self.senderUserInfo] forKey:@"user"];
+    }
     return [NSJSONSerialization dataWithJSONObject:multableDict options:kNilOptions error:nil];
 }
 
@@ -31,6 +34,8 @@
     if (json == nil) return;
     self.userId = [json stringValueForKey:@"userId"];
     self.userName = [json stringValueForKey:@"userName"];
+    NSDictionary *userinfoDic = dictionary[@"user"];
+    [self decodeUserInfo:userinfoDic];
 }
 
 + (NSString *)getObjectName {

KulexiuForStudent/KulexiuForStudent/Module/Live/LiveRoomMessage/KSLiveChatroomKickOut.m

@@ -31,6 +31,9 @@
     } else {
         [mutableDict setObject:@"" forKey:@"targetName"];
     }
+    if (self.senderUserInfo) {
+        [mutableDict setObject:[self encodeUserInfo:self.senderUserInfo] forKey:@"user"];
+    }
     return [NSJSONSerialization dataWithJSONObject:mutableDict options:kNilOptions error:nil];
 }
 
@@ -43,6 +46,8 @@
     self.userName = [json stringValueForKey:@"userName"];
     self.targetId = [json stringValueForKey:@"targetId"];
     self.targetName = [json stringValueForKey:@"targetName"];
+    NSDictionary *userinfoDic = dictionary[@"user"];
+    [self decodeUserInfo:userinfoDic];
 }
 
 + (NSString *)getObjectName {

KulexiuForStudent/KulexiuForStudent/Module/Live/LiveRoomMessage/KSLiveChatroomLeave.m

@@ -21,6 +21,9 @@
     } else {
         [multableDict setObject:@"" forKey:@"userName"];
     }
+    if (self.senderUserInfo) {
+        [multableDict setObject:[self encodeUserInfo:self.senderUserInfo] forKey:@"user"];
+    }
     return [NSJSONSerialization dataWithJSONObject:multableDict options:kNilOptions error:nil];
 }
 
@@ -31,6 +34,8 @@
     if (json == nil) return;
     self.userId = [json stringValueForKey:@"userId"];
     self.userName = [json stringValueForKey:@"userName"];
+    NSDictionary *userinfoDic = dictionary[@"user"];
+    [self decodeUserInfo:userinfoDic];
 }
 
 + (NSString *)getObjectName {

KulexiuForStudent/KulexiuForStudent/Module/Live/LiveRoomMessage/KSLiveChatroomLike.m

@@ -22,6 +22,7 @@
     if (self.senderUserInfo) {
         [dataDict setObject:[self encodeUserInfo:self.senderUserInfo] forKey:@"user"];
     }
+    
     return [NSJSONSerialization dataWithJSONObject:dataDict options:kNilOptions error:nil];
 }
 

KulexiuForStudent/KulexiuForStudent/Module/Live/LiveRoomMessage/KSLiveChatroomMemberCount.m

@@ -12,6 +12,9 @@
 - (NSData *)encode {
     NSMutableDictionary *mutableDict = [NSMutableDictionary dictionary];
     [mutableDict setObject:@(self.count) forKey:@"count"];
+    if (self.senderUserInfo) {
+        [mutableDict setObject:[self encodeUserInfo:self.senderUserInfo] forKey:@"user"];
+    }
     return [NSJSONSerialization dataWithJSONObject:mutableDict options:kNilOptions error:nil];
 }
 
@@ -21,6 +24,8 @@
     NSDictionary *json = [[NSDictionary alloc] initWithDictionary:dictionary];
     if (json == nil) return;
     self.count = [[json stringValueForKey:@"count"] intValue];
+    NSDictionary *userinfoDic = dictionary[@"user"];
+    [self decodeUserInfo:userinfoDic];
 }
 
 + (NSString *)getObjectName {

KulexiuForStudent/KulexiuForStudent/Module/Live/LiveRoomMessage/KSLiveChatroomMemberUp.m

@@ -12,6 +12,9 @@
 - (NSData *)encode {
     NSMutableDictionary *mutableDict = [NSMutableDictionary dictionary];
     [mutableDict setObject:@(self.count) forKey:@"count"];
+    if (self.senderUserInfo) {
+        [mutableDict setObject:[self encodeUserInfo:self.senderUserInfo] forKey:@"user"];
+    }
     return [NSJSONSerialization dataWithJSONObject:mutableDict options:kNilOptions error:nil];
 }
 
@@ -21,6 +24,8 @@
     NSDictionary *json = [[NSDictionary alloc] initWithDictionary:dictionary];
     if (json == nil) return;
     self.count = [[json dictionaryValueForKey:@"content"] integerValueForKey:@"count"];
+    NSDictionary *userinfoDic = dictionary[@"user"];
+    [self decodeUserInfo:userinfoDic];
 }
 
 + (NSString *)getObjectName {

KulexiuForStudent/KulexiuForStudent/Module/Live/LiveRoomMessage/KSLiveChatroomSeatApply.m

@@ -48,6 +48,9 @@
     }
     
     [mutableDict setObject:@(self.type) forKey:@"type"];
+    if (self.senderUserInfo) {
+        [mutableDict setObject:[self encodeUserInfo:self.senderUserInfo] forKey:@"user"];
+    }
     return [NSJSONSerialization dataWithJSONObject:mutableDict options:kNilOptions error:nil];
 }
 
@@ -63,6 +66,8 @@
     self.type = [json integerValueForKey:@"type"];
     self.audienceAvatar = [json stringValueForKey:@"audienceAvatar"];
     self.audienceSubjectName = [json stringValueForKey:@"audienceSubjectName"];
+    NSDictionary *userinfoDic = dictionary[@"user"];
+    [self decodeUserInfo:userinfoDic];
 }
 
 + (NSString *)getObjectName {

KulexiuForStudent/KulexiuForStudent/Module/Live/LiveRoomMessage/KSLiveChatroomSeatResponse.m

@@ -33,7 +33,9 @@
     } else {
         [mutableDict setObject:@"" forKey:@"audienceId"];
     }
-    
+    if (self.senderUserInfo) {
+        [mutableDict setObject:[self encodeUserInfo:self.senderUserInfo] forKey:@"user"];
+    }
     [mutableDict setObject:@(self.type) forKey:@"type"];
     return [NSJSONSerialization dataWithJSONObject:mutableDict options:kNilOptions error:nil];
 }
@@ -48,6 +50,8 @@
     self.audienceName = [json stringValueForKey:@"audienceName"];
     self.audienceId = [json stringValueForKey:@"audienceId"];
     self.type = [json integerValueForKey:@"type"];
+    NSDictionary *userinfoDic = dictionary[@"user"];
+    [self decodeUserInfo:userinfoDic];
 }
 
 + (NSString *)getObjectName {

KulexiuForStudent/KulexiuForStudent/Module/Live/LiveRoomMessage/KSLiveChatroomUserQuit.m

@@ -21,6 +21,9 @@
     } else {
         [multableDict setObject:@"" forKey:@"userName"];
     }
+    if (self.senderUserInfo) {
+        [multableDict setObject:[self encodeUserInfo:self.senderUserInfo] forKey:@"user"];
+    }
     return [NSJSONSerialization dataWithJSONObject:multableDict options:kNilOptions error:nil];
 }
 
@@ -31,6 +34,8 @@
     if (json == nil) return;
     self.userId = [json stringValueForKey:@"userId"];
     self.userName = [json stringValueForKey:@"userName"];
+    NSDictionary *userinfoDic = dictionary[@"user"];
+    [self decodeUserInfo:userinfoDic];
 }
 
 + (NSString *)getObjectName {

KulexiuForStudent/KulexiuForStudent/Module/Live/LiveRoomMessage/KSLiveUnBlockUser.m

@@ -12,6 +12,9 @@
 - (NSData *)encode {
     NSMutableDictionary *mutableDict = [NSMutableDictionary dictionary];
     [mutableDict setObject:self.userId forKey:@"userId"];
+    if (self.senderUserInfo) {
+        [mutableDict setObject:[self encodeUserInfo:self.senderUserInfo] forKey:@"user"];
+    }
     return [NSJSONSerialization dataWithJSONObject:mutableDict options:kNilOptions error:nil];
 }
 
@@ -21,6 +24,8 @@
     NSDictionary *json = [[NSDictionary alloc] initWithDictionary:dictionary];
     if (json == nil) return;
     self.userId = [[json dictionaryValueForKey:@"content"] stringValueForKey:@"userId"];
+    NSDictionary *userinfoDic = dictionary[@"user"];
+    [self decodeUserInfo:userinfoDic];
 }
 
 + (NSString *)getObjectName {

KulexiuForStudent/KulexiuForStudent/Module/Live/LiveRoomMessage/RCChatroomLikeCount.m

@@ -13,6 +13,9 @@
 - (NSData *)encode {
     NSMutableDictionary *mutableDict = [NSMutableDictionary dictionary];
     [mutableDict setObject:@(self.count) forKey:@"count"];
+    if (self.senderUserInfo) {
+        [mutableDict setObject:[self encodeUserInfo:self.senderUserInfo] forKey:@"user"];
+    }
     return [NSJSONSerialization dataWithJSONObject:mutableDict options:kNilOptions error:nil];
 }
 
@@ -22,6 +25,8 @@
     NSDictionary *json = [[NSDictionary alloc] initWithDictionary:dictionary];
     if (json == nil) return;
     self.count = [[json stringValueForKey:@"count"] intValue];
+    NSDictionary *userinfoDic = dictionary[@"user"];
+    [self decodeUserInfo:userinfoDic];
 }
 
 + (NSString *)getObjectName {

KulexiuForStudent/KulexiuForStudent/Module/Live/View/KSChatroomTextCell.m

@@ -174,7 +174,7 @@
         NSString *localizedMessage = seatControlMessage.seatBan ? @"关闭连麦" : @"开启连麦";
         NSString *str =[NSString stringWithFormat:@"%@%@",headString,userName];
         NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] initWithString:str];
-        [attributedString addAttribute:NSForegroundColorAttributeName value:(HexRGB(0x00FFF0)) range:[str rangeOfString:userName]];
+        [attributedString addAttribute:NSForegroundColorAttributeName value:(THEMECOLOR) range:[str rangeOfString:userName]];
         
         NSMutableAttributedString *descString = [[NSMutableAttributedString alloc] initWithString:localizedMessage];
         [descString addAttribute:NSForegroundColorAttributeName value:(HexRGB(0xffffff)) range:[localizedMessage rangeOfString:localizedMessage]];
@@ -192,7 +192,7 @@
         localizedMessage = @"将你抱下麦";
         NSString *str =[NSString stringWithFormat:@"%@%@",headString,userName];
         NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] initWithString:str];
-        [attributedString addAttribute:NSForegroundColorAttributeName value:(HexRGB(0x00FFF0)) range:[str rangeOfString:userName]];
+        [attributedString addAttribute:NSForegroundColorAttributeName value:(THEMECOLOR) range:[str rangeOfString:userName]];
         
         NSMutableAttributedString *descString = [[NSMutableAttributedString alloc] initWithString:localizedMessage];
         [descString addAttribute:NSForegroundColorAttributeName value:(HexRGB(0xffffff)) range:[localizedMessage rangeOfString:localizedMessage]];
@@ -207,7 +207,7 @@
         localizedMessage = @"拒绝了连麦申请";
         NSString *str =[NSString stringWithFormat:@"%@%@",headString,userName];
         NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] initWithString:str];
-        [attributedString addAttribute:NSForegroundColorAttributeName value:(HexRGB(0x00FFF0)) range:[str rangeOfString:userName]];
+        [attributedString addAttribute:NSForegroundColorAttributeName value:(THEMECOLOR) range:[str rangeOfString:userName]];
         
         NSMutableAttributedString *descString = [[NSMutableAttributedString alloc] initWithString:localizedMessage];
         [descString addAttribute:NSForegroundColorAttributeName value:(HexRGB(0xffffff)) range:[localizedMessage rangeOfString:localizedMessage]];