Преглед изворни кода

【fix】【APP内反馈】上传附件不能超过20M,指的是单个文件,而不是总共

tangchao пре 7 месеци
родитељ
комит
e577571b68

+ 1 - 1
PDF Office/PDF Master/Class/Tools/UserFeekback/Model/KMUserFbListModel.swift

@@ -11,7 +11,7 @@ class KMUserFbListModel: NSObject {
     var filePath: String?
     
     var fileName: String?
-    var fileSize: Float = 0
+    var fileSize: Double = 0
     
     var fileSizeString: String?
 }

+ 13 - 8
PDF Office/PDF Master/Class/Tools/UserFeekback/Window/KMUserFeekbackWindowController.swift

@@ -301,22 +301,23 @@ import Cocoa
         self.listItemView_?.hiddenTip()
         
         var datas: [KMUserFbListModel] = []
-        let maxSize: Float = 20 * 1024 * 1024
-        var fileSize: Float = 0
+        let maxSize: Double = 20 * 1024 * 1024
+        var fileSize: Double = 0
         var filePaths: [String] = []
+        var showFileSizeLimit = false
         for (i, fileP) in self.filePaths_.enumerated() {
             let model = KMUserFbListModel()
             model.filePath = fileP
             let url = URL(fileURLWithPath: fileP)
             model.fileName = url.lastPathComponent
             let attri = try?FileManager.default.attributesOfItem(atPath: fileP)
-            model.fileSize = attri?[FileAttributeKey.size] as? Float ?? 0
-            
-            fileSize += model.fileSize
+            model.fileSize = attri?[FileAttributeKey.size] as? Double ?? 0
             
+//            fileSize += model.fileSize
+            fileSize = model.fileSize
             if fileSize >= maxSize {
-                self.listItemView_?.showTip()
-                break
+                showFileSizeLimit = true
+                continue
             }
             if i >= 10 {
                 break
@@ -329,6 +330,10 @@ import Cocoa
         }
         self.filePaths_ = filePaths
         
+        if showFileSizeLimit {
+            self.listItemView_?.showTip()
+        }
+        
         if datas.count >= 10 {
             self.listHeaderItemView_?.addButton.isEnabled = false
         } else {
@@ -420,7 +425,7 @@ import Cocoa
         docScript?.executeAndReturnError(&dic)
     }
     
-    func fileSizeString(_ fSize: Float) -> String {
+    func fileSizeString(_ fSize: Double) -> String {
         let fileSize = fSize / 1024
         let size = fileSize >= 1024 ? (fileSize < 1048576 ? fileSize/1024 : fileSize/1048576.0) : fileSize
         let unit = fileSize >= 1024 ? (fileSize < 1048576 ? "M" : "G") : "K"