声部处理

KulexiuForStudent/KulexiuForStudent/Module/Home/ArrangeCourse/Controller/HomeArrangeCourseController.m

@@ -40,6 +40,7 @@
     // Do any additional setup after loading the view.
     self.ks_prefersNavigationBarHidden = YES;
     [self configUI];
+    [self requestSubjectList];
 }
 
 - (void)configUI {
@@ -57,8 +58,6 @@
         make.left.right.top.mas_equalTo(self.view);
         make.height.mas_equalTo(navHeight);
     }];
-    
-    [self configCategoryView:navHeight];
 }
 
 - (void)configCategoryView:(NSInteger)topHeight {
@@ -101,7 +100,6 @@
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
     self.navigationController.interactivePopGestureRecognizer.enabled = YES;
-     [self requestSubjectList];
     // 页面appear 禁用
     [IQKeyboardManager sharedManager].enable = NO;
 }
@@ -111,6 +109,7 @@
     // 页面Disappear 启用
     [IQKeyboardManager sharedManager].enable = YES;
 }
+
 - (void)requestSubjectList {
     [KSNetworkingManager subjectQueryPageRequest:KS_GET success:^(NSDictionary * _Nonnull dic) {
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
@@ -123,16 +122,21 @@
                 [subjectParmArray addObject:orchestParm];
             }
             self.subjectList = [subjectParmArray mutableCopy];
-            [self refreshSubjectMessage];
         }
         else{
             [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
         }
+        [self configCategoryView];
     } faliure:^(NSError * _Nonnull error) {
-        
+        [self configCategoryView];
     }];
 }
 
+- (void)configCategoryView {
+    CGFloat navHeight = [HomeArrangeNavView getViewHeight];
+    [self configCategoryView:navHeight];
+}
+
 - (void)refreshSubjectMessage {
     for (NSInteger index = 0; index < self.listViewArray.count; index++) {
         id view = self.listViewArray[index];

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

@@ -82,16 +82,11 @@
                 [weakSelf.tableView.mj_footer endRefreshingWithNoMoreData];
             }
         }];
-        [self defaultSubject];
     }
     return self;
 }
 
-- (void)defaultSubject {
-    self.subjectIndex = 0;
-    self.subjectId = USER_MANAGER.userInfo.subjectId;
-    self.searchView.subjectLabel.text = [NSString returnNoNullStringWithString:USER_MANAGER.userInfo.subjectName];
-}
+
 
 - (void)refreshAndRequestData {
     [self resetParamenter];
@@ -354,6 +349,23 @@
     }
     return isExistenceNetwork;
 }
+
+- (void)setSubjectList:(NSMutableArray *)subjectList {
+    _subjectList = subjectList;
+    [self defaultSubject:subjectList];
+}
+- (void)defaultSubject:(NSMutableArray *)subjectList {
+    
+    self.subjectId = USER_MANAGER.userInfo.subjectId;
+    self.searchView.subjectLabel.text = [NSString returnNoNullStringWithString:USER_MANAGER.userInfo.subjectName];
+    for (NSInteger index = 0; index < subjectList.count; index++) {
+        NSDictionary *parm = subjectList[index];
+        if ([[parm ks_stringValueForKey:@"subjectId"] isEqualToString:self.subjectId]) {
+            self.subjectIndex = index;
+            break;
+        }
+    }
+}
 /*
 // Only override drawRect: if you perform custom drawing.
 // An empty implementation adversely affects performance during animation.

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

@@ -35,6 +35,8 @@
 
 @property (nonatomic, strong) NSString *subjectId;
 
+@property (nonatomic, assign) NSInteger subjectIndex;
+
 @end
 
 @implementation HomeArrangeLiveCourseView
@@ -69,16 +71,10 @@
                 [weakSelf.collectionView.mj_footer endRefreshingWithNoMoreData];
             }
         }];
-        [self defaultSubject];
     }
     return self;
 }
 
-- (void)defaultSubject {
-    self.subjectId = USER_MANAGER.userInfo.subjectId;
-    self.searchView.subjectLabel.text = [NSString returnNoNullStringWithString:USER_MANAGER.userInfo.subjectName];
-}
-
 - (void)endRefresh {
     @weakObj(self);
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
@@ -314,8 +310,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"];
@@ -330,6 +326,23 @@
     }
 }
 
+- (void)setSubjectList:(NSMutableArray *)subjectList {
+    _subjectList = subjectList;
+    [self defaultSubject:subjectList];
+}
+
+- (void)defaultSubject:(NSMutableArray *)subjectList {
+    
+    self.subjectId = USER_MANAGER.userInfo.subjectId;
+    self.searchView.subjectLabel.text = [NSString returnNoNullStringWithString:USER_MANAGER.userInfo.subjectName];
+    for (NSInteger index = 0; index < subjectList.count; index++) {
+        NSDictionary *parm = subjectList[index];
+        if ([[parm ks_stringValueForKey:@"subjectId"] isEqualToString:self.subjectId]) {
+            self.subjectIndex = index;
+            break;
+        }
+    }
+}
 /*
 // Only override drawRect: if you perform custom drawing.
 // An empty implementation adversely affects performance during animation.

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

@@ -82,16 +82,11 @@
                 [weakSelf.tableView.mj_footer endRefreshingWithNoMoreData];
             }
         }];
-        [self defaultSubject];
     }
     return self;
 }
 
-- (void)defaultSubject {
-    self.subjectIndex = 0;
-    self.subjectId = USER_MANAGER.userInfo.subjectId;
-    self.searchView.subjectLabel.text = [NSString returnNoNullStringWithString:USER_MANAGER.userInfo.subjectName];
-}
+
 
 - (void)refreshAndRequestData {
     [self resetParamenter];
@@ -355,6 +350,23 @@
     return isExistenceNetwork;
 }
 
+- (void)setSubjectList:(NSMutableArray *)subjectList {
+    _subjectList = subjectList;
+    [self defaultSubject:subjectList];
+}
+
+- (void)defaultSubject:(NSMutableArray *)subjectList {
+    
+    self.subjectId = USER_MANAGER.userInfo.subjectId;
+    self.searchView.subjectLabel.text = [NSString returnNoNullStringWithString:USER_MANAGER.userInfo.subjectName];
+    for (NSInteger index = 0; index < subjectList.count; index++) {
+        NSDictionary *parm = subjectList[index];
+        if ([[parm ks_stringValueForKey:@"subjectId"] isEqualToString:self.subjectId]) {
+            self.subjectIndex = index;
+            break;
+        }
+    }
+}
 /*
 // Only override drawRect: if you perform custom drawing.
 // An empty implementation adversely affects performance during animation.

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

@@ -35,6 +35,8 @@
 
 @property (nonatomic, strong) NSString *subjectId;
 
+@property (nonatomic, assign) NSInteger subjectIndex;
+
 @end
 
 @implementation HomeArrangeVideoCourseView
@@ -71,16 +73,10 @@
                 [weakSelf.tableView.mj_footer endRefreshingWithNoMoreData];
             }
         }];
-        [self defaultSubject];
     }
     return self;
 }
 
-- (void)defaultSubject {
-    self.subjectId = USER_MANAGER.userInfo.subjectId;
-    self.searchView.subjectLabel.text = [NSString returnNoNullStringWithString:USER_MANAGER.userInfo.subjectName];
-}
-
 - (void)refreshAndRequestData {
     [self resetParamenter];
     [self requestData];
@@ -241,8 +237,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"];
@@ -318,6 +314,23 @@
     }
     return isExistenceNetwork;
 }
+
+- (void)setSubjectList:(NSMutableArray *)subjectList {
+    _subjectList = subjectList;
+    [self defaultSubject:subjectList];
+}
+- (void)defaultSubject:(NSMutableArray *)subjectList {
+    
+    self.subjectId = USER_MANAGER.userInfo.subjectId;
+    self.searchView.subjectLabel.text = [NSString returnNoNullStringWithString:USER_MANAGER.userInfo.subjectName];
+    for (NSInteger index = 0; index < subjectList.count; index++) {
+        NSDictionary *parm = subjectList[index];
+        if ([[parm ks_stringValueForKey:@"subjectId"] isEqualToString:self.subjectId]) {
+            self.subjectIndex = index;
+            break;
+        }
+    }
+}
 /*
 // Only override drawRect: if you perform custom drawing.
 // An empty implementation adversely affects performance during animation.