Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop

# Conflicts:
#	galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomeWebViewController.swift

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

@@ -148,7 +148,6 @@ extension YHHomeHoldViewPageViewController {
                     return
                 }
                 
-                model.type = 1 //for test hjl
                 if model.type == 1 {
                     //正式弹窗
                     

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

@@ -106,9 +106,9 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
         // 创建wkwebview
         webview = DWKWebView(frame: CGRect(x: 0, y: statusHeight + navHeight!, width: self.view.frame.width, height: self.view.frame.height - statusHeight - navHeight! - 59 - k_Height_safeAreaInsetsBottom()))
         webview.navigationDelegate = self
+        webview.setDebugMode(false)
         
         webview.scrollView.contentInsetAdjustmentBehavior = .never
-        webview.navigationDelegate = self
         
         api.delegate = self
         webview.addJavascriptObject(api, namespace: nil)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/OfficialApproval(正式批)/V/YHOffivialApprovalSuccessCheckView.swift

@@ -89,12 +89,6 @@ class YHOffivialApprovalSuccessCheckView: UIView {
         setupUI()
     }
     
-    let testContent = "恭喜您申请的【优秀人才入境计划】已获得港府的正式批准！从递交资料伊始，经历了235天，感谢您这一路以来对银河的信赖与包容！"
-    var timer: Timer?
-    var counter = 0
-    
-    
-    
     private var displayLink: CADisplayLink?
     private var currentIndex: Int = 0
     private var fullText: String = "恭喜您申请的【优秀人才入境计划】"
@@ -216,27 +210,6 @@ private extension YHOffivialApprovalSuccessCheckView {
         }
     }
     
-    
-    func startTyping() {
-        timer = Timer.scheduledTimer(timeInterval: 0.1, target: self, selector: #selector(typeText), userInfo: nil, repeats: true)
-        RunLoop.current.add(timer!, forMode: .common)
-    }
- 
-    @objc func typeText() {
-        if counter < testContent.count {
-            self.titleLabel.text = String(testContent.prefix(counter + 1))
-            counter += 1
-        } else {
-            timer?.invalidate()
-            counter = 0
-            
-            let aa: ASAttributedString = .init("恭喜您申请的【优秀人才入境计划】", .font(UIFont.PFSC_R(ofSize: 15)),.foreground(UIColor(hex: 0x671908, alpha: 1.0)))
-            let bb: ASAttributedString = .init("已获得港府的正式批准！", .font(UIFont.PFSC_R(ofSize: 15)),.foreground(UIColor(hex: 0xAE1616, alpha: 1.0)))
-            let cc: ASAttributedString = .init("从递交资料伊始，经历了235天，感谢您这一路以来对银河的信赖与包容！", .font(UIFont.PFSC_R(ofSize: 15)),.foreground(UIColor(hex: 0x671908, alpha: 1.0)))
-            self.titleLabel.attributed.text = aa + bb + cc
-        }
-    }
-    
     private func startTypingEffect() {
         displayLink = CADisplayLink(target: self, selector: #selector(handleDisplayLink(_:)))
         displayLink?.preferredFramesPerSecond = Int(1 / 0.1) // 设置帧率
@@ -293,6 +266,7 @@ private extension YHOffivialApprovalSuccessCheckView {
             result.append(centerattributedString)
             result.append(lastattributedString)
             self.titleLabel.attributedText = result
+            
             currentIndex += 1
         } else {
             displayLink.invalidate()

galaxy/galaxy/Classes/Modules/InteractionH5(与H5交互)/YHH5WebViewVC.swift

@@ -123,6 +123,7 @@ private extension YHH5WebViewVC {
         webview.scrollView.contentInsetAdjustmentBehavior = .never
         webview.navigationDelegate = self
         webview.scrollView.delegate = self
+        webview.setDebugMode(false)
         
         let api = YHJsApi()
         api.delegate = self

galaxy/galaxy/Classes/Modules/InteractionH5(与H5交互)/YHJsApi.swift

@@ -20,7 +20,7 @@ extension YHJsApi {
     //展示pics
     @objc func showPicsSyn(_ dicPics:[String : Any]) {
         //dsBridge.call("showPicsSyn",{pics:["123","456"], curIndex:1})
-        if dicPics.isEmpty == false {
+        if !dicPics.isEmpty {
             let curIndex : Int = dicPics["curIndex"] as? Int ?? -1
             let arrPics : [String] = dicPics["pics"] as? [String] ?? []
             

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/客服段/正式批/official_approval_close_btn.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "Group 2848@2x.png",
+      "filename" : "update_close@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Group 2848@3x.png",
+      "filename" : "update_close@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }