文案修改

KulexiuForStudent/KulexiuForStudent.xcodeproj/project.pbxproj

@@ -7615,7 +7615,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = KulexiuForStudent/KulexiuForStudent.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.6.7;
+				CURRENT_PROJECT_VERSION = 1.6.7.2;
 				DEVELOPMENT_TEAM = B2AP53HHTU;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = YES;
@@ -7802,7 +7802,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = KulexiuForStudent/KulexiuForStudent.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.6.7;
+				CURRENT_PROJECT_VERSION = 1.6.7.2;
 				DEVELOPMENT_TEAM = B2AP53HHTU;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = YES;
@@ -8135,7 +8135,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = KulexiuForStudent/KulexiuForStudent.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.6.7;
+				CURRENT_PROJECT_VERSION = 1.6.7.2;
 				DEVELOPMENT_TEAM = B2AP53HHTU;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = YES;
@@ -8426,7 +8426,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = KulexiuForStudent/KulexiuForStudent.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.6.7;
+				CURRENT_PROJECT_VERSION = 1.6.7.2;
 				DEVELOPMENT_TEAM = B2AP53HHTU;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = YES;

KulexiuForStudent/KulexiuForStudent/Module/Mine/MineCourse/View/MyVideoCourseBodyView.m

@@ -200,7 +200,6 @@
     VideoCourseCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"VideoCourseCell" forIndexPath:indexPath];
     
     VideoCourseModel *model = [self.dataArray objectAtIndex:indexPath.row];
-//    BOOL isCheck = self.selectIndex != 0;
     [cell configSourceModel:model isInCheck:NO];
     return cell;
 }
@@ -214,9 +213,6 @@
 }
 
 - (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath {
-//    if (IS_IPAD) {
-//        return CGSizeMake((NSInteger)(KPortraitWidth - 28 - 11 *2) / 3, 200);;
-//    }
     return CGSizeMake((NSInteger)(KPortraitWidth - 28 - 11) / 2, 200);
 }
 /**

KulexiuForStudent/KulexiuForStudent/Module/Mine/MineCourse/View/VideoCourseCell.m

@@ -22,6 +22,7 @@
 @property (weak, nonatomic) IBOutlet UIView *descView;
 @property (weak, nonatomic) IBOutlet UILabel *descLabel;
 @property (weak, nonatomic) IBOutlet UILabel *subjectLabel;
+@property (weak, nonatomic) IBOutlet UILabel *courseCount;
 
 @end
 
@@ -43,28 +44,33 @@
         self.teacherName.text = model.username;
     }
     
-    if (isCheck) {
-        self.descView.hidden = YES;
-        self.descLabel.text = @"";
+   
+    self.subjectLabel.text = [NSString returnNoNullStringWithString:model.lessonSubjectName];
+    
+    if ([model.payType isEqualToString:@"VIP"]) {
+        self.courseMessage.text = @"会员";
+        self.courseMessage.textColor = HexRGB(0xC76E21);
     }
-    else {
-        self.descView.hidden = NO;
+    else if ([model.payType isEqualToString:@"PAY"]) {
         if (model.lessonPrice > 0) {
-            self.descLabel.text = [NSString stringWithFormat:@"%.0f人已购买",model.countStudent];
+            self.courseMessage.textColor = HexRGB(0xFF0000);
+            NSString *text = [NSString  stringWithFormat:@"¥%.2f",model.lessonPrice];
+            NSMutableAttributedString *attrs = [[NSMutableAttributedString alloc] initWithString:text attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:18.0f weight:UIFontWeightMedium],NSForegroundColorAttributeName:HexRGB(0xFF0000)}];
+            [attrs addAttributes:@{NSFontAttributeName:[UIFont systemFontOfSize:14.0f weight:UIFontWeightMedium]} range:[text rangeOfString:@"¥"]];
+            self.courseMessage.attributedText = attrs;
         }
         else {
-            self.descLabel.text = [NSString stringWithFormat:@"%.0f人已领取",model.countStudent];
-
+            self.courseMessage.text = @"免费";
+            self.courseMessage.textColor = HexRGB(0x20BEA0);
         }
     }
-    self.subjectLabel.text = [NSString returnNoNullStringWithString:model.lessonSubjectName];
-    
-    if (model.lessonPrice > 0) {
-        self.courseMessage.text = [NSString  stringWithFormat:@"¥%.2f/%.0f课时",model.lessonPrice,model.lessonCount];
-    }
     else {
-        self.courseMessage.text = [NSString stringWithFormat:@"免费/%.0f课时",model.lessonCount];
+        self.courseMessage.text = @"";
     }
+    
+    self.courseCount.text = [NSString stringWithFormat:@"/ %.0f课时",model.lessonCount];
+    self.descLabel.text = [NSString stringWithFormat:@"%.0f人学习",model.countStudent];
+
 }
 
 @end

KulexiuForStudent/KulexiuForStudent/Module/Mine/MineCourse/View/VideoCourseCell.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<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">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <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"/>
@@ -59,13 +59,13 @@
                                 <color key="textColor" red="0.10196078431372549" green="0.10196078431372549" blue="0.10196078431372549" alpha="0.84705882352941175" colorSpace="calibratedRGB"/>
                                 <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="Yib-mA-6Ou">
-                                <rect key="frame" x="9" y="147" width="0.0" height="20"/>
+                            <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="Yib-mA-6Ou">
+                                <rect key="frame" x="9" y="151" width="0.0" height="20"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="20" id="fo4-3I-tde"/>
                                 </constraints>
-                                <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/>
-                                <color key="textColor" red="0.1764705882352941" green="0.7803921568627451" blue="0.66666666666666663" alpha="1" colorSpace="calibratedRGB"/>
+                                <fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/>
+                                <color key="textColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_default_avatal" translatesAutoresizingMaskIntoConstraints="NO" id="3il-XM-fqj">
@@ -114,6 +114,15 @@
                                     <constraint firstItem="00e-da-LHX" firstAttribute="centerY" secondItem="bIp-3Q-l9m" secondAttribute="centerY" id="sCN-Nb-Z2j"/>
                                 </constraints>
                             </view>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="/ 4课时" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fbm-h3-8Sk">
+                                <rect key="frame" x="13" y="151" width="47.5" height="20"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="20" id="K5n-OH-ZXE"/>
+                                </constraints>
+                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
                         </subviews>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
@@ -125,10 +134,13 @@
                             <constraint firstItem="pzA-yf-E6E" firstAttribute="leading" secondItem="G9V-fH-gog" secondAttribute="leading" constant="8" id="9vy-mp-5yR"/>
                             <constraint firstItem="yCS-l4-WAt" firstAttribute="top" secondItem="G9V-fH-gog" secondAttribute="bottom" constant="6" id="EOx-Xx-BzN"/>
                             <constraint firstItem="3il-XM-fqj" firstAttribute="top" secondItem="yCS-l4-WAt" secondAttribute="bottom" constant="5" id="Jjh-pl-Duz"/>
+                            <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="fbm-h3-8Sk" secondAttribute="trailing" constant="12" id="Knq-Oz-gVT"/>
                             <constraint firstAttribute="trailing" secondItem="yCS-l4-WAt" secondAttribute="trailing" constant="11" id="N8r-qo-ZmS"/>
                             <constraint firstItem="3il-XM-fqj" firstAttribute="leading" secondItem="ZgA-i1-RHm" secondAttribute="leading" constant="11" id="P7e-LF-pGN"/>
                             <constraint firstItem="wbK-Jo-ZbH" firstAttribute="centerY" secondItem="3il-XM-fqj" secondAttribute="centerY" id="TWM-PS-Pnk"/>
-                            <constraint firstItem="Yib-mA-6Ou" firstAttribute="top" secondItem="3il-XM-fqj" secondAttribute="bottom" constant="5" id="TeL-Vw-ZDm"/>
+                            <constraint firstItem="Yib-mA-6Ou" firstAttribute="top" secondItem="3il-XM-fqj" secondAttribute="bottom" constant="9" id="TeL-Vw-ZDm"/>
+                            <constraint firstItem="fbm-h3-8Sk" firstAttribute="centerY" secondItem="Yib-mA-6Ou" secondAttribute="centerY" id="cJD-TO-yuZ"/>
+                            <constraint firstItem="fbm-h3-8Sk" firstAttribute="leading" secondItem="Yib-mA-6Ou" secondAttribute="trailing" constant="4" id="g3a-ek-Gz7"/>
                             <constraint firstItem="wbK-Jo-ZbH" firstAttribute="leading" secondItem="3il-XM-fqj" secondAttribute="trailing" constant="5" id="gE4-f5-Im6"/>
                             <constraint firstItem="bIp-3Q-l9m" firstAttribute="leading" secondItem="wbK-Jo-ZbH" secondAttribute="trailing" constant="6" id="ort-Rw-FuH"/>
                             <constraint firstAttribute="trailing" secondItem="bIp-3Q-l9m" secondAttribute="trailing" constant="10" id="rAH-2L-iRc"/>
@@ -152,6 +164,7 @@
                 </userDefinedRuntimeAttribute>
             </userDefinedRuntimeAttributes>
             <connections>
+                <outlet property="courseCount" destination="fbm-h3-8Sk" id="WQf-du-Enu"/>
                 <outlet property="courseMessage" destination="Yib-mA-6Ou" id="hPM-ZS-6ZL"/>
                 <outlet property="courseTitle" destination="yCS-l4-WAt" id="1Wb-8W-iHt"/>
                 <outlet property="coverImage" destination="G9V-fH-gog" id="8HX-tu-M6Z"/>
@@ -161,7 +174,7 @@
                 <outlet property="teacherAvatar" destination="3il-XM-fqj" id="cCU-eN-inL"/>
                 <outlet property="teacherName" destination="wbK-Jo-ZbH" id="hq7-Jt-Ikb"/>
             </connections>
-            <point key="canvasLocation" x="260.86956521739131" y="22.433035714285712"/>
+            <point key="canvasLocation" x="260.86956521739131" y="22.098214285714285"/>
         </collectionViewCell>
     </objects>
     <resources>

KulexiuForStudent/KulexiuForStudent/Module/TXClassRoom/View/TXChatAreaView/TxClassroomChatMineCell.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<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">
     <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -17,7 +17,7 @@
                 <rect key="frame" x="0.0" y="0.0" width="320" height="86"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="student_logo" translatesAutoresizingMaskIntoConstraints="NO" id="k3M-Wn-982">
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_avatarRectangle" translatesAutoresizingMaskIntoConstraints="NO" id="k3M-Wn-982">
                         <rect key="frame" x="268" y="23" width="40" height="40"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="40" id="cL2-bq-BGp"/>
@@ -73,6 +73,6 @@
         </tableViewCell>
     </objects>
     <resources>
-        <image name="student_logo" width="58" height="58"/>
+        <image name="user_avatarRectangle" width="44" height="44"/>
     </resources>
 </document>