瀏覽代碼

1.专业为空显示通用
2.首页最近考试限制考试名称

Steven 5 年之前
父節點
當前提交
384de0f42b

File diff suppressed because it is too large
+ 2 - 2
MusicGradeExam/MusicGradeExam.xcodeproj/project.pbxproj


+ 2 - 2
MusicGradeExam/MusicGradeExam/AppDelegate.m

@@ -285,8 +285,8 @@
     [[RCIMClient sharedRCIMClient] setReconnectKickEnable:YES];
     
     
-//    [[RCIMClient sharedRCIMClient] setLogLevel:RC_Log_Level_Verbose];
-//    [self redirectNSlogToDocumentFolder];
+    [[RCIMClient sharedRCIMClient] setLogLevel:RC_Log_Level_Verbose];
+    [self redirectNSlogToDocumentFolder];
     
 }
 

+ 1 - 1
MusicGradeExam/MusicGradeExam/Define/PrefixHeader.pch

@@ -89,7 +89,7 @@
 #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 RCIM_KEY (@"mgb7ka1nme0yg")
 
 //#define hostURL (@"http://192.168.3.28:8000")
 //#define SEALCLASSHOST (@"http://192.168.3.28:8000/api-im")

+ 2 - 1
MusicGradeExam/MusicGradeExam/UI/Exam/View/TicketBodyView.m

@@ -99,7 +99,8 @@
     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]];
+    NSString *subjectName = [NSString isEmptyString:self.sourceModel.subjectName] ? @"通用" : self.sourceModel.subjectName;
+    self.subjectLabel.text = [NSString stringWithFormat:@"报考专业:%@",subjectName];
     self.examLevel.text = [NSString stringWithFormat:@"报考级别:%@",[self getLevelName:self.sourceModel.level]];
     
     self.examTime.text = [NSString stringWithFormat:@"考试时间:%@",[[self.sourceModel.examTime componentsSeparatedByString:@" "] firstObject]];

+ 2 - 1
MusicGradeExam/MusicGradeExam/UI/Exam/View/WaitExamBodyView.m

@@ -66,7 +66,8 @@ typedef NS_ENUM(NSInteger,EXAMSTATUS) {
     
     self.classDate.text = [[self.sourceModel.examStartTime componentsSeparatedByString:@" "] firstObject];
     self.subjectLabel.text = [NSString returnNoNullStringWithString:self.sourceModel.baseExamName];
-    self.subjectName.text = [NSString returnNoNullStringWithString:self.sourceModel.subjectName];
+    NSString *subjectName = [NSString isEmptyString:self.sourceModel.subjectName] ? @"通用" : self.sourceModel.subjectName;
+    self.subjectName.text = subjectName;
     self.levelLabel.text = [self getLevelName:self.sourceModel.level];
     // 时间
     NSDateFormatter *dateFormatter=[[NSDateFormatter alloc] init];

+ 1 - 0
MusicGradeExam/MusicGradeExam/UI/Home/View/HomeExamTicketCell.m

@@ -91,6 +91,7 @@
             levelStr = @"";
             break;
     }
+    name = [NSString isEmptyString:name] ? @"通用" : name;
     return [NSString stringWithFormat:@"%@(%@)", name, levelStr];
 }
 

+ 4 - 1
MusicGradeExam/MusicGradeExam/酷乐秀.entitlements

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict/>
+<dict>
+	<key>aps-environment</key>
+	<string>development</string>
+</dict>
 </plist>

Some files were not shown because too many files changed in this diff