nothing

MusicGradeExam/MusicGradeExam/AppDelegate.m

@@ -222,7 +222,7 @@
       [JPUSHService registerForRemoteNotificationConfig:entity delegate:self];
     //如不需要使用IDFA，advertisingIdentifier 可为nil
 
-    [JPUSHService setupWithOption:launchOptions appKey:@"7e0282ca92c12c8c45a93bb3"
+    [JPUSHService setupWithOption:launchOptions appKey:@"f72b2f373bb9d6e0bc8ae87f"
                           channel:nil
                  apsForProduction:JSPUSH_ENVIRONMENT
             advertisingIdentifier:nil];
@@ -309,7 +309,7 @@
 
 
 - (void)requestRongCloudToken {
-    /*
+    
     [KSRequestManager refreshImTokenRequest:KS_POST success:^(NSDictionary * _Nonnull dic) {
         if ([dic integerValueForKey:@"code"] == 200 && [dic boolValueForKey:@"status"]) {
             NSString *newToken = [dic stringValueForKey:@"data"];
@@ -325,7 +325,7 @@
     } faliure:^(NSError * _Nonnull error) {
         
     }];
-     */
+    
 }
 
 - (void)initTableBar {
@@ -488,7 +488,6 @@ didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
 
 #pragma mark- JPUSHRegisterDelegate
 
-
 // iOS 10 Support
 - (void)jpushNotificationCenter:(UNUserNotificationCenter *)center willPresentNotification:(UNNotification *)notification withCompletionHandler:(void (^)(NSInteger))completionHandler  API_AVAILABLE(ios(10.0)){
   // Required

MusicGradeExam/MusicGradeExam/UI/Exam/Controller/WaitExamViewController.m

@@ -78,11 +78,7 @@
     UserDefaultSetBoolForKey(YES, @"examTipsTop");
     
     NSArray *tipsArray = @[@"考场开启后，才可已进行签到，签到后排考", @"展示为当前考场的排考信息"];
-    CGRect rect1 = [self.bodyView convertRect:self.bodyView.signButton.frame toView:[UIApplication sharedApplication].keyWindow];
-    rect1.origin.y += (kNaviBarHeight-5);
-    rect1.origin.x -= 5;
-    rect1.size.width += 10;
-    rect1.size.height += 10;
+    CGRect rect1 = CGRectMake((kScreenWidth-140)/2.0f, kNaviBarHeight + 16, 140, 140);
     UIBezierPath *pathOne = [UIBezierPath bezierPathWithOvalInRect:rect1];
     CGRect rect2 = [self.bodyView convertRect:self.bodyView.examMessageView.frame toView:[UIApplication sharedApplication].keyWindow];
     rect2.origin.y += kNaviBarHeight;
@@ -175,15 +171,15 @@
             break;
         case JOINROOMACTION_JOIN:  // 加入房间
         {
-            if (self.sourceModel.recordFlag == 1) { // 去录播
+            if (self.sourceModel.classroomSwitch == 1) {
+                NSString *roomId = [NSString stringWithFormat:@"%.0f", source.examRegistrationId];
+                [self joinRoomAction:roomId];
+            }
+            else if (self.sourceModel.recordFlag == 1 && self.sourceModel.finishedExam == 4) { // 去录播
                 RecordExamViewController *ctrl = [[RecordExamViewController alloc] init];
                 ctrl.examRegistrationId = self.examRegistrationId;
                 [self.navigationController pushViewController:ctrl animated:YES];
             }
-            else {
-                NSString *roomId = [NSString stringWithFormat:@"%.0f", source.examRegistrationId];
-                [self joinRoomAction:roomId];
-            }
         }
             break;
         default:

MusicGradeExam/MusicGradeExam/UI/Login/Controller/FirstSettingViewController.m

@@ -41,7 +41,7 @@
     [_bodyView settingCallback:^(NSDictionary * _Nonnull parm) {
         [weakSelf settingPassword:parm];
     }];
-    
+    self.scrollView.frame = CGRectMake(0, 0, kScreenWidth, kScreenHeight);
     [self.scrollView addSubview:_bodyView];
     self.scrollView.contentSize = CGSizeMake(kScreenWidth, height);