Skip to content

G
galaxy-iOS
Commit 1d5b0471 authored by David黄金龙's avatar David黄金龙
Browse files
Options

Merge branch 'double11' into develop 

* double11:
  处理 H5 联调
  几处 代码优化
  处理 H5 token刷新的问题

# Conflicts:
#	galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHomeBannerView.swift
#	galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHServiceBannerView.swift
parents a10e6c06 dfc0487a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 70 additions and 48 deletions
galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHKEventWebViewController.swift
View file @ 1d5b0471
...@@ -39,14 +39,9 @@ class YHHKEventWebViewController: YHBaseViewController { ...@@ -39,14 +39,9 @@ class YHHKEventWebViewController: YHBaseViewController {
extension YHHKEventWebViewController { extension YHHKEventWebViewController {
func loadData() { func loadData() {
guard let urlString = model.list.first else { return } guard let urlString = model.list.first else { return }
// let url = NSURL(string: urlString)
// // 创建请求
// let request = NSURLRequest(url: url! as URL)
// // 加载请求
// self.webview.load(request as URLRequest)
if let url = URL(string: urlString) { if let url = URL(string: urlString) {
let request = NSURLRequest(url: url) let request = URLRequest(url: url)
webview.load(request as URLRequest) webview.load(request)
} else { } else {
let tmpUrl = YHURLEncodeHelper.urlEncodedString(urlString) let tmpUrl = YHURLEncodeHelper.urlEncodedString(urlString)
if let url = URL(string: tmpUrl) { if let url = URL(string: tmpUrl) {
......
galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomeWebViewController.swift
View file @ 1d5b0471
...@@ -347,12 +347,12 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD ...@@ -347,12 +347,12 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
if YHNetworkStatusManager.shared.isNetWorkOK { if YHNetworkStatusManager.shared.isNetWorkOK {
if needReload && self.isNetWorkOkBefore == false { if needReload && self.isNetWorkOkBefore == false {
self.webview.stopLoading() self.webview.stopLoading()
let targetUrl = NSURL(string: self.url) if let targetUrl = URL(string: self.url) {
let request = NSURLRequest(url: targetUrl! as URL) let request = URLRequest(url: targetUrl)
self.webview.load(request as URLRequest) self.webview.load(request)
}
self.getData() self.getData()
} }
self.isNetWorkOkBefore = true self.isNetWorkOkBefore = true
} }
......
galaxy/galaxy/Classes/Modules/Home(首页)/C/YHStatusAdvantageVC.swift
View file @ 1d5b0471
...@@ -102,14 +102,6 @@ private extension YHStatusAdvantageVC { ...@@ -102,14 +102,6 @@ private extension YHStatusAdvantageVC {
} }
func reloadWebUrl() { func reloadWebUrl() {
// let url = NSURL(string: url)
// // 创建请求
// let request = NSURLRequest(url: url! as URL)
// 加载请求
// webview.load(request as URLRequest)
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)
...@@ -230,11 +222,11 @@ private extension YHStatusAdvantageVC { ...@@ -230,11 +222,11 @@ private extension YHStatusAdvantageVC {
if YHNetworkStatusManager.shared.isNetWorkOK { if YHNetworkStatusManager.shared.isNetWorkOK {
if needReload && self.isNetWorkOkBefore == false { if needReload && self.isNetWorkOkBefore == false {
self.webview.stopLoading() self.webview.stopLoading()
let targetUrl = NSURL(string: self.url) if let targetUrl = URL(string: self.url) {
let request = NSURLRequest(url: targetUrl! as URL) let request = URLRequest(url: targetUrl)
self.webview.load(request as URLRequest) self.webview.load(request)
}
} }
self.isNetWorkOkBefore = true self.isNetWorkOkBefore = true
} }
......
galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHomeBannerView.swift
View file @ 1d5b0471
...@@ -135,7 +135,22 @@ extension YHHomeBannerView: FSPagerViewDataSource, FSPagerViewDelegate { ...@@ -135,7 +135,22 @@ extension YHHomeBannerView: FSPagerViewDataSource, FSPagerViewDelegate {
if model.skip_url.isEmpty == false { if model.skip_url.isEmpty == false {
switch model.skip_type { switch model.skip_type {
case 1: //跳转H5 case 1: //跳转H5
//for test hjl 建明机器IP
//var url = "http://192.168.23.66:10300/superAppBridge.html#/schoolEvaluation"
//for test hjl 梁辉机器IP
// model.skip_url = "http://192.168.23.75:10300/superAppBridge.html#/double11-home"
//for test hjl steve机器IP
// model.skip_url = "http://192.168.52.158:10300/superAppBridge.html#/double11-home"
//for test hjl 测试环境
// model.skip_url = "https://test-hkdiy-h5.galaxy-immi.com/superAppBridge.html#/double11-home"
//for test hjl
// model.skip_url = "http://192.168.23.35:10300/signatureQrcode/EcqtQYs%2Bxey7t6jLbn6JkQ%3D%3D"
//1.增加app token
var url = "" var url = ""
if YHLoginManager.shared.isLogin() { if YHLoginManager.shared.isLogin() {
let token = YHLoginManager.shared.h5Token let token = YHLoginManager.shared.h5Token
...@@ -148,8 +163,17 @@ extension YHHomeBannerView: FSPagerViewDataSource, FSPagerViewDelegate { ...@@ -148,8 +163,17 @@ extension YHHomeBannerView: FSPagerViewDataSource, FSPagerViewDelegate {
url = model.skip_url url = model.skip_url
} }
//2.增加导航栏高度
var tUrl = url
if !url.contains("navigationH=") {
tUrl = url + "?navigationH=\(k_Height_NavigationtBarAndStatuBar)"
if url.contains("?") {
tUrl = url + "&navigationH=\(k_Height_NavigationtBarAndStatuBar)"
}
}
let vc = YHH5WebViewVC() let vc = YHH5WebViewVC()
vc.url = url vc.url = tUrl
vc.isFullScreenFlag = false vc.isFullScreenFlag = false
if model.is_double_11_flag { if model.is_double_11_flag {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHServiceBannerView.swift
View file @ 1d5b0471
...@@ -123,6 +123,20 @@ extension YHServiceBannerView: FSPagerViewDataSource, FSPagerViewDelegate { ...@@ -123,6 +123,20 @@ extension YHServiceBannerView: FSPagerViewDataSource, FSPagerViewDelegate {
if model.skip_url.isEmpty == false { if model.skip_url.isEmpty == false {
switch model.skip_type { switch model.skip_type {
case 1: //跳转H5 case 1: //跳转H5
//for test hjl 建明机器IP
//var url = "http://192.168.23.66:10300/superAppBridge.html#/schoolEvaluation"
//for test hjl 梁辉机器IP
// model.skip_url = "http://192.168.23.75:10300/superAppBridge.html#/double11-home"
//for test hjl steve机器IP
// model.skip_url = "http://192.168.52.158:10300/superAppBridge.html#/double11-home"
//for test hjl 测试环境
// model.skip_url = "https://test-hkdiy-h5.galaxy-immi.com/superAppBridge.html#/double11-home"
//1.增加app token
var url = "" var url = ""
if YHLoginManager.shared.isLogin() { if YHLoginManager.shared.isLogin() {
let token = YHLoginManager.shared.h5Token let token = YHLoginManager.shared.h5Token
...@@ -135,9 +149,21 @@ extension YHServiceBannerView: FSPagerViewDataSource, FSPagerViewDelegate { ...@@ -135,9 +149,21 @@ extension YHServiceBannerView: FSPagerViewDataSource, FSPagerViewDelegate {
url = model.skip_url url = model.skip_url
} }
//2.增加导航栏高度
var tUrl = url
if !url.contains("navigationH=") {
tUrl = url + "?navigationH=\(k_Height_NavigationtBarAndStatuBar)"
if url.contains("?") {
tUrl = url + "&navigationH=\(k_Height_NavigationtBarAndStatuBar)"
}
}
let vc = YHH5WebViewVC() let vc = YHH5WebViewVC()
vc.url = url vc.url = tUrl
vc.isFullScreenFlag = false vc.isFullScreenFlag = false
if model.is_double_11_flag {
vc.isHideNavigationBar = true
}
if model.is_share_h5_flag { if model.is_share_h5_flag {
if let tModel = model.addtition_param { if let tModel = model.addtition_param {
......
galaxy/galaxy/Classes/Modules/InteractionH5(与H5交互)/YHJsApi.swift
View file @ 1d5b0471
...@@ -247,22 +247,14 @@ extension YHJsApi { ...@@ -247,22 +247,14 @@ extension YHJsApi {
} else { } else {
//普通界面 //普通界面
if !url.isEmpty { if !url.isEmpty {
// var tUrl = url + "?navigationH=\(k_Height_NavigationtBarAndStatuBar)" var tUrl = url
// let urlHasParam = String.hasQueryParameters(urlString: url) if !url.contains("avigationH=") {
// if urlHasParam { tUrl = url + "?navigationH=\(k_Height_NavigationtBarAndStatuBar)"
// tUrl = url + "&navigationH=\(k_Height_NavigationtBarAndStatuBar)" if url.contains("?") {
// } tUrl = url + "&navigationH=\(k_Height_NavigationtBarAndStatuBar)"
// let vc = YHH5WebViewVC() }
// vc.url = tUrl
// vc.isFullScreenFlag = isFullScreen == 1 ? true : false
// vc.navTitle = navTitle
// self.delegate?.navigationController?.pushViewController(vc)
var tUrl = url + "?navigationH=\(k_Height_NavigationtBarAndStatuBar)"
if url.contains("?") {
tUrl = url + "&navigationH=\(k_Height_NavigationtBarAndStatuBar)"
} }
let vc = YHH5WebViewVC() let vc = YHH5WebViewVC()
vc.url = tUrl vc.url = tUrl
vc.isFullScreenFlag = isFullScreen == 1 ? true : false vc.isFullScreenFlag = isFullScreen == 1 ? true : false
......
galaxy/galaxy/Classes/Modules/Login(登录)/C/YHWebViewViewController.swift
View file @ 1d5b0471
...@@ -27,14 +27,7 @@ class YHWebViewViewController: YHBaseViewController, WKUIDelegate, WKNavigationD ...@@ -27,14 +27,7 @@ class YHWebViewViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
// 创建wkwebview // 创建wkwebview
webview = WKWebView(frame: CGRect(x: 0, y: statusHeight + navHeight!, width: self.view.frame.width, height: self.view.frame.height - k_Height_NavigationtBarAndStatuBar)) webview = WKWebView(frame: CGRect(x: 0, y: statusHeight + navHeight!, width: self.view.frame.width, height: self.view.frame.height - k_Height_NavigationtBarAndStatuBar))
webview.navigationDelegate = self webview.navigationDelegate = self
// // 创建网址
// let url = NSURL(string: url)
// // 创建请求
// let request = NSURLRequest(url: url! as URL)
// // 加载请求
// webview.load(request as URLRequest)
if let url = URL(string: url) { if let url = URL(string: url) {
let request = URLRequest(url: url) let request = URLRequest(url: 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