添加协议跳转

liushiyu
1 parent 61bbbf6b
Showing 10 changed files with 138 additions and 12 deletions
metaCode/Classes/Common/Base/CNLiveBaseViewController.swift
metaCode/Classes/Common/Util/CNLiveCommonQiniuTool.swift
metaCode/Classes/Environment/CNLiveEnvironment.swift
metaCode/Classes/Main/LoginPage/Controller/CNLiveLoginViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveInfoShowViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveTypeFeedBackViewController.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineViewModel.swift
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_header_icon_close.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_header_icon_close.imageset/mine_header_icon_close@2x.png
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_header_icon_close.imageset/mine_header_icon_close@3x.png
@@ -205,7 +205,11 @@ class CNLiveBaseViewController: UIViewController {
     }
     @objc func ClickBackBtn() {
-        self.navigationController!.popViewController(animated: true)
+        if (self.presentingViewController != nil) {
+            self.dismiss(animated: true)
+        }else{
+            self.navigationController!.popViewController(animated: true)
+        }
     }
     @objc func topNavViewTap() {
@@ -7,10 +7,16 @@
 import Foundation
 import Qiniu
+import YYCategories
+import CNLiveRequestBastKit
+typealias ProgressBlcok = (String,CGFloat)
+typealias SuccessBlock = (String,String)
 class UploadManager: NSObject {
-    private let _qnUploadManager = QNUploadManager()
+    var successBlock: SuccessBlock?
+    var progressBlcok: ProgressBlcok?
+    private var _qnUploadManager = QNUploadManager()
     static let shared = UploadManager()
     private override init() {
         super.init()
@@ -20,9 +26,75 @@ class UploadManager: NSObject {
                 builder?.recorder = try QNFileRecorder(folder: "元码")
             } catch {}
         }
-//        _qnUploadManager = QNUploadManager(configuration: config)
+        _qnUploadManager = QNUploadManager(configuration: config)
     }
+    static func uploadImage(imageData: NSData, progressBlock: ProgressBlcok, successBlock: SuccessBlock) {
+        let key = UploadManager.createImageFileName()
+        UploadManager.shared.successBlock = successBlock
+        UploadManager.shared.progressBlcok = progressBlock
+        UploadManager.uploadData(data: imageData, key: key)
+    }
+    
+    
+    
+    /// 上传图片
+    /// - Parameters:
+    ///   - data: 上传数据
+    ///   - key: key
+    ///   - uploadProgress: 上传进度
+    ///   - resultBlock: 结果
+    static private func uploadData(data: NSData, key: String) {
+        
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.requestNetwork(with: .POST, urlString: "\(CNLiveEnvironmentManager.shared.baseUrl_shop)/Api/Index3/getQiniuToken", param: [:], cacheType: .networkOnly) { task, result, error in
+            if (error == nil) {
+                let resp = result as! NSDictionary
+                let errorCode = "\(resp["code"] ?? 0)"
+                if (errorCode == "0") {
+                    let data = resp["data"] as! Dictionary<String, Any>
+                    let token = data["token"] as! String
+                    if token.isNotBlank() {
+                        var uploadModel = QiNiuUploadModel.init()
+                        uploadModel.isCancel = false
+                        uploadModel.key = key
+                        let uploadOption = QNUploadOption.init(mime: nil, progressHandler: { key, percent in
+                            DispatchQueue.main.async {
+//                                UploadManager.shared.progressBlock
+                            }
+                        }, params: nil, checkCrc: false) {
+                            return uploadModel.isCancel
+                        }
+                    }
+                } else {
+                    showMessage(message: resp["message"] as! String)
+                }
+            } else {
+                showMessage(message: error!.localizedDescription)
+            }
+        }
+    }
+    
+    /// 设置图片名称
+    /// - Returns: 图片名
+    static private func createImageFileName() -> String {
+        let date = NSDate()
+        let currentTimeInterval = NSDate(timeIntervalSince1970: 0)
+        let imageName = "802/mateCode/img/\(date.string(withFormat: "yyyyMMdd") ?? "0000")/\(arc4random()%10).jpg"
+        return imageName
+    }
+}
+
+class QiNiuUploadModel: BaseModel {
+        
+    required init() {
+        self.uploadOption = QNUploadOption.defaultOptions()
+    }
+    ///上传文件的key
+    var key:String = ""
+    var uploadOption:QNUploadOption
+    var isCancel:Bool = false
 }
@@ -46,6 +46,7 @@ class CNLiveEnvironmentManager: NSObject{
     var appKey: String
     var baseUrl: String
     var appSecret: String
+    var baseUrl_shop: String
     ///当前环境
     var currentEnvironment: CNLiveEnvironment
@@ -56,6 +57,7 @@ class CNLiveEnvironmentManager: NSObject{
         self.appKey = ""
         self.baseUrl = ""
         self.appSecret = ""
+        self.baseUrl_shop = ""
         self.currentEnvironment = .development
     }
     //重新copy 和 mutableCopy 方法
@@ -88,6 +90,7 @@ class CNLiveEnvironmentManager: NSObject{
         self.appKey = "ae3a7ad3e4b9beb7cfe2078db648ebb89aa249ca2e82ac"
         self.appSecret = "3cc9f12db322a3d3656012ef929604cf6d6847471535f9"
         self.baseUrl = "https://api.cnlive.com"
+        self.baseUrl_shop = "https://wjjshop.cnlive.com"
     }
     //testFlight 环境配置
     func testFlightEnvironment(){
@@ -95,6 +98,7 @@ class CNLiveEnvironmentManager: NSObject{
         self.appKey = "ae3a7ad3e4b9beb7cfe2078db648ebb89aa249ca2e82ac"
         self.appSecret = "3cc9f12db322a3d3656012ef929604cf6d6847471535f9"
         self.baseUrl = "https://api.cnlive.com"
+        self.baseUrl_shop = "https://wjjshop.cnlive.com"
     }
     //production 生产环境配置
     func productionEnvironment(){
@@ -102,6 +106,7 @@ class CNLiveEnvironmentManager: NSObject{
         self.appKey = "064f392f84dfe7bbe9f1eabeda53ea02044213019b0406"
         self.appSecret = "68b5cc42fbdb466d56c2e22b00b1494feec8149f9dd32e"
         self.baseUrl = "https://api.cnlive.com"
+        self.baseUrl_shop = "https://managemall.cnlive.com"
     }
 }
@@ -69,7 +69,7 @@ class CNLiveLoginViewController : CNLiveBaseViewController, UITextViewDelegate {
     override func viewDidAppear(_ animated: Bool) {
-        LoginAuthInfoView.showAuthView()
+        
     }
     override func viewDidLoad() {
@@ -87,6 +87,8 @@ class CNLiveLoginViewController : CNLiveBaseViewController, UITextViewDelegate {
         self.setupPhoneView()
         self.setupVeriCodeView()
         self.setupLoginButtonView()
+        
+        LoginAuthInfoView.showAuthView()
     }
     deinit {
@@ -289,11 +291,13 @@ extension CNLiveLoginViewController {
     }
     @objc func pushAgreeActionMothod() {
-        self.navigationController?.pushViewController(CNLiveInfoShowViewController.init(show_type: .service), animated: true)
+        self.present(CNLiveInfoShowViewController.init(show_type: .service, is_login: true), animated: true)
+//        navi.pushViewController(CNLiveInfoShowViewController.init(show_type: .service), animated: true)
     }
     @objc func pushInfoActionMothod() {
-        self.navigationController?.pushViewController(CNLiveInfoShowViewController.init(show_type: .privacy), animated: true)
+        self.present(CNLiveInfoShowViewController.init(show_type: .service, is_login: true), animated: true)
+//        navi.pushViewController(CNLiveInfoShowViewController.init(show_type: .privacy), animated: true)
     }
 }
@@ -17,14 +17,24 @@ enum ListShowInfoType {
 class CNLiveInfoShowViewController: CNLiveBaseViewController, WKNavigationDelegate, WKUIDelegate {
+    var _is_login:Bool!
     var _show_type:ListShowInfoType!
-    init(show_type:ListShowInfoType) {
+    init(show_type:ListShowInfoType,is_login:Bool) {
        super.init(nibName:nil, bundle:nil)
         _show_type = show_type
+        _is_login = is_login
     }
     override func viewWillAppear(_ animated: Bool) {
-        navigationBarHidden = false
+        if _is_login {
+            if (self.presentingViewController != nil) {
+                //先设置一个默认返回按钮
+                let left_btn = UIButton.backItem(imageName: "mine_header_icon_close", target: self, action: #selector(changeCancelAction))
+                left_btn.backgroundColor = .white
+                let leftBtn_array : Array<UIButton> = [left_btn]
+                leftNavBtns = leftBtn_array
+            }
+        }
     }
     required init?(coder: NSCoder) {
@@ -43,6 +53,7 @@ class CNLiveInfoShowViewController: CNLiveBaseViewController, WKNavigationDelega
     override func viewDidLoad() {
         super.viewDidLoad()
+        navigationBarHidden = false
         var attrString =  ""
         switch _show_type {
             case .service:
@@ -65,9 +76,17 @@ class CNLiveInfoShowViewController: CNLiveBaseViewController, WKNavigationDelega
         }
         webView.load(URLRequest(url: URL(string: attrString)!, cachePolicy: .returnCacheDataElseLoad))
+
     }
+
-    
+    @objc func changeCancelAction() {
+        if (self.presentingViewController != nil) {
+            self.dismiss(animated: true)
+        }else{
+            self.navigationController!.popViewController(animated: true)
+        }
+    }
 //    override func viewDidLoad() {
 //        super.viewDidLoad()
 //        var attrString =  ""
@@ -263,7 +263,7 @@ extension CNLiveTypeFeedBackViewController {
                 self.navigationController?.pushViewController(CNLiveTypeFeedBackViewController.init(show_type: .manager), animated: true)
             }
             if indexPath.section == 1 {
-                self.navigationController?.pushViewController(CNLiveInfoShowViewController.init(show_type: .privacy), animated: true)
+                self.navigationController?.pushViewController(CNLiveInfoShowViewController.init(show_type: .privacy,is_login: false), animated: true)
             }
         }
         if _show_type == .about {
@@ -271,7 +271,7 @@ extension CNLiveTypeFeedBackViewController {
                 print("跳转app商店")
             }
             if indexPath.section == 1 {
-                self.navigationController?.pushViewController(CNLiveInfoShowViewController.init(show_type: .service), animated: true)
+                self.navigationController?.pushViewController(CNLiveInfoShowViewController.init(show_type: .service,is_login: false), animated: true)
             }
         }
         if _show_type == .info {
@@ -120,7 +120,7 @@ class CNLiveMineViewModel: NSObject {
         if CNLiveMineViewModel.timeStamp > NSNumber(string: UserInfoManager.shared.userInfo.expires_in)?.intValue ?? 0 {
             let param = NSMutableDictionary.init()
             param.setValue(APPId, forKey: "appId")
-            param.setValue("3cc9f12db322a3d3656012ef929604cf6d6847471535f9", forKey: "secret")
+            param.setValue(APPSecret, forKey: "secret")
             showLoading(message: "")
             CNLiveNetworking.setAllowRequestDefaultArgument(false)
             CNLiveNetworking.setupShowDataResult(false)
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "mine_header_icon_close@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "mine_header_icon_close@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}