预计等待时间

MusicGradeExam/MusicGradeExam/Define/PrefixHeader.pch

@@ -85,11 +85,11 @@
 
 //#ifdef DEBUG
 
-#define hostURL (@"https://test.kj.colexiu.com")
-#define SEALCLASSHOST (@"https://test.kj.colexiu.com/api-im")
-#define WEBHOST (@"https://test.m.kj.colexiu.com")
-#define JSPUSH_ENVIRONMENT (NO)
-#define RCIM_KEY (@"mgb7ka1nme0yg")
+//#define hostURL (@"https://test.kj.colexiu.com")
+//#define SEALCLASSHOST (@"https://test.kj.colexiu.com/api-im")
+//#define WEBHOST (@"https://test.m.kj.colexiu.com")
+//#define JSPUSH_ENVIRONMENT (NO)
+//#define RCIM_KEY (@"mgb7ka1nme0yg")
 
 //#define hostURL (@"http://192.168.3.28:8000")
 //#define SEALCLASSHOST (@"http://192.168.3.28:8000/api-im")
@@ -98,11 +98,11 @@
 //#define RCIM_KEY (@"mgb7ka1nme0yg")
 //#else    // 线上
 
-//#define hostURL (@"https://kj.colexiu.com")
-//#define SEALCLASSHOST (@"https://kj.colexiu.com/api-im")
-//#define WEBHOST (@"https://m.kj.colexiu.com")
-//#define JSPUSH_ENVIRONMENT (YES)
-//#define RCIM_KEY (@"mgb7ka1nme0yg")
+#define hostURL (@"https://kj.colexiu.com")
+#define SEALCLASSHOST (@"https://kj.colexiu.com/api-im")
+#define WEBHOST (@"https://m.kj.colexiu.com")
+#define JSPUSH_ENVIRONMENT (YES)
+#define RCIM_KEY (@"8w7jv4qb8zuyy")
 
 //#endif
 

MusicGradeExam/MusicGradeExam/UI/Exam/Model/TicketDetailModel.h

@@ -26,6 +26,8 @@
 @property (nonatomic, assign) double examRoomStudentRelationId;
 @property (nonatomic, strong) NSString *subjectName;
 @property (nonatomic, assign) double level;
+@property (nonatomic, assign) double recordMinutes;
+
 + (instancetype)modelObjectWithDictionary:(NSDictionary *)dict;
 - (instancetype)initWithDictionary:(NSDictionary *)dict;
 - (NSDictionary *)dictionaryRepresentation;

MusicGradeExam/MusicGradeExam/UI/Exam/Model/TicketDetailModel.m

@@ -23,6 +23,7 @@ NSString *const kTicketDetailModelExamRegistrationId = @"examRegistrationId";
 NSString *const kTicketDetailModelExamRoomStudentRelationId = @"examRoomStudentRelationId";
 NSString *const kTicketDetailModelExamSubjectName = @"subjectName";
 NSString *const kTicketDetailModelExamLevel = @"level";
+NSString *const kTicketDetailModelExamRecordMinutes = @"recordMinutes";
 
 @interface TicketDetailModel ()
 
@@ -47,6 +48,7 @@ NSString *const kTicketDetailModelExamLevel = @"level";
 @synthesize examRoomStudentRelationId = _examRoomStudentRelationId;
 @synthesize subjectName = _subjectName;
 @synthesize level = _level;
+@synthesize recordMinutes = _recordMinutes;
 
 + (instancetype)modelObjectWithDictionary:(NSDictionary *)dict
 {
@@ -75,6 +77,7 @@ NSString *const kTicketDetailModelExamLevel = @"level";
         self.examRoomStudentRelationId = [[self objectOrNilForKey:kTicketDetailModelExamRoomStudentRelationId fromDictionary:dict] doubleValue];
         self.subjectName = [self objectOrNilForKey:kTicketDetailModelExamSubjectName fromDictionary:dict] ;
         self.level = [[self objectOrNilForKey:kTicketDetailModelExamLevel fromDictionary:dict] doubleValue];
+        self.recordMinutes = [[self objectOrNilForKey:kTicketDetailModelExamRecordMinutes fromDictionary:dict] doubleValue];
     }
     
     return self;
@@ -99,6 +102,7 @@ NSString *const kTicketDetailModelExamLevel = @"level";
     [mutableDict setValue:[NSNumber numberWithDouble:self.examRoomStudentRelationId] forKey:kTicketDetailModelExamRoomStudentRelationId];
     [mutableDict setValue:self.subjectName forKey:kTicketDetailModelExamSubjectName];
     [mutableDict setValue:[NSNumber numberWithDouble:self.level] forKey:kTicketDetailModelExamLevel];
+    [mutableDict setValue:[NSNumber numberWithDouble:self.recordMinutes] forKey:kTicketDetailModelExamRecordMinutes];
     return [NSDictionary dictionaryWithDictionary:mutableDict];
 }
 
@@ -136,7 +140,7 @@ NSString *const kTicketDetailModelExamLevel = @"level";
     self.examRoomStudentRelationId = [aDecoder decodeDoubleForKey:kTicketDetailModelExamRoomStudentRelationId];
     self.subjectName = [aDecoder decodeObjectForKey:kTicketDetailModelExamSubjectName];
     self.level = [aDecoder decodeDoubleForKey:kTicketDetailModelExamLevel];
-    
+    self.recordMinutes = [aDecoder decodeDoubleForKey:kTicketDetailModelExamRecordMinutes];
     return self;
 }
 
@@ -158,6 +162,7 @@ NSString *const kTicketDetailModelExamLevel = @"level";
     [aCoder encodeDouble:_examRoomStudentRelationId forKey:kTicketDetailModelExamRoomStudentRelationId];
     [aCoder encodeObject:_subjectName forKey:kTicketDetailModelExamSubjectName];
     [aCoder encodeDouble:_level forKey:kTicketDetailModelExamLevel];
+    [aCoder encodeDouble:_recordMinutes forKey:kTicketDetailModelExamRecordMinutes];
 }
 
 - (id)copyWithZone:(NSZone *)zone
@@ -181,6 +186,7 @@ NSString *const kTicketDetailModelExamLevel = @"level";
         copy.examRoomStudentRelationId = self.examRoomStudentRelationId;
         copy.subjectName = [self.subjectName copyWithZone:zone];
         copy.level = copy.level;
+        copy.recordMinutes = copy.recordMinutes;
     }
     
     return copy;

MusicGradeExam/MusicGradeExam/UI/Exam/Model/TicketRefreshModel.h

@@ -18,6 +18,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign) double studentId;
 @property (nonatomic, assign) double finishedExam;
 @property (nonatomic, assign) double examRegistrationId;
+
 @end
 
 NS_ASSUME_NONNULL_END

MusicGradeExam/MusicGradeExam/UI/Exam/View/WaitExamBottomView.m

@@ -85,7 +85,8 @@ typedef NS_ENUM(NSInteger, JOINBUTTONSTATUS) {
         else {
             if (self.sourceModel.classroomSwitch == 0) {
                 self.buttonStatus = JOINBUTTONSTATUS_WAIT;
-                NSString *title = [NSString stringWithFormat:@"当前需要等待%.0f位考生",self.sourceModel.waitNum];
+                
+                NSString *title = [NSString stringWithFormat:@"前面等待%.0f人，大约%.0f分钟",self.sourceModel.waitNum, (self.sourceModel.waitNum * self.sourceModel.recordMinutes)];
                 if (self.sourceModel.waitNum == 0) {
                     title = @"即将开始考试，请准备";
                 }