UI更新

MusicGradeExam/MusicGradeExam/Assets.xcassets/Empty/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

MusicGradeExam/MusicGradeExam/Assets.xcassets/delete_white_image.imageset/Contents.json → MusicGradeExam/MusicGradeExam/Assets.xcassets/Empty/empty_library.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "delete_white_image@2x.png",
+      "filename" : "empty_library@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "delete_white_image@3x.png",
+      "filename" : "empty_library@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

MusicGradeExam/MusicGradeExam/Assets.xcassets/Empty/empty_message.imageset/Contents.json

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

MusicGradeExam/MusicGradeExam/Assets.xcassets/Empty/networking_error.imageset/Contents.json

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

MusicGradeExam/MusicGradeExam/Assets.xcassets/delete_button.imageset/Contents.json

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

MusicGradeExam/MusicGradeExam/Base/KSBaseWKWebViewController.m

@@ -46,7 +46,7 @@
     leftButton.imageInsets = UIEdgeInsetsMake(0, -5, 0, 0);
     leftButton.tintColor = HexRGB(0x1A1A1A);
     
-    UIBarButtonItem *deleteItem = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"delete_white_image"] style:UIBarButtonItemStylePlain target:self action:@selector(quitAction)];
+    UIBarButtonItem *deleteItem = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"delete_button"] style:UIBarButtonItemStylePlain target:self action:@selector(quitAction)];
     deleteItem.imageInsets = UIEdgeInsetsMake(0, -5, 0, 0);
     deleteItem.tintColor = HexRGB(0x1A1A1A);
     self.navigationItem.leftBarButtonItems = @[leftButton,deleteItem];

MusicGradeExam/MusicGradeExam/Define/PrefixHeader.pch

@@ -98,9 +98,9 @@
 //#define RCIM_KEY (@"8luwapkv84g3l")
 //#else    // 线上
 
-//#define hostURL (@"https://online.dayaedu.com")
-//#define SEALCLASSHOST (@"https://online.dayaedu.com/api-im")
-//#define WEBHOST (@"https://mstuonline.dayaedu.com")
+//#define hostURL (@"https://kj.colexiu.com")
+//#define SEALCLASSHOST (@"https://kj.colexiu.com/api-im")
+//#define WEBHOST (@"https://m.kj.colexiu.com.com")
 //#define JSPUSH_ENVIRONMENT (YES)
 //#define RCIM_KEY (@"6tnym1br6pv07")
 

MusicGradeExam/MusicGradeExam/KSRequestManager.h

@@ -221,7 +221,7 @@ NS_ASSUME_NONNULL_BEGIN
 #pragma mark --- 个人信息
 
 
-// /api-user/student/getStudent
+// /api-student/student/getStudent
 /**
  获取个人信息
  
@@ -231,7 +231,7 @@ NS_ASSUME_NONNULL_BEGIN
  */
 + (void)queryUserInfo:(NSString *)get success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure;
 
-// /api-user/student/updateInfo
+// /api-student/student/updateInfo
 
 /// 用户设置
 /// @param post post
@@ -245,7 +245,7 @@ NS_ASSUME_NONNULL_BEGIN
 /// @param faliure 失败
 + (void)updateInfoRequest:(NSString *)post idCardNo:(NSString *)idCardNo realName:(NSString *)realName gender:(NSString *)gender birthdate:(NSString *)birthdate nation:(NSString *)nation avatar:(NSString *)avatar success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure;
 
-// /api-user/suggestion/add
+// /api-student/suggestion/add
 
 /**
  新增建议
@@ -290,7 +290,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 
 #pragma mark ----- 准考证服务
-// /api-user/examCertification/queryCertificationPage
+// /api-student/examCertification/queryCertificationPage
 
 /// 获取学员准考证列表
 /// @param get get
@@ -299,7 +299,7 @@ NS_ASSUME_NONNULL_BEGIN
 /// @param faliure 失败
 + (void)queryCertificationPageRequest:(NSString *)get examRegistrationId:(NSString * _Nullable )examRegistrationId success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure;
 
-// /api-user/examCertification/needCheckingDetail
+// /api-student/examCertification/needCheckingDetail
 
 /// 待考详情
 /// @param get get
@@ -308,7 +308,7 @@ NS_ASSUME_NONNULL_BEGIN
 /// @param faliure 失败
 + (void)needCheckingDetailRequest:(NSString *)get examRegistrationId:(NSString *)examRegistrationId success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure;
 
-// /api-user/examRoomStudentRelation/signIn
+// /api-student/examRoomStudentRelation/signIn
 
 /// 签到
 /// @param post post
@@ -318,7 +318,7 @@ NS_ASSUME_NONNULL_BEGIN
 + (void)signInRequest:(NSString *)post examRegistrationId:(NSString *)examRegistrationId success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure;
 
 #pragma mark ---- 曲库
-// /api-user/examRegistration/studentBaseExams
+// /api-student/examRegistration/studentBaseExams
 
 /// 获取考级项目
 /// @param get get
@@ -326,7 +326,7 @@ NS_ASSUME_NONNULL_BEGIN
 /// @param faliure 失败
 + (void)studentBaseExamsRequest:(NSString *)get success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure;
 
-// /api-user/subject/studentQueryPage
+// /api-student/subject/studentQueryPage
 
 /// 获取学生曲库科目
 /// @param get get
@@ -335,7 +335,7 @@ NS_ASSUME_NONNULL_BEGIN
 /// @param faliure 失败
 + (void)musicLibraryPageRequest:(NSString *)get tenantId:(NSString *)tenantId success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure;
 
-// /api-user/examSong/queryPage
+// /api-student/examSong/queryPage
 
 /// 分页查询曲目
 /// @param get get

MusicGradeExam/MusicGradeExam/KSRequestManager.m

@@ -279,14 +279,14 @@
 /// @param success 成功
 /// @param faliure 失败
 + (void)multiImageUpload:(NSString *)post imgDataArray:(NSArray *)pics success:(void (^)(NSArray * _Nonnull))success faliure:(void (^)(NSError * _Nonnull))faliure {
-    NSString* url = [NSString stringWithFormat:@"%@%@",hostURL,@"/api-user/uploadFile"];
+    NSString* url = [NSString stringWithFormat:@"%@%@",hostURL,@"/api-student/uploadFile"];
     NSString *type = [UIImage typeForImageData:[pics lastObject]];
     [self uploadMultiFileWithFileArray:pics andWithUrl:url parameters:nil type:type name:@"file" mimeType:[NSString stringWithFormat:@"Image/%@",type] progress:nil success:success faliure:faliure];
 }
 
 // 证件照上传
 + (void)cardImageUpload:(NSString *)post imgData:(NSData *)imageData success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
-    NSString* url = [NSString stringWithFormat:@"%@%@",hostURL,@"/api-user/examRegistration/ocr"];
+    NSString* url = [NSString stringWithFormat:@"%@%@",hostURL,@"/api-student/examRegistration/ocr"];
     NSString *type = [UIImage typeForImageData:imageData];
     NSDictionary *parm = @{@"idCardSide" : @"front"};
     [self uploadFileWithFileData:imageData andWithUrl:url parameters:parm type:type name:@"file" mimeType:[NSString stringWithFormat:@"Image/%@",type] progress:nil success:success faliure:faliure];
@@ -309,7 +309,7 @@
 /// @param faliure 失败
 + (void)recordFileUpload:(NSString *)post fileData:(NSData *)fileData success:(void (^)(NSDictionary * _Nonnull))success faliure:(void (^)(NSError * _Nonnull))faliure {
     
-    NSString* url = [NSString stringWithFormat:@"%@%@",hostURL,@"/api-user/uploadFile"];
+    NSString* url = [NSString stringWithFormat:@"%@%@",hostURL,@"/api-student/uploadFile"];
     [self uploadFileWithFileData:fileData andWithUrl:url parameters:nil type:@".aac" name:@"file" mimeType:[NSString stringWithFormat:@"Image/.aac"] progress:nil success:success faliure:faliure];
 }
 
@@ -324,7 +324,7 @@
 + (void)videoFileUpload:(NSString *)post fileData:(NSData *)fileData progress:(void (^)(int64_t, int64_t))progress success:(void (^)(NSDictionary * _Nonnull))success faliure:(void (^)(NSError * _Nonnull))faliure {
     
     [self configRequestMethodJSON];
-    NSString* url = [NSString stringWithFormat:@"%@%@",hostURL,@"/api-user/uploadFile"];
+    NSString* url = [NSString stringWithFormat:@"%@%@",hostURL,@"/api-student/uploadFile"];
     [self uploadFileWithFileData:fileData andWithUrl:url parameters:nil type:@".mp4" name:@"file" mimeType:[NSString stringWithFormat:@"Image/.mp4"] progress:progress success:success faliure:faliure];
 }
 
@@ -564,7 +564,7 @@
     [self request:get url:url parm:nil success:success faliure:faliure];
 }
 #pragma mark --- 个人信息
-// /api-user/student/getStudent
+// /api-student/student/getStudent
 /**
  获取个人信息
  
@@ -574,11 +574,11 @@
  */
 + (void)queryUserInfo:(NSString *)get success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
     
-    NSString *url = [NSString stringWithFormat:@"%@%@",hostURL, @"/api-user/student/getStudent"];
+    NSString *url = [NSString stringWithFormat:@"%@%@",hostURL, @"/api-student/student/getStudent"];
     [self request:get url:url parm:nil success:success faliure:faliure];
 }
 
-// /api-user/student/updateInfo
+// /api-student/student/updateInfo
 
 /// 用户设置
 /// @param post post
@@ -599,11 +599,11 @@
     [parm setValue:birthdate forKey:@"birthdate"];
     [parm setValue:nation forKey:@"nation"];
     [parm setValue:avatar forKey:@"certificatePhoto"];
-    NSString *url = [NSString stringWithFormat:@"%@%@",hostURL, @"/api-user/student/updateInfo"];
+    NSString *url = [NSString stringWithFormat:@"%@%@",hostURL, @"/api-student/student/updateInfo"];
     [self request:post url:url parm:parm success:success faliure:faliure];
 }
 
-// /api-user/suggestion/add
+// /api-student/suggestion/add
 
 /**
  新增建议
@@ -619,7 +619,7 @@
     NSMutableDictionary *parm = [NSMutableDictionary dictionary];
     [parm setValue:content forKey:@"content"];
     [parm setValue:mobileNo forKey:@"mobileNo"];
-    NSString *url = [NSString stringWithFormat:@"%@%@",hostURL, @"/api-user/suggestion/add"];
+    NSString *url = [NSString stringWithFormat:@"%@%@",hostURL, @"/api-student/suggestion/add"];
     [self request:post url:url parm:parm success:success faliure:faliure];
 }
 
@@ -673,7 +673,7 @@
 }
 
 #pragma mark ----- 准考证服务
-// /api-user/examCertification/queryCertificationPage
+// /api-student/examCertification/queryCertificationPage
 
 /// 获取学员准考证列表
 /// @param get get
@@ -682,13 +682,13 @@
 /// @param 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"];
+    NSString *url = [NSString stringWithFormat:@"%@%@",hostURL, @"/api-student/examCertification/queryCertificationPage"];
     NSMutableDictionary *parm = [NSMutableDictionary dictionary];
     [parm setValue:examRegistrationId forKey:@"examRegistrationId"];
     [self request:get url:url parm:parm success:success faliure:faliure];
 }
 
-// /api-user/examCertification/needCheckingDetail
+// /api-student/examCertification/needCheckingDetail
 
 /// 待考详情
 /// @param get get
@@ -696,13 +696,13 @@
 /// @param success 成功
 /// @param faliure 失败
 + (void)needCheckingDetailRequest:(NSString *)get examRegistrationId:(NSString *)examRegistrationId success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
-    NSString *url = [NSString stringWithFormat:@"%@%@",hostURL, @"/api-user/examCertification/needCheckingDetail"];
+    NSString *url = [NSString stringWithFormat:@"%@%@",hostURL, @"/api-student/examCertification/needCheckingDetail"];
     NSMutableDictionary *parm = [NSMutableDictionary dictionary];
     [parm setValue:examRegistrationId forKey:@"examRegistrationId"];
     [self request:get url:url parm:parm success:success faliure:faliure];
 }
 
-// /api-user/examRoomStudentRelation/signIn
+// /api-student/examRoomStudentRelation/signIn
 
 /// 签到
 /// @param post post
@@ -711,25 +711,25 @@
 /// @param faliure 失败
 + (void)signInRequest:(NSString *)post examRegistrationId:(NSString *)examRegistrationId success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
     [self configRequestMethodForm];
-    NSString *url = [NSString stringWithFormat:@"%@%@",hostURL, @"/api-user/examRoomStudentRelation/signIn"];
+    NSString *url = [NSString stringWithFormat:@"%@%@",hostURL, @"/api-student/examRoomStudentRelation/signIn"];
     NSMutableDictionary *parm = [NSMutableDictionary dictionary];
     [parm setValue:examRegistrationId forKey:@"examRegistrationId"];
     [self request:post url:url parm:parm success:success faliure:faliure];
 }
 
 #pragma mark ---- 曲库
-// /api-user/examRegistration/studentBaseExams
+// /api-student/examRegistration/studentBaseExams
 
 /// 获取考级项目
 /// @param get get
 /// @param success 成功
 /// @param faliure 失败
 + (void)studentBaseExamsRequest:(NSString *)get success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
-    NSString *url = [NSString stringWithFormat:@"%@%@", hostURL, @"/api-user/examRegistration/studentBaseExams"];
+    NSString *url = [NSString stringWithFormat:@"%@%@", hostURL, @"/api-student/examRegistration/studentBaseExams"];
     [self request:get url:url parm:nil success:success faliure:faliure];
 }
 
-// /api-user/subject/studentQueryPage
+// /api-student/subject/studentQueryPage
 
 /// 获取学生曲库科目
 /// @param get get
@@ -737,14 +737,14 @@
 /// @param success 成功
 /// @param faliure 失败
 + (void)musicLibraryPageRequest:(NSString *)get tenantId:(NSString *)tenantId success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
-    NSString *url = [NSString stringWithFormat:@"%@%@", hostURL, @"/api-user/subject/studentQueryPage"];
+    NSString *url = [NSString stringWithFormat:@"%@%@", hostURL, @"/api-student/subject/studentQueryPage"];
     NSMutableDictionary *parm = [NSMutableDictionary dictionary];
 //    [parm setValue:@"0" forKey:@"parentId"];
     [parm setValue:tenantId forKey:@"tenantId"];
     [self request:get url:url parm:parm success:success faliure:faliure];
 }
 
-// /api-user/examSong/queryPage
+// /api-student/examSong/queryPage
 
 /// 分页查询曲目
 /// @param get get
@@ -756,7 +756,7 @@
 /// @param success 成功
 /// @param faliure 失败
 + (void)musicSongListRequest:(NSString *)get tenantId:(NSString *)tenantId subjectList:(NSString *)subjectList level:(NSString *)level page:(NSString *)page rows:(NSString *)rows success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure  {
-    NSString *url = [NSString stringWithFormat:@"%@%@", hostURL, @"/api-user/examSong/queryPage"];
+    NSString *url = [NSString stringWithFormat:@"%@%@", hostURL, @"/api-student/examSong/queryPage"];
     NSMutableDictionary *parm = [NSMutableDictionary dictionary];
     [parm setValue:tenantId forKey:@"tenantId"];
     [parm setValue:subjectList forKey:@"subjectList"];
@@ -775,7 +775,7 @@
 /// @param success 成功
 /// @param faliure 失败
 + (void)stuRecordDetailRequest:(NSString *)get examRegistrationId:(NSString *)examRegistrationId success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
-    NSString *url = [NSString stringWithFormat:@"%@%@", hostURL, @"/api-user/examRoomStudentRelation/stuRecordDetail"];
+    NSString *url = [NSString stringWithFormat:@"%@%@", hostURL, @"/api-student/examRoomStudentRelation/stuRecordDetail"];
     NSMutableDictionary *parm = [NSMutableDictionary dictionary];
     [parm setValue:examRegistrationId forKey:@"examRegistrationId"];
     [self request:get url:url parm:parm success:success faliure:faliure];
@@ -791,7 +791,7 @@
 /// @param faliure 失败
 + (void)stuEndRecordFinishRequest:(NSString *)post examRegistrationId:(NSString *)examRegistrationId videoUrl:(NSString *)videoUrl success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
     [self configRequestMethodForm];
-    NSString *url = [NSString stringWithFormat:@"%@%@", hostURL, @"/api-user/examRoomStudentRelation/stuEndRecord"];
+    NSString *url = [NSString stringWithFormat:@"%@%@", hostURL, @"/api-student/examRoomStudentRelation/stuEndRecord"];
     NSMutableDictionary *parm = [NSMutableDictionary dictionary];
     [parm setValue:examRegistrationId forKey:@"examRegistrationId"];
     [parm setValue:videoUrl forKey:@"videoUrl"];

MusicGradeExam/MusicGradeExam/Tools/Custom/StateView.m

@@ -21,7 +21,7 @@
     self = [super init];
     if (self) {
         _desLabel = [[UILabel alloc] init];
-        _desLabel.font = [UIFont systemFontOfSize:14.0f];
+        _desLabel.font = [UIFont systemFontOfSize:17.0f];
         _desLabel.textColor = HexRGB(0x999999);
         _desLabel.textAlignment = NSTextAlignmentCenter;
         _desLabel.numberOfLines = 1;

MusicGradeExam/MusicGradeExam/UI/Exam/View/TicketBodyView.xib

@@ -204,10 +204,10 @@
                                 <constraint firstAttribute="height" constant="188" id="ODc-fx-kwp"/>
                             </constraints>
                         </imageView>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="暂无考级信息" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MSJ-t7-aJF">
-                            <rect key="frame" x="135.5" y="374" width="111" height="22"/>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="暂无准考证" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MSJ-t7-aJF">
+                            <rect key="frame" x="145" y="374" width="92" height="22"/>
                             <fontDescription key="fontDescription" type="system" pointSize="18"/>
-                            <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+                            <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
                     </subviews>

MusicGradeExam/MusicGradeExam/UI/Exam/View/WaitExamBodyView.xib

@@ -175,10 +175,11 @@
                 </view>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8bl-8o-KNJ">
                     <rect key="frame" x="17" y="466" width="380" height="50"/>
+                    <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="50" id="gcf-YI-Gnf"/>
                     </constraints>
-                    <state key="normal" title="查看引导">
+                    <state key="normal" title="设备检查及考试引导">
                         <color key="titleColor" red="0.1764705882" green="0.78039215689999997" blue="0.66666666669999997" alpha="1" colorSpace="calibratedRGB"/>
                     </state>
                     <userDefinedRuntimeAttributes>

MusicGradeExam/MusicGradeExam/UI/ExamLibrary/Controller/ExamLibraryController.m

@@ -124,7 +124,7 @@
     self.rows = 10;
     self.dataArray = [NSMutableArray array];
     [self.tableView.mj_footer resetNoMoreData];
-    [self setPromptString:@"暂无曲目" imageName:@"wd_img_zwsj" inView:self.tableView];
+    [self setPromptString:@"暂无曲目" imageName:@"empty_library" inView:self.tableView];
     [self.tableView reloadData];
 }
 
@@ -152,7 +152,7 @@
         [self.tableView.mj_header endRefreshing];
         [self.tableView.mj_footer endRefreshing];
         if (self.networkAvaiable == NO) {
-            [self setPromptString:@"暂无网络" imageName:@"no_networking" inView:self.tableView];
+            [self setPromptString:@"网络开小差，再刷新看看" imageName:@"networking_error" inView:self.tableView];
         }
         [self.dataArray removeAllObjects];
         [self.tableView reloadData];

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

@@ -123,7 +123,7 @@
     self.scrollView.backgroundColor = HexRGB(0xf3f4f8);
     self.scrollView.frame = CGRectMake(0, 0, kScreenWidth, kScreenHeight - kTabBarHeight);
     _bodyView = [HomeBodyView shareInstance];
-    CGFloat recordHeight = (kScreenWidth - 24) / 13 * 4;
+    CGFloat recordHeight = (kScreenWidth - 24) / 351 * 120;
     CGFloat viewHeight = recordHeight * 3 + 45 + (kScreenWidth - 32) / 191 * 73 + 15 + iPhoneXSafeTopMargin + 83;
     viewHeight = kScreenHeight - kTabBarHeight ? viewHeight : kScreenHeight - kTabBarHeight;
     _bodyView.frame = CGRectMake(0, 0, kScreenWidth, viewHeight);

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

@@ -64,18 +64,18 @@
                     <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <nil key="highlightedColor"/>
                 </label>
-                <imageView clipsSubviews="YES" tag="1002" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="book_record" translatesAutoresizingMaskIntoConstraints="NO" id="FTX-tf-JYt">
-                    <rect key="frame" x="12" y="251.5" width="392" height="120.5"/>
+                <imageView clipsSubviews="YES" tag="1002" contentMode="redraw" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="book_record" translatesAutoresizingMaskIntoConstraints="NO" id="FTX-tf-JYt">
+                    <rect key="frame" x="12" y="251.5" width="392" height="134"/>
                     <gestureRecognizers/>
                     <constraints>
-                        <constraint firstAttribute="width" secondItem="FTX-tf-JYt" secondAttribute="height" multiplier="13:4" id="wNV-53-ocO"/>
+                        <constraint firstAttribute="width" secondItem="FTX-tf-JYt" secondAttribute="height" multiplier="351:120" id="jrs-LK-ywg"/>
                     </constraints>
                     <connections>
                         <outletCollection property="gestureRecognizers" destination="0cz-kF-eTZ" appends="YES" id="UGr-Vs-gwh"/>
                     </connections>
                 </imageView>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="报考记录" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="71n-fC-CqF">
-                    <rect key="frame" x="32" y="287" width="74" height="25"/>
+                    <rect key="frame" x="32" y="293.5" width="74" height="25"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="25" id="MxA-yU-X9o"/>
                     </constraints>
@@ -83,15 +83,15 @@
                     <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
-                <imageView clipsSubviews="YES" tag="1003" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="exam_record" translatesAutoresizingMaskIntoConstraints="NO" id="X8m-zH-diL">
-                    <rect key="frame" x="12" y="387" width="392" height="120.5"/>
+                <imageView clipsSubviews="YES" tag="1003" contentMode="redraw" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="exam_record" translatesAutoresizingMaskIntoConstraints="NO" id="X8m-zH-diL">
+                    <rect key="frame" x="12" y="400.5" width="392" height="134"/>
                     <gestureRecognizers/>
                     <connections>
                         <outletCollection property="gestureRecognizers" destination="g0m-kn-yMe" appends="YES" id="J0N-dX-A4b"/>
                     </connections>
                 </imageView>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="您即将进行的考试" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="y0E-93-7ac">
-                    <rect key="frame" x="32" y="454.5" width="114.5" height="20"/>
+                    <rect key="frame" x="32" y="474.5" width="114.5" height="20"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="20" id="eD7-7U-5gB"/>
                     </constraints>
@@ -100,7 +100,7 @@
                     <nil key="highlightedColor"/>
                 </label>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="考试记录" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="g1C-Ty-W4n">
-                    <rect key="frame" x="32" y="422.5" width="74" height="25"/>
+                    <rect key="frame" x="32" y="442.5" width="74" height="25"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="25" id="tTe-yW-e14"/>
                     </constraints>
@@ -109,20 +109,20 @@
                     <nil key="highlightedColor"/>
                 </label>
                 <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"/>
+                    <rect key="frame" x="151.5" y="475.5" width="14" height="18"/>
                 </imageView>
-                <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"/>
+                <imageView clipsSubviews="YES" tag="1004" contentMode="redraw" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="home_library" translatesAutoresizingMaskIntoConstraints="NO" id="6jn-Ca-srp">
+                    <rect key="frame" x="12" y="549.5" width="392" height="134"/>
                     <gestureRecognizers/>
                     <constraints>
-                        <constraint firstAttribute="width" secondItem="6jn-Ca-srp" secondAttribute="height" multiplier="13:4" id="We3-pT-D82"/>
+                        <constraint firstAttribute="width" secondItem="6jn-Ca-srp" secondAttribute="height" multiplier="351:120" id="We3-pT-D82"/>
                     </constraints>
                     <connections>
                         <outletCollection property="gestureRecognizers" destination="hzg-Cm-ZWb" appends="YES" id="re3-Lm-wRD"/>
                     </connections>
                 </imageView>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="进入考级曲库" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Gd1-H6-mZc">
-                    <rect key="frame" x="32" y="590" width="86" height="20"/>
+                    <rect key="frame" x="32" y="623.5" width="86" height="20"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="20" id="oVm-Ho-adW"/>
                     </constraints>
@@ -131,7 +131,7 @@
                     <nil key="highlightedColor"/>
                 </label>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="考级曲库" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ylI-OI-Itq">
-                    <rect key="frame" x="32" y="558" width="74" height="25"/>
+                    <rect key="frame" x="32" y="591.5" width="74" height="25"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="25" id="ClN-i1-S5V"/>
                     </constraints>
@@ -140,10 +140,10 @@
                     <nil key="highlightedColor"/>
                 </label>
                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="record_detail" translatesAutoresizingMaskIntoConstraints="NO" id="3du-vq-z5T">
-                    <rect key="frame" x="123" y="591" width="14" height="18"/>
+                    <rect key="frame" x="123" y="624.5" width="14" height="18"/>
                 </imageView>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="您的报考记录" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aDg-7e-SV3">
-                    <rect key="frame" x="32" y="319" width="86" height="20"/>
+                    <rect key="frame" x="32" y="325.5" width="86" height="20"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="20" id="LRW-oG-3IF"/>
                     </constraints>
@@ -152,7 +152,7 @@
                     <nil key="highlightedColor"/>
                 </label>
                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="record_detail" translatesAutoresizingMaskIntoConstraints="NO" id="J1M-Gy-55Y">
-                    <rect key="frame" x="123" y="320" width="14" height="18"/>
+                    <rect key="frame" x="123" y="326.5" width="14" height="18"/>
                 </imageView>
             </subviews>
             <color key="backgroundColor" red="0.95294117647058818" green="0.95686274509803915" blue="0.97254901960784312" alpha="1" colorSpace="calibratedRGB"/>
@@ -163,7 +163,7 @@
                 <constraint firstItem="deZ-CC-Tlw" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="16" id="3Kr-dw-VIu"/>
                 <constraint firstItem="3du-vq-z5T" firstAttribute="leading" secondItem="Gd1-H6-mZc" secondAttribute="trailing" constant="5" id="4kX-qt-wMo"/>
                 <constraint firstAttribute="trailing" secondItem="UE7-CX-F3s" secondAttribute="trailing" id="7Bf-Td-8s6"/>
-                <constraint firstItem="X8m-zH-diL" firstAttribute="width" secondItem="X8m-zH-diL" secondAttribute="height" multiplier="13:4" id="7Ow-SZ-xH1"/>
+                <constraint firstItem="X8m-zH-diL" firstAttribute="width" secondItem="X8m-zH-diL" secondAttribute="height" multiplier="351:120" id="7Ow-SZ-xH1"/>
                 <constraint firstItem="X8m-zH-diL" firstAttribute="leading" secondItem="FTX-tf-JYt" secondAttribute="leading" id="8IJ-cL-MHB"/>
                 <constraint firstItem="lSQ-oa-URI" firstAttribute="centerY" secondItem="y0E-93-7ac" secondAttribute="centerY" id="9z9-g0-6Xn"/>
                 <constraint firstItem="pm2-TK-yzh" firstAttribute="centerY" secondItem="qJ1-Pm-qsl" secondAttribute="centerY" id="AjB-gW-5Oi"/>

MusicGradeExam/MusicGradeExam/UI/NotiferMessage/Controller/NotifyMessageViewController.m

@@ -66,7 +66,7 @@
         [self.tableView.mj_header endRefreshing];
         [self.tableView.mj_footer endRefreshing];
         if (self.networkAvaiable == NO) {
-            [self setPromptString:@"暂无网络" imageName:@"no_networking" inView:self.tableView];
+            [self setPromptString:@"网络开小差，再刷新看看" imageName:@"networking_error" inView:self.tableView];
         }
         [self.dataArray removeAllObjects];
         [self.tableView reloadData];
@@ -77,7 +77,7 @@
 
 - (void)configUI {
     [self.view addSubview:self.tableView];
-    [self setPromptString:@"无内容" imageName:@"wd_img_zwsj" inView:self.tableView];
+    [self setPromptString:@"暂无消息" imageName:@"empty_message" inView:self.tableView];
     MJWeakSelf;
     self.tableView.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{
         [weakSelf resetParamenter];
@@ -100,11 +100,10 @@
     self.rows = 10;
     self.dataArray = [NSMutableArray array];
     [self.tableView.mj_footer resetNoMoreData];
-    [self setPromptString:@"无内容" imageName:@"wd_img_zwsj" inView:self.tableView];
+    [self setPromptString:@"暂无消息" imageName:@"empty_message" inView:self.tableView];
     [self.tableView reloadData];
 }
 
-#pragma mark --- table data source
 #pragma mark --- table data soure
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
     return self.dataArray.count;
@@ -118,7 +117,15 @@
 }
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
-    
+    MessageListModel *model = self.dataArray[indexPath.row];
+    if (model.readStatus == 0) {
+        NotifyMessageCell *cell = [tableView cellForRowAtIndexPath:indexPath];
+        [self readMessage:model baseCell:cell];
+    }
+    else {
+        // 跳转页面
+        [self toDetailViewWithTypeString:model.memo];
+    }
 }
 
 - (void)readMessage:(MessageListModel *)model baseCell:(NotifyMessageCell *)cell {
@@ -159,7 +166,7 @@
                 }
             }
         }
-        else if ([headStr isEqualToString:@"3"]) {
+        else if ([headStr isEqualToString:@"3"]) { // 待考
             NSString *valueStr = [[memo componentsSeparatedByString:@"?"] lastObject];
             NSArray *parmArray = [valueStr componentsSeparatedByString:@"&"];
             for (NSString *subStr in parmArray) {

MusicGradeExam/MusicGradeExam/UI/NotiferMessage/View/NotifyMessageCell.xib

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
@@ -82,6 +82,7 @@
                     <constraint firstItem="3zY-4P-qh6" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="U2L-6a-Tf0"/>
                     <constraint firstAttribute="trailing" secondItem="yc7-s6-gbf" secondAttribute="trailing" id="VbP-3S-iZ8"/>
                     <constraint firstItem="yL7-lv-Cfl" firstAttribute="leading" secondItem="c4k-4Y-3yQ" secondAttribute="leading" id="iIJ-BA-JPW"/>
+                    <constraint firstItem="yc7-s6-gbf" firstAttribute="top" secondItem="yL7-lv-Cfl" secondAttribute="bottom" constant="18" id="rIF-DC-fQU"/>
                     <constraint firstAttribute="bottom" secondItem="yc7-s6-gbf" secondAttribute="bottom" id="rxs-5h-LdZ"/>
                     <constraint firstItem="yc7-s6-gbf" firstAttribute="leading" secondItem="yL7-lv-Cfl" secondAttribute="leading" id="vOj-gj-6nV"/>
                 </constraints>

MusicGradeExam/MusicGradeExam/UI/UserCenter/Networking/Controller/NetworkingCheckController.m

@@ -239,7 +239,7 @@
     
     self.progressLayer = [CAShapeLayer layer];
     self.progressLayer.fillColor = [UIColor clearColor].CGColor;
-    self.progressLayer.strokeColor = HexRGB(0x13bab3).CGColor;
+    self.progressLayer.strokeColor = THEMECOLOR.CGColor;
     self.progressLayer.lineWidth = 20;
     self.progressLayer.path = circlePath.CGPath;
     self.progressLayer.strokeEnd = 0;

MusicGradeExam/MusicGradeExam/UI/UserCenter/Setting/Controller/SettingViewController.m

@@ -95,6 +95,16 @@
 
 
 - (void)logoutAction {
+    
+    [KSRequestManager logoutRequest:KS_POST success:^(NSDictionary * _Nonnull dic) {
+        [self clearSource];
+    } faliure:^(NSError * _Nonnull error) {
+        [self clearSource];
+    }];
+}
+
+
+- (void)clearSource {
     [RCConnectionManager shareManager].isNeedJoin = NO;
     [RCConnectionManager shareManager].isNeedShowMessage = NO;
     [[RCIM sharedRCIM] logout];