学生端文案和个人中心卡片样式修改

KulexiuForStudent/KulexiuForStudent/Common/Base/KSNetworkingManager.h

@@ -540,11 +540,12 @@ NS_ASSUME_NONNULL_BEGIN
 /// @param classDate 月份 yyyy-MM
 /// @param status 课程状态(NOT_START:未开始 ING:进行中 COMPLETE:已完成 CANCEL:已取消)
 /// @param subjectId 声部id
+/// @param search 搜索
 /// @param page 页数
 /// @param rows 条数
 /// @param success 成功
 /// @param faliure 失败
-+ (void)queryMyLiveCourse:(NSString *)post classDate:(NSString *)classDate status:(NSString *)status subjectId:(NSString *)subjectId page:(NSInteger)page rows:(NSInteger)rows success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure;
++ (void)queryMyLiveCourse:(NSString *)post classDate:(NSString *)classDate status:(NSString *)status subjectId:(NSString *)subjectId search:(NSString *)search page:(NSInteger)page rows:(NSInteger)rows success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure;
 
 // /api-student/videoLesson/selectMyGroup
 

KulexiuForStudent/KulexiuForStudent/Common/Base/KSNetworkingManager.m

@@ -1132,17 +1132,19 @@
 /// @param classDate 月份 yyyy-MM
 /// @param status 课程状态(NOT_START:未开始 ING:进行中 COMPLETE:已完成 CANCEL:已取消)
 /// @param subjectId 声部id
+/// @param search 搜索
 /// @param page 页数
 /// @param rows 条数
 /// @param success 成功
 /// @param faliure 失败
-+ (void)queryMyLiveCourse:(NSString *)post classDate:(NSString *)classDate status:(NSString *)status subjectId:(NSString *)subjectId page:(NSInteger)page rows:(NSInteger)rows success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
++ (void)queryMyLiveCourse:(NSString *)post classDate:(NSString *)classDate status:(NSString *)status subjectId:(NSString *)subjectId search:(NSString *)search 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/queryStudentLiveCourse"];
     NSMutableDictionary *parm = [NSMutableDictionary dictionary];
     [parm setValue:classDate forKey:@"classDate"];
     [parm setValue:status forKey:@"courseState"];
     [parm setValue:subjectId forKey:@"subjectId"];
+    [parm setValue:search forKey:@"search"];
     [parm setValue:@(page) forKey:@"page"];
     [parm setValue:@(rows) forKey:@"rows"];
     [parm setValue:UserDefault(UIDKey) forKey:@"studentId"];

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

@@ -108,7 +108,7 @@
 }
 
 - (void)requestData {
-    [KSNetworkingManager queryMyLiveCourse:KS_POST classDate:self.classDate status:self.status subjectId:self.subjectId page:self.pages rows:self.rows success:^(NSDictionary * _Nonnull dic) {
+    [KSNetworkingManager queryMyLiveCourse:KS_POST classDate:self.classDate status:self.status subjectId:self.subjectId search:self.searchKey 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"];

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

@@ -158,7 +158,8 @@
         }];
     }
     else if (self.selectIndex == 1) { // 直播课
-        [KSNetworkingManager queryMyLiveCourse:KS_POST classDate:self.classDate status:self.status subjectId:self.subjectId page:self.pages rows:self.rows success:^(NSDictionary * _Nonnull dic) {
+        NSString *searchKey = nil;
+        [KSNetworkingManager queryMyLiveCourse:KS_POST classDate:self.classDate status:self.status subjectId:self.subjectId search:searchKey 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"];

KulexiuForStudent/KulexiuForStudent/Module/Mine/View/KSMemberView.m

@@ -34,15 +34,16 @@
 
 @property (nonatomic, copy) MemberCallback callback;
 
+@property (nonatomic, strong) CAGradientLayer *memberBgLayer;
 @end
 
 @implementation KSMemberView
 - (void)awakeFromNib {
     [super awakeFromNib];
     CGRect bounce = CGRectMake(0, 0, (KPortraitWidth - 14 * 2 - 11) / 2.0f, 70);
-    CAGradientLayer *memberBgLayer = [UIView createGradientLayerFromColor:HexRGB(0xFFF7E0) startPoint:CGPointMake(0, 0) endColor:HexRGB(0xFFE2A2) endPoint:CGPointMake(1, 0.9) bounds:bounce];
-    memberBgLayer.cornerRadius = 10;
-    [self.memberBgView.layer addSublayer:memberBgLayer];
+    self.memberBgLayer = [UIView createGradientLayerFromColor:HexRGB(0xFFF7E0) startPoint:CGPointMake(0, 0) endColor:HexRGB(0xFFE2A2) endPoint:CGPointMake(1, 0.9) bounds:bounce];
+    self.memberBgLayer.cornerRadius = 10;
+    [self.memberBgView.layer addSublayer:self.memberBgLayer];
     CAGradientLayer *memberBorderLayer = [UIView createOutBgLayerFromColor:HexRGB(0xffffff) startPoint:CGPointMake(0.5, 0) endColor:HexRGBAlpha(0xffffff, 0.5f) endPoint:CGPointMake(0.5, 1) bounds:bounce radius:10 lineWidth:2];
     [self.memberBgView.layer addSublayer:memberBorderLayer];
     
@@ -95,23 +96,28 @@
         displayImg = @"member_card_bg_s";
         memberDesc = @"您已是永久SVIP会员";
         memberTitle = @"SVIP会员";
+        self.memberBgLayer.colors = @[(__bridge id)HexRGB(0xFFEDE0).CGColor, (__bridge id)HexRGB(0xFFC7A2).CGColor];
     }
     else if ([userVip.vipType isEqualToString:@"SVIP"]) {
         displayImg = @"member_card_bg_s";
         NSString *timeStr = [[userVip.svipEndDate componentsSeparatedByString:@" "] firstObject];
         memberDesc = [NSString stringWithFormat:@"有效期至%@", [NSString returnNoNullStringWithString:timeStr]];
         memberTitle = @"SVIP会员";
+        self.memberBgLayer.colors = @[(__bridge id)HexRGB(0xFFEDE0).CGColor, (__bridge id)HexRGB(0xFFC7A2).CGColor];
     }
     else if ([userVip.vipType isEqualToString:@"VIP"]) {
         displayImg = @"member_card_bg";
         NSString *timeStr = [[userVip.vipEndDate componentsSeparatedByString:@" "] firstObject];
         memberDesc = [NSString stringWithFormat:@"有效期至%@", [NSString returnNoNullStringWithString:timeStr]];
         memberTitle = @"VIP会员";
+        self.memberBgLayer.colors = @[(__bridge id)HexRGB(0xFFF7E0).CGColor, (__bridge id)HexRGB(0xFFE2A2).CGColor];
     }
     else {
         displayImg = @"member_card_bg";
         memberDesc = [NSString returnNoNullStringWithString:self.memberDefaultDesc];
         memberTitle = @"开通会员";
+        self.memberBgLayer.colors = @[(__bridge id)HexRGB(0xFFF7E0).CGColor, (__bridge id)HexRGB(0xFFE2A2).CGColor];
+
     }
     [self.mmeberBgImage setImage:[UIImage imageNamed:displayImg]];
     self.memberDesc.text = memberDesc;

KulexiuForStudent/KulexiuForStudent/Module/Mine/View/KSMemberView.xib

@@ -38,7 +38,7 @@
                                         <constraint firstAttribute="height" constant="20" id="rjb-mT-bCo"/>
                                     </constraints>
                                     <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="14"/>
-                                    <color key="textColor" red="0.38431372549019605" green="0.15686274509803921" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <color key="textColor" red="0.38431372549019605" green="0.13333333333333333" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                     <nil key="highlightedColor"/>
                                 </label>
                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="member_card_next" translatesAutoresizingMaskIntoConstraints="NO" id="oqW-oX-dVc">
@@ -50,7 +50,7 @@
                                         <constraint firstAttribute="height" constant="17" id="dNa-Pf-XW5"/>
                                     </constraints>
                                     <fontDescription key="fontDescription" type="system" pointSize="12"/>
-                                    <color key="textColor" red="0.40000000000000002" green="0.20784313725490194" blue="0.0" alpha="0.80000000000000004" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <color key="textColor" red="0.38431372549019605" green="0.13333333333333333" blue="0.0" alpha="0.80000000000000004" colorSpace="custom" customColorSpace="sRGB"/>
                                     <nil key="highlightedColor"/>
                                 </label>
                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="I7j-pE-NdM">

KulexiuForStudent/KulexiuForStudent/Module/Mine/View/MineBodyView.m

@@ -170,7 +170,7 @@
 }
 
 - (CGFloat)getViewHeight {
-    return 80 + 15 + (self.memberViewHeight.constant) / 2 + 5 + 80 + 12 + (136 + 12) * 3 + (192 + 12) + self.costomserviceViewHeight.constant;
+    return 80 + 15 + (self.memberViewHeight.constant) + 5 + 80 + 12 + (136 + 12) * 3 + (192 + 12) + self.costomserviceViewHeight.constant;
 }
 
 - (IBAction)modifyUser:(id)sender {