Commit b16a4e84 authored by David黄金龙's avatar David黄金龙

1、修改 版本号

2、处理webView的 title
3、
parent e924933b
...@@ -2976,7 +2976,7 @@ ...@@ -2976,7 +2976,7 @@
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual; CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 0; CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = ""; DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO;
...@@ -3177,7 +3177,7 @@ ...@@ -3177,7 +3177,7 @@
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual; CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 0; CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = ""; DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO;
...@@ -3219,7 +3219,7 @@ ...@@ -3219,7 +3219,7 @@
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual; CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 0; CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = ""; DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO;
......
...@@ -23,9 +23,15 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD ...@@ -23,9 +23,15 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
var bottomView: YHHomeWebBottomView! var bottomView: YHHomeWebBottomView!
var url = "" var url = ""
var id: Int = 0 var id: Int = 0
var vcTitle : String?
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
gk_navBarAlpha = 1.0
gk_navLineHidden = false
gk_navTitle = vcTitle
view.backgroundColor = .white view.backgroundColor = .white
viewModel = YHHomeWebViewModel() viewModel = YHHomeWebViewModel()
//获取导航栏高度 //获取导航栏高度
...@@ -139,7 +145,6 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD ...@@ -139,7 +145,6 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
bottomView.isHidden = true bottomView.isHidden = true
webview.frame = CGRect(x: 0, y: statusHeight + navHeight!, width: self.view.frame.width, height: self.view.frame.height - statusHeight - navHeight!) webview.frame = CGRect(x: 0, y: statusHeight + navHeight!, width: self.view.frame.width, height: self.view.frame.height - statusHeight - navHeight!)
} }
getData() getData()
} }
...@@ -166,7 +171,11 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD ...@@ -166,7 +171,11 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
// MARK: - WKNavigationDelegate // MARK: - WKNavigationDelegate
func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) { func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
self.navigationItem.title = webview.title
if vcTitle == nil {
gk_navTitle = webview.title
}
} }
// MARK: - WKUIDelegate // MARK: - WKUIDelegate
......
...@@ -270,20 +270,21 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource { ...@@ -270,20 +270,21 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
printLog(url) printLog(url)
let vc = YHHomeWebViewController() let vc = YHHomeWebViewController()
vc.vcTitle = "积分中心"
vc.url = url vc.url = url
self.navigationController?.pushViewController(vc) self.navigationController?.pushViewController(vc)
} }
case .myTestCode://我的测评码 case .myTestCode://我的测评码
printLog("我的测评码") printLog("我的测评码")
let vc = YHHomeWebViewController() let vc = YHHomeWebViewController()
vc.vcTitle = "我的测评码"
vc.url = "https://test-cdn-pub.galaxy-immi.com/5000000/2377716732943678766120240418180233.png" vc.url = "https://test-cdn-pub.galaxy-immi.com/5000000/2377716732943678766120240418180233.png"
self.navigationController?.pushViewController(vc) self.navigationController?.pushViewController(vc)
case .appointGalaxyBay://预约银河湾 case .appointGalaxyBay://预约银河湾
printLog("预约银河湾") printLog("预约银河湾")
let vc = YHHomeWebViewController() let vc = YHHomeWebViewController()
vc.vcTitle = "预约银河湾"
vc.url = "https://upload.cdn.galaxy-immi.com/sell/product/images/page-1686138671996.png" vc.url = "https://upload.cdn.galaxy-immi.com/sell/product/images/page-1686138671996.png"
self.navigationController?.pushViewController(vc) self.navigationController?.pushViewController(vc)
default: default:
......
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