1.推送跳转逻辑

2.xib数据清除

KulexiuForStudent/KulexiuForStudent/AppDelegate.m

@@ -45,6 +45,10 @@
 
 #import "FeedbackListViewController.h"
 
+#import "VIPCourseGroupViewController.h"
+#import "AccompanyCourseGroupViewController.h"
+#import "MusicRoomGroupViewController.h"
+
 @import TXLiteAVSDK_Professional;
 
 @interface AppDelegate ()<WXApiDelegate,JPUSHRegisterDelegate,V2TXLivePremierObserver>
@@ -833,6 +837,35 @@ didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
                     [navCtrl pushViewController:detailVC animated:YES];
                 }
             }
+            else if ([pageType isEqualToString:@"coursePlan"]) { // 课程规划
+                NSString *parmString = [dict ks_stringValueForKey:@"params"];
+                NSData *parmData = [parmString mj_JSONData];
+                NSError *error;
+                NSDictionary *parm = [NSJSONSerialization JSONObjectWithData:parmData options:NSJSONReadingMutableContainers error:&error];
+                if (!error) {
+                    NSString *courseType = [parm ks_stringValueForKey:@"courseType"];
+                    NSString *courseGroupId = [parm ks_stringValueForKey:@"courseGroupId"];
+                    if ([courseType isEqualToString:@"VIP"]) {
+                        VIPCourseGroupViewController *ctrl = [[VIPCourseGroupViewController alloc] init];
+                        ctrl.courseGroupId = courseGroupId;
+                        CustomNavViewController *navCtrl = self.tabBarController.selectedViewController;
+                        [navCtrl pushViewController:ctrl animated:YES];
+                    }
+                    else if ([courseType isEqualToString:@"PRACTICE"]) {
+                        AccompanyCourseGroupViewController *ctrl = [[AccompanyCourseGroupViewController alloc] init];
+                        ctrl.courseGroupId = courseGroupId;
+                        CustomNavViewController *navCtrl = self.tabBarController.selectedViewController;
+                        [navCtrl pushViewController:ctrl animated:YES];
+                    }
+                    else if ([courseType isEqualToString:@"PIANO_ROOM_CLASS"]) {
+                        MusicRoomGroupViewController *ctrl = [[MusicRoomGroupViewController alloc] init];
+                        ctrl.courseGroupId = courseGroupId;
+                        CustomNavViewController *navCtrl = self.tabBarController.selectedViewController;
+                        [navCtrl pushViewController:ctrl animated:YES];
+                    }
+                    
+                }
+            }
             else if ([pageType isEqualToString:@"liveRoom"]) { // 直播
                 NSString *parmString = [dict ks_stringValueForKey:@"params"];
                 NSData *parmData = [parmString mj_JSONData];

KulexiuForStudent/KulexiuForStudent/Common/Base/KSNetworkingManager.h

@@ -1071,6 +1071,7 @@ NS_ASSUME_NONNULL_BEGIN
 /// 约课老师列表
 /// @param post post json
 /// @param courseType 课程类型 VIP / PRACTICE
+/// @param subjectId 声部ID
 /// @param search 搜索
 /// @param recentFree 是否最近30天有空
 /// @param sortField 排序类型
@@ -1079,7 +1080,7 @@ NS_ASSUME_NONNULL_BEGIN
 /// @param rows 条数
 /// @param success 成功
 /// @param faliure 失败
-+ (void)findTeacherList:(NSString *)post courseType:(NSString *)courseType search:(NSString *)search recentFree:(BOOL)recentFree sortField:(NSString *)sortField sortRule:(NSString *)sortRule page:(NSInteger)page rows:(NSInteger)rows success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure;
++ (void)findTeacherList:(NSString *)post courseType:(NSString *)courseType subjectId:(NSString *)subjectId search:(NSString *)search recentFree:(BOOL)recentFree sortField:(NSString *)sortField sortRule:(NSString *)sortRule page:(NSInteger)page rows:(NSInteger)rows success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure;
 
 // api-student/videoLesson/selectGroup
 

KulexiuForStudent/KulexiuForStudent/Common/Base/KSNetworkingManager.m

@@ -2026,11 +2026,13 @@
     [parm setValue:@(9999) forKey:@"rows"];
     [self request:get andWithUrl:url and:parm success:success faliure:faliure];
 }
+
 // courseSchedule/teacherList
 
 /// 约课老师列表
 /// @param post post json
 /// @param courseType 课程类型 VIP / PRACTICE
+/// @param subjectId 声部ID
 /// @param search 搜索
 /// @param recentFree 是否最近30天有空
 /// @param sortField 排序类型
@@ -2039,7 +2041,7 @@
 /// @param rows 条数
 /// @param success 成功
 /// @param faliure 失败
-+ (void)findTeacherList:(NSString *)post courseType:(NSString *)courseType search:(NSString *)search recentFree:(BOOL)recentFree sortField:(NSString *)sortField sortRule:(NSString *)sortRule page:(NSInteger)page rows:(NSInteger)rows success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
++ (void)findTeacherList:(NSString *)post courseType:(NSString *)courseType subjectId:(NSString *)subjectId search:(NSString *)search recentFree:(BOOL)recentFree sortField:(NSString *)sortField sortRule:(NSString *)sortRule page:(NSInteger)page rows:(NSInteger)rows success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
     
     [self configRequestMethodJSON];
     NSString *url = [NSString stringWithFormat:@"%@%@",hostURL, @"/api-student/courseSchedule/queryTeacherList"];
@@ -2047,6 +2049,7 @@
     [parm setValue:@(page) forKey:@"page"];
     [parm setValue:@(rows) forKey:@"rows"];
     [parm setValue:courseType forKey:@"courseType"];
+    [parm setValue:subjectId forKey:@"subjectId"];
     [parm setValue:search forKey:@"search"];
     [parm setValue:sortField forKey:@"sortField"];
     [parm setValue:sortRule forKey:@"sortRule"];

KulexiuForStudent/KulexiuForStudent/Module/Course/View/CourseForLiveCell.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="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="22504"/>
+        <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"/>
@@ -56,6 +56,11 @@
                                     <constraint firstAttribute="width" constant="47" id="9Wg-OO-U4i"/>
                                     <constraint firstAttribute="height" constant="47" id="uww-MX-dub"/>
                                 </constraints>
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                        <real key="value" value="8"/>
+                                    </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="dEp-ou-JBA">
                                 <rect key="frame" x="68" y="56" width="0.0" height="24"/>

KulexiuForStudent/KulexiuForStudent/Module/Home/ArrangeCourse/View/CourseTeacherDescCell.m

@@ -58,7 +58,7 @@
     self.courseDuration.text = [NSString stringWithFormat:@"/%@分钟", model.courseMinutes];
     double price = [model.subjectPrice doubleValue];
     if (price > 0) {
-        NSString *mountMsg = [NSString formatDoubleNum:price];
+        NSString *mountMsg = [NSString formatAllDoubleNum:price];
         self.priceLabel.text = mountMsg;
         self.tagLabel.hidden = NO;
     }

KulexiuForStudent/KulexiuForStudent/Module/Home/ArrangeCourse/View/CourseTeacherDescCell.xib

@@ -32,8 +32,8 @@
                                     </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="kSc-Bn-tRF">
-                                <rect key="frame" x="94" y="14" width="32" 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="kSc-Bn-tRF">
+                                <rect key="frame" x="94" y="14" width="0.0" height="22"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="22" id="NrO-ml-kfW"/>
                                 </constraints>
@@ -41,7 +41,7 @@
                                 <color key="textColor" red="0.074509803921568626" green="0.078431372549019607" blue="0.082352941176470587" 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="wAx-0C-FLk">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wAx-0C-FLk">
                                 <rect key="frame" x="94" y="40" width="241" height="18"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="18" id="5wJ-hT-XRQ"/>
@@ -71,8 +71,8 @@
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="arrange_course_icon" translatesAutoresizingMaskIntoConstraints="NO" id="VcT-no-hdl">
                                 <rect key="frame" x="94" y="65" width="12" height="14"/>
                             </imageView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="已上课时34节" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kQq-1l-JW1">
-                                <rect key="frame" x="110" y="64" width="78" height="16"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kQq-1l-JW1">
+                                <rect key="frame" x="110" y="64" width="0.0" height="16"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="16" id="Hvk-2R-872"/>
                                 </constraints>
@@ -89,8 +89,8 @@
                                 <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="100.00" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="14o-Dv-2M4">
-                                <rect key="frame" x="241.66666666666666" y="60" width="47.666666666666657" height="21"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="14o-Dv-2M4">
+                                <rect key="frame" x="289.33333333333331" y="60" width="0.0" height="21"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="21" id="l3t-yK-rvz"/>
                                 </constraints>
@@ -108,7 +108,7 @@
                                 <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="vnz-ny-LSC">
-                                <rect key="frame" x="232.66666666666666" y="64" width="7" height="16"/>
+                                <rect key="frame" x="280.33333333333331" y="64" width="7" height="16"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="16" id="MJU-iu-Jft"/>
                                 </constraints>

KulexiuForStudent/KulexiuForStudent/Module/Home/ArrangeCourse/View/HomeArrangeAccompanyCourseView.m

@@ -44,6 +44,8 @@
 
 @property (nonatomic, assign) BOOL recentFree;
 
+@property (nonatomic, assign) NSInteger subjectIndex;
+
 @end
 
 @implementation HomeArrangeAccompanyCourseView
@@ -86,6 +88,7 @@
 }
 
 - (void)defaultSubject {
+    self.subjectIndex = 0;
     self.subjectId = USER_MANAGER.userInfo.subjectId;
     self.searchView.subjectLabel.text = [NSString returnNoNullStringWithString:USER_MANAGER.userInfo.subjectName];
 }
@@ -117,7 +120,7 @@
 
 - (void)requestData { // 趣纠课程
     
-    [KSNetworkingManager findTeacherList:KS_POST courseType:@"PRACTICE" search:self.searchKey recentFree:self.recentFree sortField:self.sortField sortRule:self.sortRole page:self.pages rows:self.rows success:^(NSDictionary * _Nonnull dic) {
+    [KSNetworkingManager findTeacherList:KS_POST courseType:@"PRACTICE" subjectId:self.subjectId search:self.searchKey recentFree:self.recentFree sortField:self.sortField sortRule:self.sortRole page:self.pages rows:self.rows success:^(NSDictionary * _Nonnull dic) {
         [self endRefresh];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             NSArray *sourceArray = [[dic ks_dictionaryValueForKey:@"data"] ks_arrayValueForKey:@"rows"];
@@ -259,8 +262,8 @@
             [nameArray addObject:[parm ks_stringValueForKey:@"subjectName"]];
         }
         MJWeakSelf;
-        KSChoosePicker *picker = [[KSChoosePicker alloc] initWithTitle:@"" sourceData:nameArray lastChooseIndex:0 sureButtonColor:THEMECOLOR chooseReturnWithBlock:^(NSString * _Nonnull returnValue, NSInteger chooseIndex) {
-            
+        KSChoosePicker *picker = [[KSChoosePicker alloc] initWithTitle:@"" sourceData:nameArray lastChooseIndex:self.subjectIndex sureButtonColor:THEMECOLOR chooseReturnWithBlock:^(NSString * _Nonnull returnValue, NSInteger chooseIndex) {
+            weakSelf.subjectIndex = chooseIndex;
             weakSelf.searchView.subjectLabel.text = returnValue;
             NSDictionary *parm = self.subjectList[chooseIndex];
             weakSelf.subjectId = [parm ks_stringValueForKey:@"subjectId"];

KulexiuForStudent/KulexiuForStudent/Module/Home/ArrangeCourse/View/HomeArrangeVIPCourseView.m

@@ -44,6 +44,8 @@
 
 @property (nonatomic, assign) BOOL recentFree;
 
+@property (nonatomic, assign) NSInteger subjectIndex;
+
 @end
 
 @implementation HomeArrangeVIPCourseView
@@ -86,6 +88,7 @@
 }
 
 - (void)defaultSubject {
+    self.subjectIndex = 0;
     self.subjectId = USER_MANAGER.userInfo.subjectId;
     self.searchView.subjectLabel.text = [NSString returnNoNullStringWithString:USER_MANAGER.userInfo.subjectName];
 }
@@ -117,7 +120,7 @@
 
 - (void)requestData { // VIP课程
     
-    [KSNetworkingManager findTeacherList:KS_POST courseType:@"VIP" search:self.searchKey recentFree:self.recentFree sortField:self.sortField sortRule:self.sortRole page:self.pages rows:self.rows success:^(NSDictionary * _Nonnull dic) {
+    [KSNetworkingManager findTeacherList:KS_POST courseType:@"VIP" subjectId:self.subjectId search:self.searchKey recentFree:self.recentFree sortField:self.sortField sortRule:self.sortRole page:self.pages rows:self.rows success:^(NSDictionary * _Nonnull dic) {
         [self endRefresh];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             NSArray *sourceArray = [[dic ks_dictionaryValueForKey:@"data"] ks_arrayValueForKey:@"rows"];
@@ -259,8 +262,8 @@
             [nameArray addObject:[parm ks_stringValueForKey:@"subjectName"]];
         }
         MJWeakSelf;
-        KSChoosePicker *picker = [[KSChoosePicker alloc] initWithTitle:@"" sourceData:nameArray lastChooseIndex:0 sureButtonColor:THEMECOLOR chooseReturnWithBlock:^(NSString * _Nonnull returnValue, NSInteger chooseIndex) {
-            
+        KSChoosePicker *picker = [[KSChoosePicker alloc] initWithTitle:@"" sourceData:nameArray lastChooseIndex:self.subjectIndex sureButtonColor:THEMECOLOR chooseReturnWithBlock:^(NSString * _Nonnull returnValue, NSInteger chooseIndex) {
+            weakSelf.subjectIndex = chooseIndex;
             weakSelf.searchView.subjectLabel.text = returnValue;
             NSDictionary *parm = self.subjectList[chooseIndex];
             weakSelf.subjectId = [parm ks_stringValueForKey:@"subjectId"];

KulexiuForStudent/KulexiuForStudent/Module/Home/ArrangeCourse/View/LiveCourseArrangeCell.m

@@ -53,11 +53,13 @@
     NSString *introduce = model.courseIntroduce;
     if (![NSString isEmptyString:introduce]) {
         introduce = [introduce replaceAll:@"\n" WithString:@" "];
+        self.courseDesc.text = [NSString returnNoNullStringWithString:introduce];
+    }
+    else {
+        self.courseDesc.text = @"暂无介绍";
     }
-    self.courseDesc.text = [NSString returnNoNullStringWithString:introduce];
-    
     if (model.coursePrice > 0) {
-        NSString *mountMsg = [NSString formatDoubleNum:model.coursePrice];
+        NSString *mountMsg = [NSString formatAllDoubleNum:model.coursePrice];
         self.priceLabel.text = mountMsg;
         self.tagLabel.hidden = NO;
     }
@@ -68,7 +70,7 @@
     
     self.courseCount.text = [NSString stringWithFormat:@"/%.0f课时",model.courseNum];
     self.teacherName.text = [NSString returnNoNullStringWithString:model.teacherName];
-    [self.teacherAvatar sd_setImageWithURL:[NSURL URLWithString:[model.avatar getUrlFileName]] placeholderImage:[UIImage imageNamed:TEACHER_AVATAR]];
+    [self.teacherAvatar sd_setImageWithURL:[NSURL URLWithString:[model.avatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:TEACHER_AVATAR]];
 }
 
 @end

KulexiuForStudent/KulexiuForStudent/Module/Home/ArrangeCourse/View/LiveCourseArrangeCell.xib

@@ -94,8 +94,8 @@
                                 <color key="textColor" red="0.46666666670000001" green="0.46666666670000001" blue="0.46666666670000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="752" text="200" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FTk-RK-PpI">
-                                <rect key="frame" x="235" y="278" width="29" height="24"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="752" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FTk-RK-PpI">
+                                <rect key="frame" x="264" y="278" width="0.0" height="24"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="24" id="iJt-Ll-uCa"/>
                                 </constraints>
@@ -134,7 +134,7 @@
                                 </userDefinedRuntimeAttributes>
                             </imageView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="752" text="¥" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kmf-67-UiN">
-                                <rect key="frame" x="226" y="283" width="7" height="17"/>
+                                <rect key="frame" x="255" y="283" width="7" height="17"/>
                                 <fontDescription key="fontDescription" name="DINAlternate-Bold" family="DIN Alternate" pointSize="14"/>
                                 <color key="textColor" red="0.95686274510000002" green="0.27058823529999998" blue="0.25490196079999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>

KulexiuForStudent/KulexiuForStudent/Module/Home/ArrangeCourse/View/VideoCourseArrangeCell.m

@@ -87,7 +87,7 @@
     }
     
     self.teacherName.text = [NSString returnNoNullStringWithString:model.userName];
-    [self.teacherAvatar sd_setImageWithURL:[NSURL URLWithString:[model.avatar getUrlFileName]] placeholderImage:[UIImage imageNamed:TEACHER_AVATAR]];
+    [self.teacherAvatar sd_setImageWithURL:[NSURL URLWithString:[model.avatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:TEACHER_AVATAR]];
 }
 
 - (void)setSelected:(BOOL)selected animated:(BOOL)animated {

KulexiuForStudent/KulexiuForStudent/Module/Home/ArrangeCourse/View/VideoCourseArrangeCell.xib

@@ -33,10 +33,10 @@
                                 </userDefinedRuntimeAttributes>
                             </imageView>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jJ6-0j-owd">
-                                <rect key="frame" x="16" y="16" width="28" height="14"/>
+                                <rect key="frame" x="16" y="16" width="8" 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="c1P-HO-aD8">
-                                        <rect key="frame" x="4" y="1" width="20" height="12"/>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="c1P-HO-aD8">
+                                        <rect key="frame" x="4" y="1" width="0.0" height="12"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="12" id="nl8-EG-eyC"/>
                                         </constraints>
@@ -58,8 +58,8 @@
                                     </userDefinedRuntimeAttribute>
                                 </userDefinedRuntimeAttributes>
                             </view>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="752" text="120" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="g4R-nC-SBs">
-                                <rect key="frame" x="309" y="68" width="26" height="21"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="752" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="g4R-nC-SBs">
+                                <rect key="frame" x="335" y="68" width="0.0" height="21"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="21" id="iMT-fx-cJM"/>
                                 </constraints>
@@ -68,10 +68,10 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fJN-RM-wff">
-                                <rect key="frame" x="227.33333333333334" y="43" width="42.666666666666657" height="18"/>
+                                <rect key="frame" x="186" y="43" width="12" height="18"/>
                                 <subviews>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="4课时" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3GF-0R-nHu">
-                                        <rect key="frame" x="6.0000000000000018" y="0.0" width="30.666666666666671" height="18"/>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3GF-0R-nHu">
+                                        <rect key="frame" x="6" y="0.0" width="0.0" height="18"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="11"/>
                                         <color key="textColor" red="0.46666666670000001" green="0.46666666670000001" blue="0.46666666670000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <nil key="highlightedColor"/>
@@ -92,10 +92,10 @@
                                 </userDefinedRuntimeAttributes>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Exy-3P-Utb">
-                                <rect key="frame" x="170" y="43" width="53.333333333333343" height="18"/>
+                                <rect key="frame" x="170" y="43" width="12" height="18"/>
                                 <subviews>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="3首曲目" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9jz-X3-StJ">
-                                        <rect key="frame" x="6" y="0.0" width="41.333333333333336" height="18"/>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9jz-X3-StJ">
+                                        <rect key="frame" x="6" y="0.0" width="0.0" height="18"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="11"/>
                                         <color key="textColor" red="0.46666666670000001" green="0.46666666670000001" blue="0.46666666670000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <nil key="highlightedColor"/>
@@ -115,7 +115,7 @@
                                     </userDefinedRuntimeAttribute>
                                 </userDefinedRuntimeAttributes>
                             </view>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="从零开始学竖笛视频课" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tVu-HG-WPK">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tVu-HG-WPK">
                                 <rect key="frame" x="170" y="14" width="165" height="21"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="21" id="PbQ-DU-qiX"/>
@@ -125,13 +125,13 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="752" text="¥" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6xv-gM-cKE">
-                                <rect key="frame" x="300" y="71" width="7" height="17"/>
+                                <rect key="frame" x="326" y="71" width="7" height="17"/>
                                 <fontDescription key="fontDescription" name="DINAlternate-Bold" family="DIN Alternate" pointSize="14"/>
                                 <color key="textColor" red="0.95686274510000002" green="0.27058823529999998" blue="0.25490196079999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <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="pqK-xI-BUS">
-                                <rect key="frame" x="194" y="70.333333333333329" width="26" height="15.666666666666671"/>
+                            <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="pqK-xI-BUS">
+                                <rect key="frame" x="194" y="78" width="0.0" height="0.0"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                 <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>

KulexiuForStudent/KulexiuForStudent/Module/Home/NoticeCenter/Controller/NotiferMessageViewController.m

@@ -16,6 +16,10 @@
 #import "NotiferNavView.h"
 #import "UserInfoManager.h"
 #import "FeedbackListViewController.h"
+#import "MyCourseViewController.h"
+#import "VIPCourseGroupViewController.h"
+#import "AccompanyCourseGroupViewController.h"
+#import "MusicRoomGroupViewController.h"
 
 @interface NotiferMessageViewController ()<UITableViewDelegate, UITableViewDataSource>
 
@@ -261,6 +265,58 @@
                 else if ([pageType isEqualToString:@"feedback"]) { //反馈
                     [self toFeedback];
                 }
+                else if ([pageType isEqualToString:@"vipClass"]) { // 我的课程 ->vip定制课
+                    DISPLAY_INDEX index = DISPLAY_INDEX_VIP;
+                    MyCourseViewController *ctrl = [[MyCourseViewController alloc] init];
+                    [ctrl displayWithIndex:index];
+                    [self.navigationController pushViewController:ctrl animated:YES];
+                }
+                else if ([pageType isEqualToString:@"practiceClass"]) { // 我的课程 ->趣纠课
+                    DISPLAY_INDEX index = DISPLAY_INDEX_FIRST;
+                    MyCourseViewController *ctrl = [[MyCourseViewController alloc] init];
+                    [ctrl displayWithIndex:index];
+                    [self.navigationController pushViewController:ctrl animated:YES];
+                }
+                else if ([pageType isEqualToString:@"liveClass"]) { // 我的课程 ->直播课
+                    DISPLAY_INDEX index = DISPLAY_INDEX_LIVE;
+                    MyCourseViewController *ctrl = [[MyCourseViewController alloc] init];
+                    [ctrl displayWithIndex:index];
+                    [self.navigationController pushViewController:ctrl animated:YES];
+                }
+                else if ([pageType isEqualToString:@"videoClass"]) { // 我的课程 ->视频课
+                    DISPLAY_INDEX index = DISPLAY_INDEX_VIDEO;
+                    MyCourseViewController *ctrl = [[MyCourseViewController alloc] init];
+                    [ctrl displayWithIndex:index];
+                    [self.navigationController pushViewController:ctrl animated:YES];
+                }
+                else if ([pageType isEqualToString:@"coursePlan"]) { // 课程规划
+                    NSString *parmString = [dict ks_stringValueForKey:@"params"];
+                    NSData *parmData = [parmString mj_JSONData];
+                    NSError *error;
+                    NSDictionary *parm = [NSJSONSerialization JSONObjectWithData:parmData options:NSJSONReadingMutableContainers error:&error];
+                    if (!error) {
+                        NSString *courseType = [parm ks_stringValueForKey:@"courseType"];
+                        NSString *courseGroupId = [parm ks_stringValueForKey:@"courseGroupId"];
+                        if ([courseType isEqualToString:@"VIP"]) {
+                            VIPCourseGroupViewController *ctrl = [[VIPCourseGroupViewController alloc] init];
+                            ctrl.courseGroupId = courseGroupId;
+                            [self.navigationController pushViewController:ctrl animated:YES];
+                        }
+                        else if ([courseType isEqualToString:@"PRACTICE"]) {
+                            AccompanyCourseGroupViewController *ctrl = [[AccompanyCourseGroupViewController alloc] init];
+                            ctrl.courseGroupId = courseGroupId;
+                            [self.navigationController pushViewController:ctrl animated:YES];
+                        }
+                        else if ([courseType isEqualToString:@"PIANO_ROOM_CLASS"]) {
+                            MusicRoomGroupViewController *ctrl = [[MusicRoomGroupViewController alloc] init];
+                            ctrl.courseGroupId = courseGroupId;
+                            [self.navigationController pushViewController:ctrl animated:YES];
+                        }
+                        
+                    }
+                }
+                
+                
             }
             else {
                 NSString *webUrl = [dict ks_stringValueForKey:@"url"];

KulexiuForStudent/KulexiuForStudent/Module/Home/View/HomeLiveCouseCell.m

@@ -48,7 +48,7 @@
     [self.teacherAvatar sd_setImageWithURL:[NSURL URLWithString:[source.avatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:TEACHER_AVATAR]];
 
     if (source.courseGroupPrice > 0) {
-        NSString *mountMsg = [NSString formatDoubleNum:source.courseGroupPrice];
+        NSString *mountMsg = [NSString formatAllDoubleNum:source.courseGroupPrice];
         NSString *descMsg = [NSString stringWithFormat:@"¥%@",mountMsg];
         
         NSMutableAttributedString *attr = [[NSMutableAttributedString alloc] initWithString:descMsg attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:12.0f],NSForegroundColorAttributeName:HexRGB(0xfa6400)}];

KulexiuForStudent/KulexiuForStudent/Module/Home/View/HomeVideoCourseCell.m

@@ -43,7 +43,7 @@
     }
     [self.teacherAvatar sd_setImageWithURL:[NSURL URLWithString:[source.avatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:TEACHER_AVATAR]];
     if (source.lessonPrice > 0) {
-        NSString *mountMsg = [NSString formatDoubleNum:source.lessonPrice];
+        NSString *mountMsg = [NSString formatAllDoubleNum:source.lessonPrice];
         NSString *descMsg = [NSString stringWithFormat:@"¥%@",mountMsg];
         NSMutableAttributedString *attr = [[NSMutableAttributedString alloc] initWithString:descMsg attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:12.0f],NSForegroundColorAttributeName:HexRGB(0xfa6400)}];
         [attr addAttributes:@{NSFontAttributeName:[UIFont systemFontOfSize:16.0f weight:UIFontWeightSemibold]} range:[descMsg rangeOfString:mountMsg]];

KulexiuForStudent/KulexiuForStudent/Module/Mine/MineCourse/View/LiveCourseGroup/MyLiveCourseGroupListCell.m

@@ -54,8 +54,11 @@
     NSString *introduce = model.courseIntroduce;
     if (![NSString isEmptyString:introduce]) {
         introduce = [introduce replaceAll:@"\n" WithString:@" "];
+        self.courseDesc.text = [NSString returnNoNullStringWithString:introduce];
+    }
+    else {
+        self.courseDesc.text = @"暂无介绍";
     }
-    self.courseDesc.text = [NSString returnNoNullStringWithString:introduce];
     
     NSMutableAttributedString *attrs = [[NSMutableAttributedString alloc] initWithString:@"已上课时 " attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:12.0f weight:UIFontWeightRegular],NSForegroundColorAttributeName:HexRGB(0x999999)}];
     NSAttributedString *finishNumAttr = [[NSAttributedString alloc] initWithString:[NSString stringWithFormat:@"%zd", model.completeCourseNum] attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:12.0f weight:UIFontWeightSemibold],NSForegroundColorAttributeName:THEMECOLOR}];

KulexiuForStudent/KulexiuForStudent/Module/Mine/MineCourse/View/LiveCourseGroup/MyLiveCourseGroupListCell.xib

@@ -27,8 +27,8 @@
                                     <constraint firstAttribute="width" constant="20" id="YQF-hU-pNP"/>
                                 </constraints>
                             </imageView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="752" text="已开课" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8nr-OW-hsO">
-                                <rect key="frame" x="223" y="13" width="42" height="20"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="752" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8nr-OW-hsO">
+                                <rect key="frame" x="265" y="13" width="0.0" height="20"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="20" id="pzy-qh-z2B"/>
                                 </constraints>
@@ -48,10 +48,10 @@
                                 </userDefinedRuntimeAttributes>
                             </imageView>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7YS-Lc-hvS">
-                                <rect key="frame" x="20" y="54" width="36" height="19"/>
+                                <rect key="frame" x="20" y="54" width="12" height="19"/>
                                 <subviews>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="长笛" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="K2S-UG-2xD">
-                                        <rect key="frame" x="6" y="3.0000000000000009" width="24" height="13.333333333333336"/>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="K2S-UG-2xD">
+                                        <rect key="frame" x="6" y="9.6666666666666643" width="0.0" height="0.0"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                         <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <nil key="highlightedColor"/>
@@ -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"/>
@@ -79,7 +79,7 @@
                                 <color key="textColor" red="0.074509803920000006" green="0.078431372550000003" blue="0.08235294118" 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="2hL-aY-XV2">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2hL-aY-XV2">
                                 <rect key="frame" x="12" y="222.33333333333334" width="253" height="20"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="20" id="1yp-t1-vx3"/>
@@ -88,14 +88,14 @@
                                 <color key="textColor" red="0.46666666670000001" green="0.46666666670000001" blue="0.46666666670000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="752" text="已上课时 4 /总课时 6" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9sU-yS-7be">
-                                <rect key="frame" x="132.66666666666663" y="312.66666666666669" width="132.33333333333337" height="17"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="752" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9sU-yS-7be">
+                                <rect key="frame" x="265" y="321" width="0.0" height="0.0"/>
                                 <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>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="752" image="arrange_course_icon" translatesAutoresizingMaskIntoConstraints="NO" id="iiI-K9-fO1">
-                                <rect key="frame" x="118.66666666666667" y="314" width="12.000000000000014" height="14"/>
+                                <rect key="frame" x="251" y="314" width="12" height="14"/>
                             </imageView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="752" text="开课时间：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="80p-dX-TfO">
                                 <rect key="frame" x="39" y="13" width="62.666666666666657" height="20"/>
@@ -106,8 +106,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>
@@ -127,8 +127,8 @@
                                     </userDefinedRuntimeAttribute>
                                 </userDefinedRuntimeAttributes>
                             </imageView>
-                            <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="8Nu-1r-jPb">
-                                <rect key="frame" x="44" y="313.66666666666669" width="28" height="17"/>
+                            <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="8Nu-1r-jPb">
+                                <rect key="frame" x="44" y="322" width="0.0" height="0.0"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>

KulexiuForStudent/KulexiuForStudent/Module/Mine/MineCourse/View/VideoCourseGroup/MyVideoGroupListCell.xib

@@ -33,10 +33,10 @@
                                 </userDefinedRuntimeAttributes>
                             </imageView>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="X9f-x2-drl">
-                                <rect key="frame" x="16" y="16" width="28" height="14"/>
+                                <rect key="frame" x="16" y="16" width="8" 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="exN-B6-D82">
-                                        <rect key="frame" x="4" y="1" width="20" height="12"/>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="exN-B6-D82">
+                                        <rect key="frame" x="4" y="1" width="0.0" height="12"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="12" id="ikn-PM-oTz"/>
                                         </constraints>
@@ -59,10 +59,10 @@
                                 </userDefinedRuntimeAttributes>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="F1K-0G-zso">
-                                <rect key="frame" x="227.33333333333334" y="43" width="42.666666666666657" height="18"/>
+                                <rect key="frame" x="186" y="43" width="12" height="18"/>
                                 <subviews>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="4课时" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="v90-bW-vHn">
-                                        <rect key="frame" x="6.0000000000000018" y="0.0" width="30.666666666666671" height="18"/>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="v90-bW-vHn">
+                                        <rect key="frame" x="6" y="0.0" width="0.0" height="18"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="11"/>
                                         <color key="textColor" red="0.46666666670000001" green="0.46666666670000001" blue="0.46666666670000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <nil key="highlightedColor"/>
@@ -83,10 +83,10 @@
                                 </userDefinedRuntimeAttributes>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="s0F-Lb-ssK">
-                                <rect key="frame" x="170" y="43" width="53.333333333333343" height="18"/>
+                                <rect key="frame" x="170" y="43" width="12" height="18"/>
                                 <subviews>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="3首曲目" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iyS-6i-p8d">
-                                        <rect key="frame" x="6" y="0.0" width="41.333333333333336" height="18"/>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iyS-6i-p8d">
+                                        <rect key="frame" x="6" y="0.0" width="0.0" height="18"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="11"/>
                                         <color key="textColor" red="0.46666666670000001" green="0.46666666670000001" blue="0.46666666670000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <nil key="highlightedColor"/>
@@ -106,7 +106,7 @@
                                     </userDefinedRuntimeAttribute>
                                 </userDefinedRuntimeAttributes>
                             </view>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="从零开始学竖笛视频课" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mt0-5a-cZX">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mt0-5a-cZX">
                                 <rect key="frame" x="170" y="14" width="161" height="21"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="21" id="cxi-yY-VOh"/>
@@ -127,8 +127,8 @@
                                     </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="ecO-2w-UK0">
-                                <rect key="frame" x="194" y="72.333333333333329" width="26" height="15.666666666666671"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ecO-2w-UK0">
+                                <rect key="frame" x="194" y="80" width="0.0" height="0.0"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                 <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>