提交更改拍摄完成asset空导致崩溃

梁星国
1 parent d6fa5789
Showing 1 changed file with 18 additions and 3 deletions
CNLiveAVCamera/Classes/XFPhotoLibraryManager.m
@@ -292,6 +292,13 @@
         } error:&error];
         NSLog(@"error1: %@", error);
+        if (getCameraVideoCompletionBlock) {
+            if (!assetId || error)
+            {
+                getCameraVideoCompletionBlock(nil,videoUrl,error);
+                return;
+            }
+        }
         // 获取曾经创建过的自定义视频相册名字
         PHAssetCollection *createdAssetCollection = nil;
@@ -314,6 +321,14 @@
                 assetCollectionId = [PHAssetCollectionChangeRequest creationRequestForAssetCollectionWithTitle:blockAssetCollectionName].placeholderForCreatedAssetCollection.localIdentifier;
             } error:&error];
+            
+            if (getCameraVideoCompletionBlock) {
+                if (!assetId || error || !assetCollectionId)
+                {
+                    getCameraVideoCompletionBlock(nil,videoUrl,error);
+                    return;
+                }
+            }
             NSLog(@"error2: %@", error);
@@ -332,13 +347,13 @@
         PHFetchResult<PHAsset *> *res = [PHAsset fetchAssetsWithLocalIdentifiers:@[assetId] options:nil];
-        PHAsset *asset = res[0];
+        PHAsset *asset = [res firstObject];
         NSLog(@"asset:\n%@",asset);
         if (getCameraVideoCompletionBlock) {
-            if (error)
+            if (error || !asset)
             {
-                getCameraVideoCompletionBlock(nil,nil,error);
+                getCameraVideoCompletionBlock(nil,blockVideoUrl,error);
             }
             else
             {