UI 调整

KulexiuForTeacher/KulexiuForTeacher.xcodeproj/project.pbxproj

@@ -982,7 +982,6 @@
 		BCE6A0A527F8517900C97704 /* MineVideoCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = BCE6A0A327F8517900C97704 /* MineVideoCell.xib */; };
 		BCE6A0A927F852CD00C97704 /* MineFansGroupCell.m in Sources */ = {isa = PBXBuildFile; fileRef = BCE6A0A727F852CD00C97704 /* MineFansGroupCell.m */; };
 		BCE6A0AA27F852CD00C97704 /* MineFansGroupCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = BCE6A0A827F852CD00C97704 /* MineFansGroupCell.xib */; };
-		BCE70D3328C6DA4B00DE7A69 /* StyleEditViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BCE70D3228C6DA4B00DE7A69 /* StyleEditViewController.m */; };
 		BCE70D3628C6DA8B00DE7A69 /* MyStyleEditHeadView.m in Sources */ = {isa = PBXBuildFile; fileRef = BCE70D3528C6DA8B00DE7A69 /* MyStyleEditHeadView.m */; };
 		BCE70D3828C6DA9300DE7A69 /* MyStyleEditHeadView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BCE70D3728C6DA9300DE7A69 /* MyStyleEditHeadView.xib */; };
 		BCEA751A2818D59300886A86 /* BankNameModel.m in Sources */ = {isa = PBXBuildFile; fileRef = BCEA75192818D59300886A86 /* BankNameModel.m */; };
@@ -2702,8 +2701,6 @@
 		BCE6A0A627F852CD00C97704 /* MineFansGroupCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MineFansGroupCell.h; sourceTree = "<group>"; };
 		BCE6A0A727F852CD00C97704 /* MineFansGroupCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MineFansGroupCell.m; sourceTree = "<group>"; };
 		BCE6A0A827F852CD00C97704 /* MineFansGroupCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MineFansGroupCell.xib; sourceTree = "<group>"; };
-		BCE70D3128C6DA4B00DE7A69 /* StyleEditViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = StyleEditViewController.h; sourceTree = "<group>"; };
-		BCE70D3228C6DA4B00DE7A69 /* StyleEditViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = StyleEditViewController.m; sourceTree = "<group>"; };
 		BCE70D3428C6DA8B00DE7A69 /* MyStyleEditHeadView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MyStyleEditHeadView.h; sourceTree = "<group>"; };
 		BCE70D3528C6DA8B00DE7A69 /* MyStyleEditHeadView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MyStyleEditHeadView.m; sourceTree = "<group>"; };
 		BCE70D3728C6DA9300DE7A69 /* MyStyleEditHeadView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MyStyleEditHeadView.xib; sourceTree = "<group>"; };
@@ -5274,8 +5271,6 @@
 				BC5EB5B12804027500B4A3B0 /* MyStyleViewController.m */,
 				BCF61BE22804248F0000ACFE /* InstrumentChooseViewController.h */,
 				BCF61BE32804248F0000ACFE /* InstrumentChooseViewController.m */,
-				BCE70D3128C6DA4B00DE7A69 /* StyleEditViewController.h */,
-				BCE70D3228C6DA4B00DE7A69 /* StyleEditViewController.m */,
 			);
 			path = Controller;
 			sourceTree = "<group>";
@@ -7596,7 +7591,6 @@
 				BC7663092827C95200C91A1D /* KSUploadManager.m in Sources */,
 				BC3ACD972890D61400060E97 /* NoRecordViewController.m in Sources */,
 				BC4BCE7A2823AB6500522C8B /* KSAddressPickerView.m in Sources */,
-				BCE70D3328C6DA4B00DE7A69 /* StyleEditViewController.m in Sources */,
 				BCC9F42727F69BD200647449 /* KSWhiteboardControl.m in Sources */,
 				277935E527E328C00010E277 /* CustomNavViewController.m in Sources */,
 				275E3DE027F467410010EC30 /* KSChatEmojiBoardView.m in Sources */,

KulexiuForTeacher/KulexiuForTeacher/Module/Home/Music/View/MusicMessageCell.m

@@ -83,7 +83,7 @@
             self.playImage.hidden = YES;
             self.checkView.hidden = YES;
             self.actionView.hidden = NO;
-            self.actionLabel.text = @"修改";
+            self.actionLabel.text = @"详情";
             self.actionButton.userInteractionEnabled = NO;
             self.actionLabel.textColor = HexRGB(0xFF4E19);
             [self.actionImage setImage:[UIImage imageNamed:@"edit_course"]];
@@ -95,10 +95,10 @@
             self.playImage.hidden = YES;
             self.checkView.hidden = YES;
             self.actionView.hidden = NO;
-            self.actionLabel.text = @"上架";
+            self.actionLabel.text = @"详情";
             self.actionButton.userInteractionEnabled = NO;
-            self.actionLabel.textColor = HexRGB(0xFF1919);
-            [self.actionImage setImage:[UIImage imageNamed:@"racking_course"]];
+            self.actionLabel.textColor = HexRGB(0xFF4E19);
+            [self.actionImage setImage:[UIImage imageNamed:@"edit_course"]];
             authString = [NSString stringWithFormat:@"作曲：%@",songMessage.composer];
         }
             break;

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/CreateStyle/Controller/MyStyleViewController.m

@@ -25,8 +25,7 @@
 #import "ModifyPhoneCheckController.h"
 #import "UserAuthViewController.h"
 #import "ModifyNameViewController.h"
-#import "MyCreateGroupBottomView.h"
-#import "MineFansGroupCell.h"
+
 @interface MyStyleViewController ()<UITableViewDelegate,UITableViewDataSource,WMPlayerDelegate,RSKImageCropViewControllerDelegate,RSKImageCropViewControllerDataSource>
 {
     WMPlayer *_wmPlayer;
@@ -63,7 +62,6 @@
 
 @property (nonatomic, strong) MyStyleEditHeadView *infoHeadView;
 
-@property (nonatomic, strong) MyCreateGroupHeadView *groupHeadView;
 
 @end
 
@@ -75,7 +73,6 @@
     self.ks_prefersNavigationBarHidden = YES;
     [self configUI];
     [self requestMyStyle];
-    [self requestTeacherGroup];
 }
 
 - (void)viewWillAppear:(BOOL)animated {
@@ -139,25 +136,7 @@
     }];
 }
 
-- (void)requestTeacherGroup {
-    [KSNetworkingManager queryTeacherGroupRequest:KS_POST success:^(NSDictionary * _Nonnull dic) {
-        if ([dic integerValueForKey:@"code"] == 200 && [dic boolValueForKey:@"status"]) {
-            NSArray *sourceArray = [dic arrayValueForKey:@"data"];
-            NSMutableArray *groupArray = [NSMutableArray array];
-            for (NSDictionary *parm in sourceArray) {
-                MinePageGroupModel *model = [[MinePageGroupModel alloc] initWithDictionary:parm];
-                [groupArray addObject:model];
-            }
-            self.fansGroupArray = [NSMutableArray arrayWithArray:groupArray];
-        }
-        else {
-            [self MBPShow:MESSAGEKEY];
-        }
-        [self.tableView reloadData];
-    } faliure:^(NSError * _Nonnull error) {
-        
-    }];
-}
+
 
 - (void)configWithSubjectMessage:(NSString *)subjectId subjectName:(NSString *)subjectName {
     if (![NSString isEmptyString:subjectId] && ![NSString isEmptyString:subjectName]) {
@@ -240,90 +219,61 @@
 
 #pragma mark ---- table data source
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
-    return 2;
+    return 1;
 }
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
-    if (section == 1) {
-        return self.fansGroupArray.count;
-    }
+
     return 3;
 }
 
 - (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
-    if (section == 0) {
-        return [MyStyleEditHeadView getViewHeight];
-    }
-    else {
-        return [MyCreateGroupHeadView getViewHeight];
-    }
+    return [MyStyleEditHeadView getViewHeight];
 }
 
 - (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section {
-    if (section == 0) {
-        return CGFLOAT_MIN;
-    }
-    else {
-        return [MyCreateGroupBottomView getViewHeight];
-    }
+    return CGFLOAT_MIN;
 }
 
 - (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section {
-    if (section == 0) {
-        return self.infoHeadView;
-    }
-    return self.groupHeadView;
+    return self.infoHeadView;
 }
 
 - (UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section {
-    if (section == 0) {
-        return [UIView new];
-    }
-    return [MyCreateGroupBottomView shareInstance];
+   return [UIView new];
 }
 
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
-    if (indexPath.section == 0) {
-        if (indexPath.row == 0) {
-            MyStyleInstrumentCell *cell = [tableView dequeueReusableCellWithIdentifier:@"MyStyleInstrumentCell"];
-            MJWeakSelf;
-            [cell configWithSource:self.instrumentArray callback:^(STYLE_INSTRUMENT type, NSMutableArray * _Nullable sourceArray) {
-                if (type == STYLE_INSTRUMENT_CHOOSE) {
-                    [weakSelf chooseInstrumentWithArray:sourceArray];
-                }
-                else { // 刷新
-                    [weakSelf refreshInstrumentPart:sourceArray];
-                }
-            }];
-            return cell;
-        }
-        else if (indexPath.row == 1) {
-            MyStyleIntroduceCell *cell = [tableView dequeueReusableCellWithIdentifier:@"MyStyleIntroduceCell"];
-            MJWeakSelf;
-            [cell configWithIntroduceMessage:self.content modifyCallback:^(NSString * _Nullable content) {
-                weakSelf.content = content;
-            }];
-            return cell;
-        }
-        else {
-            MyStyleVideoCell *cell = [tableView dequeueReusableCellWithIdentifier:@"MyStyleVideoCell"];
-            [cell configWithSource:self.videoArray];
-            MJWeakSelf;
-            [cell opreationCallback:^(STYLEVIDEO type, UIView * _Nullable containerView) {
-                [weakSelf opreationVideoCell:type container:containerView];
-            }];
-            return cell;
-        }
+    if (indexPath.row == 0) {
+        MyStyleInstrumentCell *cell = [tableView dequeueReusableCellWithIdentifier:@"MyStyleInstrumentCell"];
+        MJWeakSelf;
+        [cell configWithSource:self.instrumentArray callback:^(STYLE_INSTRUMENT type, NSMutableArray * _Nullable sourceArray) {
+            if (type == STYLE_INSTRUMENT_CHOOSE) {
+                [weakSelf chooseInstrumentWithArray:sourceArray];
+            }
+            else { // 刷新
+                [weakSelf refreshInstrumentPart:sourceArray];
+            }
+        }];
+        return cell;
+    }
+    else if (indexPath.row == 1) {
+        MyStyleIntroduceCell *cell = [tableView dequeueReusableCellWithIdentifier:@"MyStyleIntroduceCell"];
+        MJWeakSelf;
+        [cell configWithIntroduceMessage:self.content modifyCallback:^(NSString * _Nullable content) {
+            weakSelf.content = content;
+        }];
+        return cell;
     }
     else {
-        MinePageGroupModel *model = self.fansGroupArray[indexPath.row];
-        MineFansGroupCell *cell = [tableView dequeueReusableCellWithIdentifier:@"MineFansGroupCell"];
-        
-        [cell configWithSource:model chatAction:^(NSString *groupName, NSString *groupId) {
+        MyStyleVideoCell *cell = [tableView dequeueReusableCellWithIdentifier:@"MyStyleVideoCell"];
+        [cell configWithSource:self.videoArray];
+        MJWeakSelf;
+        [cell opreationCallback:^(STYLEVIDEO type, UIView * _Nullable containerView) {
+            [weakSelf opreationVideoCell:type container:containerView];
         }];
         return cell;
     }
-    
 }
 
 - (void)opreationVideoCell:(STYLEVIDEO)type container:(UIView *)container {
@@ -776,25 +726,6 @@
     [[RCIM sharedRCIM] clearGroupUserInfoCache];
 }
 
-- (MyCreateGroupHeadView *)groupHeadView {
-    if (!_groupHeadView) {
-        _groupHeadView = [MyCreateGroupHeadView shareInstance];
-        MJWeakSelf;
-        [_groupHeadView createGroupCallback:^{
-            [weakSelf createGroupAction];
-        }];
-    }
-    return _groupHeadView;
-}
-
-- (void)createGroupAction {
-    CreateFansGroupViewController *ctrl = [[CreateFansGroupViewController alloc] init];
-    MJWeakSelf;
-    [ctrl successCallback:^{
-        [weakSelf requestTeacherGroup];
-    }];
-    [self.navigationController pushViewController:ctrl animated:YES];
-}
 
 #pragma mark --- RSKImageCropViewControllerDelegate
 

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/CreateStyle/Controller/StyleEditViewController.h

@@ -1,16 +0,0 @@
-//
-//  StyleEditViewController.h
-//  KulexiuForTeacher
-//
-//  Created by 王智 on 2022/9/6.
-//
-
-#import "KSBaseViewController.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface StyleEditViewController : KSBaseViewController
-
-@end
-
-NS_ASSUME_NONNULL_END

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/CreateStyle/Controller/StyleEditViewController.m

@@ -1,31 +0,0 @@
-//
-//  StyleEditViewController.m
-//  KulexiuForTeacher
-//
-//  Created by 王智 on 2022/9/6.
-//
-
-#import "StyleEditViewController.h"
-
-@interface StyleEditViewController ()
-
-@end
-
-@implementation StyleEditViewController
-
-- (void)viewDidLoad {
-    [super viewDidLoad];
-    // Do any additional setup after loading the view.
-}
-
-/*
-#pragma mark - Navigation
-
-// In a storyboard-based application, you will often want to do a little preparation before navigation
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
-    // Get the new view controller using [segue destinationViewController].
-    // Pass the selected object to the new view controller.
-}
-*/
-
-@end

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/LiveCourseCell.m

@@ -12,11 +12,6 @@
 @property (weak, nonatomic) IBOutlet UIView *statusView;
 @property (weak, nonatomic) IBOutlet UILabel *statusLabel;
 
-@property (weak, nonatomic) IBOutlet UIView *actionView;
-@property (weak, nonatomic) IBOutlet UIImageView *actionImage;
-@property (weak, nonatomic) IBOutlet UILabel *actionLabel;
-@property (weak, nonatomic) IBOutlet NSLayoutConstraint *actionViewWidth;
-
 @property (weak, nonatomic) IBOutlet UIImageView *coverImage;
 @property (weak, nonatomic) IBOutlet UILabel *courseName;
 
@@ -71,21 +66,14 @@
     NSString *courseBegin = [formatter stringFromDate:startDate];
     self.courseTime.text = [NSString returnNoNullStringWithString:courseBegin];
     self.subjectLabel.text = [NSString returnNoNullStringWithString:model.subjectName];
-    self.actionViewWidth.constant = 0.0f;
     switch (status) {
         case COURSERSTATUS_ING:
         {
             self.statusView.backgroundColor = HexRGB(0xd5fff7);
             self.statusLabel.textColor = HexRGB(0x2dc7aa);
             self.statusLabel.text = @"进行中";
-            self.actionView.hidden = YES;
             self.orderUser.hidden = NO;
-//            if (hideStatusView) {
-//                self.statusView.hidden = YES;
-//            }
-//            else {
-                self.statusView.hidden = NO;
-//            }
+            self.statusView.hidden = NO;
         }
             break;
         case COURSERSTATUS_NOTSALE:
@@ -93,7 +81,6 @@
             self.statusView.backgroundColor = HexRGB(0xFFEEE3);
             self.statusLabel.textColor = HexRGB(0xFF4E19);
             self.statusLabel.text = @"未上架";
-            self.actionView.hidden = YES;
             self.orderUser.hidden = YES;
         }
             break;
@@ -102,11 +89,6 @@
             self.statusView.backgroundColor = HexRGB(0xFFE7E7);
             self.statusLabel.textColor = HexRGB(0xFF1919);
             self.statusLabel.text = @"销售中";
-            self.actionView.hidden = NO;
-            self.actionViewWidth.constant = 70.0f;
-            self.actionLabel.text = @"下架课程";
-            self.actionLabel.textColor = HexRGB(0x008AE0);
-            [self.actionImage setImage:[UIImage imageNamed:@"unshelve_course"]];
             self.orderUser.hidden = NO;
         }
             break;
@@ -115,7 +97,6 @@
             self.statusView.backgroundColor = HexRGB(0xDEF2FF);
             self.statusLabel.textColor = HexRGB(0x008AE0);
             self.statusLabel.text = @"已完成";
-            self.actionView.hidden = YES;
             self.orderUser.hidden = NO;
             
         }
@@ -125,11 +106,6 @@
             self.statusView.backgroundColor = HexRGB(0xF0F0F0);
             self.statusLabel.textColor = HexRGB(0x666666);
             self.statusLabel.text = @"已取消";
-            self.actionView.hidden = NO;
-            self.actionViewWidth.constant = 70.0f;
-            self.actionLabel.text = @"重新上架";
-            self.actionLabel.textColor = HexRGB(0xFF1919);
-            [self.actionImage setImage:[UIImage imageNamed:@"racking_course"]];
             self.orderUser.hidden = NO;
         }
             break;

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/LiveCourseCell.xib

@@ -126,42 +126,13 @@
                                 <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="iFV-Gd-TqC">
-                                <rect key="frame" x="302" y="87.5" width="70" height="20"/>
-                                <subviews>
-                                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="unshelve_course" translatesAutoresizingMaskIntoConstraints="NO" id="C06-l4-KGT">
-                                        <rect key="frame" x="65" y="6.5" width="5" height="7"/>
-                                        <constraints>
-                                            <constraint firstAttribute="width" constant="5" id="5vX-qe-KWR"/>
-                                            <constraint firstAttribute="height" constant="7" id="Axu-h4-rMr"/>
-                                        </constraints>
-                                    </imageView>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="下架课程" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tjC-1s-zlM">
-                                        <rect key="frame" x="0.0" y="1.5" width="58" height="17"/>
-                                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                        <color key="textColor" red="0.0" green="0.54117647058823526" blue="0.8784313725490196" alpha="1" colorSpace="calibratedRGB"/>
-                                        <nil key="highlightedColor"/>
-                                    </label>
-                                </subviews>
-                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                                <constraints>
-                                    <constraint firstItem="tjC-1s-zlM" firstAttribute="centerY" secondItem="iFV-Gd-TqC" secondAttribute="centerY" id="3lP-XI-mmL"/>
-                                    <constraint firstAttribute="height" constant="20" id="Qxx-Nl-EW4"/>
-                                    <constraint firstItem="tjC-1s-zlM" firstAttribute="leading" secondItem="iFV-Gd-TqC" secondAttribute="leading" id="WAU-Vc-axE"/>
-                                    <constraint firstAttribute="width" constant="70" id="Wuo-rZ-Fax"/>
-                                    <constraint firstAttribute="trailing" secondItem="C06-l4-KGT" secondAttribute="trailing" id="er7-J6-LI2"/>
-                                    <constraint firstItem="C06-l4-KGT" firstAttribute="centerY" secondItem="iFV-Gd-TqC" secondAttribute="centerY" id="olT-Ns-Ufm"/>
-                                </constraints>
-                            </view>
                         </subviews>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
                             <constraint firstItem="xxS-NZ-g2N" firstAttribute="leading" secondItem="Mvt-WC-c3g" secondAttribute="leading" constant="11" id="1sN-cR-l8Q"/>
-                            <constraint firstItem="iFV-Gd-TqC" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="d65-nw-cWo" secondAttribute="trailing" constant="4" id="2kW-eg-TON"/>
                             <constraint firstItem="d65-nw-cWo" firstAttribute="centerY" secondItem="pom-27-xPp" secondAttribute="centerY" id="3HT-10-mx6"/>
                             <constraint firstItem="d65-nw-cWo" firstAttribute="leading" secondItem="pom-27-xPp" secondAttribute="trailing" constant="8" id="4pL-Qt-Aey"/>
                             <constraint firstAttribute="trailing" secondItem="fS2-h4-cBg" secondAttribute="trailing" constant="10" id="6Cp-qd-kCN"/>
-                            <constraint firstAttribute="trailing" secondItem="iFV-Gd-TqC" secondAttribute="trailing" constant="14" id="8IO-R5-DWS"/>
                             <constraint firstItem="tFR-9q-Bap" firstAttribute="top" secondItem="Mvt-WC-c3g" secondAttribute="top" constant="7" id="A0n-bX-Wxi"/>
                             <constraint firstAttribute="trailing" secondItem="alu-CI-VLe" secondAttribute="trailing" constant="14" id="BgX-xP-Agg"/>
                             <constraint firstItem="IJp-7D-01q" firstAttribute="top" secondItem="Mvt-WC-c3g" secondAttribute="top" constant="9" id="Iwm-wH-hr5"/>
@@ -173,8 +144,8 @@
                             <constraint firstItem="ZsQ-DL-KCn" firstAttribute="leading" secondItem="xxS-NZ-g2N" secondAttribute="leading" constant="4" id="YQP-hP-shh"/>
                             <constraint firstItem="alu-CI-VLe" firstAttribute="centerY" secondItem="dnA-By-ThI" secondAttribute="centerY" id="ZsX-YZ-KjT"/>
                             <constraint firstItem="pom-27-xPp" firstAttribute="leading" secondItem="xxS-NZ-g2N" secondAttribute="trailing" constant="14" id="cg6-cR-qTo"/>
+                            <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="d65-nw-cWo" secondAttribute="trailing" constant="12" id="e02-Fo-Jyh"/>
                             <constraint firstItem="IJp-7D-01q" firstAttribute="leading" secondItem="Mvt-WC-c3g" secondAttribute="leading" constant="15" id="gNW-qS-yUt"/>
-                            <constraint firstItem="iFV-Gd-TqC" firstAttribute="centerY" secondItem="d65-nw-cWo" secondAttribute="centerY" id="j3e-Dr-eqM"/>
                             <constraint firstItem="pom-27-xPp" firstAttribute="bottom" secondItem="xxS-NZ-g2N" secondAttribute="bottom" constant="-1" id="j9u-RC-StY"/>
                             <constraint firstItem="xxS-NZ-g2N" firstAttribute="top" secondItem="Mvt-WC-c3g" secondAttribute="top" constant="40" id="jSd-RY-pLM"/>
                             <constraint firstAttribute="trailing" secondItem="tFR-9q-Bap" secondAttribute="trailing" id="jsW-bq-EDp"/>
@@ -200,10 +171,6 @@
             <viewLayoutGuide key="safeArea" id="aW0-zy-SZf"/>
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <connections>
-                <outlet property="actionImage" destination="C06-l4-KGT" id="KG3-0S-vOC"/>
-                <outlet property="actionLabel" destination="tjC-1s-zlM" id="oWY-hq-LST"/>
-                <outlet property="actionView" destination="iFV-Gd-TqC" id="T8l-Hd-gnz"/>
-                <outlet property="actionViewWidth" destination="Wuo-rZ-Fax" id="wlU-kj-jce"/>
                 <outlet property="courseCount" destination="d65-nw-cWo" id="4ke-74-1PS"/>
                 <outlet property="courseName" destination="fS2-h4-cBg" id="MBL-3f-0NB"/>
                 <outlet property="courseTime" destination="dnA-By-ThI" id="zYH-8K-CD9"/>
@@ -218,7 +185,6 @@
         </tableViewCell>
     </objects>
     <resources>
-        <image name="unshelve_course" width="5" height="7"/>
         <image name="video_placeholder" width="103" height="72"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/VideoCourse/View/VideoCourseCell.m

@@ -12,11 +12,6 @@
 @property (weak, nonatomic) IBOutlet UIView *statusView;
 @property (weak, nonatomic) IBOutlet UILabel *statusLabel;
 
-@property (weak, nonatomic) IBOutlet UIView *actionView;
-@property (weak, nonatomic) IBOutlet UIImageView *actionImage;
-@property (weak, nonatomic) IBOutlet UILabel *actionLabel;
-@property (weak, nonatomic) IBOutlet NSLayoutConstraint *actionViewHeight;
-
 @property (weak, nonatomic) IBOutlet UIImageView *coverImage;
 
 @property (weak, nonatomic) IBOutlet UILabel *courseTitle;
@@ -63,23 +58,16 @@
         self.descLabel.text = [NSString stringWithFormat:@"%.0f人已领取",model.countStudent];
     }
     self.subjectLabel.text = [NSString returnNoNullStringWithString:model.lessonSubjectName];
-    self.actionViewHeight.constant = 0.0f;
     switch (status) {
         case VIDEOGRROUP_STATUS_ING:
         {
             self.statusView.backgroundColor = HexRGB(0xd5fff7);
             self.statusLabel.textColor = HexRGB(0x2dc7aa);
             self.statusLabel.text = @"已上架";
-            self.actionView.hidden = NO;
             if (hideBottomView) {
-                self.actionView.hidden = YES;
                 self.statusView.hidden = YES;
             }
             else {
-                self.actionViewHeight.constant = 40.0f;
-                self.actionLabel.textColor = HexRGB(0x008AE0);
-                self.actionLabel.text = @"下架此课程";
-                [self.actionImage setImage:[UIImage imageNamed:@"unshelve_course"]];
                 self.descLabel.hidden = NO;
                 self.statusView.hidden = NO;
             }
@@ -91,7 +79,6 @@
             self.statusView.backgroundColor = HexRGB(0xDEF2FF);
             self.statusLabel.textColor = HexRGB(0x008AE0);
             self.statusLabel.text = @"审核中";
-            self.actionView.hidden = YES;
             self.descLabel.hidden = YES;
         }
             break;
@@ -100,11 +87,6 @@
             self.statusView.backgroundColor = HexRGB(0xFFE7E7);
             self.statusLabel.textColor = HexRGB(0xFF1919);
             self.statusLabel.text = @"失败";
-            self.actionView.hidden = NO;
-            self.actionViewHeight.constant = 40.0f;
-            self.actionLabel.textColor = HexRGB(0xFF4E19);
-            self.actionLabel.text = @"重新编辑";
-            [self.actionImage setImage:[UIImage imageNamed:@"edit_course"]];
             self.descLabel.hidden = NO;
         }
             break;
@@ -112,12 +94,7 @@
         {
             self.statusView.backgroundColor = HexRGB(0xF0F0F0);
             self.statusLabel.textColor = HexRGB(0x666666);
-            self.statusLabel.text = @"已取消";
-            self.actionView.hidden = NO;
-            self.actionViewHeight.constant = 40.0f;
-            self.actionLabel.text = @"重新上架";
-            self.actionLabel.textColor = HexRGB(0xFF1919);
-            [self.actionImage setImage:[UIImage imageNamed:@"racking_course"]];
+            self.statusLabel.text = @"已下架";
             self.descLabel.hidden = NO;
         }
             break;

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/VideoCourse/View/VideoCourseCell.xib

@@ -12,14 +12,14 @@
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="gTV-IL-0wX" customClass="VideoCourseCell">
-            <rect key="frame" x="0.0" y="0.0" width="168" height="240"/>
+            <rect key="frame" x="0.0" y="0.0" width="168" height="210"/>
             <autoresizingMask key="autoresizingMask"/>
             <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
-                <rect key="frame" x="0.0" y="0.0" width="168" height="240"/>
+                <rect key="frame" x="0.0" y="0.0" width="168" height="210"/>
                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                 <subviews>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZgA-i1-RHm">
-                        <rect key="frame" x="0.0" y="0.0" width="168" height="240"/>
+                        <rect key="frame" x="0.0" y="0.0" width="168" height="210"/>
                         <subviews>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="video_placeholder" translatesAutoresizingMaskIntoConstraints="NO" id="G9V-fH-gog">
                                 <rect key="frame" x="0.0" y="0.0" width="168" height="111"/>
@@ -98,60 +98,11 @@
                                 <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ipj-PO-tx8">
-                                <rect key="frame" x="0.0" y="200" width="168" height="40"/>
-                                <subviews>
-                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="AAn-Mo-haN">
-                                        <rect key="frame" x="0.0" y="0.0" width="168" height="1"/>
-                                        <color key="backgroundColor" red="0.97254901960784312" green="0.97254901960784312" blue="0.97254901960784312" alpha="1" colorSpace="calibratedRGB"/>
-                                        <constraints>
-                                            <constraint firstAttribute="height" constant="1" id="Vsj-f7-CdH"/>
-                                        </constraints>
-                                    </view>
-                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2k6-8I-8eh">
-                                        <rect key="frame" x="44" y="10" width="80" height="20"/>
-                                        <subviews>
-                                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="unshelve_course" translatesAutoresizingMaskIntoConstraints="NO" id="4i1-bR-DLX">
-                                                <rect key="frame" x="75" y="6.5" width="5" height="7"/>
-                                                <constraints>
-                                                    <constraint firstAttribute="height" constant="7" id="HYe-eo-rL1"/>
-                                                    <constraint firstAttribute="width" constant="5" id="cgt-qB-UtW"/>
-                                                </constraints>
-                                            </imageView>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="下架此课程" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Hfh-X0-Fzs">
-                                                <rect key="frame" x="0.0" y="1.5" width="71.5" height="17"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                                <color key="textColor" red="0.0" green="0.54117647059999996" blue="0.87843137250000003" alpha="1" colorSpace="calibratedRGB"/>
-                                                <nil key="highlightedColor"/>
-                                            </label>
-                                        </subviews>
-                                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                                        <constraints>
-                                            <constraint firstItem="Hfh-X0-Fzs" firstAttribute="centerY" secondItem="2k6-8I-8eh" secondAttribute="centerY" id="4un-2C-eUO"/>
-                                            <constraint firstItem="Hfh-X0-Fzs" firstAttribute="leading" secondItem="2k6-8I-8eh" secondAttribute="leading" id="g1i-5U-I4E"/>
-                                            <constraint firstAttribute="trailing" secondItem="4i1-bR-DLX" secondAttribute="trailing" id="iZj-df-E4e"/>
-                                            <constraint firstAttribute="width" constant="80" id="kwG-uv-hyI"/>
-                                            <constraint firstAttribute="height" constant="20" id="tfG-m8-WU4"/>
-                                            <constraint firstItem="4i1-bR-DLX" firstAttribute="centerY" secondItem="2k6-8I-8eh" secondAttribute="centerY" id="vhR-zf-3vX"/>
-                                        </constraints>
-                                    </view>
-                                </subviews>
-                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                <constraints>
-                                    <constraint firstItem="AAn-Mo-haN" firstAttribute="leading" secondItem="ipj-PO-tx8" secondAttribute="leading" id="4qj-LL-8Ew"/>
-                                    <constraint firstItem="2k6-8I-8eh" firstAttribute="centerX" secondItem="ipj-PO-tx8" secondAttribute="centerX" id="50V-rg-eXx"/>
-                                    <constraint firstAttribute="trailing" secondItem="AAn-Mo-haN" secondAttribute="trailing" id="DMO-BR-pnL"/>
-                                    <constraint firstItem="2k6-8I-8eh" firstAttribute="centerY" secondItem="ipj-PO-tx8" secondAttribute="centerY" id="FGd-0i-s8p"/>
-                                    <constraint firstItem="AAn-Mo-haN" firstAttribute="top" secondItem="ipj-PO-tx8" secondAttribute="top" id="LuU-jp-orx"/>
-                                    <constraint firstAttribute="height" constant="40" id="QDu-aF-nEU"/>
-                                </constraints>
-                            </view>
                         </subviews>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
                             <constraint firstItem="yCS-l4-WAt" firstAttribute="leading" secondItem="ZgA-i1-RHm" secondAttribute="leading" constant="11" id="1Ls-Wb-fRT"/>
                             <constraint firstItem="Spj-bd-Syo" firstAttribute="leading" secondItem="Yib-mA-6Ou" secondAttribute="leading" id="21X-Vs-W4W"/>
-                            <constraint firstItem="ipj-PO-tx8" firstAttribute="leading" secondItem="ZgA-i1-RHm" secondAttribute="leading" id="2H4-aL-8iv"/>
                             <constraint firstItem="QDb-Of-i8k" firstAttribute="leading" secondItem="ZgA-i1-RHm" secondAttribute="leading" id="4uA-9W-JFO"/>
                             <constraint firstItem="G9V-fH-gog" firstAttribute="top" secondItem="ZgA-i1-RHm" secondAttribute="top" id="5ix-vd-TUM"/>
                             <constraint firstItem="Yib-mA-6Ou" firstAttribute="leading" secondItem="ZgA-i1-RHm" secondAttribute="leading" constant="12" id="74G-dg-JPA"/>
@@ -160,10 +111,8 @@
                             <constraint firstItem="G9V-fH-gog" firstAttribute="leading" secondItem="ZgA-i1-RHm" secondAttribute="leading" id="9e1-eo-OKH"/>
                             <constraint firstItem="yCS-l4-WAt" firstAttribute="top" secondItem="G9V-fH-gog" secondAttribute="bottom" constant="6" id="EOx-Xx-BzN"/>
                             <constraint firstItem="x8Q-G1-Gq9" firstAttribute="leading" secondItem="Yib-mA-6Ou" secondAttribute="trailing" constant="8" id="GF2-Ui-YuH"/>
-                            <constraint firstAttribute="bottom" secondItem="ipj-PO-tx8" secondAttribute="bottom" id="GX2-pS-GEd"/>
                             <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="x8Q-G1-Gq9" secondAttribute="trailing" constant="12" id="M2o-33-e5R"/>
                             <constraint firstAttribute="trailing" secondItem="yCS-l4-WAt" secondAttribute="trailing" constant="13" id="N8r-qo-ZmS"/>
-                            <constraint firstAttribute="trailing" secondItem="ipj-PO-tx8" secondAttribute="trailing" id="Sf6-5F-BqA"/>
                             <constraint firstItem="QDb-Of-i8k" firstAttribute="top" secondItem="ZgA-i1-RHm" secondAttribute="top" constant="8" id="am0-Ac-1cy"/>
                             <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="Spj-bd-Syo" secondAttribute="trailing" constant="14" id="cas-aJ-Em1"/>
                             <constraint firstAttribute="trailing" secondItem="GEE-Kj-3db" secondAttribute="trailing" constant="6" id="rh1-SG-rcT"/>
@@ -188,10 +137,6 @@
                 </userDefinedRuntimeAttribute>
             </userDefinedRuntimeAttributes>
             <connections>
-                <outlet property="actionImage" destination="4i1-bR-DLX" id="jPy-Gh-vnO"/>
-                <outlet property="actionLabel" destination="Hfh-X0-Fzs" id="Btb-xb-Bnb"/>
-                <outlet property="actionView" destination="ipj-PO-tx8" id="KJO-rj-Uud"/>
-                <outlet property="actionViewHeight" destination="QDu-aF-nEU" id="xiX-75-bkj"/>
                 <outlet property="courseCount" destination="x8Q-G1-Gq9" id="uHy-hh-aCg"/>
                 <outlet property="courseMessage" destination="Yib-mA-6Ou" id="hPM-ZS-6ZL"/>
                 <outlet property="courseTitle" destination="yCS-l4-WAt" id="1Wb-8W-iHt"/>
@@ -205,7 +150,6 @@
         </collectionViewCell>
     </objects>
     <resources>
-        <image name="unshelve_course" width="5" height="7"/>
         <image name="video_placeholder" width="103" height="72"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/VideoCourse/View/VideoListBodyView.m

@@ -233,7 +233,7 @@
 }
 
 - (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath {
-    CGFloat height = self.selectIndex == 1 ? 200 : 240;
+    CGFloat height = self.selectIndex == 1 ? 200 : 210;
     return CGSizeMake((kScreenWidth - 28 - 11) / 2.0f, height);
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/View/MineBottomView.m

@@ -23,6 +23,11 @@
 
 @implementation MineBottomView
 
+- (void)awakeFromNib {
+    [super awakeFromNib];
+    self.isTestUser = YES;
+}
+
 + (instancetype)shareInstance {
     MineBottomView *view = [[[NSBundle mainBundle] loadNibNamed:@"MineBottomView" owner:nil options:nil] firstObject];
     return view;

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/View/MineFunctionView.m

@@ -22,7 +22,10 @@
 @end
 
 @implementation MineFunctionView
-
+- (void)awakeFromNib {
+    [super awakeFromNib];
+    self.isTestUser = YES;
+}
 
 + (instancetype)shareInstance {
     MineFunctionView *view = [[[NSBundle mainBundle] loadNibNamed:@"MineFunctionView" owner:nil options:nil] firstObject];