Commit 8a2d5aa5 authored by David黄金龙's avatar David黄金龙

1、资讯页无网络时候的交互

2、版本号 0.8.0.5
parent 57bbf743
...@@ -3252,7 +3252,7 @@ ...@@ -3252,7 +3252,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements; CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3; CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = RXHYW88XR7; DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
...@@ -3456,7 +3456,7 @@ ...@@ -3456,7 +3456,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements; CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3; CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = RXHYW88XR7; DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
...@@ -3502,7 +3502,7 @@ ...@@ -3502,7 +3502,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements; CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3; CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = RXHYW88XR7; DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
......
...@@ -43,6 +43,11 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD ...@@ -43,6 +43,11 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
//有些界面需要保存图片的功能 //有些界面需要保存图片的功能
var showSavePicBottomFlag : Bool = false var showSavePicBottomFlag : Bool = false
//是否曾今有过网络
private var isNetWorkOkBefore : Bool = false
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
...@@ -154,7 +159,7 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD ...@@ -154,7 +159,7 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
make.height.equalTo(59 + k_Height_safeAreaInsetsBottom()) make.height.equalTo(59 + k_Height_safeAreaInsetsBottom())
} }
view.addSubview(self.noNetWorkTipsView) view.addSubview(noNetWorkTipsView)
self.noNetWorkTipsView.snp.makeConstraints { make in self.noNetWorkTipsView.snp.makeConstraints { make in
make.left.right.bottom.equalToSuperview() make.left.right.bottom.equalToSuperview()
make.top.equalToSuperview().offset(k_Height_NavigationtBarAndStatuBar) make.top.equalToSuperview().offset(k_Height_NavigationtBarAndStatuBar)
...@@ -281,16 +286,24 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD ...@@ -281,16 +286,24 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
func updateNetWorkStatusUI(needReload:Bool) { func updateNetWorkStatusUI(needReload:Bool) {
DispatchQueue.main.async { DispatchQueue.main.async {
if YHNetworkStatusManager.shared.isNetWorkOK { if YHNetworkStatusManager.shared.isNetWorkOK {
if needReload { if needReload && self.isNetWorkOkBefore == false {
self.webview.stopLoading() self.webview.stopLoading()
let targetUrl = NSURL(string: self.url) let targetUrl = NSURL(string: self.url)
let request = NSURLRequest(url: targetUrl! as URL) let request = NSURLRequest(url: targetUrl! as URL)
self.webview.load(request as URLRequest) self.webview.load(request as URLRequest)
self.getData() self.getData()
} }
self.isNetWorkOkBefore = true
} }
self.view.bringSubviewToFront(self.noNetWorkTipsView)
self.noNetWorkTipsView.isHidden = YHNetworkStatusManager.shared.isNetWorkOK if self.isNetWorkOkBefore == false {
self.view.bringSubviewToFront(self.noNetWorkTipsView)
self.noNetWorkTipsView.isHidden = YHNetworkStatusManager.shared.isNetWorkOK
} else {
self.noNetWorkTipsView.isHidden = true
}
if YHNetworkStatusManager.shared.isNetWorkOK { if YHNetworkStatusManager.shared.isNetWorkOK {
if (self.vcTitle == "香港身份测评码" || !self.model.img_url.isEmpty) { if (self.vcTitle == "香港身份测评码" || !self.model.img_url.isEmpty) {
self.addRightItems() self.addRightItems()
...@@ -370,7 +383,7 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD ...@@ -370,7 +383,7 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
} }
func saveImageToPhotoLib() { func saveImageToPhotoLib() {
var urlString = self.url let urlString = self.url
guard let url = URL(string: urlString) else { guard let url = URL(string: urlString) else {
YHHUD.flash(message: "参数错误,保存失败") YHHUD.flash(message: "参数错误,保存失败")
return return
......
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