新证书

MusicGradeExam/MusicGradeExam.xcodeproj/project.pbxproj

@@ -406,7 +406,6 @@
 		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>"; };
-		2729F7CE24C7D43600E1F3C4 /* 酷乐秀.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "酷乐秀.entitlements"; sourceTree = "<group>"; };
 		2729F7CF24C8174A00E1F3C4 /* FileNameView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FileNameView.h; sourceTree = "<group>"; };
 		2729F7D024C8174A00E1F3C4 /* FileNameView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FileNameView.m; sourceTree = "<group>"; };
 		2729F7D224C8175E00E1F3C4 /* FileNameView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = FileNameView.xib; sourceTree = "<group>"; };
@@ -452,6 +451,7 @@
 		273EFB5D24DD36420069DB4D /* RongRTCLib.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = RongRTCLib.framework; sourceTree = "<group>"; };
 		273EFB6E24E672830069DB4D /* TicketRefreshModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TicketRefreshModel.h; sourceTree = "<group>"; };
 		273EFB6F24E672830069DB4D /* TicketRefreshModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TicketRefreshModel.m; sourceTree = "<group>"; };
+		273EFB7124EBB90A0069DB4D /* 酷乐秀Release.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "酷乐秀Release.entitlements"; 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>"; };
@@ -1252,7 +1252,7 @@
 		27476F4524BBFB5900181362 /* MusicGradeExam */ = {
 			isa = PBXGroup;
 			children = (
-				2729F7CE24C7D43600E1F3C4 /* 酷乐秀.entitlements */,
+				273EFB7124EBB90A0069DB4D /* 酷乐秀Release.entitlements */,
 				2747718624BC0C0400181362 /* KSRequestManager.h */,
 				2747700224BC0C0000181362 /* KSRequestManager.m */,
 				2747707524BC0C0200181362 /* Manager */,
@@ -1704,10 +1704,10 @@
 		2747702524BC0C0100181362 /* HTTP */ = {
 			isa = PBXGroup;
 			children = (
-				2747702624BC0C0100181362 /* HTTPUtility.m */,
+				2747702924BC0C0100181362 /* HTTPResult.h */,
 				2747702724BC0C0100181362 /* HTTPResult.m */,
 				2747702824BC0C0100181362 /* HTTPUtility.h */,
-				2747702924BC0C0100181362 /* HTTPResult.h */,
+				2747702624BC0C0100181362 /* HTTPUtility.m */,
 			);
 			path = HTTP;
 			sourceTree = "<group>";
@@ -3477,7 +3477,7 @@
 				CODE_SIGN_ENTITLEMENTS = "MusicGradeExam/酷乐秀.entitlements";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1.0.0;
-				DEVELOPMENT_TEAM = 2K89M44X82;
+				DEVELOPMENT_TEAM = P664H7S5LL;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -3498,7 +3498,7 @@
 					"$(PROJECT_DIR)/MusicGradeExam/RongCloud/IMLib",
 				);
 				MARKETING_VERSION = 1.0.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.DayaMusic.MusicGradeExam;
+				PRODUCT_BUNDLE_IDENTIFIER = com.JMCloudMusic.MusicGradeExam;
 				PRODUCT_NAME = "酷乐秀";
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -3509,10 +3509,10 @@
 			baseConfigurationReference = 1AA4DFCEF527585287BEBFE0 /* Pods-MusicGradeExam.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_ENTITLEMENTS = "MusicGradeExam/酷乐秀.entitlements";
+				CODE_SIGN_ENTITLEMENTS = "MusicGradeExam/酷乐秀Release.entitlements";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1.0.0;
-				DEVELOPMENT_TEAM = 2K89M44X82;
+				DEVELOPMENT_TEAM = P664H7S5LL;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -3533,7 +3533,7 @@
 					"$(PROJECT_DIR)/MusicGradeExam/RongCloud/IMLib",
 				);
 				MARKETING_VERSION = 1.0.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.DayaMusic.MusicGradeExam;
+				PRODUCT_BUNDLE_IDENTIFIER = com.JMCloudMusic.MusicGradeExam;
 				PRODUCT_NAME = "酷乐秀";
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};

MusicGradeExam/MusicGradeExam/AppDelegate.m

@@ -133,14 +133,14 @@
     [self registerRemoteNotification:application];
     
     
-//    [self versionCheck];
+    [self versionCheck];
     
     return YES;
 }
 
 - (void)versionCheck {
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-        [KSUpdateManager ks_updateWithAPPID:@"1487057217" withBundleId:nil block:^(NSString * _Nonnull currentVersion, NSString * _Nonnull storeVersion, NSString * _Nonnull openUrl, BOOL isUpdate) {
+        [KSUpdateManager ks_updateWithAPPID:@"1528132269" withBundleId:nil block:^(NSString * _Nonnull currentVersion, NSString * _Nonnull storeVersion, NSString * _Nonnull openUrl, BOOL isUpdate) {
             if (isUpdate) {
                 
                 [KSRequestManager appVersionInfoRequest:KS_GET success:^(NSDictionary * _Nonnull dic) {

MusicGradeExam/MusicGradeExam/Define/PrefixHeader.pch

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

MusicGradeExam/MusicGradeExam/KSRequestManager.m

@@ -299,7 +299,7 @@
 #pragma mark --- version
 // api-web/appVersionInfo/queryByPlatform
 + (void)appVersionInfoRequest:(NSString *)get success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
-    NSString *url = [NSString stringWithFormat:@"%@%@", hostURL, @"/api-web/appVersionInfo/queryByPlatform"];
+    NSString *url = [NSString stringWithFormat:@"%@%@", hostURL, @"/api-user/appVersionInfo/queryByPlatform"];
     NSMutableDictionary *parm = [NSMutableDictionary dictionary];
     [parm setValue:@"iOS-user" forKey:@"platform"];
     [self request:get url:url parm:parm success:success faliure:faliure];

MusicGradeExam/MusicGradeExam/UI/Home/View/HomeExamTicketCell.m

@@ -16,6 +16,8 @@
 
 @property (weak, nonatomic) IBOutlet UILabel *countLabel;
 
+@property (weak, nonatomic) IBOutlet UILabel *examName;
+
 @end
 
 @implementation HomeExamTicketCell
@@ -26,6 +28,7 @@
 }
 
 - (void)configCellWithSource:(TicketListModel *)model {
+    self.examName.text = [NSString returnNoNullStringWithString:model.baseExamName];
     self.examSubject.text = [self getSubjectName:model.subjectName level:model.level];
     if (![NSString isEmptyString:model.examTime]) {
         self.classDate.text = [[model.examTime componentsSeparatedByString:@" "] firstObject];

MusicGradeExam/MusicGradeExam/UI/Home/View/HomeExamTicketCell.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"/>
@@ -109,6 +109,7 @@
             <connections>
                 <outlet property="classDate" destination="Qoe-n1-s6Q" id="pJb-Vj-mKT"/>
                 <outlet property="countLabel" destination="cKe-X3-WHL" id="XQh-33-job"/>
+                <outlet property="examName" destination="qvJ-vA-iTg" id="p2e-GV-3v6"/>
                 <outlet property="examSubject" destination="SBL-f7-w01" id="ohU-Wn-f8W"/>
             </connections>
             <point key="canvasLocation" x="131.15942028985509" y="108.48214285714285"/>

MusicGradeExam/MusicGradeExam/酷乐秀.entitlements

@@ -1,8 +1,5 @@
 <?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>
-	<key>aps-environment</key>
-	<string>development</string>
-</dict>
+<dict/>
 </plist>

MusicGradeExam/MusicGradeExam/酷乐秀Release.entitlements

@@ -0,0 +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>
+	<key>aps-environment</key>
+	<string>development</string>
+</dict>
+</plist>