Commit 2f98500c authored by David黄金龙's avatar David黄金龙

1、修改版本号

2、处理 webView内部返回的问题
parent 22dfeade
...@@ -5132,7 +5132,7 @@ ...@@ -5132,7 +5132,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 = 5; CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = RXHYW88XR7; DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
...@@ -5158,7 +5158,7 @@ ...@@ -5158,7 +5158,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 0.9.7; MARKETING_VERSION = 0.9.8;
PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy; PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
...@@ -5274,7 +5274,7 @@ ...@@ -5274,7 +5274,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 = 5; CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = RXHYW88XR7; DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
...@@ -5300,7 +5300,7 @@ ...@@ -5300,7 +5300,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 0.9.7; MARKETING_VERSION = 0.9.8;
PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy; PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
...@@ -5479,7 +5479,7 @@ ...@@ -5479,7 +5479,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 = 5; CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = RXHYW88XR7; DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
...@@ -5505,7 +5505,7 @@ ...@@ -5505,7 +5505,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 0.9.7; MARKETING_VERSION = 0.9.8;
PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy; PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
...@@ -5526,7 +5526,7 @@ ...@@ -5526,7 +5526,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 = 5; CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = RXHYW88XR7; DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
...@@ -5552,7 +5552,7 @@ ...@@ -5552,7 +5552,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 0.9.7; MARKETING_VERSION = 0.9.8;
PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy; PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
......
...@@ -80,6 +80,20 @@ class YHH5WebViewVC: YHBaseViewController, WKUIDelegate, WKNavigationDelegate { ...@@ -80,6 +80,20 @@ class YHH5WebViewVC: YHBaseViewController, WKUIDelegate, WKNavigationDelegate {
let vm = YHHomePageViewModel() let vm = YHHomePageViewModel()
return vm return vm
}() }()
//webView内部返回
var isSupportWebviewInterBackFlag : Bool = false
override func backItemClick(_ sender: Any) {
if isSupportWebviewInterBackFlag {
if webview.canGoBack {
webview.goBack()
return
}
}
self.navigationController?.popViewController()
}
} }
// MARK: - 内部方法 // MARK: - 内部方法
...@@ -123,6 +137,7 @@ private extension YHH5WebViewVC { ...@@ -123,6 +137,7 @@ private extension YHH5WebViewVC {
} }
shareView.block = { tag in shareView.block = { tag in
if tag == 0 { if tag == 0 {
//分享 //分享
...@@ -371,9 +386,10 @@ extension YHH5WebViewVC : UIScrollViewDelegate { ...@@ -371,9 +386,10 @@ extension YHH5WebViewVC : UIScrollViewDelegate {
alpha = 1.0 alpha = 1.0
} }
gk_navBarAlpha = alpha gk_navBarAlpha = alpha
gk_navTitle = navTitle
} else { } else {
gk_navBarAlpha = 0.0 gk_navBarAlpha = 0.0
gk_navTitle = ""
} }
} }
} }
...@@ -378,9 +378,10 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource { ...@@ -378,9 +378,10 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
token.insert(contentsOf: addtionString, at: indexToInsert) token.insert(contentsOf: addtionString, at: indexToInsert)
url = url + "?param=" + token url = url + "?param=" + token
let vc = YHHomeWebViewController() let vc = YHH5WebViewVC()
vc.vcTitle = "积分中心" vc.navTitle = "积分中心"
vc.url = url vc.url = url
vc.isSupportWebviewInterBackFlag = true
self.navigationController?.pushViewController(vc) self.navigationController?.pushViewController(vc)
} }
case .myTestCode://我的测评码 case .myTestCode://我的测评码
......
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