修改共有方案私转公字符串处理方案 解决部分私转公失败的问题

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignCertificateManage(续期证件管理)/C/YHResignCertificateDetailViewController.swift

@@ -156,7 +156,8 @@ class YHResignCertificateDetailViewController: YHBaseViewController {
             
         } else {
             if detailType == .SmallWhiteNote {
-                submitSmallWhiteBarInfo()
+                let view = YHSmallWhiteNoteTemplateView.sheetView()
+                view.show()
                 let smallWhiteBar: [String: Any] = ["is_show": true,
                                                     "submit": false
                                                     ]

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignCertificateManage(续期证件管理)/V/YHResignCertificatePassportTableViewCell.swift

@@ -24,7 +24,6 @@ class YHResignCertificatePassportTableViewCell: UITableViewCell {
     var frontDeleteButton: UIButton!
     var activityIndicator: UIActivityIndicatorView!
     var showMessageLabel: UILabel!
-    var cardLabel: UILabel!
     var cardBeginView: YHItemView!
     var cardEndView: YHItemView!
     var viewModel: YHBaseViewModel = YHBaseViewModel()
@@ -51,12 +50,10 @@ class YHResignCertificatePassportTableViewCell: UITableViewCell {
     var urls: [String]? {
         didSet {
             guard let firstUrl = urls?.first, firstUrl.count != 0 else {
-                cardLabel.isHidden = true
                 cardBeginView.isHidden = true
                 cardEndView.isHidden = true
                 return
             }
-            cardLabel.isHidden = false
             cardBeginView.isHidden = false
             cardEndView.isHidden = false
             self.firstUrl = firstUrl
@@ -276,20 +273,6 @@ class YHResignCertificatePassportTableViewCell: UITableViewCell {
             make.height.equalTo(20)
         }
         
-        cardLabel = {
-            let label = UILabel()
-            label.font = UIFont.PFSC_R(ofSize: 15)
-            label.textColor = UIColor.mainTextColor
-            label.text = "卡片有效期"
-            return label
-        }()
-        centerView.addSubview(cardLabel)
-        cardLabel.snp.makeConstraints { make in
-            make.left.equalTo(18)
-            make.right.equalTo(-18)
-            make.top.equalTo(229)
-            make.height.equalTo(20)
-        }
         cardBeginView = {
             let view = YHItemView()
             return view
@@ -303,7 +286,7 @@ class YHResignCertificatePassportTableViewCell: UITableViewCell {
         centerView.addSubview(cardBeginView)
         cardBeginView.snp.makeConstraints { make in
             make.left.equalTo(18)
-            make.top.equalTo(cardLabel.snp.bottom)
+            make.top.equalTo(229)
             make.height.equalTo(52)
             make.right.equalTo(-18)
         }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignCertificateManage(续期证件管理)/VM/YHResignCertificateDetailViewModel.swift

@@ -38,8 +38,8 @@ class YHResignCertificateDetailViewModel: YHBaseViewModel {
     }
     
     func getPassPortDataSource(_ isShowPrompt: Bool) -> [YHItemModel] {
-        let item1 = YHItemModel(id: .id1, isNeed: true, title: "开始时间", isUserKeyBoard: false, prompts: "请选择", message: getResultString(dataModel.cert_info.issue_start), type: .time, isShowPrompts: isShowPrompt, alertMessage:"请选择开始时间")
-        let item2 = YHItemModel(id: .id2, isNeed: true, title: "到期时间", isUserKeyBoard: false, prompts: "请选择", message: getResultString(dataModel.cert_info.issue_end), type: .time, isShowPrompts: isShowPrompt, alertMessage:"请选择到期时间")
+        let item1 = YHItemModel(id: .id1, isNeed: true, title: "签发日期", isUserKeyBoard: false, prompts: "请选择", message: getResultString(dataModel.cert_info.issue_start), type: .time, isShowPrompts: isShowPrompt, alertMessage:"请选择开始时间")
+        let item2 = YHItemModel(id: .id2, isNeed: true, title: "届满日期", isUserKeyBoard: false, prompts: "请选择", message: getResultString(dataModel.cert_info.issue_end), type: .time, isShowPrompts: isShowPrompt, alertMessage:"请选择到期时间")
         return [item1, item2]
     }
     

galaxy/galaxy/Classes/Tools/Upload/YHOSSManager.swift

@@ -215,17 +215,11 @@ class YHOSSManager: NSObject, URLSessionDelegate {
         DispatchQueue.global().async {
             
             let bucketName = self.getBucket(url)
-            let pathComponents = url.pathComponents
-            var objectKey = ""
-            for i in 0..<pathComponents.count {
-                if i == 0 || i == 1 {
             
-                } else if i == pathComponents.count - 1 {
-                    objectKey = objectKey + pathComponents[i]
-                } else {
-                    objectKey = objectKey + pathComponents[i] + "/"
-                }
-            }
+            guard let resultUrl = URL(string: url) else { return }
+            var objectKey = resultUrl.path
+            objectKey.removeFirst()
+
             let task = self.mClient.presignConstrainURL(withBucketName: bucketName, withObjectKey: objectKey, withExpirationInterval: 60 * 5)
             task.continue({ (t) -> Any? in
                 let result = t