推送相关

KulexiuForTeacher/KulexiuForTeacher/AppDelegate.m

@@ -45,6 +45,7 @@
 
 #import "FeedbackListViewController.h"
 #import "MinePageViewController.h"
+#import "MyGroupCourseViewController.h"
 
 @interface AppDelegate ()<JPUSHRegisterDelegate>
 
@@ -678,6 +679,10 @@ didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
                         index = DISPLAY_INDEX_FIRST;
                         [self toMyCourse:index];
                     }
+                    else if ([pageType isEqualToString:@"groupClass"]) {  // 我的课程 ->小组课
+                        DISPLAY_INDEX index = DISPLAY_INDEX_GROUP;
+                        [self toMyCourse:index];
+                    }
                     else if ([pageType isEqualToString:@"liveClass"]) { // 我的课程 ->直播课
                         index = DISPLAY_INDEX_LIVE;
                         [self toMyCourse:index];
@@ -689,6 +694,9 @@ didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
                     else if ([pageType isEqualToString:@"homepage"]) { // 跳转老师个人主页
                         [self toUserHomepage];
                     }
+                    else if ([pageType isEqualToString:@"groupCourseCancel"]) { // 小组课取消
+                        [self toGroupCancelPage];
+                    }
                 }
                 else {  // 空 或者 h5
                     NSString *webUrl = [dict ks_stringValueForKey:@"url"];
@@ -760,6 +768,10 @@ didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
             DISPLAY_INDEX index = DISPLAY_INDEX_FIRST;
             [self toMyCourse:index];
         }
+        else if ([pageType isEqualToString:@"groupClass"]) {  // 我的课程 ->小组课
+            DISPLAY_INDEX index = DISPLAY_INDEX_GROUP;
+            [self toMyCourse:index];
+        }
         else if ([pageType isEqualToString:@"liveClass"]) { // 我的课程 ->直播课
             DISPLAY_INDEX index = DISPLAY_INDEX_LIVE;
             [self toMyCourse:index];
@@ -771,6 +783,9 @@ didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
         else if ([pageType isEqualToString:@"buyPractice"] || [pageType isEqualToString:@"courseRemind"]) { // 课表
             [self toCourseTable];
         }
+        else if ([pageType isEqualToString:@"groupCourseCancel"]) { // 小组课取消
+            [self toGroupCancelPage];
+        }
         else if ([pageType isEqualToString:@"evaluate"]) { // 评价列表
             [self toEvaluateList];
         }
@@ -810,6 +825,22 @@ didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
     }
 }
 
+- (void)toGroupCancelPage {
+    UIViewController *vc = [UIApplication sharedApplication].keyWindow.rootViewController;
+    if ([vc isKindOfClass:[UITabBarController class]]) {
+        KSTabBarViewController *tabCtrl = (KSTabBarViewController *)vc;
+        CustomNavViewController *navCtrl = (CustomNavViewController *)tabCtrl.selectedViewController;
+        if ([navCtrl.visibleViewController isKindOfClass:NSClassFromString(@"MyGroupCourseViewController")]) {
+            return;
+        }
+        else {
+            MyGroupCourseViewController *ctrl = [[MyGroupCourseViewController alloc] init];
+            [ctrl scrollToLastPage];
+            [navCtrl pushViewController:ctrl animated:YES];
+        }
+    }
+}
+
 // 跳转到课表
 - (void)toCourseTable {
     [self.tabBarController tabBarSelectedWithIndex:1];

KulexiuForTeacher/KulexiuForTeacher/Module/Course/MusicRoom/Controller/MusicRoomViewController.m

@@ -90,12 +90,10 @@
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
     [self requestCourseInfoMessage];
-    [self configStatusViewColorWhite:YES];
 }
 
 - (void)viewWillDisappear:(BOOL)animated {
     [super viewWillDisappear:animated];
-    [self configStatusViewColorWhite:NO];
 }
 
 - (void)requestCourseInfoMessage {

KulexiuForTeacher/KulexiuForTeacher/Module/Course/MyGroupCourse/View/GroupCourseListCell.xib

@@ -138,6 +138,9 @@
                                                 <real key="value" value="11"/>
                                             </userDefinedRuntimeAttribute>
                                         </userDefinedRuntimeAttributes>
+                                        <connections>
+                                            <action selector="enterClassRoom:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="WAA-WW-EvT"/>
+                                        </connections>
                                     </button>
                                 </subviews>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>

KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/Controller/MyCourseViewController.h

@@ -12,6 +12,7 @@
 typedef NS_ENUM(NSInteger, DISPLAY_INDEX) {
     DISPLAY_INDEX_VIP = 0,    // VIP定制
     DISPLAY_INDEX_FIRST,      // 趣纠课
+    DISPLAY_INDEX_GROUP,      // 小组课
     DISPLAY_INDEX_LIVE,       // 直播课
     DISPLAY_INDEX_VIDEO,       // 视频课
     DISPLAY_INDEX_MUSIC,      // 琴房课

KulexiuForTeacher/KulexiuForTeacher/Module/Home/NotiferMessage/Controller/NotiferMessageViewController.m

@@ -20,6 +20,7 @@
 #import "FeedbackListViewController.h"
 #import "MyCourseViewController.h"
 #import "MinePageViewController.h"
+#import "MyGroupCourseViewController.h"
 
 @interface NotiferMessageViewController ()<UITableViewDelegate, UITableViewDataSource>
 
@@ -288,6 +289,12 @@
                     [ctrl displayWithIndex:index];
                     [self.navigationController pushViewController:ctrl animated:YES];
                 }
+                else if ([pageType isEqualToString:@"groupClass"]) {  // 我的课程 ->小组课
+                    DISPLAY_INDEX index = DISPLAY_INDEX_GROUP;
+                    MyCourseViewController *ctrl = [[MyCourseViewController alloc] init];
+                    [ctrl displayWithIndex:index];
+                    [self.navigationController pushViewController:ctrl animated:YES];
+                }
                 else if ([pageType isEqualToString:@"liveClass"]) { // 我的课程 ->直播课
                     DISPLAY_INDEX index = DISPLAY_INDEX_LIVE;
                     MyCourseViewController *ctrl = [[MyCourseViewController alloc] init];
@@ -300,6 +307,11 @@
                     [ctrl displayWithIndex:index];
                     [self.navigationController pushViewController:ctrl animated:YES];
                 }
+                else if ([pageType isEqualToString:@"groupCourseCancel"]) { // 小组课取消
+                    MyGroupCourseViewController *ctrl = [[MyGroupCourseViewController alloc] init];
+                    [ctrl scrollToLastPage];
+                    [self.navigationController pushViewController:ctrl animated:YES];
+                }
                 else if ([pageType isEqualToString:@"homepage"]) { // 个人主页
                     MinePageViewController *pageCtrl = [[MinePageViewController alloc] init];
                     [self.navigationController pushViewController:pageCtrl animated:YES];

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

@@ -737,8 +737,9 @@
     else {
         self.navView.headTitle.hidden = YES;
         self.navView.lineView.hidden = YES;
-        CGFloat rate = space / kNaviBarHeight < 0 ? 0 : space / kNaviBarHeight;
-        self.navView.backgroundColor = HexRGBAlpha(0xffffff, rate);
+//        CGFloat rate = space / kNaviBarHeight < 0 ? 0 : space / kNaviBarHeight;
+//        self.navView.backgroundColor = HexRGBAlpha(0xffffff, rate);
+        self.navView.backgroundColor = HexRGB(0xffffff);
     }
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/CroupCourse/Controller/MyGroupCourseViewController.h

@@ -17,6 +17,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong, readonly) JXCategoryTitleView *categoryView;
 @property (nonatomic, strong) NSArray <NSString *> *titles;
 
+- (void)scrollToLastPage;
+
 @end
 
 NS_ASSUME_NONNULL_END

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/CroupCourse/Controller/MyGroupCourseViewController.m

@@ -23,10 +23,17 @@
 
 @property (nonatomic, strong) TeacherInfo *teacherInfo;
 
+@property (nonatomic, assign) NSInteger displayIndex;
+
+
 @end
 
 @implementation MyGroupCourseViewController
 
+- (void)scrollToLastPage {
+    self.displayIndex = 4;
+}
+
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
@@ -69,6 +76,9 @@
     self.categoryView.listContainer = (id<JXCategoryViewListContainer>)self.pagerView.listContainerView;
     self.pagerView.listContainerView.listCellBackgroundColor = [UIColor clearColor];
     [self.view addSubview:self.pagerView];
+    if (self.displayIndex != 0) {
+        [self.categoryView setDefaultSelectedIndex:self.displayIndex];
+    }
 }
 
 - (void)rightBtnClick {