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

1、增加一处 和 h5的交互

parent 55fe300d
...@@ -21,7 +21,7 @@ class YHConfigModel : SmartCodable { ...@@ -21,7 +21,7 @@ class YHConfigModel : SmartCodable {
var suggest_updating: Bool = false var suggest_updating: Bool = false
var suggest_updating_msg: String = "" var suggest_updating_msg: String = ""
var is_integral_open : Bool = false //条件控制哈 var is_integral_open : Bool = false //条件控制哈 pingguo shenhe
var is_recharge_order_open : Bool = false //双十一banner开关 //`is_recharge_order_open` int NOT NULL DEFAULT '0' COMMENT '1 开启 0关闭', var is_recharge_order_open : Bool = false //双十一banner开关 //`is_recharge_order_open` int NOT NULL DEFAULT '0' COMMENT '1 开启 0关闭',
required init() { required init() {
......
...@@ -95,7 +95,6 @@ class YHRangeDatePickerSheetView2: UIView { ...@@ -95,7 +95,6 @@ class YHRangeDatePickerSheetView2: UIView {
lazy var timeHoldView : YHPickTimeHoldView = { lazy var timeHoldView : YHPickTimeHoldView = {
let imageV = YHPickTimeHoldView() let imageV = YHPickTimeHoldView()
// imageV.backgroundColor = .yellow //for test hjl
return imageV return imageV
}() }()
......
...@@ -216,8 +216,6 @@ private extension YHRangeDatePickerView2 { ...@@ -216,8 +216,6 @@ private extension YHRangeDatePickerView2 {
make.left.right.equalToSuperview() make.left.right.equalToSuperview()
make.height.equalTo(YHRangeDatePickerView2.viewH2) make.height.equalTo(YHRangeDatePickerView2.viewH2)
} }
// calendar.backgroundColor = .red //for test hjl
} }
func tapOneDate(_ date : Date) { func tapOneDate(_ date : Date) {
......
...@@ -112,6 +112,9 @@ class YHH5WebViewVC: YHBaseViewController, WKUIDelegate, WKNavigationDelegate { ...@@ -112,6 +112,9 @@ class YHH5WebViewVC: YHBaseViewController, WKUIDelegate, WKNavigationDelegate {
//6、是否展示 导航栏上的title //6、是否展示 导航栏上的title
var showNavigationTitleFlag : Bool = true var showNavigationTitleFlag : Bool = true
//22、禁用全局手势
private var disableFullScreenGestureFlag : Bool = false
//默认的返回按钮图片 //默认的返回按钮图片
private var myDefaultBackImage : UIImage = UIImage(named: "back_icon") ?? UIImage() private var myDefaultBackImage : UIImage = UIImage(named: "back_icon") ?? UIImage()
...@@ -371,6 +374,7 @@ private extension YHH5WebViewVC { ...@@ -371,6 +374,7 @@ private extension YHH5WebViewVC {
@objc func share() { @objc func share() {
if self.isShareToMiniProgramFlag { if self.isShareToMiniProgramFlag {
if let path = self.shareMiniPath,!path.isEmpty { if let path = self.shareMiniPath,!path.isEmpty {
YHShareManager.shared.shareToMiniProgram(path:path, shareTitle: shareMiniTitle) YHShareManager.shared.shareToMiniProgram(path:path, shareTitle: shareMiniTitle)
...@@ -421,6 +425,11 @@ private extension YHH5WebViewVC { ...@@ -421,6 +425,11 @@ private extension YHH5WebViewVC {
} }
} }
} }
//是否启用全局返回手势
func navigationShouldPopOnGesture() -> Bool {
return !disableFullScreenGestureFlag
}
} }
...@@ -485,6 +494,20 @@ extension YHH5WebViewVC { ...@@ -485,6 +494,20 @@ extension YHH5WebViewVC {
// MARK: - h5实现的接口 // MARK: - h5实现的接口
extension YHH5WebViewVC { extension YHH5WebViewVC {
//22、禁用全局手势返回
func disableFullScreenGestureSyn(_ tag : String) {
if tag.contains("0") {
//启用
self.disableFullScreenGestureFlag = false
} else if tag.contains("1") {
//禁用
self.disableFullScreenGestureFlag = true
}
}
//20、导航栏上是否展示title //20、导航栏上是否展示title
func hideNavigationTitleSyn(_ tag : String) { func hideNavigationTitleSyn(_ tag : String) {
if tag.contains("0") { if tag.contains("0") {
......
...@@ -18,6 +18,17 @@ class YHJsApi: NSObject { ...@@ -18,6 +18,17 @@ class YHJsApi: NSObject {
} }
extension YHJsApi { extension YHJsApi {
//禁用全局手势返回
@objc func disableFullScreenGestureSyn(_ tag : Any) {
DispatchQueue.main.async {
if let tag = tag as? String, tag.count == 1 {
if let delegate = self.delegate as? YHH5WebViewVC {
delegate.disableFullScreenGestureSyn(tag)
}
}
}
}
//21、使用safari WebView打开Url //21、使用safari WebView打开Url
@objc func openUrlWithSafariSyn(_ payUrl: String) { @objc func openUrlWithSafariSyn(_ payUrl: String) {
DispatchQueue.main.async { DispatchQueue.main.async {
......
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