首页logo替换

MusicGradeExam/MusicGradeExam/Assets.xcassets/Home/home_library.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "home_library@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "home_library@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

MusicGradeExam/MusicGradeExam/Define/PrefixHeader.pch

@@ -85,17 +85,17 @@
 
 //#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 (@"8luwapkv84g3l")
-
-#define hostURL (@"http://192.168.3.28:8000")
-#define SEALCLASSHOST (@"http://192.168.3.28:8000/api-im")
+#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 (@"8luwapkv84g3l")
+
+//#define hostURL (@"http://192.168.3.28:8000")
+//#define SEALCLASSHOST (@"http://192.168.3.28:8000/api-im")
+//#define WEBHOST (@"https://test.m.kj.colexiu.com")
+//#define JSPUSH_ENVIRONMENT (NO)
+//#define RCIM_KEY (@"8luwapkv84g3l")
 //#else    // 线上
 
 //#define hostURL (@"https://online.dayaedu.com")

MusicGradeExam/MusicGradeExam/KSRequestManager.h

@@ -294,9 +294,10 @@ NS_ASSUME_NONNULL_BEGIN
 
 /// 获取学员准考证列表
 /// @param get get
+/// @param examRegistrationId  考场id
 /// @param success 成功
 /// @param faliure 失败
-+ (void)queryCertificationPageRequest:(NSString *)get success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure;
++ (void)queryCertificationPageRequest:(NSString *)get examRegistrationId:(NSString * _Nullable )examRegistrationId success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure;
 
 // /api-user/examCertification/needCheckingDetail
 

MusicGradeExam/MusicGradeExam/KSRequestManager.m

@@ -235,6 +235,7 @@
                    progress:(void(^)(int64_t bytesRead, int64_t totalBytes))progress
                     success:(void(^)(NSURL *fileUrl))success
                     faliure:(void(^)(NSError *error))faliure {
+    
     [[KSNetworking shareManager] downloadWithUrl:myUrl progressBlock:^(int64_t bytesRead, int64_t totalBytes) {
         if (progress) {
             progress(bytesRead, totalBytes);
@@ -245,7 +246,6 @@
         }
     } failBlock:^(NSError * _Nonnull error) {
         [self showMessage:@"网络或服务器错误，请重试"];
-
         if (faliure) {
             faliure(error);
         }
@@ -257,13 +257,16 @@
                     progress:(void(^)(int64_t bytesRead, int64_t totalBytes))progress
                 successBlock:(void(^)(NSMutableArray *dics))success
                    failBlock:(void(^)(NSError *error))faliure {
+    [self clearRequestHeader];
     [[KSNetworking shareManager] downloadMutilFileWithUrl:urlArray progressBlock:^(int64_t bytesRead, int64_t totalBytes) {
         
     } successBlock:^(NSArray * _Nonnull responses) {
+        [self configRequestHeader];
         NSMutableArray *result = [NSMutableArray arrayWithArray:responses];
         success(result);
     } failBlock:^(NSArray * _Nonnull errors) {
         [self showMessage:@"网络或服务器错误，请重试"];
+        [self configRequestHeader];
         faliure([errors lastObject]);
     }];
 }
@@ -674,12 +677,15 @@
 
 /// 获取学员准考证列表
 /// @param get get
+/// @param examRegistrationId  考场id
 /// @param success 成功
 /// @param faliure 失败
-+ (void)queryCertificationPageRequest:(NSString *)get success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
++ (void)queryCertificationPageRequest:(NSString *)get examRegistrationId:(NSString *)examRegistrationId success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
     
     NSString *url = [NSString stringWithFormat:@"%@%@",hostURL, @"/api-user/examCertification/queryCertificationPage"];
-    [self request:get url:url parm:nil success:success faliure:faliure];
+    NSMutableDictionary *parm = [NSMutableDictionary dictionary];
+    [parm setValue:examRegistrationId forKey:@"examRegistrationId"];
+    [self request:get url:url parm:parm success:success faliure:faliure];
 }
 
 // /api-user/examCertification/needCheckingDetail

MusicGradeExam/MusicGradeExam/UI/Classroom/Controller/ClassroomViewController.m

@@ -420,6 +420,7 @@
     NSLog(@"memberRecordAction %@", member);
     RoomMember *curMember = [ClassroomService sharedService].currentRoom.currentMember;
     if ([curMember.userId isEqualToString:member.userId]) {
+        self.isKick = YES;
         [[RoomLoginHelper sharedInstance] logout:^{
         } error:^(RongRTCCode code) {
         }];

MusicGradeExam/MusicGradeExam/UI/Exam/Controller/ExamTicketViewController.m

@@ -36,7 +36,7 @@
 }
 
 - (void)requestData {
-    [KSRequestManager queryCertificationPageRequest:KS_GET success:^(NSDictionary * _Nonnull dic) {
+    [KSRequestManager queryCertificationPageRequest:KS_GET examRegistrationId:nil success:^(NSDictionary * _Nonnull dic) {
         if ([dic integerValueForKey:@"code"] == 200 && [dic boolValueForKey:@"status"]) {
             NSArray *source = [dic arrayValueForKey:@"data"];
             if (source.count) {

MusicGradeExam/MusicGradeExam/UI/Exam/View/TicketBodyView.m

@@ -93,7 +93,7 @@
     self.cardNo.text = [NSString stringWithFormat:@"准考证号：%@",[NSString returnNoNullStringWithString:self.sourceModel.cardNo]];
     self.userName.text = [NSString stringWithFormat:@"考试名字：%@",[NSString returnNoNullStringWithString:self.sourceModel.realName]];
     self.userSex.text = self.sourceModel.gender == 1 ? @"考生性别：男" : @"考生性别：女";
-    self.subjectLabel.text = [NSString stringWithFormat:@"报考级别：%@",[NSString returnNoNullStringWithString:self.sourceModel.subjectName]];
+    self.subjectLabel.text = [NSString stringWithFormat:@"报考专业：%@",[NSString returnNoNullStringWithString:self.sourceModel.subjectName]];
     self.examLevel.text = [NSString stringWithFormat:@"报考级别：%@",[self getLevelName:self.sourceModel.level]];
     self.examTime.text = [NSString stringWithFormat:@"考试时间：%@",[NSString returnNoNullStringWithString:self.sourceModel.examTime]];
     self.classLocation.text = [NSString isEmptyString:self.sourceModel.examAddress] ? @"考试地点：网络教室" : [NSString stringWithFormat:@"考试地点%@",self.sourceModel.examAddress];

MusicGradeExam/MusicGradeExam/UI/Home/Controller/ExamDisplayViewController.m

@@ -36,7 +36,7 @@
 }
 
 - (void)requestData {
-    [KSRequestManager queryCertificationPageRequest:KS_GET success:^(NSDictionary * _Nonnull dic) {
+    [KSRequestManager queryCertificationPageRequest:KS_GET examRegistrationId:self.examRegistrationId success:^(NSDictionary * _Nonnull dic) {
         if ([dic integerValueForKey:@"code"] == 200 && [dic boolValueForKey:@"status"]) {
             NSArray *source = [dic arrayValueForKey:@"data"];
             if (source.count) {

MusicGradeExam/MusicGradeExam/UI/Home/Controller/HomeViewController.m

@@ -61,7 +61,7 @@
 
 
 - (void)queryTicketMessage {
-    [KSRequestManager queryCertificationPageRequest:KS_GET success:^(NSDictionary * _Nonnull dic) {
+    [KSRequestManager queryCertificationPageRequest:KS_GET examRegistrationId:nil success:^(NSDictionary * _Nonnull dic) {
         if ([dic integerValueForKey:@"code"] == 200 && [dic boolValueForKey:@"status"]) {
             NSArray *source = [dic arrayValueForKey:@"data"];
             NSMutableArray *ticketArray = [NSMutableArray array];

MusicGradeExam/MusicGradeExam/UI/Home/View/HomeBodyView.xib

@@ -111,7 +111,7 @@
                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="record_detail" translatesAutoresizingMaskIntoConstraints="NO" id="lSQ-oa-URI">
                     <rect key="frame" x="151.5" y="455.5" width="14" height="18"/>
                 </imageView>
-                <imageView clipsSubviews="YES" tag="1004" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="exam_record" translatesAutoresizingMaskIntoConstraints="NO" id="6jn-Ca-srp">
+                <imageView clipsSubviews="YES" tag="1004" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="home_library" translatesAutoresizingMaskIntoConstraints="NO" id="6jn-Ca-srp">
                     <rect key="frame" x="12" y="522.5" width="392" height="121"/>
                     <gestureRecognizers/>
                     <constraints>
@@ -223,6 +223,7 @@
     <resources>
         <image name="book_record" width="351" height="120"/>
         <image name="exam_record" width="351" height="120"/>
+        <image name="home_library" width="351" height="120"/>
         <image name="home_top" width="375" height="158"/>
         <image name="notice_read" width="19" height="22"/>
         <image name="record_detail" width="14" height="18"/>