Merge branch 'new_product' into qrcode

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -8968,7 +8968,7 @@
 				CODE_SIGN_ENTITLEMENTS = yinheReplayExt/yinheReplayExt.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = yinheReplayExt/Info.plist;
@@ -8998,7 +8998,7 @@
 				CODE_SIGN_ENTITLEMENTS = yinheReplayExt/yinheReplayExt.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = yinheReplayExt/Info.plist;
@@ -9028,7 +9028,7 @@
 				CODE_SIGN_ENTITLEMENTS = yinheReplayExt/yinheReplayExt.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = yinheReplayExt/Info.plist;
@@ -9058,7 +9058,7 @@
 				CODE_SIGN_ENTITLEMENTS = yinheReplayExt/yinheReplayExt.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = yinheReplayExt/Info.plist;
@@ -9147,8 +9147,8 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
-				DEBUG_INFORMATION_FORMAT = dwarf;
+				CURRENT_PROJECT_VERSION = 3;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -9296,8 +9296,8 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
-				DEBUG_INFORMATION_FORMAT = dwarf;
+				CURRENT_PROJECT_VERSION = 3;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -9507,7 +9507,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 3;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -9558,8 +9558,8 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
-				DEBUG_INFORMATION_FORMAT = dwarf;
+				CURRENT_PROJECT_VERSION = 3;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (

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

@@ -44,7 +44,20 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
     
     var progBar = UIProgressView()
     var bottomView: YHHomeWebBottomView!
-    var url = ""
+    var url = "" {
+        didSet {
+            if url.contains("isLogin=") {
+                printLog("RESULT_URL: \(url)")
+                return
+            }
+            let is_login = YHLoginManager.shared.isLogin() ? 1 : 0
+            if url.contains("?") {
+                url += "&isLogin=\(is_login)"
+            } else {
+                url += "?isLogin=\(is_login)"
+            }
+        }
+    }
     var id: Int = 0
     var vcTitle: String?
     var model: YHWebModel = YHWebModel()

galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHomeKingKongBlockView.swift

@@ -138,13 +138,7 @@ private extension YHHomeKingKongBlockView {
                 gotoBusinessStar()
             case 8:
                 // 银河新品
-                if !YHLoginManager.shared.isLogin() {
-                    YHOneKeyLoginManager.shared.oneKeyLogin()
-                    return
-                }
-                
                 var url = YHBaseUrlManager.shared.businessH5Url() + "/yh-new-goods/detail"
-                
                 if YHLoginManager.shared.isLogin() {
                     let token = YHLoginManager.shared.h5Token
                     let urlHasParam = String.hasQueryParameters(urlString: url)

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

@@ -56,7 +56,20 @@ class YHH5WebViewVC: YHBaseViewController, WKUIDelegate, WKNavigationDelegate {
         return view
     }()
     
-    var url = ""
+    var url = "" {
+        didSet {
+            if url.contains("isLogin=") {
+//                printLog("RESULT_URL: \(url)")
+                return
+            }
+            let is_login = YHLoginManager.shared.isLogin() ? 1 : 0
+            if url.contains("?") {
+                url += "&isLogin=\(is_login)"
+            } else {
+                url += "?isLogin=\(is_login)"
+            }
+        }
+    }
     var navTitle = "" // 导航栏title
     
     lazy var noNetWorkTipsView: YHEmptyDataView = {