Bladeren bron

文案修改

Steven 8 maanden geleden
bovenliggende
commit
bf84aa10b4

+ 4 - 4
KulexiuForTeacher/KulexiuForTeacher.xcodeproj/project.pbxproj

@@ -8556,7 +8556,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = KulexiuForTeacher/KulexiuForTeacher.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.6.7;
+				CURRENT_PROJECT_VERSION = 1.6.7.1;
 				DEVELOPMENT_TEAM = B2AP53HHTU;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = YES;
@@ -8736,7 +8736,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = KulexiuForTeacher/KulexiuForTeacher.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.6.7;
+				CURRENT_PROJECT_VERSION = 1.6.7.1;
 				DEVELOPMENT_TEAM = B2AP53HHTU;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = YES;
@@ -9044,7 +9044,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = KulexiuForTeacher/KulexiuForTeacher.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.6.7;
+				CURRENT_PROJECT_VERSION = 1.6.7.1;
 				DEVELOPMENT_TEAM = B2AP53HHTU;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = YES;
@@ -9319,7 +9319,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = KulexiuForTeacher/KulexiuForTeacher.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.6.7;
+				CURRENT_PROJECT_VERSION = 1.6.7.1;
 				DEVELOPMENT_TEAM = B2AP53HHTU;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = YES;

+ 1 - 1
KulexiuForTeacher/KulexiuForTeacher.xcodeproj/xcshareddata/xcschemes/KulexiuForTeacher.xcscheme

@@ -52,7 +52,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "TEST"
+      buildConfiguration = "Release"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"

+ 1 - 1
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/LiveCourseCell.m

@@ -57,7 +57,7 @@
         self.priceLabel.text = [NSString  stringWithFormat:@"免费"];
     }
     
-    self.courseCount.text = [NSString stringWithFormat:@"/%.0f课时",model.courseNum];
+    self.courseCount.text = [NSString stringWithFormat:@"/ %.0f课时",model.courseNum];
     // time
     NSDateFormatter *formatter = [NSObject getDateformatter];
     [formatter setDateFormat:@"yyyy-MM-dd HH:mm:ss"];

+ 4 - 6
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MinePageVideoCell.m

@@ -45,7 +45,6 @@
     if ([model.payType isEqualToString:@"VIP"]) {
         self.courseMessage.text = @"会员";
         self.courseMessage.textColor = HexRGB(0xC76E21);
-        self.descLabel.text = @"";
     }
     else if ([model.payType isEqualToString:@"PAY"]) {
         if (model.lessonPrice > 0) {
@@ -54,20 +53,19 @@
             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;
-            self.descLabel.text = [NSString stringWithFormat:@"%.0f人已购买",model.countStudent];
 
         }
         else {
             self.courseMessage.text = @"免费";
-            self.courseMessage.textColor = HexRGB(0xC76E21);
-            self.descLabel.text = [NSString stringWithFormat:@"%.0f人已领取",model.countStudent];
+            self.courseMessage.textColor = HexRGB(0x20BEA0);
         }
     }
     else {
         self.courseMessage.text = @"";
-        self.descLabel.text = @"";
     }
-    self.courseCount.text = [NSString stringWithFormat:@"/%.0f课时",model.lessonCount];
+    self.courseCount.text = [NSString stringWithFormat:@"/ %.0f课时",model.lessonCount];
+    self.descLabel.text = [NSString stringWithFormat:@"%.0f人学习",model.countStudent];
+
     self.subjectLabel.text = [NSString returnNoNullStringWithString:model.lessonSubjectName];
 }
 

+ 2 - 2
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MinePageVideoCell.xib

@@ -92,8 +92,8 @@
                                 <color key="textColor" red="1" green="0.50196078430000002" blue="0.17254901959999999" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="/4课时" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Mbx-Mx-WUq">
-                                <rect key="frame" x="61.5" y="164" width="43.5" height="17"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="/ 4课时" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Mbx-Mx-WUq">
+                                <rect key="frame" x="61.5" y="164" width="47.5" height="17"/>
                                 <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"/>

+ 4 - 7
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/VideoCourse/View/VideoCourseCell.m

@@ -46,7 +46,6 @@
     if ([model.payType isEqualToString:@"VIP"]) {
         self.courseMessage.text = @"会员";
         self.courseMessage.textColor = HexRGB(0xC76E21);
-        self.descLabel.text = @"";
     }
     else if ([model.payType isEqualToString:@"PAY"]) {
         if (model.lessonPrice > 0) {
@@ -55,20 +54,18 @@
             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;
-            self.descLabel.text = [NSString stringWithFormat:@"%.0f人已购买",model.countStudent];
         }
         else {
             self.courseMessage.text = @"免费";
-            self.courseMessage.textColor = HexRGB(0xC76E21);
-            self.descLabel.text = [NSString stringWithFormat:@"%.0f人已领取",model.countStudent];
+            self.courseMessage.textColor = HexRGB(0x20BEA0);
         }
     }
     else {
         self.courseMessage.text = @"";
-        self.descLabel.text = @"";
     }
-    self.courseCount.text = [NSString stringWithFormat:@"/%.0f课时",model.lessonCount];
-    
+    self.courseCount.text = [NSString stringWithFormat:@"/ %.0f课时",model.lessonCount];
+    self.descLabel.text = [NSString stringWithFormat:@"%.0f人学习",model.countStudent];
+
     self.subjectLabel.text = [NSString returnNoNullStringWithString:model.lessonSubjectName];
     switch (status) {
         case VIDEOGRROUP_STATUS_ING:

+ 2 - 2
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/VideoCourse/View/VideoCourseCell.xib

@@ -92,8 +92,8 @@
                                 <color key="textColor" red="1" green="0.50196078431372548" blue="0.17254901960784313" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="/4课时" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="x8Q-G1-Gq9">
-                                <rect key="frame" x="61.5" y="164" width="43.5" height="17"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="/ 4课时" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="x8Q-G1-Gq9">
+                                <rect key="frame" x="61.5" y="164" width="47.5" height="17"/>
                                 <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"/>