diff --git a/Ifish.xcodeproj/project.pbxproj b/Ifish.xcodeproj/project.pbxproj index 96d694a..7aa1b78 100644 --- a/Ifish.xcodeproj/project.pbxproj +++ b/Ifish.xcodeproj/project.pbxproj @@ -15892,7 +15892,7 @@ "$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrlIOS/libAVCtrl", "$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrl", ); - MARKETING_VERSION = 5.1.16; + MARKETING_VERSION = 5.1.18; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "-ObjC", @@ -16010,7 +16010,7 @@ "$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrlIOS/libAVCtrl", "$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrl", ); - MARKETING_VERSION = 5.1.16; + MARKETING_VERSION = 5.1.18; ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = ( "-ObjC", diff --git a/Ifish/ViewController.m b/Ifish/ViewController.m index e104bed..16374df 100644 --- a/Ifish/ViewController.m +++ b/Ifish/ViewController.m @@ -151,7 +151,7 @@ //根据链接打开页面 id page = [AlibcTradePageFactory page:goodslink]; AlibcTradeShowParams* showParam = [[AlibcTradeShowParams alloc] init]; - showParam.openType = AlibcOpenTypeH5; + showParam.openType = AlibcOpenTypeNative; //自定义web IfishAlibcWebViewController* myView = [[IfishAlibcWebViewController alloc] init]; diff --git a/Ifish/controllers/IfishTabControllers/IfishADTimerViewController.m b/Ifish/controllers/IfishTabControllers/IfishADTimerViewController.m index 4e6c3cd..b7ba83e 100644 --- a/Ifish/controllers/IfishTabControllers/IfishADTimerViewController.m +++ b/Ifish/controllers/IfishTabControllers/IfishADTimerViewController.m @@ -145,7 +145,7 @@ //根据链接打开页面 id page = [AlibcTradePageFactory page:goodslink]; AlibcTradeShowParams* showParam = [[AlibcTradeShowParams alloc] init]; - showParam.openType = AlibcOpenTypeH5; + showParam.openType = AlibcOpenTypeNative; //自定义web IfishAlibcWebViewController* myView = [[IfishAlibcWebViewController alloc] init]; @@ -162,6 +162,10 @@ //}]; } + else + { + [self setAppTabRoot]; + } } //设置根视图 diff --git a/Ifish/controllers/IfishTabControllers/我的/mineControllers/pushSetControllrs/AboutUsViewController.m b/Ifish/controllers/IfishTabControllers/我的/mineControllers/pushSetControllrs/AboutUsViewController.m index 89e46a2..c13662c 100644 --- a/Ifish/controllers/IfishTabControllers/我的/mineControllers/pushSetControllrs/AboutUsViewController.m +++ b/Ifish/controllers/IfishTabControllers/我的/mineControllers/pushSetControllrs/AboutUsViewController.m @@ -25,7 +25,7 @@ // CFShow((__bridge CFTypeRef)(infoDic)); NSString *app_Version=[infoDic objectForKey:@"CFBundleShortVersionString"]; NSLog(@"app_Version%@",app_Version); - app_Version=@"4.7.16"; + app_Version=@"4.7.18"; NSString *versionStr = [NSString stringWithFormat:@"v%@",app_Version]; NSString *buildVersion = [infoDic objectForKey:@"CFBundleVersion"]; if (buildVersion.length > 0) { diff --git a/Ifish/controllers/IfishTabControllers/探索/AiyuYanXuan/ViewControlller/AIyuYanXuanViewController.m b/Ifish/controllers/IfishTabControllers/探索/AiyuYanXuan/ViewControlller/AIyuYanXuanViewController.m index 4c785a4..52e293c 100644 --- a/Ifish/controllers/IfishTabControllers/探索/AiyuYanXuan/ViewControlller/AIyuYanXuanViewController.m +++ b/Ifish/controllers/IfishTabControllers/探索/AiyuYanXuan/ViewControlller/AIyuYanXuanViewController.m @@ -156,7 +156,7 @@ static NSString * const cellIdenti = @"IfishBCShopItemCell"; id page = [AlibcTradePageFactory page:linkUrl]; AlibcTradeShowParams* showParam = [[AlibcTradeShowParams alloc] init]; //app 内闭环交易 强制H5 打开 - showParam.openType = AlibcOpenTypeH5; + showParam.openType = AlibcOpenTypeNative; //AlibcWebViewController* myView = [[AlibcWebViewController alloc] init]; //自定义web diff --git a/Ifish/controllers/IfishTabControllers/探索/FishDoctor/VController/FishDoctorViewController.m b/Ifish/controllers/IfishTabControllers/探索/FishDoctor/VController/FishDoctorViewController.m index 834276c..6ffe90f 100644 --- a/Ifish/controllers/IfishTabControllers/探索/FishDoctor/VController/FishDoctorViewController.m +++ b/Ifish/controllers/IfishTabControllers/探索/FishDoctor/VController/FishDoctorViewController.m @@ -667,7 +667,7 @@ typedef NS_ENUM(NSInteger, IfishDoctorPayType){ //根据链接打开页面 id page = [AlibcTradePageFactory page:goodslink]; AlibcTradeShowParams* showParam = [[AlibcTradeShowParams alloc] init]; - showParam.openType = AlibcOpenTypeH5; + showParam.openType = AlibcOpenTypeNative; //自定义web IfishAlibcWebViewController* myView = [[IfishAlibcWebViewController alloc] init]; diff --git a/Ifish/controllers/IfishTabControllers/探索/IfishLive/IfishNewLiveList/LoveFishLiveListBaseViewController.m b/Ifish/controllers/IfishTabControllers/探索/IfishLive/IfishNewLiveList/LoveFishLiveListBaseViewController.m index fee4aa1..a768d94 100644 --- a/Ifish/controllers/IfishTabControllers/探索/IfishLive/IfishNewLiveList/LoveFishLiveListBaseViewController.m +++ b/Ifish/controllers/IfishTabControllers/探索/IfishLive/IfishNewLiveList/LoveFishLiveListBaseViewController.m @@ -154,7 +154,7 @@ id page = [AlibcTradePageFactory page:linkUrl]; AlibcTradeShowParams* showParam = [[AlibcTradeShowParams alloc] init]; //app 内闭环交易 强制H5 打开 - showParam.openType = AlibcOpenTypeH5; + showParam.openType = AlibcOpenTypeNative; //AlibcWebViewController* myView = [[AlibcWebViewController alloc] init]; //自定义web diff --git a/Ifish/controllers/IfishTabControllers/探索/IfishNewShopsFlie/IfishGoodsManage/Controller/IfishGoodsManageViewController.m b/Ifish/controllers/IfishTabControllers/探索/IfishNewShopsFlie/IfishGoodsManage/Controller/IfishGoodsManageViewController.m index 5fe553c..a4740ce 100644 --- a/Ifish/controllers/IfishTabControllers/探索/IfishNewShopsFlie/IfishGoodsManage/Controller/IfishGoodsManageViewController.m +++ b/Ifish/controllers/IfishTabControllers/探索/IfishNewShopsFlie/IfishGoodsManage/Controller/IfishGoodsManageViewController.m @@ -128,7 +128,7 @@ static NSString * const cellIdenti = @"IfishBCShopItemCell"; id page = [AlibcTradePageFactory page:linkUrl]; AlibcTradeShowParams* showParam = [[AlibcTradeShowParams alloc] init]; //app 内闭环交易 强制H5 打开 - showParam.openType = AlibcOpenTypeH5; + showParam.openType = AlibcOpenTypeNative; //AlibcWebViewController* myView = [[AlibcWebViewController alloc] init]; //自定义web diff --git a/Ifish/controllers/IfishTabControllers/探索/lookafterServer/KanHuFuWuXInRuKou/KanHuFuWuViewController.m b/Ifish/controllers/IfishTabControllers/探索/lookafterServer/KanHuFuWuXInRuKou/KanHuFuWuViewController.m index e33fad9..5f3909b 100644 --- a/Ifish/controllers/IfishTabControllers/探索/lookafterServer/KanHuFuWuXInRuKou/KanHuFuWuViewController.m +++ b/Ifish/controllers/IfishTabControllers/探索/lookafterServer/KanHuFuWuXInRuKou/KanHuFuWuViewController.m @@ -452,7 +452,7 @@ id page = [AlibcTradePageFactory page:linkUrl]; AlibcTradeShowParams* showParam = [[AlibcTradeShowParams alloc] init]; //app 内闭环交易 强制H5 打开 - showParam.openType = AlibcOpenTypeH5; + showParam.openType = AlibcOpenTypeNative; //AlibcWebViewController* myView = [[AlibcWebViewController alloc] init]; //自定义web diff --git a/Ifish/controllers/IfishTabControllers/消息/PushMasssageWebViewController.m b/Ifish/controllers/IfishTabControllers/消息/PushMasssageWebViewController.m index c3ba4d0..6f64ea9 100644 --- a/Ifish/controllers/IfishTabControllers/消息/PushMasssageWebViewController.m +++ b/Ifish/controllers/IfishTabControllers/消息/PushMasssageWebViewController.m @@ -9,6 +9,8 @@ #import "PushMasssageWebViewController.h" #import #import +#import +#import "IfishAlibcWebViewController.h" //#import "NJKWebViewProgressView.h" //#import "NJKWebViewProgress.h" @interface PushMasssageWebViewController () @@ -114,6 +116,43 @@ Strong UIProgressView *wkProgressView; [self.webView setNavigationDelegate:nil]; [self.webView setUIDelegate:nil]; } + +- (void)webView:(WKWebView*)webView decidePolicyForNavigationAction:(WKNavigationAction*)navigationAction decisionHandler:(void (^)(WKNavigationActionPolicy))decisionHandler +{ + if ([navigationAction.request.URL.absoluteString containsString:@"taobao"]) + { + + //535991514644 + //根据商品ID + //id page = [AlibcTradePageFactory itemDetailPage: @"535991514644"]; + //根据链接打开页面 + id page = [AlibcTradePageFactory page:navigationAction.request.URL.absoluteString ]; + AlibcTradeShowParams* showParam = [[AlibcTradeShowParams alloc] init]; + //app 内闭环交易 强制H5 打开 + showParam.openType = AlibcOpenTypeNative; + + //AlibcWebViewController* myView = [[AlibcWebViewController alloc] init]; + //自定义web + IfishAlibcWebViewController* myView = [[IfishAlibcWebViewController alloc] init]; + NSInteger ret = [[AlibcTradeSDK sharedInstance].tradeService show:self.navigationController webView:myView.webView page:page showParams:showParam taoKeParams:nil trackParam:nil tradeProcessSuccessCallback:^(AlibcTradeResult * _Nullable result) { + + } tradeProcessFailedCallback:^(NSError * _Nullable error) { + + }]; //返回1,说明h5打开,否则不应该展示页面 + + + if (ret == 1) { + + self.hidesBottomBarWhenPushed = YES; + [self.navigationController pushViewController:myView animated:YES]; + } + decisionHandler(WKNavigationActionPolicyCancel); + } + else + { + decisionHandler(WKNavigationActionPolicyAllow); +} +} // 页面开始加载时调用 - (void)webView:(WKWebView *)webView didStartProvisionalNavigation:(WKNavigation *)navigation { diff --git a/Ifish/controllers/IfishTabControllers/设备/IfishDeviceViewController.m b/Ifish/controllers/IfishTabControllers/设备/IfishDeviceViewController.m index a0e7f7c..988cb4b 100644 --- a/Ifish/controllers/IfishTabControllers/设备/IfishDeviceViewController.m +++ b/Ifish/controllers/IfishTabControllers/设备/IfishDeviceViewController.m @@ -1767,7 +1767,7 @@ Assign BOOL isPush; id page = [AlibcTradePageFactory page:linkUrl]; AlibcTradeShowParams* showParam = [[AlibcTradeShowParams alloc] init]; //app 内闭环交易 强制H5 打开 - showParam.openType = AlibcOpenTypeH5; + showParam.openType = AlibcOpenTypeNative; //AlibcWebViewController* myView = [[AlibcWebViewController alloc] init]; //自定义web diff --git a/Ifish/controllers/IfishTabControllers/设备/Informations/ViewControlller/IfishInformationViewController.m b/Ifish/controllers/IfishTabControllers/设备/Informations/ViewControlller/IfishInformationViewController.m index 2634c0d..d95f928 100644 --- a/Ifish/controllers/IfishTabControllers/设备/Informations/ViewControlller/IfishInformationViewController.m +++ b/Ifish/controllers/IfishTabControllers/设备/Informations/ViewControlller/IfishInformationViewController.m @@ -262,7 +262,7 @@ id page = [AlibcTradePageFactory page:linkUrl]; AlibcTradeShowParams* showParam = [[AlibcTradeShowParams alloc] init]; //app 内闭环交易 强制H5 打开 - showParam.openType = AlibcOpenTypeH5; + showParam.openType = AlibcOpenTypeNative; //AlibcWebViewController* myView = [[AlibcWebViewController alloc] init]; //自定义web diff --git a/Ifish/controllers/IfishTabControllers/设备/QianDao/ViewControlller/QianDaoViewController.m b/Ifish/controllers/IfishTabControllers/设备/QianDao/ViewControlller/QianDaoViewController.m index e9e151a..b323e39 100644 --- a/Ifish/controllers/IfishTabControllers/设备/QianDao/ViewControlller/QianDaoViewController.m +++ b/Ifish/controllers/IfishTabControllers/设备/QianDao/ViewControlller/QianDaoViewController.m @@ -380,7 +380,7 @@ id page = [AlibcTradePageFactory page:linkUrl]; AlibcTradeShowParams* showParam = [[AlibcTradeShowParams alloc] init]; //app 内闭环交易 强制H5 打开 - showParam.openType = AlibcOpenTypeH5; + showParam.openType = AlibcOpenTypeNative; //AlibcWebViewController* myView = [[AlibcWebViewController alloc] init]; //自定义web diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PPlayBack/P2PPlayingbackVC.m b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PPlayBack/P2PPlayingbackVC.m index fff8a6e..65064fa 100644 --- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PPlayBack/P2PPlayingbackVC.m +++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PPlayBack/P2PPlayingbackVC.m @@ -609,7 +609,7 @@ if([[P2PClient sharedClient] getPlaybackCurrentFileIndex]>=([[P2PClient sharedClient] getPlaybackFilesLength]-1)){ [self.view makeToast:NSLocalizedString(@"no_next_files", nil)]; }else{ - [[P2PClient sharedClient] next]; + [((P2PClient*)[P2PClient sharedClient]) next]; } } #pragma mark - 快进