1、删除不使用的代码

2、统一 picMaxSize  = 2 * 1024 8 1024

galaxy/galaxy/Classes/Base/C/YHBaseViewModel.swift

@@ -13,27 +13,11 @@ import Alamofire
 class YHBaseViewModel {
     // 上传方法
     func uploadImage(_ image: UIImage, _ isPublic: Bool = false, callBackBlock:@escaping (_ success: String?, _ error:YHErrorModel?)->()) {
-#if DEBUG
-        let size = image.imageSize()
-        YHHUD.flash(message: "\(Float(size/1024/1024))M")
-#endif
-//        let strUrl = YHBaseUrlManager.shared.curOssURL() + YHAllApiName.OSS.uploadApi
-//        let boundary = UUID().uuidString
-//        let headers: HTTPHeaders = [
-//            "Content-type": "multipart/form-data; boundary=\(boundary)",
-//            "businessCode": "4001001"
-//        ]
-//        let _ = YHNetRequest.uplaodRequest(url: strUrl, headers: headers, image: image) { [weak self] json, code in
-//            guard let _ = self else { return }
-//            if json.code == 200 {
-//                callBackBlock(json.data as? String, nil)
-//            } else {
-//                let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
-//                callBackBlock(nil, error)
-//            }
-//        } failBlock: { err in
-//            callBackBlock(nil, err)
-//        }
+//#if DEBUG
+//        let size = image.imageSize()
+//        YHHUD.flash(message: "\(Float(size/1024/1024))M")
+//#endif
+
         if YHNetworkStatusManager.shared.isNetWorkOK == false {
             DispatchQueue.main.async {
                 YHHUD.flash(message: "网络不可用，请检查网络设置")

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/V/YHImagePickerView.swift

@@ -254,8 +254,8 @@ extension YHImagePickerView: UINavigationControllerDelegate, UIImagePickerContro
 extension YHImagePickerView {
     func checkImage( _image : UIImage) -> UIImage? {
         let size = _image.imageSize()
-        if size > 4 * 1024 * 1024 {
-            if let data = _image.compressOriginalImage(4 * 1024 * 1024), let ttt = UIImage(data: data) {
+        if size > picMaxSize {
+            if let data = _image.compressOriginalImage(picMaxSize), let ttt = UIImage(data: data) {
                 return ttt
             }
         }

galaxy/galaxy/Classes/Tools/Extention/UIImage+Extension.swift

@@ -192,61 +192,3 @@ enum ImageCopmpressSize {
     //压缩到4M(1024*1024*4)
     case four
 }
-
-
-//extension UIImage {
-//    func compressImage(size:ImageCopmpressSize) -> Data{
-//        switch size {
-//        case .one:
-//            return compressImage(maxLength: 1024*100)
-//        case .two:
-//            return compressImage(maxLength: 1024*200)
-//        case .three:
-//            return compressImage(maxLength: 1024*300)
-//        case .four:
-//            return compressImage(maxLength: 4 * 1024 * 1024)
-//        }
-//    }
-//    
-//    
-//    // 图片压缩 byte
-//    func compressImage(maxLength: Int) -> Data {
-//        // let tempMaxLength: Int = maxLength / 8
-//        let tempMaxLength: Int = maxLength
-//        var compression: CGFloat = 1
-//        guard var data = self.jpegData(compressionQuality: compression), data.count > tempMaxLength else { return self.jpegData(compressionQuality: compression)! }
-//        
-//        // 压缩大小
-//        var max: CGFloat = 1
-//        var min: CGFloat = 0
-//        for _ in 0..<6 {
-//            compression = (max + min) / 2
-//            data = self.jpegData(compressionQuality: compression)!
-//            if CGFloat(data.count) < CGFloat(tempMaxLength) * 0.9 {
-//                min = compression
-//            } else if data.count > tempMaxLength {
-//                max = compression
-//            } else {
-//                break
-//            }
-//        }
-//        var resultImage: UIImage = UIImage(data: data)!
-//        if data.count < tempMaxLength { return data }
-//        
-//        // 压缩大小
-//        var lastDataLength: Int = 0
-//        while data.count > tempMaxLength && data.count != lastDataLength {
-//            lastDataLength = data.count
-//            let ratio: CGFloat = CGFloat(tempMaxLength) / CGFloat(data.count)
-//            print("Ratio =", ratio)
-//            let size: CGSize = CGSize(width: Int(resultImage.size.width * sqrt(ratio)),
-//                                      height: Int(resultImage.size.height * sqrt(ratio)))
-//            UIGraphicsBeginImageContext(size)
-//            resultImage.draw(in: CGRect(x: 0, y: 0, width: size.width, height: size.height))
-//            resultImage = UIGraphicsGetImageFromCurrentImageContext()!
-//            UIGraphicsEndImageContext()
-//            data = resultImage.jpegData(compressionQuality: compression)!
-//        }
-//        return data
-//    }
-//}

galaxy/galaxy/Classes/Tools/Helper/YhConstant.swift

@@ -7,9 +7,10 @@
 //
 
 import UIKit
+// MARK: - 统一上传图片的最大值
+let picMaxSize : Int = 2 * 1024 * 1024
 
 // MARK: - 工程中的 常量定义
-
 let APP_NAME = Bundle.main.infoDictionary!["CFBundleName"] as! String
 
 /// 打印

galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift

@@ -217,7 +217,7 @@ class YHNetRequest: NSObject {
         }
         
         
-        let size = Int(2 * 1024 * 1024)
+        let size = picMaxSize
         guard let imageData = image.compressOriginalImage(size) else { return httpRequest }
         
 

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

@@ -86,7 +86,7 @@ class YHOSSManager: NSObject, URLSessionDelegate {
     
     func putObject(image: UIImage, _ isPublic: Bool = false, callBackBlock:@escaping (_ success: String?, _ error:YHErrorModel?)->()) {
         let request = OSSPutObjectACLRequest()
-        let size = Int(2 * 1024 * 1024)
+        let size = picMaxSize
         guard let imageData = image.compressOriginalImage(size) else {
             callBackBlock(nil, YHErrorModel())
             return