Steven 1 year ago
parent
commit
1662f2224b

BIN
KulexiuForStudent/KulexiuForStudent/Assets.xcassets/PlayerImage/merge_music_bg.imageset/merge_music_bg@2x.png


BIN
KulexiuForStudent/KulexiuForStudent/Assets.xcassets/PlayerImage/merge_music_bg.imageset/merge_music_bg@3x.png


+ 2 - 1
KulexiuForStudent/KulexiuForStudent/Common/Base/KSAccompanyWebViewController.m

@@ -528,9 +528,10 @@
             else if ([[parm ks_stringValueForKey:@"api"] isEqualToString:@"openCamera"]) { // 开启摄像头
                 PREMISSIONTYPE canOpenCamera = [RecordCheckManager checkCameraPremissionAvaiable:NO showInView:nil];
                 PREMISSIONTYPE albumEnable =  [RecordCheckManager checkPhotoLibraryPremissionAvaiable:NO showInView:nil];
-                
+
                 if (canOpenCamera == PREMISSIONTYPE_YES) {
                     self.isCameraOpen = YES;
+                    [self.videoRecordManager setIgnoreAudio:YES];
                     [self.videoRecordManager configSessiondisplayInView:self.viewContainer];
                     [self postMessage:parm];
                 }

+ 8 - 0
KulexiuForStudent/KulexiuForStudent/Common/Base/KSUploadManager.m

@@ -200,6 +200,14 @@
 
 
 - (void)uploadFileToOssWithSource:(NSString *)fileName fileData:(NSData *)fileData progress:(KSUploadProgress)uploadProgress successCallback:(void(^)(NSString *fileUrl))success faliure:(void(^)(void))faliure {
+    if (fileData == nil) {
+        if (faliure) {
+            dispatch_main_async_safe(^{
+                faliure();
+            });
+        }
+        return;
+    }
     self.cosFileName = fileName;
     QCloudCOSXMLUploadObjectRequest *put = [QCloudCOSXMLUploadObjectRequest new];
     put.bucket = self.cosBucketName;

+ 1 - 1
KulexiuForStudent/KulexiuForStudent/Common/MediaMerge/MusicPlayer/kSNewPlayer.m

@@ -44,7 +44,7 @@
 
 - (void)preparePlaySongWithUrl:(NSString *)urlStr {
     self.cacheFinish = NO;
-    urlStr = [UrlDecode encodeUrlStringWithString:urlStr];
+    urlStr = [urlStr getUrlEndcodeString];
     AVURLAsset *asset = [[AVURLAsset alloc] initWithURL:[NSURL URLWithString:urlStr] options:nil];
     if (_songItem) {
         [self removeAllNoticeAndObserver];