Skip to content

G
galaxy-iOS
Commit f23a31e7 authored by pete谢兆麟's avatar pete谢兆麟
Browse files
Options

解决未登录情况下进入h5 重新登录之后 带yhid给到H5

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