Steven 4 лет назад
Родитель
Сommit
c4a6649d2d

+ 4 - 4
MusicGradeExam/MusicGradeExam.xcodeproj/project.pbxproj

@@ -3482,7 +3482,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = "MusicGradeExam/酷乐秀.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.1.0;
+				CURRENT_PROJECT_VERSION = 1.2.0;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = P664H7S5LL;
 				ENABLE_BITCODE = NO;
@@ -3504,7 +3504,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/MusicGradeExam/RongCloud/IMLib",
 				);
-				MARKETING_VERSION = 1.1.0;
+				MARKETING_VERSION = 1.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.JMCloudMusic.MusicGradeExam;
 				PRODUCT_NAME = "酷乐秀";
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -3518,7 +3518,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = "MusicGradeExam/酷乐秀.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.1.0;
+				CURRENT_PROJECT_VERSION = 1.2.0;
 				DEVELOPMENT_TEAM = P664H7S5LL;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -3539,7 +3539,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/MusicGradeExam/RongCloud/IMLib",
 				);
-				MARKETING_VERSION = 1.1.0;
+				MARKETING_VERSION = 1.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.JMCloudMusic.MusicGradeExam;
 				PRODUCT_NAME = "酷乐秀";
 				TARGETED_DEVICE_FAMILY = "1,2";

+ 1 - 1
MusicGradeExam/MusicGradeExam/Tools/Custom/KSMediaManager.h

@@ -21,7 +21,7 @@ typedef void(^MediaCallback)(NSString * _Nullable videoUrl, NSMutableArray * _Nu
 
 @interface KSMediaManager : NSObject
 
-@property (nonatomic, strong) KSBaseViewController *baseCtrl;
+@property (nonatomic, weak) KSBaseViewController *baseCtrl;
 
 @property (nonatomic, strong) NSMutableArray *imageArray;    // 图片数组
 

+ 6 - 9
MusicGradeExam/MusicGradeExam/UI/NotiferMessage/Controller/NotifyMessageViewController.m

@@ -183,15 +183,12 @@
                 }
             }
         }
-        else if ([headStr isEqualToString:@"4"]) {
-            NSRange range = [memo rangeOfString:@"?"];
-            if (range.location != NSNotFound) {
-                NSString *url = [memo substringFromIndex:(range.location+range.length)];
-                
-                KSBaseWKWebViewController *webCtrl = [[KSBaseWKWebViewController alloc] init];
-                webCtrl.url = url;
-                [self.navigationController pushViewController:webCtrl animated:YES];
-            }
+        else if ([headStr isEqualToString:@"4"]) { // 跳转考试记录
+            KSBaseWKWebViewController *ctrl = [[KSBaseWKWebViewController alloc] init];
+            ctrl.url = [NSString stringWithFormat:@"%@%@", WEBHOST, @"/#/examRecord"];
+            ctrl.hiddenNavBar = NO;
+            ctrl.headTitle = @"考试记录";
+            [self.navigationController pushViewController:ctrl animated:YES];
         }
         else {
             NSRange range = [memo rangeOfString:@"?"];

+ 1 - 0
MusicGradeExam/MusicGradeExam/UI/RecordExam/Controller/RecordExamViewController.m

@@ -339,6 +339,7 @@
             MJWeakSelf;
             [self removeAllFile];
             [self KSShowMsg:@"提交成功" promptCompletion:^{
+                [weakSelf.topView stopDurationTimer];
                 [weakSelf.navigationController popViewControllerAnimated:YES];
             }];
         }