nothing

KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/EmptyStatus/empty_course_grey.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "empty_course_grey@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "empty_course_grey@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Controller/MineViewController.m

@@ -139,7 +139,7 @@
         make.height.mas_equalTo(height);
     }];
     self.normalFunctionView.isMember = isMember;
-    self.normalFunctionView.isTestUser = self.mineInfo.isTestUser;
+    self.normalFunctionView.isSettlement = self.mineInfo.isSettlement;
     [self.normalFunctionView configView];
     CGFloat functionHeight = [self.normalFunctionView getViewHeight];
     [self.normalFunctionView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -155,7 +155,7 @@
     }];
 
     self.bottomView.isMember = isMember;
-    self.bottomView.isTestUser = self.mineInfo.isTestUser;
+    self.bottomView.isSettlement = self.mineInfo.isSettlement;
     CGFloat bottomViewHeight = [self.bottomView getViewHeight];
     [self.bottomView mas_updateConstraints:^(MASConstraintMaker *make) {
         make.height.mas_equalTo(bottomViewHeight);

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/Controller/MinePageViewController.m

@@ -74,7 +74,8 @@
     self.categoryView.indicators = @[lineView];
     
     _pagerView = [self preferredPagingView];
-    self.pagerView.frame = CGRectMake(0, topHeight, kScreenWidth, kScreenHeight - iPhoneXSafeBottomMargin - topHeight);
+    self.pagerView.frame = CGRectMake(0, topHeight, KPortraitWidth, KPortraitHeight - iPhoneXSafeBottomMargin - topHeight);
+//    self.pagerView.automaticallyDisplayListVerticalScrollIndicator = NO;
     self.pagerView.mainTableView.gestureDelegate = self;
     self.pagerView.backgroundColor = [UIColor clearColor];
     self.pagerView.mainTableView.backgroundColor = [UIColor clearColor];
@@ -144,8 +145,13 @@
             [listView beginFirstRefresh];
         }
     }
+    [IQKeyboardManager sharedManager].enable = NO;
 }
 
+- (void)viewWillDisappear:(BOOL)animated {
+    [super viewWillDisappear:animated];
+    [IQKeyboardManager sharedManager].enable = YES;
+}
 - (void)viewDidAppear:(BOOL)animated {
     [super viewDidAppear:animated];
     self.navigationController.interactivePopGestureRecognizer.enabled = (self.categoryView.selectedIndex == 0);

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

@@ -122,7 +122,7 @@
     
     self.dataArray = [NSMutableArray array];
     [self.tableView.mj_footer resetNoMoreData];
-    [self setPromptString:@"暂无课程～" imageName:@"empty_course" inView:self.tableView];
+    [self setPromptString:@"本月没有课程" imageName:@"empty_course_grey" inView:self.tableView];
     [self.tableView reloadData];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MinePageSort/MinePageSortView.m

@@ -59,7 +59,7 @@
         {
             self.sortTitleLabel.text = @"我的直播课";
             self.actionLabel.text = @"创建课程";
-            self.timeView.hidden = NO;
+            self.timeView.hidden = YES;
         }
             break;
         case SORTVIEWTYPE_VIDEO:

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

@@ -89,7 +89,7 @@
     self.rows = 10;
     self.dataArray = [NSMutableArray array];
     [self.collectionView.mj_footer resetNoMoreData];
-    [self setPromptString:@"暂无课程～" imageName:@"empty_course" inView:self.collectionView];
+    [self setPromptString:@"本月没有课程" imageName:@"empty_course_grey" inView:self.collectionView];
     [self.collectionView reloadData];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Model/TeacherInfo.h

@@ -53,7 +53,7 @@
 @property (nonatomic, assign) NSInteger degreeFlag;
 @property (nonatomic, assign) NSInteger teacherFlag;
 
-@property (nonatomic, assign) NSInteger isTestUser;
+@property (nonatomic, assign) NSInteger isSettlement;
 
 + (instancetype)modelObjectWithDictionary:(NSDictionary *)dict;
 - (instancetype)initWithDictionary:(NSDictionary *)dict;

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Model/TeacherInfo.m

@@ -48,7 +48,7 @@ NSString *const kTeacherInfoIsVip = @"isVip";
 NSString *const kTeacherInfoMembershipDays = @"membershipDays";
 NSString *const kTeacherInfoDegreeFlag= @"degreeFlag";
 NSString *const kTeacherInfoTeacherFlag = @"teacherFlag";
-NSString *const kTeacherInfoIsTestUser = @"isTestUser";
+NSString *const kTeacherInfoIsSettlement = @"isSettlement";
 
 @interface TeacherInfo ()
 
@@ -98,7 +98,7 @@ NSString *const kTeacherInfoIsTestUser = @"isTestUser";
 @synthesize membershipDays = _membershipDays;
 @synthesize degreeFlag = _degreeFlag;
 @synthesize teacherFlag = _teacherFlag;
-@synthesize isTestUser = _isTestUser;
+@synthesize isSettlement = _isSettlement;
 
 + (instancetype)modelObjectWithDictionary:(NSDictionary *)dict
 {
@@ -152,7 +152,7 @@ NSString *const kTeacherInfoIsTestUser = @"isTestUser";
             self.membershipDays = [[self objectOrNilForKey:kTeacherInfoMembershipDays fromDictionary:dict] doubleValue];
         self.degreeFlag = [[self objectOrNilForKey:kTeacherInfoDegreeFlag fromDictionary:dict] integerValue];
         self.teacherFlag = [[self objectOrNilForKey:kTeacherInfoTeacherFlag fromDictionary:dict] integerValue];
-        self.isTestUser = [[self objectOrNilForKey:kTeacherInfoIsTestUser fromDictionary:dict] integerValue];
+        self.isSettlement = [[self objectOrNilForKey:kTeacherInfoIsSettlement fromDictionary:dict] integerValue];
     }
     
     return self;
@@ -202,7 +202,7 @@ NSString *const kTeacherInfoIsTestUser = @"isTestUser";
     [mutableDict setValue:[NSNumber numberWithDouble:self.membershipDays] forKey:kTeacherInfoMembershipDays];
     [mutableDict setValue:[NSNumber numberWithInteger:self.degreeFlag] forKey:kTeacherInfoDegreeFlag];
     [mutableDict setValue:[NSNumber numberWithInteger:self.teacherFlag] forKey:kTeacherInfoTeacherFlag];
-    [mutableDict setValue:[NSNumber numberWithInteger:self.isTestUser] forKey:kTeacherInfoIsTestUser];
+    [mutableDict setValue:[NSNumber numberWithInteger:self.isSettlement] forKey:kTeacherInfoIsSettlement];
     return [NSDictionary dictionaryWithDictionary:mutableDict];
 }
 
@@ -269,7 +269,7 @@ NSString *const kTeacherInfoIsTestUser = @"isTestUser";
     self.membershipDays = [aDecoder decodeDoubleForKey:kTeacherInfoMembershipDays];
     self.degreeFlag = [aDecoder decodeIntegerForKey:kTeacherInfoDegreeFlag];
     self.teacherFlag = [aDecoder decodeIntegerForKey:kTeacherInfoTeacherFlag];
-    self.isTestUser = [aDecoder decodeIntegerForKey:kTeacherInfoIsTestUser];
+    self.isSettlement = [aDecoder decodeIntegerForKey:kTeacherInfoIsSettlement];
     return self;
 }
 
@@ -316,7 +316,7 @@ NSString *const kTeacherInfoIsTestUser = @"isTestUser";
     [aCoder encodeDouble:_membershipDays forKey:kTeacherInfoMembershipDays];
     [aCoder encodeInteger:_degreeFlag forKey:kTeacherInfoDegreeFlag];
     [aCoder encodeInteger:_teacherFlag forKey:kTeacherInfoTeacherFlag];
-    [aCoder encodeInteger:_isTestUser forKey:kTeacherInfoIsTestUser];
+    [aCoder encodeInteger:_isSettlement forKey:kTeacherInfoIsSettlement];
 }
 
 - (id)copyWithZone:(NSZone *)zone
@@ -324,7 +324,7 @@ NSString *const kTeacherInfoIsTestUser = @"isTestUser";
     TeacherInfo *copy = [[TeacherInfo alloc] init];
     
     if (copy) {
-
+        
         copy.birthdate = [self.birthdate copyWithZone:zone];
         copy.graduateSchool = [self.graduateSchool copyWithZone:zone];
         copy.workUnit = [self.workUnit copyWithZone:zone];
@@ -365,9 +365,8 @@ NSString *const kTeacherInfoIsTestUser = @"isTestUser";
         copy.membershipDays = self.membershipDays;
         copy.degreeFlag = self.degreeFlag;
         copy.teacherFlag = self.teacherFlag;
-        copy.isTestUser = self.isTestUser;
+        copy.isSettlement = self.isSettlement;
     }
-    
     return copy;
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/View/MineBottomView.h

@@ -14,7 +14,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, assign) BOOL isMember;
 
-@property (nonatomic, assign) BOOL isTestUser;
+@property (nonatomic, assign) BOOL isSettlement; // 是否结算 1 结算
 
 @property (weak, nonatomic) IBOutlet UILabel *shareAmountLabel;
 

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

@@ -25,7 +25,7 @@
 
 - (void)awakeFromNib {
     [super awakeFromNib];
-    self.isTestUser = YES;
+    self.isSettlement = NO;
 }
 
 + (instancetype)shareInstance {
@@ -44,7 +44,7 @@
     if (self.isMember == NO) {
         defaultHeight -= 60.0f;
     }
-    if (self.isTestUser) {
+    if (self.isSettlement == NO) {
         defaultHeight -= 60.0f;
     }
     CGFloat viewHeight = defaultHeight;
@@ -63,18 +63,19 @@
     }
 }
 
-- (void)setIsTestUser:(BOOL)isTestUser {
-    _isTestUser = isTestUser;
-    if (isTestUser) {
-        self.spreadView.hidden = YES;
-        self.spreadViewHeight.constant = 0.0f;
-    }
-    else {
+- (void)setIsSettlement:(BOOL)isSettlement {
+    _isSettlement = isSettlement;
+    if (isSettlement) {
         self.spreadView.hidden = NO;
         self.spreadViewHeight.constant = 60.0f;
     }
+    else {
+        self.spreadView.hidden = YES;
+        self.spreadViewHeight.constant = 0.0f;
+    }
 }
 
+
 - (IBAction)tapAction:(UITapGestureRecognizer *)sender {
     NSInteger index = sender.view.tag;
     

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/View/MineFunctionView.h

@@ -14,7 +14,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, assign) BOOL isMember;
 
-@property (nonatomic, assign) BOOL isTestUser;
+@property (nonatomic, assign) BOOL isSettlement;
 
 
 + (instancetype)shareInstance;

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

@@ -24,7 +24,7 @@
 @implementation MineFunctionView
 - (void)awakeFromNib {
     [super awakeFromNib];
-    self.isTestUser = YES;
+    self.isSettlement = NO;
 }
 
 + (instancetype)shareInstance {
@@ -37,7 +37,7 @@
     CGFloat space = (KPortraitWidth - 28 - 4 * FUNCTIONVIEW_WIDTH) / 5.0f;
     BOOL skipView = NO;
     for (NSInteger index = 0; index < self.imageArray.count; index++) {
-        if (self.isTestUser && index == 1) {
+        if (self.isSettlement == NO && index == 1) {
             skipView = YES;
             continue;
         }

KulexiuForTeacher/Podfile

@@ -18,8 +18,8 @@
   pod 'Reachability', '~> 3.2'
   pod 'JCore', '2.7.1-noidfa'
   pod 'JPush', '4.3.0'
-  pod 'JXCategoryView'
-  pod 'JXPagingView/Pager'
+#  pod 'JXCategoryView'
+#  pod 'JXPagingView/Pager'
   pod 'Bugly'
   pod 'Whiteboard'
   pod 'RSKImageCropper'