推送相关

KulexiuForStudent/KulexiuForStudent.xcodeproj/xcshareddata/xcschemes/KulexiuForStudent.xcscheme

@@ -92,7 +92,7 @@
       buildConfiguration = "Debug">
    </AnalyzeAction>
    <ArchiveAction
-      buildConfiguration = "DEV"
+      buildConfiguration = "TEST"
       revealArchiveInOrganizer = "YES">
    </ArchiveAction>
 </Scheme>

KulexiuForStudent/KulexiuForStudent/AppDelegate.m

@@ -778,16 +778,16 @@ didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
                 }
                 else {
                     [self.tabBarController tabBarSelectedWithIndex:3];
-                    CustomNavViewController *navCtrl = self.tabBarController.selectedViewController;
+                    CustomNavViewController *currentNavCtrl = self.tabBarController.selectedViewController;
                     TenantNotiferCenterController *ctrl = [[TenantNotiferCenterController alloc] init];
-                    [navCtrl pushViewController:ctrl animated:YES];
+                    [currentNavCtrl pushViewController:ctrl animated:YES];
                 }
             }
             else {
                 [self.tabBarController tabBarSelectedWithIndex:3];
-                CustomNavViewController *navCtrl = self.tabBarController.selectedViewController;
+                CustomNavViewController *currentNavCtrl = self.tabBarController.selectedViewController;
                 TenantNotiferCenterController *ctrl = [[TenantNotiferCenterController alloc] init];
-                [navCtrl pushViewController:ctrl animated:YES];
+                [currentNavCtrl pushViewController:ctrl animated:YES];
             }
         }
     }
@@ -883,16 +883,16 @@ didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
                     }
                     else {
                         [self.tabBarController tabBarSelectedWithIndex:0];
-                        CustomNavViewController *navCtrl = self.tabBarController.selectedViewController;
+                        CustomNavViewController *currentNavCtrl = self.tabBarController.selectedViewController;
                         NotiferMessageViewController *ctrl = [[NotiferMessageViewController alloc] init];
                         [navCtrl pushViewController:ctrl animated:YES];
                     }
                 }
                 else {
                     [self.tabBarController tabBarSelectedWithIndex:0];
-                    CustomNavViewController *navCtrl = self.tabBarController.selectedViewController;
+                    CustomNavViewController *currentNavCtrl = self.tabBarController.selectedViewController;
                     NotiferMessageViewController *ctrl = [[NotiferMessageViewController alloc] init];
-                    [navCtrl pushViewController:ctrl animated:YES];
+                    [currentNavCtrl pushViewController:ctrl animated:YES];
                 }
             }
             else if ([pageType isEqualToString:@"feedback"]) { //反馈
@@ -934,16 +934,16 @@ didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
                     }
                     else {
                         [self.tabBarController tabBarSelectedWithIndex:0];
-                        CustomNavViewController *navCtrl = self.tabBarController.selectedViewController;
+                        CustomNavViewController *currentNavCtrl = self.tabBarController.selectedViewController;
                         NotiferMessageViewController *ctrl = [[NotiferMessageViewController alloc] init];
-                        [navCtrl pushViewController:ctrl animated:YES];
+                        [currentNavCtrl pushViewController:ctrl animated:YES];
                     }
                 }
                 else {
                     [self.tabBarController tabBarSelectedWithIndex:0];
-                    CustomNavViewController *navCtrl = self.tabBarController.selectedViewController;
+                    CustomNavViewController *currentNavCtrl = self.tabBarController.selectedViewController;
                     NotiferMessageViewController *ctrl = [[NotiferMessageViewController alloc] init];
-                    [navCtrl pushViewController:ctrl animated:YES];
+                    [currentNavCtrl pushViewController:ctrl animated:YES];
                 }
             }
         }
@@ -960,10 +960,22 @@ didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
 }
 
 - (void)toMyCourseWithPage:(DISPLAY_INDEX)displayIndex {
-    MyCourseViewController *ctrl = [[MyCourseViewController alloc] init];
-    [ctrl displayWithIndex:displayIndex];
-    CustomNavViewController *navCtrl = self.tabBarController.selectedViewController;
-    [navCtrl pushViewController:ctrl animated:YES];
+    
+    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(@"MyCourseViewController")]) {
+            MyCourseViewController *ctrl = (MyCourseViewController *)navCtrl.visibleViewController;
+            [ctrl selectedPageWithIndex:displayIndex];
+            return;
+        }
+        else {
+            MyCourseViewController *ctrl = [[MyCourseViewController alloc] init];
+            [ctrl displayWithIndex:displayIndex];
+            [navCtrl pushViewController:ctrl animated:YES];
+        }
+    }
 }
 
 - (void)toFeedback {

KulexiuForStudent/KulexiuForStudent/Module/Mine/Homework/View/CourseEvaluateAlertView.xib

@@ -113,11 +113,11 @@
                             <rect key="frame" x="14" y="67" width="365" height="86"/>
                             <subviews>
                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4lZ-yB-kbK" customClass="KSStarView">
-                                    <rect key="frame" x="84.666666666666686" y="12" width="196" height="28"/>
+                                    <rect key="frame" x="77.666666666666686" y="5" width="210" height="42"/>
                                     <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                     <constraints>
-                                        <constraint firstAttribute="width" constant="196" id="5SH-bw-eN7"/>
-                                        <constraint firstAttribute="height" constant="28" id="CGo-bx-0Q1"/>
+                                        <constraint firstAttribute="width" constant="210" id="5SH-bw-eN7"/>
+                                        <constraint firstAttribute="height" constant="42" id="CGo-bx-0Q1"/>
                                     </constraints>
                                 </view>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="如果满意请给五星好评喔～" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IlQ-xr-Mup">
@@ -133,7 +133,7 @@
                             <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                             <constraints>
                                 <constraint firstAttribute="bottom" secondItem="IlQ-xr-Mup" secondAttribute="bottom" constant="12" id="Vf9-DF-Lnr"/>
-                                <constraint firstItem="4lZ-yB-kbK" firstAttribute="top" secondItem="2zU-Zn-BFb" secondAttribute="top" constant="12" id="ivT-jk-FQI"/>
+                                <constraint firstItem="4lZ-yB-kbK" firstAttribute="top" secondItem="2zU-Zn-BFb" secondAttribute="top" constant="5" id="ivT-jk-FQI"/>
                                 <constraint firstItem="IlQ-xr-Mup" firstAttribute="centerX" secondItem="2zU-Zn-BFb" secondAttribute="centerX" id="rO4-CI-hQM"/>
                                 <constraint firstItem="4lZ-yB-kbK" firstAttribute="centerX" secondItem="2zU-Zn-BFb" secondAttribute="centerX" id="snE-vj-hTH"/>
                                 <constraint firstAttribute="height" constant="86" id="tdc-Oi-lAd"/>

KulexiuForStudent/KulexiuForStudent/Module/Mine/MineCourse/Controller/MyCourseViewController.h

@@ -29,6 +29,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)displayWithIndex:(DISPLAY_INDEX)displayIndex;
 
+- (void)selectedPageWithIndex:(DISPLAY_INDEX)pageIndex;
+
 @end
 
 NS_ASSUME_NONNULL_END

KulexiuForStudent/KulexiuForStudent/Module/Mine/MineCourse/Controller/MyCourseViewController.m

@@ -111,6 +111,13 @@
     self.displayIndex = displayIndex;
 }
 
+- (void)selectedPageWithIndex:(DISPLAY_INDEX)pageIndex {
+    if (pageIndex != self.selectedIndex) {
+        [self.categoryView selectItemAtIndex:pageIndex];
+        self.selectedIndex = pageIndex;
+    }
+}
+
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
     // 页面appear 禁用