Commit ce5421e3 authored by guanghui.shi's avatar guanghui.shi

删除通知活动部分的JS跳转兼容

parent 69f939e1
...@@ -285,7 +285,7 @@ ...@@ -285,7 +285,7 @@
if ([DeviceAdaptation canClick]) { if ([DeviceAdaptation canClick]) {
if (model.nav_url && model.nav_url.length > 0) { if (model.nav_url && model.nav_url.length > 0) {
NSString *urlStr = model.nav_url; NSString *urlStr = model.nav_url;
[self openURLWithUrlString:urlStr]; [QGApplicationOpenURL handleAllSupportUrl:urlStr];
} else { } else {
NSMutableDictionary *mdict = [NSMutableDictionary dictionaryWithCapacity:1]; NSMutableDictionary *mdict = [NSMutableDictionary dictionaryWithCapacity:1];
[mdict setValue:model forKey:@"msgListModel"]; [mdict setValue:model forKey:@"msgListModel"];
...@@ -297,7 +297,7 @@ ...@@ -297,7 +297,7 @@
} else { } else {
if (!model.navExpire || ![model.navExpire boolValue]) { if (!model.navExpire || ![model.navExpire boolValue]) {
NSString *urlStr = model.nav_url; NSString *urlStr = model.nav_url;
[self openURLWithUrlString:urlStr]; [QGApplicationOpenURL handleAllSupportUrl:urlStr];
} }
} }
} }
...@@ -310,34 +310,6 @@ ...@@ -310,34 +310,6 @@
} }
} }
/// 处理跳转逻辑,如果是http处理callbackBlock,如果不是,任意跳转
/// @param urlString NSString
- (void)openURLWithUrlString:(NSString *)urlString
{
NSString *urlStr = urlString;
NSURL *url = [NSURL URLWithString:urlStr];
//如果直接转失败,则编码一下 再转
if (!url) {
urlStr = [urlStr stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
url = [NSURL URLWithString:urlStr];
}
XYQBJumpType jumpType = [[QGApplicationOpenURL shareInstance] autoParseURL:url];
/// 针对webView特别处理
if (jumpType == XYQBJumpTypeHttp) {
CWWebViewController *webVC = [[CWWebViewController alloc]init];
webVC.urlString = urlStr;
webVC.callBackBlock = ^(NSString *tag, NSDictionary *params) {
if ([tag isEqualToString:WebView_ReopenBrowserWithNewUrl]) {
[QGApplicationOpenURL handleAllSupportUrl:params[@"urlString"]];
}
};
[self.navigationController pushViewController:webVC animated:YES];
}else{
[QGApplicationOpenURL handleAllSupportUrl:urlString];
}
}
- (void)allDataSelected { - (void)allDataSelected {
BOOL selected = NO; BOOL selected = NO;
if ([self.dataSource count] != self.selectedData.count) { if ([self.dataSource count] != self.selectedData.count) {
......
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