Steven пре 4 година
родитељ
комит
4e6b5929e7

+ 6 - 6
MusicGradeExam/MusicGradeExam/UI/Classroom/View/TitleView/ClassTitleView.m

@@ -25,7 +25,7 @@
 @interface ClassTitleView ()
 
 //@property (nonatomic, strong) UILabel *timeLable;
-//@property (nonatomic, strong) NSTimer *timeTimer;
+@property (nonatomic, strong) NSTimer *timeTimer;
 @property (nonatomic, strong) NSMutableArray *buttonArray;
 @property (nonatomic, strong) NSArray *buttonImageArray;
 @property (nonatomic, strong) NSArray *buttonHighlightedImageArray;
@@ -51,7 +51,7 @@
         self.isCountDown = NO;
         self.duration = [ClassroomService sharedService].currentRoom.surplusTime;
         [self refreshTitleView];
-//        [self.timeTimer setFireDate:[NSDate distantPast]];
+        [self.timeTimer setFireDate:[NSDate distantPast]];
     }
     return self;
 }
@@ -190,13 +190,13 @@
 
 
 - (void)stopDurationTimer {
-    /*
+    
     [self.timeTimer setFireDate:[NSDate distantFuture]];
     if (self.timeTimer.valid) {
         [self.timeTimer invalidate];
         self.timeTimer = nil;
     }
-     */
+    
 }
 
 
@@ -362,7 +362,7 @@
     return _buttonArray;
 }
 
-/*
+
 - (NSTimer *)timeTimer {
     if (_timeTimer == nil) {
         
@@ -376,7 +376,7 @@
     
     return _timeTimer;
 }
-*/
+
 - (void)setNetStatus:(NetWorkingStatus)netStatus {
     _netStatus = netStatus;
     NSString *displayImg = @"network_status1";

+ 2 - 0
MusicGradeExam/MusicGradeExam/UI/Exam/Controller/WaitExamViewController.m

@@ -47,6 +47,8 @@
 // 去录播
 - (void)toRecordExam {
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5f * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        
+        //
         RecordExamViewController *ctrl = [[RecordExamViewController alloc] init];
         ctrl.examRegistrationId = self.examRegistrationId;
         [self.navigationController pushViewController:ctrl animated:YES];

+ 11 - 1
MusicGradeExam/MusicGradeExam/UI/RecordExam/Controller/RecordExamViewController.m

@@ -53,7 +53,13 @@
     // Do any additional setup after loading the view.
     self.ks_prefersNavigationBarHidden = YES;
     [self configUI];
-    [self evaluateSource];
+    if (self.sourceModel) {
+        [self evaluateSource];
+    }
+    else {
+        [self requestData];
+    }
+    
 }
 
 - (void)viewWillAppear:(BOOL)animated {
@@ -67,6 +73,7 @@
     if(@available(iOS 13.0, *)){
         [UIApplication sharedApplication].statusBarStyle = UIStatusBarStyleDarkContent;
     }
+    [self.topView stopDurationTimer];
 }
 
 - (void)requestData {
@@ -86,6 +93,9 @@
 }
 
 - (void)evaluateSource {
+    if (self.sourceModel == nil) {
+        return;
+    }
     [self.topView configTime:[NSString stringWithFormat:@"%.0f", self.sourceModel.subTime]];
     [self.tipsView configWithEndTime:self.sourceModel.examEndTime];
     NSData *songDate = [self.sourceModel.songJson dataUsingEncoding:NSUTF8StringEncoding];

+ 2 - 0
MusicGradeExam/MusicGradeExam/UI/RecordExam/View/RecordBodyView.h

@@ -25,6 +25,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)topviewAction:(RecordTopBlock)block;
 
+- (void)stopDurationTimer;
+
 @end
 
 NS_ASSUME_NONNULL_END

+ 1 - 0
MusicGradeExam/MusicGradeExam/UI/RecordExam/View/RecordBodyView.m

@@ -105,6 +105,7 @@
     
     return _timeTimer;
 }
+
 /*
 // Only override drawRect: if you perform custom drawing.
 // An empty implementation adversely affects performance during animation.