动态获取二维码数据

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHEvaluationViewVC.swift

@@ -8,6 +8,7 @@
 
 import UIKit
 import WebKit
+import dsBridge
 
 /*
  快速测评

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHStatusAdvantageVC.swift

@@ -32,7 +32,14 @@ class YHStatusAdvantageVC: YHBaseViewController, WKUIDelegate, WKNavigationDeleg
     }()
     
     
-   
+    lazy var viewModel: YHHomePageViewModel = {
+        let vm = YHHomePageViewModel()
+        return vm
+    }()
+    
+    
+    var isQrInfoOk : Bool = false
+    
     
     //是否曾今有过网络
     private var isNetWorkOkBefore : Bool = false
@@ -46,12 +53,27 @@ class YHStatusAdvantageVC: YHBaseViewController, WKUIDelegate, WKNavigationDeleg
         webview.removeObserver(self, forKeyPath: "estimatedProgress")
         NotificationCenter.default.removeObserver(self)
     }
+    
+    override func viewWillLayoutSubviews() {
+        super.viewWillLayoutSubviews()
+        
+        
+    }
 }
 
 
 // MARK: - 内部方法
 private extension YHStatusAdvantageVC {
     
+    func loadQrInfo() {
+        let params : [String : Any] = ["pid" : 16]
+        viewModel.getHKEvent(param: params) { success, error in
+            if success {
+                self.isQrInfoOk = true
+            }
+        }
+    }
+    
     func setupUI() {
         gk_navBarAlpha = 1.0
         gk_navLineHidden = false
@@ -97,12 +119,19 @@ private extension YHStatusAdvantageVC {
                 let vc = YHEvaluationViewVC()
                 self.navigationController?.pushViewController(vc)
             } else if tag == 1 {
-                
-                // TODO: - for test hjl 需要进一步完善
-                let codeUrl = "https://public-resuorces.oss-cn-shenzhen.aliyuncs.com/app/article_clue_default_user_code1.png"
-                let downloadUrl = "https://public-resuorces.oss-cn-shenzhen.aliyuncs.com/app/article_clue_default_user_code.png"
-                
-                YHConsultantQRCodeView.codeView(codeUrl, downloadUrl: downloadUrl).show()
+                if self.isQrInfoOk {
+                    if let arr = self.viewModel.hkList,arr.count > 0 {
+                        let item : YHHKEventModel = arr[0]
+                        
+                        if item.list.count > 1 {
+                            let codeUrl =  item.list[0]//"https://public-resuorces.oss-cn-shenzhen.aliyuncs.com/app/article_clue_default_user_code1.png"
+                            let downloadUrl = item.list[1]//"https://public-resuorces.oss-cn-shenzhen.aliyuncs.com/app/article_clue_default_user_code.png"
+                            
+                            YHConsultantQRCodeView.codeView(codeUrl, downloadUrl: downloadUrl).show()
+                            
+                        }
+                    }
+                }
             } else if tag == 2 {
                 //邀请有礼
                 if YHLoginManager.shared.isLogin() {
@@ -126,6 +155,10 @@ private extension YHStatusAdvantageVC {
             make.top.equalToSuperview().offset(k_Height_NavigationtBarAndStatuBar)
         }
         updateNetWorkStatusUI(needReload: false)
+        
+        if !YHLoginManager.shared.isLogin() {
+            loadQrInfo()
+        }
     }
     
     func addRightItems() {

galaxy/galaxy/Classes/Modules/Home(首页)/VM/YHHomePageViewModel.swift

@@ -14,7 +14,7 @@ class YHHomePageViewModel : YHBaseViewModel {
     var arrHomeNewsData: [YHHomeListModel]?
     var banners: [YHBannerModel]?
     var classify: [YHHomeClassifyModel]?
-    var hkList: [YHHKEventModel]?
+    var hkList: [YHHKEventModel]? //香港办事 也是静态数据的入口
     var classifyArr:[YHHomeInfoClassifyModel?] = []
     
     //首页相关参数
@@ -408,9 +408,11 @@ extension YHHomePageViewModel {
         }
     }
     
-    func getHKEvent(callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
+    func getHKEvent(param : [String:Any] = [:],callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Common.hklistApi
-        let _ = YHNetRequest.getRequest(url: strUrl) { [weak self] json, code in
+        
+//        let param = ["pid":16]
+        let _ = YHNetRequest.getRequest(url: strUrl,params:param) { [weak self] json, code in
             guard let self = self else { return }
             //1. json字符串 转 对象
             if json.code == 200 {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/C/YHMyDocumentsDetailViewController.swift

@@ -369,7 +369,7 @@ class YHMyDocumentsDetailViewController: YHBaseViewController {
         // 先OSS上传得到URL
         self.viewModel.uploadImage(img) {
             [weak self] url, error in
-            guard let self = self else { return }
+            guard self != nil else { return }
             if let url = url, !url.isEmpty {
                 callBack?(true, url)
                 return