Skip to content

G
galaxy-iOS
Commit 0a02162f authored by AlexZhu's avatar AlexZhu
Browse files
Options

Merge branch 'push' into push-qiyu

parents fe4c4f12 f23a31e7
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
galaxy/galaxy/Classes/Modules/InteractionH5(与H5交互)/YHH5WebViewVC.swift
View file @ 0a02162f
......@@ -154,12 +154,13 @@ private extension YHH5WebViewVC {
func reloadWebViewWithToken() {
if YHLoginManager.shared.isLogin() {
let token = YHLoginManager.shared.h5Token
let yhid = YHLoginManager.shared.userModel?.id ?? ""
if !url.contains("param=") {
// 无 param= 的情况
var tUrl = url + "?param=" + token
var tUrl = url + "?param=" + token + "&yhid=" + yhid
let urlHasParam = String.hasQueryParameters(urlString: url)
if urlHasParam {
tUrl = url + "&param=" + token
tUrl = url + "&param=" + token + "&yhid=" + yhid
}
if let url = URL(string: tUrl) {
......@@ -177,7 +178,7 @@ private extension YHH5WebViewVC {
let arr0 = url.components(separatedBy: separator)
if arr0.count == 1 {
// eg: httts://www.baidu.com?param=
let tUrl = arr0[0] + "?param=" + token
let tUrl = arr0[0] + "?param=" + token + "&yhid=" + yhid
if let url = URL(string: tUrl) {
let request = URLRequest(url: url)
webview.load(request)
......@@ -190,7 +191,7 @@ private extension YHH5WebViewVC {
if arr1.count == 1 {
// eg: httts://www.baidu.com?param=123434324
let tUrl = arr0[0] + "?param=" + token
let tUrl = arr0[0] + "?param=" + token + "&yhid=" + yhid
if let url = URL(string: tUrl) {
let request = URLRequest(url: url)
webview.load(request)
......@@ -198,7 +199,7 @@ private extension YHH5WebViewVC {
}
} else {
// eg: httts://www.baidu.com?param=123434324&key2=1232323
var tUrl = arr0[0] + "?param=" + token
var tUrl = arr0[0] + "?param=" + token + "&yhid=" + yhid
for(index, str) in arr1.enumerated() {
if index != 0 {
tUrl = tUrl + "&" + str
......@@ -218,7 +219,7 @@ private extension YHH5WebViewVC {
let arr0 = url.components(separatedBy: separator)
if arr0.count == 1 {
// eg: httts://www.baidu.com?key0=123434324 &param=
let tUrl = arr0[0] + "&param=" + token
let tUrl = arr0[0] + "&param=" + token + "&yhid=" + yhid
if let url = URL(string: tUrl) {
let request = URLRequest(url: url)
webview.load(request)
......@@ -233,7 +234,7 @@ private extension YHH5WebViewVC {
if arr1.count == 1 {
// eg: httts://www.baidu.com?key0=123434324 &param= 1234980
let tUrl = arr0[0] + "&param=" + token
let tUrl = arr0[0] + "&param=" + token + "&yhid=" + yhid
if let url = URL(string: tUrl) {
let request = URLRequest(url: url)
webview.load(request)
......@@ -241,7 +242,7 @@ private extension YHH5WebViewVC {
}
} else {
// eg: httts://www.baidu.com?key0=123434324 &param= 1234980 & key1=34234
var tUrl = arr0[0] + "&param=" + token
var tUrl = arr0[0] + "&param=" + token + "&yhid=" + yhid
for(index, str) in arr1.enumerated() {
if index != 0 {
tUrl = tUrl + "&" + str
......@@ -332,8 +333,7 @@ private extension YHH5WebViewVC {
}
url = tUrl
if !url.contains("yhid=") {
let id = YHLoginManager.shared.userModel?.id ?? ""
if !url.contains("yhid="), let id = YHLoginManager.shared.userModel?.id {
tUrl = url + "?yhid=\(id)"
if url.contains("?") {
tUrl = url + "&yhid=\(id)"
......
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