iOS Team / CNLiveCServiceModule · Commits

Commit fb990dc5c8f32c8b1d3e5e9b0ad58f723fdd3294

Authored by yanglingyu
1 parent 4a36f72c

更多跳转修改

Inline Side-by-side
Showing 3 changed files with 15 additions and 2 deletions
CNLiveCServiceModule/Classes/Manager/CNLiveCServiceManagerBridge.h
  View file @fb990dc
@@ -10,7 +10,8 @@ @@ -10,7 +10,8 @@
10 typedef NS_ENUM(NSInteger , CNCServiceJumpType) { 10 typedef NS_ENUM(NSInteger , CNCServiceJumpType) {
11 CNCServiceJumpTypeService, //服务内容跳转逻辑 11 CNCServiceJumpTypeService, //服务内容跳转逻辑
12 CNCServiceJumpTypeGoods, //商品详情页 12 CNCServiceJumpTypeGoods, //商品详情页
13 - CNCServiceJumpTypeVideo //音频文件 13 + CNCServiceJumpTypeVideo , //音频文件
  14 + CNCServiceJumpTypeWebVC //电商h5页面
14 }; 15 };
15 @protocol CNLiveCServiceProtocol <NSObject> 16 @protocol CNLiveCServiceProtocol <NSObject>
16 17
@@ -65,6 +66,11 @@ NS_ASSUME_NONNULL_BEGIN @@ -65,6 +66,11 @@ NS_ASSUME_NONNULL_BEGIN
65 *@param contentId 服务id 66 *@param contentId 服务id
66 */ 67 */
67 + (void)jumpGetPageOtherVC:(NSString *)contentId controller:(UIViewController *)controller; 68 + (void)jumpGetPageOtherVC:(NSString *)contentId controller:(UIViewController *)controller;
  69 +/**
  70 + *服务号跳转
  71 + *@param urlStr 网页地址
  72 + */
  73 ++ (void)jumpWebVCWithUrl:(NSString *)urlStr controller:(UIViewController *)controller;
68 @end 74 @end
69 75
70 NS_ASSUME_NONNULL_END 76 NS_ASSUME_NONNULL_END
CNLiveCServiceModule/Classes/Manager/CNLiveCServiceManagerBridge.m
  View file @fb990dc
@@ -57,6 +57,13 @@ @@ -57,6 +57,13 @@
57 [QMUITips hideAllTips]; 57 [QMUITips hideAllTips];
58 }]; 58 }];
59 } 59 }
  60 +
  61 ++ (void)jumpWebVCWithUrl:(NSString *)urlStr controller:(UIViewController *)controller{
  62 + NSDictionary *param = @{
  63 + @"webUrl":urlStr,
  64 + };
  65 + [CNLiveCServiceManagerBridge jumpViewControllerType:CNCServiceJumpTypeWebVC param:param controller:controller];
  66 +}
60 + (void)jumpViewControllerType:(CNCServiceJumpType)type param:(NSDictionary *)param controller:(UIViewController *)controller{ 67 + (void)jumpViewControllerType:(CNCServiceJumpType)type param:(NSDictionary *)param controller:(UIViewController *)controller{
61 68
62 [[CNLiveCServiceManagerBridge shareManager].protocol jumpControllerType:type param:param controller:controller]; 69 [[CNLiveCServiceManagerBridge shareManager].protocol jumpControllerType:type param:param controller:controller];
CNLiveCServiceModule/Classes/View/CNLiveGoodsOrVideoHeaderView.m
  View file @fb990dc
@@ -56,7 +56,7 @@ @@ -56,7 +56,7 @@
56 #pragma mark - Action 56 #pragma mark - Action
57 - (void)moreButtonClick 57 - (void)moreButtonClick
58 { 58 {
59 - [CNLiveCServiceManagerBridge jumpServiceController:_pageModel.blockId type:_pageModel.moreType to:_pageModel.moreUrl shopType:_pageModel.showType controller:[CNLiveCServiceManagerBridge viewControllerFromView:self]]; 59 + [CNLiveCServiceManagerBridge jumpWebVCWithUrl:_pageModel.moreUrl controller:[CNLiveCServiceManagerBridge viewControllerFromView:self]];
60 } 60 }
61 61
62 #pragma mark - Setting&&Getting 62 #pragma mark - Setting&&Getting