Merge branch 'develop' into xq

# Conflicts:
#	galaxy/fastlane/Fastfile
#	galaxy/galaxy.xcodeproj/project.pbxproj

galaxy/fastlane/Fastfile

@@ -42,7 +42,10 @@ platform :ios do
   txIM = "develop-desk-tx"
   gift = "gift_push"
   Im_618 = "develop-tx-618"
+  GZL = "GZL"
   xq = "xq"
+  webFix = "develop_bugfix_web"
+
 
   #打包正使用的分支
   myPack_branch = xq

galaxy/galaxy/AppDelegate.swift

@@ -213,7 +213,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate, WXApiDelegate {
                                             printLog("需要登录")
                                             return
                                         }
-                                        var url = YHBaseUrlManager.shared.curBusinessStarUrl()
+                                        // 增加来源
+                                        var url = YHBaseUrlManager.shared.curBusinessStarUrl() + "?channel=qrcode"
 
                                         if YHLoginManager.shared.isLogin() {
                                             let token = YHLoginManager.shared.h5Token
@@ -247,7 +248,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate, WXApiDelegate {
                                             printLog("需要登录")
                                             return
                                         }
-                                        var url = YHBaseUrlManager.shared.curBusinessStarStoreUrl()
+                                        // 增加来源
+                                        var url = YHBaseUrlManager.shared.curBusinessStarStoreUrl() + "?channel=qrcode"
 
                                         if YHLoginManager.shared.isLogin() {
                                             let token = YHLoginManager.shared.h5Token
@@ -270,6 +272,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, WXApiDelegate {
                                         }
                                         
                                         let vc = YHH5WebViewVC()
+                                        vc.isFullScreenFlag = false
                                         vc.url = tUrl
                                         UIViewController.current?.navigationController?.pushViewController(vc)
                                     }

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

@@ -83,6 +83,11 @@ class YHH5WebViewVC: YHBaseViewController, WKUIDelegate, WKNavigationDelegate {
                                                name: UIResponder.keyboardWillHideNotification, object: nil)
     }
     
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        reloadUI()
+    }
+    
     deinit {
         if webview.observationInfo != nil {
             webview.removeObserver(self, forKeyPath: #keyPath(WKWebView.estimatedProgress))