达人修改为老师

KulexiuForStudent/KulexiuForStudent/Module/Home/Controller/HomeViewController.m

@@ -140,10 +140,10 @@
 @property (nonatomic, strong) UICollectionView *musicCollectionView; // 曲谱容器
 @property (nonatomic, strong) NSMutableArray *musicArray; // 曲谱数据
 @property (nonatomic, assign) CGFloat musicViewHeight; // music 高度
-// 推荐达人
+// 推荐老师
 @property (nonatomic, strong) HomeHotTalentView *talentView;
-@property (nonatomic, strong) UICollectionView *talentCollectionView; // 推荐达人容器
-@property (nonatomic, strong) NSMutableArray *talentArray; // 推荐达人数据
+@property (nonatomic, strong) UICollectionView *talentCollectionView; // 推荐老师容器
+@property (nonatomic, strong) NSMutableArray *talentArray; // 推荐老师数据
 @property (nonatomic, assign) CGFloat talentViewHeight; // talent 高度
 
 // 视频课
@@ -193,7 +193,7 @@
     [super viewDidLoad];
     // Do any additional setup after loading the view.
     self.ks_prefersNavigationBarHidden = YES;
-    _titles = @[@"达人风采",@"热门资讯"];
+    _titles = @[@"老师风采",@"热门资讯"];
     self.isFirstLoad = YES;
     [self configNavView];
     [self configUI];
@@ -297,7 +297,7 @@
         make.height.mas_equalTo(self.musicViewHeight);
     }];
     
-    // 推荐达人
+    // 推荐老师
     [self.headView addSubview:self.talentView];
     self.talentViewHeight = CGFLOAT_MIN;
     [self.talentView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -809,7 +809,7 @@
     [self requestNewsList];
     [self requestNotice];
     [self requestCourseInfo];
-    // 达人
+    // 老师
     [self requestTalentSource];
     [self requestHotAlbum];
     [self requestHomeMusicMessage];
@@ -836,7 +836,7 @@
     [self refreshAlbumView];
         
     [self refreshMusicView];
-    // 达人
+    // 老师
     [self refreshTalentView];
     // 课程
     [self refreshCourseView];
@@ -1369,7 +1369,7 @@
         NSInteger count = self.musicArray.count / 4 + lastRowCount;
         return count;
     }
-    else if (collectionView == self.talentCollectionView) { // 推荐达人
+    else if (collectionView == self.talentCollectionView) { // 推荐老师
         return self.talentArray.count;
     }
     else if (collectionView == self.videoCollectionView) { // 视频课
@@ -1495,7 +1495,7 @@
         ctrl.url = [NSString stringWithFormat:@"%@%@%@", WEBHOST, @"/#/music-album-detail/",model.internalBaseClassIdentifier];
         [self.navigationController pushViewController:ctrl animated:YES];
     }
-    else if (collectionView == self.talentCollectionView) { // 达人风采
+    else if (collectionView == self.talentCollectionView) { // 老师风采
         TalentTeacherModel *model = self.talentArray[indexPath.item];
         [self displayTeacherDetail:[NSString stringWithFormat:@"%.0f",model.userId]];
     }
@@ -1589,7 +1589,6 @@
         case HOMENAV_TAG_SEARCH: // 搜索
         {
             HomeArrangeCourseController *ctrl = [[HomeArrangeCourseController alloc] init];
-            [ctrl displayWithIndex:DISPLAY_INDEX_LIVE];
             [self.navigationController pushViewController:ctrl animated:YES];
             return;
             KSBaseWKWebViewController *webCtrl = [[KSBaseWKWebViewController alloc] init];

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

@@ -90,7 +90,7 @@
     }
     
     if ([NSString isEmptyString:sourceModel.graduateSchool]) {
-        self.graduateSchool.text = @"认证达人";
+        self.graduateSchool.text = @"认证老师";
     }
     else {
         self.graduateSchool.text = [NSString returnNoNullStringWithString:sourceModel.graduateSchool];

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

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -48,7 +48,7 @@
                                 <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
                                 <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">
+                            <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="115" width="82" height="17"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="17" id="L6R-xr-JHX"/>
@@ -64,7 +64,7 @@
                                         <rect key="frame" x="2" y="2" width="33" height="14"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="直播中" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="r9C-td-aZd">
-                                                <rect key="frame" x="4" y="2" width="25" height="10"/>
+                                                <rect key="frame" x="4.5" y="2" width="24" height="10"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="8"/>
                                                 <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                                 <nil key="highlightedColor"/>

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

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21225" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21207"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -13,8 +13,8 @@
             <rect key="frame" x="0.0" y="0.0" width="623" height="244"/>
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="推荐达人" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ocF-cI-geX">
-                    <rect key="frame" x="24" y="30" width="73.5" height="22"/>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="推荐老师" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ocF-cI-geX">
+                    <rect key="frame" x="24" y="30" width="71.5" height="22"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="22" id="cce-8F-ZTG"/>
                     </constraints>
@@ -37,7 +37,7 @@
                     </constraints>
                 </imageView>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rZg-YL-a5F">
-                    <rect key="frame" x="564" y="32" width="45" height="18"/>
+                    <rect key="frame" x="565" y="32" width="44" height="18"/>
                     <color key="backgroundColor" red="0.1764705882352941" green="0.7803921568627451" blue="0.66666666666666663" alpha="0.10000000000000001" colorSpace="calibratedRGB"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="18" id="OkI-Tj-OYy"/>
@@ -49,7 +49,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="nhJ-zw-nWQ">
-                    <rect key="frame" x="570" y="33.5" width="25" height="15"/>
+                    <rect key="frame" x="571" y="33.5" width="24" height="15"/>
                     <fontDescription key="fontDescription" type="system" pointSize="12"/>
                     <color key="textColor" red="0.1764705882" green="0.78039215689999997" blue="0.66666666669999997" alpha="1" colorSpace="calibratedRGB"/>
                     <nil key="highlightedColor"/>
@@ -62,7 +62,7 @@
                     </constraints>
                 </imageView>
                 <button opaque="NO" tag="1008" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="J76-uF-Ucm">
-                    <rect key="frame" x="570" y="26" width="34" height="30"/>
+                    <rect key="frame" x="571" y="26" width="33" height="30"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="30" id="O0L-Nf-Gcm"/>
                     </constraints>

KulexiuForStudent/KulexiuForStudent/Module/Live/View/ShareLiveView/ShareLiveDisplayView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_0" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -62,7 +62,7 @@
                                     </constraints>
                                 </imageView>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="直播中" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gwb-vF-L9p">
-                                    <rect key="frame" x="27" y="4.6666666666666572" width="37" height="15"/>
+                                    <rect key="frame" x="27" y="4.6666666666666572" width="36" height="15"/>
                                     <fontDescription key="fontDescription" type="system" weight="medium" pointSize="12"/>
                                     <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                     <nil key="highlightedColor"/>
@@ -125,7 +125,7 @@
                             </constraints>
                         </imageView>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="扫码下载酷乐秀进入直播间互动" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FFG-83-ZxA">
-                            <rect key="frame" x="129" y="336.66666666666669" width="172" height="17"/>
+                            <rect key="frame" x="129" y="336.66666666666669" width="167" height="17"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="17" id="Q7Q-24-Ug9"/>
                             </constraints>
@@ -158,14 +158,14 @@
                                         </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="HwK-8P-Jtb">
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="快进入老师的直播间一起围观～" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HwK-8P-Jtb">
                                     <rect key="frame" x="58" y="9" width="250" height="20"/>
                                     <fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/>
                                     <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                     <nil key="highlightedColor"/>
                                 </label>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="为您推荐" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4Mn-fi-jz6">
-                                    <rect key="frame" x="58" y="33" width="49.333333333333343" height="15"/>
+                                    <rect key="frame" x="58" y="33" width="48" height="15"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                     <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                     <nil key="highlightedColor"/>
@@ -193,7 +193,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="njD-0Z-9Q2">
-                            <rect key="frame" x="22.000000000000004" y="152" width="57.333333333333343" height="22"/>
+                            <rect key="frame" x="22" y="152" width="56" height="22"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="22" id="goz-4P-xae"/>
                             </constraints>