Commit 7e714463 authored by David黄金龙's avatar David黄金龙

Merge branch 'main-fix' into youhua-dev

* main-fix:
  代码优化
  banner 分享 链接无id时 隐藏分享按钮
  文字修改

# Conflicts:
#	galaxy/galaxy/Classes/Modules/Login(登录)/C/YHPhoneLoginWithVideoBkgViewController.swift
parents b41ea0e5 a3ecdbd3
...@@ -43,10 +43,11 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD ...@@ -43,10 +43,11 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
gk_navBarAlpha = 1.0 gk_navBarAlpha = 1.0
gk_navLineHidden = false gk_navLineHidden = false
gk_navTitle = vcTitle gk_navTitle = vcTitle
if !(vcTitle == "积分中心" || vcTitle == "预约银河湾") {
let rightButtonItem = UIBarButtonItem(image: UIImage(named: "share_item")?.withRenderingMode(.alwaysOriginal), style: .plain, target: self, action: #selector(share)) if (vcTitle == "香港身份测评码") {
gk_navRightBarButtonItem = rightButtonItem addRightItems()
gk_navItemRightSpace = 16 } else {
printLog("通过ID的逻辑来处理")
} }
view.backgroundColor = .white view.backgroundColor = .white
viewModel = YHHomeWebViewModel() viewModel = YHHomeWebViewModel()
...@@ -206,6 +207,11 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD ...@@ -206,6 +207,11 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
if operationFlag { if operationFlag {
self.block?(model) self.block?(model)
} }
if model.img_url.isEmpty == false {
self.addRightItems()
}
} }
} }
} else { } else {
...@@ -352,3 +358,19 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD ...@@ -352,3 +358,19 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
getData() getData()
} }
} }
extension YHHomeWebViewController {
func addRightItems() {
let rightButtonItem = UIBarButtonItem(image: UIImage(named: "share_item")?.withRenderingMode(.alwaysOriginal), style: .plain, target: self, action: #selector(share))
gk_navRightBarButtonItem = rightButtonItem
gk_navItemRightSpace = 16
}
func removeRightItems() {
gk_navRightBarButtonItems = []
}
}
...@@ -138,7 +138,7 @@ private extension YHStartPageViewController { ...@@ -138,7 +138,7 @@ private extension YHStartPageViewController {
guard let self = self else { return } guard let self = self else { return }
let vc = YHWebViewViewController() let vc = YHWebViewViewController()
vc.url = url vc.url = url
vc.navTitle = "银河港生活隐私政策" vc.navTitle = "银河港生活隐私协议"
self.navigationController?.pushViewController(vc) self.navigationController?.pushViewController(vc)
} }
......
...@@ -124,7 +124,7 @@ class YHLoginPrivacyView: UIView { ...@@ -124,7 +124,7 @@ class YHLoginPrivacyView: UIView {
@objc func firstUrlClick() { @objc func firstUrlClick() {
let vc = YHWebViewViewController() let vc = YHWebViewViewController()
vc.url = YHBaseUrlManager.shared.curPrivacyAgreementUrl() vc.url = YHBaseUrlManager.shared.curPrivacyAgreementUrl()
vc.navTitle = "银河港生活隐私政策" vc.navTitle = "银河港生活隐私协议"
UIViewController.current?.navigationController?.pushViewController(vc) UIViewController.current?.navigationController?.pushViewController(vc)
} }
......
...@@ -274,7 +274,7 @@ extension YHMySettingViewController : UITableViewDelegate, UITableViewDataSource ...@@ -274,7 +274,7 @@ extension YHMySettingViewController : UITableViewDelegate, UITableViewDataSource
//隐私政策 //隐私政策
let vc = YHWebViewViewController() let vc = YHWebViewViewController()
vc.url = YHBaseUrlManager.shared.curPrivacyAgreementUrl() vc.url = YHBaseUrlManager.shared.curPrivacyAgreementUrl()
vc.navTitle = "银河港生活隐私政策" vc.navTitle = "银河港生活隐私协议"
UIViewController.current?.navigationController?.pushViewController(vc) UIViewController.current?.navigationController?.pushViewController(vc)
} }
......
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