Parcourir la source

直播课介绍换行处理

Steven il y a 7 mois
Parent
commit
1215ea779d

+ 12 - 2
KulexiuForTeacher/KulexiuForTeacher/AppDelegate.m

@@ -755,7 +755,10 @@ didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
                 if ([action isEqualToString:@"app"]) {
                     NSString *pageType = [dict ks_stringValueForKey:@"pageTag"];
                     DISPLAY_INDEX index = DISPLAY_INDEX_FIRST;
-                    if ([pageType isEqualToString:@"practiceClass"]) { // 我的课程 ->趣纠课
+                    if ([pageType isEqualToString:@"vipClass"]) {
+                        index = DISPLAY_INDEX_VIP;
+                    }
+                    else if ([pageType isEqualToString:@"practiceClass"]) { // 我的课程 ->趣纠课
                         index = DISPLAY_INDEX_FIRST;
                     }
                     else if ([pageType isEqualToString:@"liveClass"]) { // 我的课程 ->直播课
@@ -826,7 +829,14 @@ didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
         NSString *action = [dict ks_stringValueForKey:@"action"];
         if ([action isEqualToString:@"app"]) { // 跳原生
             NSString *pageType = [dict ks_stringValueForKey:@"pageTag"];
-            if ([pageType isEqualToString:@"practiceClass"]) { // 我的课程 ->趣纠课
+            if ([pageType isEqualToString:@"vipClass"]) { // 我的课程 ->vip定制课
+                DISPLAY_INDEX index = DISPLAY_INDEX_VIP;
+                MyCourseViewController *ctrl = [[MyCourseViewController alloc] init];
+                [ctrl displayWithIndex:index];
+                CustomNavViewController *navCtrl = self.tabBarController.selectedViewController;
+                [navCtrl pushViewController:ctrl animated:YES];
+            }
+            else if ([pageType isEqualToString:@"practiceClass"]) { // 我的课程 ->趣纠课
                 DISPLAY_INDEX index = DISPLAY_INDEX_FIRST;
                 MyCourseViewController *ctrl = [[MyCourseViewController alloc] init];
                 [ctrl displayWithIndex:index];

+ 6 - 1
KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/LiveCourseGroup/MyLiveCourseGroupListCell.m

@@ -48,7 +48,12 @@
     [self.courseCover sd_setImageWithURL:[NSURL URLWithString:[model.backgroundPic getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:@"video_placeholder"]];
     self.courseSubject.text = [NSString returnNoNullStringWithString:model.subjectName];
     self.courseTitle.text = [NSString returnNoNullStringWithString:model.courseGroupName];
-    self.courseDesc.text = [NSString returnNoNullStringWithString:model.courseIntroduce];
+    
+    NSString *introduce = model.courseIntroduce;
+    if (![NSString isEmptyString:introduce]) {
+        introduce = [introduce replaceAll:@"\n" WithString:@" "];
+    }
+    self.courseDesc.text = [NSString returnNoNullStringWithString:introduce];
     self.bookDesc.text = [NSString stringWithFormat:@"%.0f人已学习", model.studentCount];
     
     NSMutableAttributedString *attrs = [[NSMutableAttributedString alloc] initWithString:@"已上课时 " attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:12.0f weight:UIFontWeightRegular],NSForegroundColorAttributeName:HexRGB(0x999999)}];

+ 3 - 3
KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/LiveCourseGroup/MyLiveCourseGroupListCell.xib

@@ -70,7 +70,7 @@
                                     </userDefinedRuntimeAttribute>
                                 </userDefinedRuntimeAttributes>
                             </view>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="从零开始学竖笛直播课" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UwF-HP-7VM">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UwF-HP-7VM">
                                 <rect key="frame" x="12" y="196.33333333333334" width="253" height="22"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="22" id="mec-OG-ov4"/>
@@ -129,8 +129,8 @@
                                 <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" horizontalCompressionResistancePriority="749" text="2024-11-16 09:30" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Erw-V1-YaB">
-                                <rect key="frame" x="101.66666666666669" y="13" width="111.33333333333331" 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="Erw-V1-YaB">
+                                <rect key="frame" x="101.66666666666667" y="13" width="0.0" height="20"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="20" id="wGf-c3-p4r"/>
                                 </constraints>

+ 5 - 1
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MinePageLiveCourse/MineLiveCourseGroupCell.m

@@ -70,8 +70,12 @@
     self.courseTime.text = [NSString returnNoNullStringWithString:courseBegin];
     self.subjectLabel.text = [NSString returnNoNullStringWithString:model.subjectName];
     
+    NSString *introduce = model.courseIntroduce;
+    if (![NSString isEmptyString:introduce]) {
+        introduce = [introduce replaceAll:@"\n" WithString:@" "];
+    }
     // 介绍
-    self.teacherDesc.text = [NSString returnNoNullStringWithString:model.courseIntroduce];
+    self.teacherDesc.text = [NSString returnNoNullStringWithString:introduce];
     switch (status) {
         case COURSERSTATUS_ING:
         {