考级曲库

MusicGradeExam/MusicGradeExam.xcodeproj/project.pbxproj

@@ -7,6 +7,9 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		2729F7C724C6C87400E1F3C4 /* OpenFileViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2729F7C624C6C87400E1F3C4 /* OpenFileViewController.m */; };
+		2729F7CA24C6EB4A00E1F3C4 /* SubjectNameModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 2729F7C924C6EB4A00E1F3C4 /* SubjectNameModel.m */; };
+		2729F7CD24C6F3F300E1F3C4 /* SongListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 2729F7CC24C6F3F300E1F3C4 /* SongListModel.m */; };
 		27476F4824BBFB5900181362 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 27476F4724BBFB5900181362 /* AppDelegate.m */; };
 		27476F4E24BBFB5900181362 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 27476F4D24BBFB5900181362 /* ViewController.m */; };
 		27476F5124BBFB5900181362 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 27476F4F24BBFB5900181362 /* Main.storyboard */; };
@@ -364,6 +367,12 @@
 /* Begin PBXFileReference section */
 		1AA4DFCEF527585287BEBFE0 /* Pods-MusicGradeExam.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MusicGradeExam.release.xcconfig"; path = "Target Support Files/Pods-MusicGradeExam/Pods-MusicGradeExam.release.xcconfig"; sourceTree = "<group>"; };
 		1C12DE728E343C25BB5998D7 /* libPods-MusicGradeExam.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-MusicGradeExam.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		2729F7C524C6C87400E1F3C4 /* OpenFileViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OpenFileViewController.h; sourceTree = "<group>"; };
+		2729F7C624C6C87400E1F3C4 /* OpenFileViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OpenFileViewController.m; sourceTree = "<group>"; };
+		2729F7C824C6EB4900E1F3C4 /* SubjectNameModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SubjectNameModel.h; sourceTree = "<group>"; };
+		2729F7C924C6EB4A00E1F3C4 /* SubjectNameModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SubjectNameModel.m; sourceTree = "<group>"; };
+		2729F7CB24C6F3F300E1F3C4 /* SongListModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SongListModel.h; sourceTree = "<group>"; };
+		2729F7CC24C6F3F300E1F3C4 /* SongListModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SongListModel.m; sourceTree = "<group>"; };
 		27476F4324BBFB5900181362 /* 酷乐秀.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "酷乐秀.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		27476F4624BBFB5900181362 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		27476F4724BBFB5900181362 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
@@ -1468,8 +1477,8 @@
 		2747701824BC0C0100181362 /* RTCService */ = {
 			isa = PBXGroup;
 			children = (
-				2747701924BC0C0100181362 /* RTCService.m */,
 				2747701A24BC0C0100181362 /* RTCService.h */,
+				2747701924BC0C0100181362 /* RTCService.m */,
 			);
 			path = RTCService;
 			sourceTree = "<group>";
@@ -1790,14 +1799,14 @@
 		2747708624BC0C0300181362 /* Cache */ = {
 			isa = PBXGroup;
 			children = (
-				2747708724BC0C0300181362 /* KSLRUManager.h */,
-				2747708824BC0C0300181362 /* KSMemoryCache.h */,
 				2747708924BC0C0300181362 /* KSCacheManager.h */,
+				2747708E24BC0C0300181362 /* KSCacheManager.m */,
 				2747708A24BC0C0300181362 /* KSDiskCache.h */,
+				2747708D24BC0C0300181362 /* KSDiskCache.m */,
+				2747708724BC0C0300181362 /* KSLRUManager.h */,
 				2747708B24BC0C0300181362 /* KSLRUManager.m */,
+				2747708824BC0C0300181362 /* KSMemoryCache.h */,
 				2747708C24BC0C0300181362 /* KSMemoryCache.m */,
-				2747708D24BC0C0300181362 /* KSDiskCache.m */,
-				2747708E24BC0C0300181362 /* KSCacheManager.m */,
 			);
 			path = Cache;
 			sourceTree = "<group>";
@@ -2241,6 +2250,8 @@
 			children = (
 				2748F8EF24C05F4C003F8E11 /* ExamLibraryController.h */,
 				2748F8F024C05F4C003F8E11 /* ExamLibraryController.m */,
+				2729F7C524C6C87400E1F3C4 /* OpenFileViewController.h */,
+				2729F7C624C6C87400E1F3C4 /* OpenFileViewController.m */,
 			);
 			path = Controller;
 			sourceTree = "<group>";
@@ -2248,6 +2259,10 @@
 		2748F8ED24C05F30003F8E11 /* Model */ = {
 			isa = PBXGroup;
 			children = (
+				2729F7C824C6EB4900E1F3C4 /* SubjectNameModel.h */,
+				2729F7C924C6EB4A00E1F3C4 /* SubjectNameModel.m */,
+				2729F7CB24C6F3F300E1F3C4 /* SongListModel.h */,
+				2729F7CC24C6F3F300E1F3C4 /* SongListModel.m */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -2891,6 +2906,7 @@
 				2747722924BC0C0500181362 /* KSChoosePicker.m in Sources */,
 				274771B224BC0C0500181362 /* ZKCycleScrollViewFlowLayout.m in Sources */,
 				274771BB24BC0C0500181362 /* ALCalendarDate.m in Sources */,
+				2729F7CA24C6EB4A00E1F3C4 /* SubjectNameModel.m in Sources */,
 				2747724D24BC0C0500181362 /* JXCategoryNumberCellModel.m in Sources */,
 				274771C024BC0C0500181362 /* ALCalendarManager.m in Sources */,
 				2747724C24BC0C0500181362 /* JXCategoryNumberCell.m in Sources */,
@@ -3025,6 +3041,7 @@
 				2747721824BC0C0500181362 /* NSObject+ReadDocument.m in Sources */,
 				27EF3F2624C02B68002068A2 /* MainToolView.m in Sources */,
 				2747718F24BC0C0500181362 /* TZImageCropManager.m in Sources */,
+				2729F7C724C6C87400E1F3C4 /* OpenFileViewController.m in Sources */,
 				2747725924BC0C0500181362 /* GRScanManager.m in Sources */,
 				2747724224BC0C0500181362 /* JXCategoryTitleImageView.m in Sources */,
 				2747720424BC0C0500181362 /* UITextView+ZWPlaceHolder.m in Sources */,
@@ -3035,6 +3052,7 @@
 				274771B924BC0C0500181362 /* ALCalendarConfig.m in Sources */,
 				2747726324BC0C0500181362 /* LLFileManager.m in Sources */,
 				274771FE24BC0C0500181362 /* NSMutableString+KSSafe.m in Sources */,
+				2729F7CD24C6F3F300E1F3C4 /* SongListModel.m in Sources */,
 				2747723D24BC0C0500181362 /* JXCategoryIndicatorCell.m in Sources */,
 				2747721A24BC0C0500181362 /* UIImage+Addtions.m in Sources */,
 				274771EC24BC0C0500181362 /* LoginBodyView.m in Sources */,

MusicGradeExam/MusicGradeExam/Assets.xcassets/Classroom/mb_notice.imageset/Contents.json

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

MusicGradeExam/MusicGradeExam/KSRequestManager.h

@@ -66,6 +66,10 @@ NS_ASSUME_NONNULL_BEGIN
  */
 + (void)videoFileUpload:(NSString *)post fileData:(NSData *)fileData progress:(void(^)(int64_t bytesWritten,int64_t totalBytes))progress success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure;
 
+
+#pragma mark ---- 文件下载
++ (void)downloadFileRequestWithFileUrl:(NSString *)url progress:(void (^)(int64_t bytesRead, int64_t totalBytes))progress success:(void(^)(NSURL *fileUrl))success faliure:(void (^)(NSError * error))faliure;
+
 #pragma mark ---- 验证码服务
 // /api-auth/code/sendSms
 
@@ -307,6 +311,25 @@ NS_ASSUME_NONNULL_BEGIN
 /// @param success 成功
 /// @param faliure 失败
 + (void)signInRequest:(NSString *)post examRegistrationId:(NSString *)examRegistrationId success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure;
+
+#pragma mark ---- 曲库
+// /api-user/subject/studentQueryPage
+
+/// 获取学生曲库科目
+/// @param get get
+/// @param success 成功
+/// @param faliure 失败
++ (void)musicLibraryPageRequest:(NSString *)get success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure;
+
+// /api-user/examSong/queryPage
+
+/// 分页查询曲目
+/// @param get get
+/// @param subjectList 专业
+/// @param level 级别
+/// @param success 成功
+/// @param faliure 失败
++ (void)musicSongListRequest:(NSString *)get subjectList:(NSString *)subjectList level:(NSString *)level success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure;
 @end
 
 NS_ASSUME_NONNULL_END

MusicGradeExam/MusicGradeExam/KSRequestManager.m

@@ -13,7 +13,7 @@
 #import <RongIMKit/RongIMKit.h>
 #import "JPUSHService.h"
 #import "RCConnectionManager.h"
-//#import "LoginViewController.h"
+#import "LoginViewController.h"
 
 @implementation KSRequestManager
 
@@ -136,7 +136,7 @@
 }
 
 + (void)logoutAction {
-    /*
+    
     [MBProgressHUD hideHUD];
     [self clearRequestHeader];
     // 取消推送别名
@@ -145,29 +145,23 @@
     [[NSUserDefaults standardUserDefaults] removeObjectForKey:TokenKey];
     [[NSUserDefaults standardUserDefaults] removeObjectForKey:RongTokenKey];
     [[NSUserDefaults standardUserDefaults] synchronize];
-    [UIApplication sharedApplication].applicationIconBadgeNumber = 0;
     [RCConnectionManager shareManager].isNeedJoin = NO;
     [RCConnectionManager shareManager].isNeedShowMessage = NO;
     [[RCIM sharedRCIM] logout];
     
     // 回到登录界面
+    // 回到登录界面
     UIViewController *vc = [UIApplication sharedApplication].keyWindow.rootViewController;
     if ([vc isKindOfClass:[UITabBarController class]]) {
         UITabBarController *tab = (UITabBarController *)[UIApplication sharedApplication].keyWindow.rootViewController;
         CustomNavViewController *ctrl = (CustomNavViewController *)tab.selectedViewController;
-        [ctrl popToRootViewControllerAnimated:YES];
+        [ctrl popToRootViewControllerAnimated:NO];
+        
         LoginViewController *logonVC = [[LoginViewController alloc] init];
         CustomNavViewController *navCtrl = [[CustomNavViewController alloc] initWithRootViewController:logonVC];
-        if ([tab.selectedViewController isKindOfClass:[CustomNavViewController class]]) {
-            CustomNavViewController *currentNav = tab.selectedViewController;
-            if ([currentNav.visibleViewController isKindOfClass:[HomeViewController class]]) {
-                logonVC.homeLogin = YES;
-            }
-        }
         navCtrl.modalPresentationStyle = UIModalPresentationFullScreen;
         [tab.selectedViewController presentViewController:navCtrl animated:YES completion:nil];
     }
-     */
 }
 
 // 提示信息
@@ -236,6 +230,28 @@
     }];
 }
 
+// 下载
++ (void)downloadTaskWithUrl:(NSString *)myUrl
+                   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);
+        }
+    } successBlock:^(NSURL * _Nullable url) {
+        if (success) {
+            success(url);
+        }
+    } failBlock:^(NSError * _Nonnull error) {
+        [self showMessage:@"网络或服务器错误，请重试"];
+
+        if (faliure) {
+            faliure(error);
+        }
+    }];
+}
+
 #pragma mark --- 图片上传
 
 /// 图片上传
@@ -293,6 +309,13 @@
     [self uploadFileWithFileData:fileData andWithUrl:url parameters:nil type:@".mp4" name:@"file" mimeType:[NSString stringWithFormat:@"Image/.mp4"] progress:progress success:success faliure:faliure];
 }
 
+#pragma mark ---- 文件下载
++ (void)downloadFileRequestWithFileUrl:(NSString *)url progress:(void (^)(int64_t, int64_t))progress success:(void (^)(NSURL * _Nonnull))success faliure:(void (^)(NSError * _Nonnull))faliure {
+    [self downloadTaskWithUrl:url progress:progress success:success faliure:faliure];
+}
+
+
+
 #pragma mark ---- 验证码服务
 // /api-auth/code/sendSms
 
@@ -670,4 +693,34 @@
     [self request:post url:url parm:parm success:success faliure:faliure];
 }
 
+#pragma mark ---- 曲库
+// /api-user/subject/studentQueryPage
+
+/// 获取学生曲库科目
+/// @param get get
+/// @param success 成功
+/// @param faliure 失败
++ (void)musicLibraryPageRequest:(NSString *)get success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
+    NSString *url = [NSString stringWithFormat:@"%@%@", hostURL, @"/api-user/subject/studentQueryPage"];
+    NSMutableDictionary *parm = [NSMutableDictionary dictionary];
+    [parm setValue:@"0" forKey:@"parentId"];
+    [self request:get url:url parm:nil success:success faliure:faliure];
+}
+
+// /api-user/examSong/queryPage
+
+/// 分页查询曲目
+/// @param get get
+/// @param subjectList 专业
+/// @param level 级别
+/// @param success 成功
+/// @param faliure 失败
++ (void)musicSongListRequest:(NSString *)get subjectList:(NSString *)subjectList level:(NSString *)level success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
+    NSString *url = [NSString stringWithFormat:@"%@%@", hostURL, @"/api-user/examSong/queryPage"];
+    NSMutableDictionary *parm = [NSMutableDictionary dictionary];
+    [parm setValue:subjectList forKey:@"subjectList"];
+    [parm setValue:level forKey:@"level"];
+    [self request:get url:url parm:nil success:success faliure:faliure];
+}
+
 @end

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

@@ -338,7 +338,7 @@
 
 - (void)memberDidJoin:(RoomMember *)member {
     NSLog(@"memberDidJoin %@",member);
-    if(member.role != RoleAudience) {
+    if(member.role == RoleTeacher) {
         [self.videoListView reloadVideoList];
     }
     if (member.role == RoleTeacher || member.role == RoleAssistant) {
@@ -351,7 +351,7 @@
     // 此处移除
     [[KSRemoteUserManager shareInstance] removeUser:member.userId];
     
-    if(member.role != RoleAudience) {
+    if(member.role == RoleTeacher) {
         [self.videoListView reloadVideoList];
     }
 }
@@ -368,6 +368,19 @@
     }
 }
 
+- (void)memberRecordAction:(RoomMember *)member {
+    NSLog(@"memberRecordAction %@", member);
+    RoomMember *curMember = [ClassroomService sharedService].currentRoom.currentMember;
+    if ([curMember.userId isEqualToString:member.userId]) {
+        // 弹窗提示去录播
+        [KSNormalAlertView ks_showAlertWithTitle:@"当前在线直播考试无法正常完成\n主考官建议您使用录播进行考试" leftTitle:@"取消" rightTitle:@"去录播" cancel:^{
+            
+        } confirm:^{
+            
+        }];
+    }
+}
+
 - (void)errorDidOccur:(ErrorCode)code {
     NSLog(@"errorDidOccur %@",@(code));
     [self.hud hideAnimated:YES];

MusicGradeExam/MusicGradeExam/UI/Classroom/Service/Classroom/ClassroomService.h

@@ -23,6 +23,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)memberDidJoin:(RoomMember *)member;
 - (void)memberDidLeave:(RoomMember *)member;
 - (void)memberDidKick:(RoomMember *)member;
+- (void)memberRecordAction:(RoomMember *)member;
 //转让助教，助教收到的回调
 - (void)assistantDidTransfer:(RoomMember *)oldAssistant newAssistant:(RoomMember *)newAssistant;
 //除降级外其它角色变化

MusicGradeExam/MusicGradeExam/UI/Classroom/Service/Classroom/ClassroomService.m

@@ -694,7 +694,7 @@
                     [self.classroomDelegate memberDidJoin:mem];
                 }
             }
-        }else if(msg.action == MemberChangeActionLeave){
+        } else if(msg.action == MemberChangeActionLeave) {
             if([self.classroomDelegate respondsToSelector:@selector(memberDidLeave:)]) {
                 RoomMember *mem = [[RoomMember alloc] init];
                 mem.userId = msg.userId;
@@ -705,7 +705,7 @@
                     [self.classroomDelegate memberDidLeave:mem];
                 }
             }
-        }else if(msg.action == MemberChangeActionKick) {
+        } else if(msg.action == MemberChangeActionKick) {
             if ([msg.userId isEqualToString:self.currentRoom.currentMember.userId]) {
                 if ([self.classroomDelegate respondsToSelector:@selector(roomDidLeave)]) {
                     [self.classroomDelegate roomDidLeave];
@@ -718,6 +718,15 @@
                 }
             }
         }
+        else if (msg.action == MemberChangeActionRecord) { // 去录制
+            RoomMember *mem = [self.currentRoom getMember:msg.userId];
+            if ([self.classroomDelegate respondsToSelector:@selector(memberRecordAction:)]) {
+                [self.classroomDelegate memberRecordAction:mem];
+            }
+        }
+        else if (msg.action == MemberChangeActionRefresh) { // 刷新列表
+            [[NSNotificationCenter defaultCenter] postNotificationName:RefreshWaitListNotification object:nil];
+        }
     });
 }
 

MusicGradeExam/MusicGradeExam/UI/Classroom/Service/Classroom/Message/MemberChangeMessage.h

@@ -17,6 +17,11 @@ typedef NS_ENUM(NSUInteger, MemberChangeAction) {
     MemberChangeActionLeave = 2,
     //被踢掉线
     MemberChangeActionKick = 3,
+    // 录制
+    MemberChangeActionRecord = 4,
+    // 刷新排队列表
+    MemberChangeActionRefresh = 5,
+    
 };
 
 /**

MusicGradeExam/MusicGradeExam/UI/Classroom/Service/Classroom/Util/Macro.h

@@ -21,4 +21,5 @@ NSLog(@"[SealClassLog] desc: %@", [NSString stringWithFormat:(s), ##__VA_ARGS__]
 #define RoleDidChangeNotification @"RoleDidChangeNotification"
 #define OnReceiveMessageNotification @"OnReceiveMessageNotification"
 
+#define RefreshWaitListNotification @"RefreshWaitListNotification"
 #endif /* Macro_h */

MusicGradeExam/MusicGradeExam/UI/Classroom/Service/IM/KSIMService.m

@@ -20,6 +20,7 @@
     });
     return service;
 }
+
 - (void)ksOnReceived:(RCMessage *)message left:(int)nLeft object:(id)object {
     if (![[ClassroomService sharedService] isHoldMessage:message]) {
         if ([self.ksReceiveMessageDelegate respondsToSelector:@selector(onReceiveMessage:left:object:)]) {

MusicGradeExam/MusicGradeExam/UI/Classroom/Service/RTCService/RTCService.m

@@ -568,7 +568,8 @@
     if(!_captureParam) {
         _captureParam = [[RongRTCVideoCaptureParam alloc] init];
         _captureParam.videoOrientation = AVCaptureVideoOrientationLandscapeRight;
-        _captureParam.maxBitrate = 1000;
+        _captureParam.videoSizePreset = RongRTCVideoSizePreset720x480;
+//        _captureParam.maxBitrate = 1000;
         _captureParam.minBitrate = 500;
     }
     return _captureParam;

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

@@ -19,6 +19,8 @@
 
 @property (nonatomic, strong) OnlineRoomManager *classManager;
 
+@property (nonatomic, assign) BOOL cancleRequest;
+
 @end
 
 @implementation WaitExamViewController
@@ -29,6 +31,17 @@
     [self allocTitle:@"待考"];
     self.view.backgroundColor = HexRGB(0xf3f4f8);
     [self configUI];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(backLoginView) name:@"backLoginView" object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(refreshWaitList) name:RefreshWaitListNotification object:nil];
+}
+
+- (void)refreshWaitList {
+    [self requestDataWithHub:NO];
+}
+
+// 试听课被挤掉
+- (void)backLoginView {
+    _cancleRequest = YES;
 }
 
 - (void)viewWillAppear:(BOOL)animated {
@@ -37,13 +50,23 @@
     if(@available(iOS 13.0, *)){
         [UIApplication sharedApplication].statusBarStyle = UIStatusBarStyleDarkContent;
     }
-    [self requestData];
+    if (_cancleRequest) {
+        _cancleRequest = NO;
+        [KSRequestManager logoutAction];
+        return;
+    }
+    [self requestDataWithHub:YES];
 }
 
-- (void)requestData {
-    [self showhud];
+- (void)requestDataWithHub:(BOOL)needHub {
+    if (needHub) {
+       [self showhud];
+    }
+    
     [KSRequestManager needCheckingDetailRequest:KS_GET examRegistrationId:self.examRegistrationId success:^(NSDictionary * _Nonnull dic) {
-        [self removehub];
+        if (needHub) {
+            [self removehub];
+        }
         if ([dic integerValueForKey:@"code"] == 200 && [dic boolValueForKey:@"status"]) {
             self.sourceModel = [[TicketDetailModel alloc] initWithDictionary:[dic dictionaryValueForKey:@"data"]];
             [self.bodyView configMessageSource:self.sourceModel];
@@ -52,7 +75,9 @@
             [self MBPShow:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
-        [self removehub];
+        if (needHub) {
+            [self removehub];
+        }
     }];
 }
 
@@ -96,7 +121,6 @@
 }
 
 
-
 #pragma mark ----- 签到
 - (void)signAction {
     [self showhud];
@@ -124,6 +148,9 @@
     }
     return _classManager;
 }
+- (void)dealloc {
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
 /*
 #pragma mark - Navigation
 

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

@@ -9,6 +9,9 @@
 #import "ExamLibraryController.h"
 #import <HMSegmentedControl.h>
 #import "ExamLibraryListCell.h"
+#import "OpenFileViewController.h"
+#import "SubjectNameModel.h"
+#import "SongListModel.h"
 
 @interface ExamLibraryController ()<UITableViewDelegate, UITableViewDataSource>
 
@@ -18,6 +21,11 @@
 
 @property (nonatomic, strong) UITableView *tableView;
 
+@property (nonatomic, strong) NSMutableArray *subjectArray;
+
+@property (nonatomic, strong) NSString *levelString;
+
+@property (nonatomic, strong) NSString *subjectId;
 
 @end
 
@@ -27,7 +35,27 @@
     [super viewDidLoad];
     // Do any additional setup after loading the view.
     [self allocTitle:@"考级曲库"];
-    [self configUI];
+    [self querySubjectMessage];
+}
+
+- (void)querySubjectMessage {
+    [self showhud];
+    [KSRequestManager musicLibraryPageRequest:KS_GET success:^(NSDictionary * _Nonnull dic) {
+        [self removehub];
+        if ([dic integerValueForKey:@"code"] == 200 && [dic boolValueForKey:@"status"]) {
+            NSArray *source = [[dic dictionaryValueForKey:@"data"] arrayValueForKey:@"rows"];
+            for (NSDictionary *parm in source) {
+                SubjectNameModel *model = [[SubjectNameModel alloc] initWithDictionary:parm];
+                [self.subjectArray addObject:model];
+            }
+            [self configUI];
+        }
+        else {
+            [self MBPShow:MESSAGEKEY];
+        }
+    } faliure:^(NSError * _Nonnull error) {
+        [self removehub];
+    }];
 }
 
 - (void)viewWillAppear:(BOOL)animated {
@@ -37,14 +65,20 @@
         [UIApplication sharedApplication].statusBarStyle = UIStatusBarStyleDarkContent;
     }
 }
-- (void)requestData {
-    [self.tableView reloadData];
-}
+
 
 - (void)configUI {
+    NSMutableArray *nameArray = [NSMutableArray array];
+    for (SubjectNameModel *model in self.subjectArray) {
+        [nameArray addObject:model.name];
+    }
+    SubjectNameModel *model = self.subjectArray[0];
+    self.subjectId = [NSString stringWithFormat:@"%.0f", model.internalBaseClassIdentifier];
+    self.levelString = @"1";
+
     self.view.backgroundColor = HexRGB(0xf3f4f8);
     [self.scrollView removeFromSuperview];
-    _topSegment = [[HMSegmentedControl alloc] initWithSectionTitles:@[@"钢琴",@"长笛",@"萨克斯",@"单簧管"]];
+    _topSegment = [[HMSegmentedControl alloc] initWithSectionTitles:nameArray];
     _topSegment.titleTextAttributes = @{NSFontAttributeName:[UIFont systemFontOfSize:17.0f], NSForegroundColorAttributeName:HexRGB(0x333333)};
     _topSegment.selectedTitleTextAttributes = @{NSFontAttributeName:[UIFont systemFontOfSize:17.0f weight:UIFontWeightMedium], NSForegroundColorAttributeName:THEMECOLOR};
     _topSegment.selectionIndicatorColor = THEMECOLOR;
@@ -66,29 +100,99 @@
     [self.view addSubview:_secondSegment];
     
     [self.view addSubview:self.tableView];
+    MJWeakSelf;
+    self.tableView.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{
+        [weakSelf resetParamenter];
+        [weakSelf requestData];
+    }];
+    self.tableView.mj_footer = [MJRefreshBackNormalFooter footerWithRefreshingBlock:^{
+        if (weakSelf.isLoadMore) {
+            weakSelf.pages += 1;
+            [weakSelf requestData];
+        }
+        else {
+            [weakSelf.tableView.mj_footer endRefreshingWithNoMoreData];
+        }
+    }];
+    [self resetParamenter];
+    [self requestData];
+}
+
+- (void)resetParamenter {
+    self.isLoadMore = YES;
+    self.pages = 1;
+    self.rows = 10;
+    self.dataArray = [NSMutableArray array];
+    [self.tableView.mj_footer resetNoMoreData];
+    [self setPromptString:@"暂无曲目" imageName:@"wd_img_zwsj" inView:self.tableView];
+    [self.tableView reloadData];
+}
+
+- (void)requestData {
+    [KSRequestManager musicSongListRequest:KS_GET subjectList:self.subjectId level:self.levelString success:^(NSDictionary * _Nonnull dic) {
+        [self.tableView.mj_header endRefreshing];
+        [self.tableView.mj_footer endRefreshing];
+        if ([dic integerValueForKey:@"code"] == 200 && [dic boolValueForKey:@"status"]) {
+            NSArray *source = [[dic dictionaryValueForKey:@"data"] arrayValueForKey:@"rows"];
+            for (NSDictionary *parm in source) {
+                SongListModel *model = [[SongListModel alloc] initWithDictionary:parm];
+                [self.dataArray addObject:model];
+            }
+            if (source.count < self.rows) {
+                self.isLoadMore = NO;
+            }
+            [self.tableView reloadData];
+        }
+        else {
+            [self MBPShow:MESSAGEKEY];
+        }
+        
+        [self changePromptLabelState];
+    } faliure:^(NSError * _Nonnull error) {
+        [self.tableView.mj_header endRefreshing];
+        [self.tableView.mj_footer endRefreshing];
+        if (self.networkAvaiable == NO) {
+            [self setPromptString:@"暂无网络" imageName:@"no_networking" inView:self.tableView];
+        }
+        [self.dataArray removeAllObjects];
+        [self.tableView reloadData];
+        [self changePromptLabelState];
+    }];
 }
 
 - (void)selectedSegment:(HMSegmentedControl *)segmentCtrl {
+    NSInteger subjectIndex = segmentCtrl.selectedSegmentIndex;
+    SubjectNameModel *subjectModel = self.subjectArray[subjectIndex];
     
+    self.subjectId = [NSString stringWithFormat:@"%.0f", subjectModel.internalBaseClassIdentifier];
+    [self.secondSegment setSelectedSegmentIndex:0 animated:YES];
+    [self resetParamenter];
+    [self requestData];
 }
 
 - (void)levelSegmentAction:(HMSegmentedControl *)segmentCtrl {
+    NSInteger levelIndex = segmentCtrl.selectedSegmentIndex + 1;
+    self.levelString = [NSString stringWithFormat:@"%zd", levelIndex];
+    [self resetParamenter];
     [self requestData];
 }
 
 #pragma mark ------ table data source
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
-    return 10;
-//    return self.dataArray.count;
+    return self.dataArray.count;
 }
 
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+    SongListModel *model = self.dataArray[indexPath.row];
     ExamLibraryListCell *cell = [tableView dequeueReusableCellWithIdentifier:@"ExamLibraryListCell"];
+    [cell configCellWithSource:model];
     return cell;
 }
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
-    
+    OpenFileViewController *fileUrl = [[OpenFileViewController alloc] init];
+    fileUrl.urlString = @"https://www.tutorialspoint.com/ios/ios_tutorial.pdf";
+    [self.navigationController pushViewController:fileUrl animated:YES];
 }
 
 - (UITableView *)tableView {
@@ -107,6 +211,13 @@
     }
     return _tableView;
 }
+
+- (NSMutableArray *)subjectArray {
+    if (!_subjectArray) {
+        _subjectArray = [NSMutableArray array];
+    }
+    return _subjectArray;
+}
 /*
 #pragma mark - Navigation
 

MusicGradeExam/MusicGradeExam/UI/ExamLibrary/Controller/OpenFileViewController.h

@@ -0,0 +1,19 @@
+//
+//  OpenFileViewController.h
+//  MusicGradeExam
+//
+//  Created by Kyle on 2020/7/21.
+//  Copyright © 2020 DayaMusic. All rights reserved.
+//
+
+#import "KSBaseViewController.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface OpenFileViewController : KSBaseViewController
+
+@property (nonatomic, strong) NSString *urlString;
+
+@end
+
+NS_ASSUME_NONNULL_END

MusicGradeExam/MusicGradeExam/UI/ExamLibrary/Controller/OpenFileViewController.m

@@ -0,0 +1,135 @@
+//
+//  OpenFileViewController.m
+//  MusicGradeExam
+//
+//  Created by Kyle on 2020/7/21.
+//  Copyright © 2020 DayaMusic. All rights reserved.
+//
+
+#import "OpenFileViewController.h"
+#import <QuickLook/QuickLook.h>
+
+@interface OpenFileViewController ()<QLPreviewControllerDataSource, QLPreviewControllerDelegate>
+
+@property (nonatomic, strong) QLPreviewController *previewCtrl;
+
+@property (nonatomic, strong) NSURL *fileURL;
+
+
+@end
+
+@implementation OpenFileViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    // Do any additional setup after loading the view.
+    [self allocTitle:@"曲目详情"];
+    [self addChildViewController:self.previewCtrl];
+    [self.view addSubview:self.previewCtrl.view];
+}
+
+
+- (void)viewWillAppear:(BOOL)animated {
+    [super viewWillAppear:animated];
+    [self requestFileSource];
+}
+
+- (void)requestFileSource {
+    if ([self isFileExist:self.urlString]) { // 本地加载
+        self.fileURL = [self getSavePath:self.urlString];
+        //刷新界面,如果不刷新的话，不重新走一遍代理方法，返回的url还是上一次的url
+        [self.previewCtrl refreshCurrentPreviewItem];
+    }
+    else { // 网络下载
+        [KSRequestManager downloadFileRequestWithFileUrl:self.urlString progress:^(int64_t bytesRead, int64_t totalBytes) {
+            
+        } success:^(NSURL * _Nonnull fileUrl) {
+            self.fileURL = fileUrl;
+            [self.previewCtrl refreshCurrentPreviewItem];
+        } faliure:^(NSError * _Nonnull error) {
+            
+        }];
+    }
+}
+
+#pragma mark ------ QLPreviewControllerDataSource
+- (id<QLPreviewItem>)previewController:(QLPreviewController *)controller previewItemAtIndex:(NSInteger)index {
+    return self.fileURL;
+}
+
+- (NSInteger)numberOfPreviewItemsInPreviewController:(QLPreviewController *)previewController {
+    return 1;
+}
+
+- (QLPreviewController *)previewCtrl {
+    if (!_previewCtrl) {
+        _previewCtrl = [[QLPreviewController alloc] init];
+        _previewCtrl.view.frame = CGRectMake(0, 0, kScreenWidth, kScreenHeight - kNaviBarHeight - iPhoneXSafeBottomMargin);
+        _previewCtrl.delegate = self;
+        _previewCtrl.dataSource = self;
+        _previewCtrl.currentPreviewItemIndex = 0;
+        _previewCtrl.navigationController.navigationBar.userInteractionEnabled = NO;
+    }
+    return _previewCtrl;
+}
+
+#pragma mark ----- 文件处理
+- (BOOL)saveFileWithFileName:(NSString *)fileName {
+    NSURL *preUrl = [self getSavePath:fileName];
+    NSString *copyPath = preUrl.path;
+    NSFileManager *fileMamager = [NSFileManager defaultManager];
+    NSString *path = [[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES)lastObject] stringByAppendingPathComponent:@"FileLibrary"];
+    path = [path stringByAppendingPathComponent:[NSString stringWithFormat:@"%@",fileName]];
+    NSError *error = nil;
+    if (![fileMamager copyItemAtPath:copyPath toPath:path error:&error]) {
+        [fileMamager removeItemAtPath:copyPath error:nil];
+        NSLog(@"拷贝失败:%@", error.userInfo);
+        return NO;
+    }
+    else {
+        [fileMamager removeItemAtPath:copyPath error:nil];
+        return YES;
+    }
+}
+
+- (NSURL *)getSavePath:(NSString *)fileName {
+    //  在Documents目录下创建一个名为FileData的文件夹
+    NSString *path = [[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES)lastObject] stringByAppendingPathComponent:@"FileLibrary"];
+    NSLog(@"%@",path);
+    
+    NSFileManager *fileManager = [NSFileManager defaultManager];
+    BOOL isDir = FALSE;
+    BOOL isDirExist = [fileManager fileExistsAtPath:path isDirectory:&isDir];
+    if(!(isDirExist && isDir)) {
+        BOOL bCreateDir = [fileManager createDirectoryAtPath:path withIntermediateDirectories:YES attributes:nil error:nil];
+        if(!bCreateDir){
+            NSLog(@"创建文件夹失败！");
+        }
+        NSLog(@"创建文件夹成功，文件路径%@",path);
+    }
+    
+    path = [path stringByAppendingPathComponent:fileName];
+    NSLog(@"file path:%@",path);
+    NSURL *url=[NSURL fileURLWithPath:path];
+    return url;
+}
+
+//判断文件是否已经在沙盒中存在
+-(BOOL)isFileExist:(NSString *)fileName {
+    NSString *path = [[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES)lastObject] stringByAppendingPathComponent:@"FileLibrary"];
+    NSString *filePath = [path stringByAppendingPathComponent:fileName];
+    NSFileManager *fileManager = [NSFileManager defaultManager];
+    BOOL result = [fileManager fileExistsAtPath:filePath];
+    return result;
+}
+/*
+#pragma mark - Navigation
+
+// In a storyboard-based application, you will often want to do a little preparation before navigation
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    // Get the new view controller using [segue destinationViewController].
+    // Pass the selected object to the new view controller.
+}
+*/
+
+@end

MusicGradeExam/MusicGradeExam/UI/ExamLibrary/Model/SongListModel.h

@@ -0,0 +1,31 @@
+//
+//  SongListModel.h
+//
+//  Created by   on 2020/7/21
+//  Copyright (c) 2020 __MyCompanyName__. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+
+
+@interface SongListModel : NSObject <NSCoding, NSCopying>
+
+@property (nonatomic, assign) double internalBaseClassIdentifier;
+@property (nonatomic, strong) NSString *subjectList;
+@property (nonatomic, assign) double delFlag;
+@property (nonatomic, strong) NSString *songAuthor;
+@property (nonatomic, strong) NSString *songName;
+@property (nonatomic, strong) NSString *tenantId;
+@property (nonatomic, strong) NSString *type;
+@property (nonatomic, strong) NSString *fileUrlList;
+@property (nonatomic, strong) NSString *createTime;
+@property (nonatomic, strong) NSString *subjectNames;
+@property (nonatomic, strong) NSString *levelList;
+@property (nonatomic, strong) NSString *updateTime;
+
++ (instancetype)modelObjectWithDictionary:(NSDictionary *)dict;
+- (instancetype)initWithDictionary:(NSDictionary *)dict;
+- (NSDictionary *)dictionaryRepresentation;
+
+@end

MusicGradeExam/MusicGradeExam/UI/ExamLibrary/Model/SongListModel.m

@@ -0,0 +1,172 @@
+//
+//  SongListModel.m
+//
+//  Created by   on 2020/7/21
+//  Copyright (c) 2020 __MyCompanyName__. All rights reserved.
+//
+
+#import "SongListModel.h"
+
+
+NSString *const kSongListModelId = @"id";
+NSString *const kSongListModelSubjectList = @"subjectList";
+NSString *const kSongListModelDelFlag = @"delFlag";
+NSString *const kSongListModelSongAuthor = @"songAuthor";
+NSString *const kSongListModelSongName = @"songName";
+NSString *const kSongListModelTenantId = @"tenantId";
+NSString *const kSongListModelType = @"type";
+NSString *const kSongListModelFileUrlList = @"fileUrlList";
+NSString *const kSongListModelCreateTime = @"createTime";
+NSString *const kSongListModelSubjectNames = @"subjectNames";
+NSString *const kSongListModelLevelList = @"levelList";
+NSString *const kSongListModelUpdateTime = @"updateTime";
+
+
+@interface SongListModel ()
+
+- (id)objectOrNilForKey:(id)aKey fromDictionary:(NSDictionary *)dict;
+
+@end
+
+@implementation SongListModel
+
+@synthesize internalBaseClassIdentifier = _internalBaseClassIdentifier;
+@synthesize subjectList = _subjectList;
+@synthesize delFlag = _delFlag;
+@synthesize songAuthor = _songAuthor;
+@synthesize songName = _songName;
+@synthesize tenantId = _tenantId;
+@synthesize type = _type;
+@synthesize fileUrlList = _fileUrlList;
+@synthesize createTime = _createTime;
+@synthesize subjectNames = _subjectNames;
+@synthesize levelList = _levelList;
+@synthesize updateTime = _updateTime;
+
+
++ (instancetype)modelObjectWithDictionary:(NSDictionary *)dict
+{
+    return [[self alloc] initWithDictionary:dict];
+}
+
+- (instancetype)initWithDictionary:(NSDictionary *)dict
+{
+    self = [super init];
+    
+    // This check serves to make sure that a non-NSDictionary object
+    // passed into the model class doesn't break the parsing.
+    if(self && [dict isKindOfClass:[NSDictionary class]]) {
+            self.internalBaseClassIdentifier = [[self objectOrNilForKey:kSongListModelId fromDictionary:dict] doubleValue];
+            self.subjectList = [self objectOrNilForKey:kSongListModelSubjectList fromDictionary:dict];
+            self.delFlag = [[self objectOrNilForKey:kSongListModelDelFlag fromDictionary:dict] doubleValue];
+            self.songAuthor = [self objectOrNilForKey:kSongListModelSongAuthor fromDictionary:dict];
+            self.songName = [self objectOrNilForKey:kSongListModelSongName fromDictionary:dict];
+            self.tenantId = [self objectOrNilForKey:kSongListModelTenantId fromDictionary:dict];
+            self.type = [self objectOrNilForKey:kSongListModelType fromDictionary:dict];
+            self.fileUrlList = [self objectOrNilForKey:kSongListModelFileUrlList fromDictionary:dict];
+            self.createTime = [self objectOrNilForKey:kSongListModelCreateTime fromDictionary:dict];
+            self.subjectNames = [self objectOrNilForKey:kSongListModelSubjectNames fromDictionary:dict];
+            self.levelList = [self objectOrNilForKey:kSongListModelLevelList fromDictionary:dict];
+            self.updateTime = [self objectOrNilForKey:kSongListModelUpdateTime fromDictionary:dict];
+
+    }
+    
+    return self;
+    
+}
+
+- (NSDictionary *)dictionaryRepresentation
+{
+    NSMutableDictionary *mutableDict = [NSMutableDictionary dictionary];
+    [mutableDict setValue:[NSNumber numberWithDouble:self.internalBaseClassIdentifier] forKey:kSongListModelId];
+    [mutableDict setValue:self.subjectList forKey:kSongListModelSubjectList];
+    [mutableDict setValue:[NSNumber numberWithDouble:self.delFlag] forKey:kSongListModelDelFlag];
+    [mutableDict setValue:self.songAuthor forKey:kSongListModelSongAuthor];
+    [mutableDict setValue:self.songName forKey:kSongListModelSongName];
+    [mutableDict setValue:self.tenantId forKey:kSongListModelTenantId];
+    [mutableDict setValue:self.type forKey:kSongListModelType];
+    [mutableDict setValue:self.fileUrlList forKey:kSongListModelFileUrlList];
+    [mutableDict setValue:self.createTime forKey:kSongListModelCreateTime];
+    [mutableDict setValue:self.subjectNames forKey:kSongListModelSubjectNames];
+    [mutableDict setValue:self.levelList forKey:kSongListModelLevelList];
+    [mutableDict setValue:self.updateTime forKey:kSongListModelUpdateTime];
+
+    return [NSDictionary dictionaryWithDictionary:mutableDict];
+}
+
+- (NSString *)description 
+{
+    return [NSString stringWithFormat:@"%@", [self dictionaryRepresentation]];
+}
+
+#pragma mark - Helper Method
+- (id)objectOrNilForKey:(id)aKey fromDictionary:(NSDictionary *)dict
+{
+    id object = [dict objectForKey:aKey];
+    return [object isEqual:[NSNull null]] ? nil : object;
+}
+
+
+#pragma mark - NSCoding Methods
+
+- (id)initWithCoder:(NSCoder *)aDecoder
+{
+    self = [super init];
+
+    self.internalBaseClassIdentifier = [aDecoder decodeDoubleForKey:kSongListModelId];
+    self.subjectList = [aDecoder decodeObjectForKey:kSongListModelSubjectList];
+    self.delFlag = [aDecoder decodeDoubleForKey:kSongListModelDelFlag];
+    self.songAuthor = [aDecoder decodeObjectForKey:kSongListModelSongAuthor];
+    self.songName = [aDecoder decodeObjectForKey:kSongListModelSongName];
+    self.tenantId = [aDecoder decodeObjectForKey:kSongListModelTenantId];
+    self.type = [aDecoder decodeObjectForKey:kSongListModelType];
+    self.fileUrlList = [aDecoder decodeObjectForKey:kSongListModelFileUrlList];
+    self.createTime = [aDecoder decodeObjectForKey:kSongListModelCreateTime];
+    self.subjectNames = [aDecoder decodeObjectForKey:kSongListModelSubjectNames];
+    self.levelList = [aDecoder decodeObjectForKey:kSongListModelLevelList];
+    self.updateTime = [aDecoder decodeObjectForKey:kSongListModelUpdateTime];
+    return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)aCoder
+{
+
+    [aCoder encodeDouble:_internalBaseClassIdentifier forKey:kSongListModelId];
+    [aCoder encodeObject:_subjectList forKey:kSongListModelSubjectList];
+    [aCoder encodeDouble:_delFlag forKey:kSongListModelDelFlag];
+    [aCoder encodeObject:_songAuthor forKey:kSongListModelSongAuthor];
+    [aCoder encodeObject:_songName forKey:kSongListModelSongName];
+    [aCoder encodeObject:_tenantId forKey:kSongListModelTenantId];
+    [aCoder encodeObject:_type forKey:kSongListModelType];
+    [aCoder encodeObject:_fileUrlList forKey:kSongListModelFileUrlList];
+    [aCoder encodeObject:_createTime forKey:kSongListModelCreateTime];
+    [aCoder encodeObject:_subjectNames forKey:kSongListModelSubjectNames];
+    [aCoder encodeObject:_levelList forKey:kSongListModelLevelList];
+    [aCoder encodeObject:_updateTime forKey:kSongListModelUpdateTime];
+}
+
+- (id)copyWithZone:(NSZone *)zone
+{
+    SongListModel *copy = [[SongListModel alloc] init];
+    
+    if (copy) {
+
+        copy.internalBaseClassIdentifier = self.internalBaseClassIdentifier;
+        copy.subjectList = [self.subjectList copyWithZone:zone];
+        copy.delFlag = self.delFlag;
+        copy.songAuthor = [self.songAuthor copyWithZone:zone];
+        copy.songName = [self.songName copyWithZone:zone];
+        copy.tenantId = [self.tenantId copyWithZone:zone];
+        copy.type = [self.type copyWithZone:zone];
+        copy.fileUrlList = [self.fileUrlList copyWithZone:zone];
+        copy.createTime = [self.createTime copyWithZone:zone];
+        copy.subjectNames = [self.subjectNames copyWithZone:zone];
+        copy.levelList = [self.levelList copyWithZone:zone];
+        copy.updateTime = [self.updateTime copyWithZone:zone];
+    }
+    
+    return copy;
+}
+
+
+@end

MusicGradeExam/MusicGradeExam/UI/ExamLibrary/Model/SubjectNameModel.h

@@ -0,0 +1,30 @@
+//
+//  SubjectNameModel.h
+//
+//  Created by   on 2020/7/21
+//  Copyright (c) 2020 __MyCompanyName__. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+
+
+@interface SubjectNameModel : NSObject <NSCoding, NSCopying>
+
+@property (nonatomic, strong) NSString *subjects;
+@property (nonatomic, strong) NSString *img;
+@property (nonatomic, strong) NSString *parentName;
+@property (nonatomic, assign) double internalBaseClassIdentifier;
+@property (nonatomic, strong) NSString *code;
+@property (nonatomic, strong) NSString *tenantId;
+@property (nonatomic, strong) NSString *updateTime;
+@property (nonatomic, assign) BOOL delFlag;
+@property (nonatomic, strong) NSString *name;
+@property (nonatomic, strong) NSString *createTime;
+@property (nonatomic, assign) double parentSubjectId;
+
++ (instancetype)modelObjectWithDictionary:(NSDictionary *)dict;
+- (instancetype)initWithDictionary:(NSDictionary *)dict;
+- (NSDictionary *)dictionaryRepresentation;
+
+@end

MusicGradeExam/MusicGradeExam/UI/ExamLibrary/Model/SubjectNameModel.m

@@ -0,0 +1,165 @@
+//
+//  SubjectNameModel.m
+//
+//  Created by   on 2020/7/21
+//  Copyright (c) 2020 __MyCompanyName__. All rights reserved.
+//
+
+#import "SubjectNameModel.h"
+
+
+NSString *const kSubjectNameModelSubjects = @"subjects";
+NSString *const kSubjectNameModelImg = @"img";
+NSString *const kSubjectNameModelParentName = @"parentName";
+NSString *const kSubjectNameModelId = @"id";
+NSString *const kSubjectNameModelCode = @"code";
+NSString *const kSubjectNameModelTenantId = @"tenantId";
+NSString *const kSubjectNameModelUpdateTime = @"updateTime";
+NSString *const kSubjectNameModelDelFlag = @"delFlag";
+NSString *const kSubjectNameModelName = @"name";
+NSString *const kSubjectNameModelCreateTime = @"createTime";
+NSString *const kSubjectNameModelParentSubjectId = @"parentSubjectId";
+
+
+@interface SubjectNameModel ()
+
+- (id)objectOrNilForKey:(id)aKey fromDictionary:(NSDictionary *)dict;
+
+@end
+
+@implementation SubjectNameModel
+
+@synthesize subjects = _subjects;
+@synthesize img = _img;
+@synthesize parentName = _parentName;
+@synthesize internalBaseClassIdentifier = _internalBaseClassIdentifier;
+@synthesize code = _code;
+@synthesize tenantId = _tenantId;
+@synthesize updateTime = _updateTime;
+@synthesize delFlag = _delFlag;
+@synthesize name = _name;
+@synthesize createTime = _createTime;
+@synthesize parentSubjectId = _parentSubjectId;
+
+
++ (instancetype)modelObjectWithDictionary:(NSDictionary *)dict
+{
+    return [[self alloc] initWithDictionary:dict];
+}
+
+- (instancetype)initWithDictionary:(NSDictionary *)dict
+{
+    self = [super init];
+    
+    // This check serves to make sure that a non-NSDictionary object
+    // passed into the model class doesn't break the parsing.
+    if(self && [dict isKindOfClass:[NSDictionary class]]) {
+            self.subjects = [self objectOrNilForKey:kSubjectNameModelSubjects fromDictionary:dict];
+            self.img = [self objectOrNilForKey:kSubjectNameModelImg fromDictionary:dict];
+            self.parentName = [self objectOrNilForKey:kSubjectNameModelParentName fromDictionary:dict];
+            self.internalBaseClassIdentifier = [[self objectOrNilForKey:kSubjectNameModelId fromDictionary:dict] doubleValue];
+            self.code = [self objectOrNilForKey:kSubjectNameModelCode fromDictionary:dict];
+            self.tenantId = [self objectOrNilForKey:kSubjectNameModelTenantId fromDictionary:dict];
+            self.updateTime = [self objectOrNilForKey:kSubjectNameModelUpdateTime fromDictionary:dict];
+            self.delFlag = [[self objectOrNilForKey:kSubjectNameModelDelFlag fromDictionary:dict] boolValue];
+            self.name = [self objectOrNilForKey:kSubjectNameModelName fromDictionary:dict];
+            self.createTime = [self objectOrNilForKey:kSubjectNameModelCreateTime fromDictionary:dict];
+            self.parentSubjectId = [[self objectOrNilForKey:kSubjectNameModelParentSubjectId fromDictionary:dict] doubleValue];
+
+    }
+    
+    return self;
+    
+}
+
+- (NSDictionary *)dictionaryRepresentation
+{
+    NSMutableDictionary *mutableDict = [NSMutableDictionary dictionary];
+    [mutableDict setValue:self.subjects forKey:kSubjectNameModelSubjects];
+    [mutableDict setValue:self.img forKey:kSubjectNameModelImg];
+    [mutableDict setValue:self.parentName forKey:kSubjectNameModelParentName];
+    [mutableDict setValue:[NSNumber numberWithDouble:self.internalBaseClassIdentifier] forKey:kSubjectNameModelId];
+    [mutableDict setValue:self.code forKey:kSubjectNameModelCode];
+    [mutableDict setValue:self.tenantId forKey:kSubjectNameModelTenantId];
+    [mutableDict setValue:self.updateTime forKey:kSubjectNameModelUpdateTime];
+    [mutableDict setValue:[NSNumber numberWithBool:self.delFlag] forKey:kSubjectNameModelDelFlag];
+    [mutableDict setValue:self.name forKey:kSubjectNameModelName];
+    [mutableDict setValue:self.createTime forKey:kSubjectNameModelCreateTime];
+    [mutableDict setValue:[NSNumber numberWithDouble:self.parentSubjectId] forKey:kSubjectNameModelParentSubjectId];
+
+    return [NSDictionary dictionaryWithDictionary:mutableDict];
+}
+
+- (NSString *)description 
+{
+    return [NSString stringWithFormat:@"%@", [self dictionaryRepresentation]];
+}
+
+#pragma mark - Helper Method
+- (id)objectOrNilForKey:(id)aKey fromDictionary:(NSDictionary *)dict
+{
+    id object = [dict objectForKey:aKey];
+    return [object isEqual:[NSNull null]] ? nil : object;
+}
+
+
+#pragma mark - NSCoding Methods
+
+- (id)initWithCoder:(NSCoder *)aDecoder
+{
+    self = [super init];
+
+    self.subjects = [aDecoder decodeObjectForKey:kSubjectNameModelSubjects];
+    self.img = [aDecoder decodeObjectForKey:kSubjectNameModelImg];
+    self.parentName = [aDecoder decodeObjectForKey:kSubjectNameModelParentName];
+    self.internalBaseClassIdentifier = [aDecoder decodeDoubleForKey:kSubjectNameModelId];
+    self.code = [aDecoder decodeObjectForKey:kSubjectNameModelCode];
+    self.tenantId = [aDecoder decodeObjectForKey:kSubjectNameModelTenantId];
+    self.updateTime = [aDecoder decodeObjectForKey:kSubjectNameModelUpdateTime];
+    self.delFlag = [aDecoder decodeBoolForKey:kSubjectNameModelDelFlag];
+    self.name = [aDecoder decodeObjectForKey:kSubjectNameModelName];
+    self.createTime = [aDecoder decodeObjectForKey:kSubjectNameModelCreateTime];
+    self.parentSubjectId = [aDecoder decodeDoubleForKey:kSubjectNameModelParentSubjectId];
+    return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)aCoder
+{
+
+    [aCoder encodeObject:_subjects forKey:kSubjectNameModelSubjects];
+    [aCoder encodeObject:_img forKey:kSubjectNameModelImg];
+    [aCoder encodeObject:_parentName forKey:kSubjectNameModelParentName];
+    [aCoder encodeDouble:_internalBaseClassIdentifier forKey:kSubjectNameModelId];
+    [aCoder encodeObject:_code forKey:kSubjectNameModelCode];
+    [aCoder encodeObject:_tenantId forKey:kSubjectNameModelTenantId];
+    [aCoder encodeObject:_updateTime forKey:kSubjectNameModelUpdateTime];
+    [aCoder encodeBool:_delFlag forKey:kSubjectNameModelDelFlag];
+    [aCoder encodeObject:_name forKey:kSubjectNameModelName];
+    [aCoder encodeObject:_createTime forKey:kSubjectNameModelCreateTime];
+    [aCoder encodeDouble:_parentSubjectId forKey:kSubjectNameModelParentSubjectId];
+}
+
+- (id)copyWithZone:(NSZone *)zone
+{
+    SubjectNameModel *copy = [[SubjectNameModel alloc] init];
+    
+    if (copy) {
+
+        copy.subjects = [self.subjects copyWithZone:zone];
+        copy.img = [self.img copyWithZone:zone];
+        copy.parentName = [self.parentName copyWithZone:zone];
+        copy.internalBaseClassIdentifier = self.internalBaseClassIdentifier;
+        copy.code = [self.code copyWithZone:zone];
+        copy.tenantId = [self.tenantId copyWithZone:zone];
+        copy.updateTime = [self.updateTime copyWithZone:zone];
+        copy.delFlag = self.delFlag;
+        copy.name = [self.name copyWithZone:zone];
+        copy.createTime = [self.createTime copyWithZone:zone];
+        copy.parentSubjectId = self.parentSubjectId;
+    }
+    
+    return copy;
+}
+
+
+@end

MusicGradeExam/MusicGradeExam/UI/ExamLibrary/View/ExamLibraryListCell.h

@@ -7,11 +7,14 @@
 //
 
 #import <UIKit/UIKit.h>
+#import "SongListModel.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
 @interface ExamLibraryListCell : UITableViewCell
 
+- (void)configCellWithSource:(SongListModel *)sourceModel;
+
 @end
 
 NS_ASSUME_NONNULL_END

MusicGradeExam/MusicGradeExam/UI/ExamLibrary/View/ExamLibraryListCell.m

@@ -8,6 +8,13 @@
 
 #import "ExamLibraryListCell.h"
 
+@interface ExamLibraryListCell ()
+
+
+@property (weak, nonatomic) IBOutlet UILabel *nameLabel;
+
+@end
+
 @implementation ExamLibraryListCell
 
 - (void)awakeFromNib {
@@ -16,6 +23,10 @@
     self.selectionStyle = UITableViewCellSelectionStyleNone;
 }
 
+- (void)configCellWithSource:(SongListModel *)sourceModel {
+    self.nameLabel.text = [NSString returnNoNullStringWithString:sourceModel.songName];
+}
+
 - (void)setSelected:(BOOL)selected animated:(BOOL)animated {
     [super setSelected:selected animated:animated];
 

MusicGradeExam/MusicGradeExam/UI/ExamLibrary/View/ExamLibraryListCell.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"/>
@@ -50,6 +50,9 @@
                 </constraints>
             </tableViewCellContentView>
             <viewLayoutGuide key="safeArea" id="aW0-zy-SZf"/>
+            <connections>
+                <outlet property="nameLabel" destination="2GP-2c-FS4" id="ZcP-bK-PmA"/>
+            </connections>
             <point key="canvasLocation" x="131.15942028985509" y="105.46875"/>
         </tableViewCell>
     </objects>

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

@@ -61,6 +61,9 @@
                 [ticketArray addObject:model];
             }
             self.dataArray = [NSMutableArray arrayWithArray:ticketArray];
+            if (self.dataArray.count) {
+                // 建立IM连接
+            }
         }
         else {
             [self MBPShow:MESSAGEKEY];

MusicGradeExam/MusicGradeExam/UI/Login/Controller/VefiLoginViewController.m

@@ -53,8 +53,7 @@
     }
     MJWeakSelf;
     [_bodyView vefiLoginCallback:^(VEFIACTION action, NSDictionary *parm) {
-        [weakSelf operationWithType:action parm:parm];
-    }];
+        [weakSelf operationWithType:action parm:parm];     }];
     [self.scrollView addSubview:_bodyView];
     self.scrollView.contentSize = CGSizeMake(kScreenWidth, height);
     if (@available(iOS 11.0, *)) {

MusicGradeExam/MusicGradeExam/UI/Login/View/ModifyBodyView.m

@@ -44,7 +44,8 @@
     self.phoneField.userInteractionEnabled = phoneEnable;
     NSString *phoneStr = USER_MANAGER.userInfo.phone;
     if (phoneEnable == NO) {
-        self.phoneField.text = [phoneStr stringByReplacingCharactersInRange:NSMakeRange(3, 4) withString:@"****"];
+//        self.phoneField.text = [phoneStr stringByReplacingCharactersInRange:NSMakeRange(3, 4) withString:@"****"];
+        self.phoneField.text = phoneStr;
     }
     else {
         self.phoneField.text = @"";