Commit 275b2411 authored by pete谢兆麟's avatar pete谢兆麟

链接修改

parent 9a054045
...@@ -8156,7 +8156,7 @@ ...@@ -8156,7 +8156,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements; CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2; CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = RXHYW88XR7; DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
...@@ -8302,7 +8302,7 @@ ...@@ -8302,7 +8302,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements; CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2; CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = RXHYW88XR7; DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
...@@ -8510,7 +8510,7 @@ ...@@ -8510,7 +8510,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements; CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2; CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = RXHYW88XR7; DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
...@@ -8558,7 +8558,7 @@ ...@@ -8558,7 +8558,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements; CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2; CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = RXHYW88XR7; DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
......
...@@ -155,6 +155,15 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD ...@@ -155,6 +155,15 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
url = self.url + "?uid=\(YHLoginManager.shared.userModel?.id ?? "0")" url = self.url + "?uid=\(YHLoginManager.shared.userModel?.id ?? "0")"
} }
if !url.contains("yhid=") {
let id = YHLoginManager.shared.userModel?.id ?? ""
if url.contains("?") {
url = url + "&yhid=\(id)"
} else {
url = url + "?yhid=\(id)"
}
}
if let url = URL(string: url) { if let url = URL(string: url) {
let request = URLRequest(url: url) let request = URLRequest(url: url)
webview.load(request) webview.load(request)
......
...@@ -326,7 +326,8 @@ private extension YHH5WebViewVC { ...@@ -326,7 +326,8 @@ private extension YHH5WebViewVC {
tUrl = url + "&navigationH=\(k_Height_NavigationtBarAndStatuBar)" tUrl = url + "&navigationH=\(k_Height_NavigationtBarAndStatuBar)"
} }
} }
url = tUrl
if !url.contains("statusBarH=") { if !url.contains("statusBarH=") {
tUrl = url + "?statusBarH=\(k_Height_StatusBar)" tUrl = url + "?statusBarH=\(k_Height_StatusBar)"
if url.contains("?") { if url.contains("?") {
...@@ -334,6 +335,15 @@ private extension YHH5WebViewVC { ...@@ -334,6 +335,15 @@ private extension YHH5WebViewVC {
} }
} }
url = tUrl url = tUrl
if !url.contains("yhid=") {
let id = YHLoginManager.shared.userModel?.id ?? ""
tUrl = url + "?yhid=\(id)"
if url.contains("?") {
tUrl = url + "&yhid=\(id)"
}
}
url = tUrl
printLog("hjl: 当前加载的url是:\(url)") printLog("hjl: 当前加载的url是:\(url)")
if let url = URL(string: url) { if let url = URL(string: url) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment