Преглед на файлове

修正磁盘大小判断

harry преди 3 години
родител
ревизия
1f337eb89c

+ 0 - 21
BFRecordScreenKit/Assets/BFRecordScreenKit.xcassets/export_saveall_h.imageset/Contents.json

@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "export_saveall_h@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

BIN
BFRecordScreenKit/Assets/BFRecordScreenKit.xcassets/export_saveall_h.imageset/export_saveall_h@3x.png


+ 0 - 21
BFRecordScreenKit/Assets/BFRecordScreenKit.xcassets/export_saveall_n.imageset/Contents.json

@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "export_saveall_n@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

BIN
BFRecordScreenKit/Assets/BFRecordScreenKit.xcassets/export_saveall_n.imageset/export_saveall_n@3x.png


+ 0 - 21
BFRecordScreenKit/Assets/BFRecordScreenKit.xcassets/export_saveonly_h.imageset/Contents.json

@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "export_saveonly_h@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

BIN
BFRecordScreenKit/Assets/BFRecordScreenKit.xcassets/export_saveonly_h.imageset/export_saveonly_h@3x.png


+ 0 - 21
BFRecordScreenKit/Assets/BFRecordScreenKit.xcassets/export_saveonly_n.imageset/Contents.json

@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "export_saveonly_n@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

BIN
BFRecordScreenKit/Assets/BFRecordScreenKit.xcassets/export_saveonly_n.imageset/export_saveonly_n@3x.png


+ 3 - 3
BFRecordScreenKit/Classes/BFRecordExport.swift

@@ -322,7 +322,7 @@ public class BFRecordExport {
                 if itemModell.voiceStickers.count == 0 && synthesisAll {
                     modelDuraion += 2
                 }else {
-                    modelDuraion = itemModell.materialDuraion                    
+                    modelDuraion = itemModell.materialDuraion
                 }
             }else if itemModell.mediaType == .VIDEO{
                 modelDuraion = itemModell.dealedDurationRanges.reduce(0.0) { partialResult, srange in
@@ -378,8 +378,8 @@ public class BFRecordExport {
                 }
             }
 
-            BFLog(1, message: "导出设置的码率为:\(Double(orgeBitRate)/1024.0/1024.0)M")
-            let preSize = Double(orgeBitRate) * totalDuration / (1024*1024)
+            BFLog(1, message: "导出设置的码率为:\(Double(orgeBitRate)/1024.0/1024.0)Mb")
+            let preSize = Double(orgeBitRate) * totalDuration / (1024*1024*8)
             let freeSize = PQBridgeObject.getPhoneDiskFreeSize()
             if preSize + 100.0 > freeSize { // 存储完后磁盘剩余至少100M
                 let error = NSError(domain: "err", code: ExportError.DiskNoSpace.rawValue, userInfo: ["msg":"磁盘空间不足"])

+ 2 - 0
BFRecordScreenKit/Classes/RecordScreen/Controller/BFRecordScreenController.swift

@@ -929,6 +929,8 @@ public class BFRecordScreenController: BFBaseViewController {
         }
         // 录制中不显示播放按钮
         (collectionView.cellForItem(at: IndexPath(item: currItemModelIndex, section: 0)) as? BFImageCoverViewCell)?.playBtn.isSelected = true
+        
+        
     }
 
     @objc func endRecord() {