|
@@ -12,7 +12,6 @@
|
|
#import "ProgramCourseGroupBodyView.h"
|
|
#import "ProgramCourseGroupBodyView.h"
|
|
#import "StudentCourseGroupDetailModel.h"
|
|
#import "StudentCourseGroupDetailModel.h"
|
|
#import "MusicRoomGroupHeadView.h"
|
|
#import "MusicRoomGroupHeadView.h"
|
|
-#import "MusicRoomStudentPageView.h"
|
|
|
|
|
|
|
|
@interface MusicRoomGroupViewController ()<JXPagerViewDelegate,JXCategoryViewDelegate,JXPagerMainTableViewGestureDelegate>
|
|
@interface MusicRoomGroupViewController ()<JXPagerViewDelegate,JXCategoryViewDelegate,JXPagerMainTableViewGestureDelegate>
|
|
|
|
|
|
@@ -62,8 +61,8 @@
|
|
make.left.right.top.mas_equalTo(self.view);
|
|
make.left.right.top.mas_equalTo(self.view);
|
|
make.height.mas_equalTo(navHeight);
|
|
make.height.mas_equalTo(navHeight);
|
|
}];
|
|
}];
|
|
- self.headHeight = 44.0f;
|
|
|
|
- self.titles = @[@"课程列表",@"上课学生"];
|
|
|
|
|
|
+ self.headHeight = CGFLOAT_MIN;
|
|
|
|
+ self.titles = @[@""];
|
|
[self configCategoryView:navHeight];
|
|
[self configCategoryView:navHeight];
|
|
}
|
|
}
|
|
|
|
|
|
@@ -105,12 +104,6 @@
|
|
self.categoryView.titleColor = HexRGB(0x666666);
|
|
self.categoryView.titleColor = HexRGB(0x666666);
|
|
self.categoryView.titleColorGradientEnabled = YES;
|
|
self.categoryView.titleColorGradientEnabled = YES;
|
|
|
|
|
|
- JXCategoryIndicatorLineView *lineView = [[JXCategoryIndicatorLineView alloc] init];
|
|
|
|
- lineView.indicatorColor = THEMECOLOR;
|
|
|
|
- lineView.indicatorWidth = 16;
|
|
|
|
- lineView.indicatorHeight = 4;
|
|
|
|
- self.categoryView.indicators = @[lineView];
|
|
|
|
-
|
|
|
|
_pagerView = [self preferredPagingView];
|
|
_pagerView = [self preferredPagingView];
|
|
self.pagerView.frame = CGRectMake(0, topHeight, KPortraitWidth, KPortraitHeight - topHeight);
|
|
self.pagerView.frame = CGRectMake(0, topHeight, KPortraitWidth, KPortraitHeight - topHeight);
|
|
self.pagerView.backgroundColor = [UIColor clearColor];
|
|
self.pagerView.backgroundColor = [UIColor clearColor];
|
|
@@ -178,28 +171,15 @@
|
|
}
|
|
}
|
|
|
|
|
|
- (id<JXPagerViewListViewDelegate>)pagerView:(JXPagerView *)pagerView initListAtIndex:(NSInteger)index {
|
|
- (id<JXPagerViewListViewDelegate>)pagerView:(JXPagerView *)pagerView initListAtIndex:(NSInteger)index {
|
|
- if (index == 0) {
|
|
|
|
- ProgramCourseGroupBodyView *listView = [[ProgramCourseGroupBodyView alloc] init];
|
|
|
|
- listView.naviController = self.navigationController;
|
|
|
|
- listView.selectIndex = index;
|
|
|
|
- listView.courseGroupId = self.courseGroupId;
|
|
|
|
- listView.courseType = COURSE_GROUP_TYPE_MUSICROOM;
|
|
|
|
- [self.listViewArray replaceObjectAtIndex:index withObject:listView];
|
|
|
|
- self.listViewArray[index] = listView;
|
|
|
|
- [listView beginFirstRefresh];
|
|
|
|
- return listView;
|
|
|
|
- }
|
|
|
|
- else {
|
|
|
|
- MusicRoomStudentPageView *listView = [[MusicRoomStudentPageView alloc] init];
|
|
|
|
- listView.naviController = self.navigationController;
|
|
|
|
- listView.selectIndex = index;
|
|
|
|
- listView.courseGroupId = self.courseGroupId;
|
|
|
|
- [self.listViewArray replaceObjectAtIndex:index withObject:listView];
|
|
|
|
- self.listViewArray[index] = listView;
|
|
|
|
- [listView beginFirstRefresh];
|
|
|
|
- return listView;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
|
|
+ ProgramCourseGroupBodyView *listView = [[ProgramCourseGroupBodyView alloc] init];
|
|
|
|
+ listView.naviController = self.navigationController;
|
|
|
|
+ listView.selectIndex = index;
|
|
|
|
+ listView.courseGroupId = self.courseGroupId;
|
|
|
|
+ listView.courseType = COURSE_GROUP_TYPE_MUSICROOM;
|
|
|
|
+ [self.listViewArray replaceObjectAtIndex:index withObject:listView];
|
|
|
|
+ self.listViewArray[index] = listView;
|
|
|
|
+ [listView beginFirstRefresh];
|
|
|
|
+ return listView;
|
|
}
|
|
}
|
|
|
|
|
|
- (void)pagerView:(JXPagerView *)pagerView mainTableViewDidScroll:(UIScrollView *)scrollView {
|
|
- (void)pagerView:(JXPagerView *)pagerView mainTableViewDidScroll:(UIScrollView *)scrollView {
|
|
@@ -254,7 +234,7 @@
|
|
}
|
|
}
|
|
- (NSMutableArray *)listViewArray {
|
|
- (NSMutableArray *)listViewArray {
|
|
if (!_listViewArray) {
|
|
if (!_listViewArray) {
|
|
- _listViewArray = [NSMutableArray arrayWithArray:@[@"",@""]];
|
|
|
|
|
|
+ _listViewArray = [NSMutableArray arrayWithArray:@[@""]];
|
|
}
|
|
}
|
|
return _listViewArray;
|
|
return _listViewArray;
|
|
}
|
|
}
|