暴露方法修改礼物流程基本跑通

毕珂
1 parent 49c8a9ff
Showing 14 changed files with 190 additions and 33 deletions
DSCnliveShopSDK.podspec
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/DSCnliveShopSDK
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/DSGiftResource.bundle/GiveGift/ChatAlert/DS_Opt_Give_CA_edit@2x.png
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/DSGiftResource.bundle/GiveGift/ChatAlert/DS_Opt_Give_CA_edit@3x.png
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/Headers/DSCnliveShopSDK.h
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/Headers/DSCnliveShopSDKCheck.h
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/Headers/DSCnliveShopSDKEnum.h
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/Headers/DSCnliveShopSDKManager.h
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/Headers/DSCnliveShopSDKProtocol.h
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/Headers/DSCnliveShopSDKSkip.h
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/Headers/DSOGiftDetailsEnum.h
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/Headers/DSOGiftDetailsViewController.h
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/Headers/DSOGiveGiftsViewController.h
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/Info.plist
  
 Pod::Spec.new do |s|
   s.name             = 'DSCnliveShopSDK'
-  s.version          = '0.3.4.006'
+  s.version          = '0.3.4.007'
   s.summary          = 'cnlive电商SDK'
   s.homepage         = 'http://bj.gitlab.cnlive.com/ios-team/DSCnliveShopSDK'
   s.license          = { :type => 'MIT', :file => 'LICENSE' }
@@ -21,6 +21,7 @@ Pod::Spec.new do |s|
   s.dependency 'Qiniu', '7.2.5'
   s.dependency 'Masonry', '1.1.0'
   s.dependency 'PLPlayerKit', '~> 3.4.3'
+  s.dependency 'TXIMSDK_iOS'
   s.dependency 'CNLiveRequestBastKit'
   s.dependency 'CNLiveSDKs/CNLiveEncryptSDK'
   s.dependency 'CNLiveSDKs/CNLivePaySDK'
@@ -15,6 +15,7 @@ FOUNDATION_EXPORT const unsigned char DSCnliveShopSDKVersionString[];
  
 #import <DSCnliveShopSDK/DSCnliveShopSDKManager.h>
 #import <DSCnliveShopSDK/DSCnliveShopSDKSkip.h>
+#import <DSCnliveShopSDK/DSCnliveShopSDKCheck.h>
 #import <DSCnliveShopSDK/DSCnliveShopSDKProtocol.h>
 #import <DSCnliveShopSDK/DSCnliveShopSDKShareModel.h>
 #import <DSCnliveShopSDK/DSCnliveShopSDKConstant.h>
@@ -23,12 +24,10 @@ FOUNDATION_EXPORT const unsigned char DSCnliveShopSDKVersionString[];
 #import <DSCnliveShopSDK/DSCnliveShopSDKPBaseViewController.h>
 #import <DSCnliveShopSDK/DSNavButton.h>
  
-#import <DSCnliveShopSDK/DSOrderListViewController.h>
-#import <DSCnliveShopSDK/DSAfterSaleListViewController.h>
-#import <DSCnliveShopSDK/DSHappHPParentViewController.h>
-#import <DSCnliveShopSDK/DSROrderListViewController.h>
-#import <DSCnliveShopSDK/DSServiceHPViewController.h>
+#import <DSCnliveShopSDK/DSOGiveGiftsViewController.h>
 #import <DSCnliveShopSDK/DSOMyGivingGiftsListViewController.h>
+#import <DSCnliveShopSDK/DSOGiftDetailsViewController.h>
+#import <DSCnliveShopSDK/DSOGiftDetailsEnum.h>
  
 #import <DSCnliveShopSDK/DSAddressRequest.h>
 #import <DSCnliveShopSDK/DSAddressEnum.h>
@@ -38,12 +37,19 @@ FOUNDATION_EXPORT const unsigned char DSCnliveShopSDKVersionString[];
 #import <DSCnliveShopSDK/DSAddressViewController.h>
 #import <DSCnliveShopSDK/DSEditAddressViewController.h>
  
+#import <DSCnliveShopSDK/DSOrderListViewController.h>
+#import <DSCnliveShopSDK/DSAfterSaleListViewController.h>
+#import <DSCnliveShopSDK/DSHappHPParentViewController.h>
+#import <DSCnliveShopSDK/DSROrderListViewController.h>
+#import <DSCnliveShopSDK/DSServiceHPViewController.h>
+
 #import <DSCnliveShopSDK/DSCnliveShopSDKExampleListViewController.h>
  
 #else
  
 #import "DSCnliveShopSDKManager.h"
 #import "DSCnliveShopSDKSkip.h"
+#import "DSCnliveShopSDKCheck.h"
 #import "DSCnliveShopSDKProtocol.h"
 #import "DSCnliveShopSDKShareModel.h"
 #import "DSCnliveShopSDKConstant.h"
@@ -52,12 +58,10 @@ FOUNDATION_EXPORT const unsigned char DSCnliveShopSDKVersionString[];
 #import "DSCnliveShopSDKPBaseViewController.h"
 #import "DSNavButton.h"
  
-#import "DSOrderListViewController.h"
-#import "DSAfterSaleListViewController.h"
-#import "DSHappHPParentViewController.h"
-#import "DSROrderListViewController.h"
-#import "DSServiceHPViewController.h"
+#import "DSOGiveGiftsViewController.h"
 #import "DSOMyGivingGiftsListViewController.h"
+#import "DSOGiftDetailsViewController.h"
+#import "DSOGiftDetailsEnum.h"
  
 #import "DSAddressRequest.h"
 #import "DSAddressEnum.h"
@@ -67,6 +71,12 @@ FOUNDATION_EXPORT const unsigned char DSCnliveShopSDKVersionString[];
 #import "DSAddressViewController.h"
 #import "DSEditAddressViewController.h"
  
+#import "DSOrderListViewController.h"
+#import "DSAfterSaleListViewController.h"
+#import "DSHappHPParentViewController.h"
+#import "DSROrderListViewController.h"
+#import "DSServiceHPViewController.h"
+
 #import "DSCnliveShopSDKExampleListViewController.h"
  
 #endif
+//
+//  DSCnliveShopSDKCheck.h
+//  DSCnliveShopSDK
+//
+//  Created by zhaolin on 2019/12/6.
+//  Copyright © 2019 BIKE. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface DSCnliveShopSDKCheck : NSObject
+
+/**
+ 检测分享类型
+
+ @param shareUrl 分享url
+ @return 分享类型 -1不是电商分享 1文创商品 2普通商品 3主题活动 4店铺首页 5达人 6动态 7达人列表 8礼物分享 9优选库首页 10电影作品详情 12服务号 ...
+ 分享类型之后会有更多 不能用枚举写了 只要不是-1就是电商的
+ */
+-(NSInteger)checkShareTypeByShareUrl:(nonnull NSString*)shareUrl;
+
+/// 检测是否有礼物
+/// @param completion 检测回调  isHave有没有礼物 有礼物跳转礼物详情 没礼物跳转h5
+/// errorCode 0没错 1没登录 2请求错误 errorMessage错误信息
+-(void)checkIsHaveGiftCompletion:(void (^)(BOOL isHave, NSString * _Nullable giftOrderId, NSString * _Nullable url, NSUInteger errorCode, NSString * _Nullable errorMessage))completion;
+
+@end
+
+NS_ASSUME_NONNULL_END
@@ -10,19 +10,32 @@
 #define DSCnliveShopSDKEnum_h
  
 typedef NS_ENUM(NSUInteger, DSUserLoginStatus) {//登录状态
-    DSUserLoginStatusNotLogged = 0,     //未登录
-    DSUserLoginStatusLogged             //已登录
+    DSUserLoginStatusNotLogged = 0,             //未登录
+    DSUserLoginStatusLogged                     //已登录
 };
  
 typedef NS_ENUM(NSUInteger, DSClearSTVCType) {//清除保存的目标控制器类型
-    DSClearSTVCTypeNone = 0,            //不清除
-    DSClearSTVCTypeLoginProcess,        //登录流程保存的控制器
+    DSClearSTVCTypeNone = 0,                  //不清除
+    DSClearSTVCTypeLoginProcess,              //登录流程保存的控制器
 };
  
 typedef NS_ENUM(NSUInteger, DSServiceSkipType) {//服务号跳转类型
-    DSServiceSkipTypeReleaseInterface = 0,  //跳转发布界面
-    DSServiceSkipTypeOnlineGamesVC,         //跳转线上赛事界面
-    DSServiceSkipTypeGlobalGoodsShopVC,     //跳转环球优物界面
+    DSServiceSkipTypeReleaseInterface = 0,      //跳转发布界面
+    DSServiceSkipTypeOnlineGamesVC,             //跳转线上赛事界面
+    DSServiceSkipTypeGlobalGoodsShopVC,         //跳转环球优物界面
+};
+
+typedef NS_ENUM(NSUInteger, DSUMengCheckType) {//友盟查看类型
+    DSUMengCheckTypeViewController = 0,        //查看控制器
+    DSUMengCheckTypeActionMethod,              //查看事件方法
+};
+
+typedef NS_ENUM(NSUInteger, DSUMengCheckSLType) {//友盟查看二级类型
+    //查看控制器
+    DSUMengCheckSLTypeServiceHP = 0,             //服务号首页
+    //查看事件方法
+    DSUMengCheckSLTypeServiceHPClickSearch,      //服务号首页点击搜索
+    DSUMengCheckSLTypeServiceHPClickItem,        //服务号首页点击item
 };
  
 #endif /* DSCnliveShopSDKEnum_h */
@@ -9,6 +9,7 @@
 #import <UIKit/UIKit.h>
 #import "DSCnliveShopSDKProtocol.h"
 #import "DSCnliveShopSDKSkip.h"
+#import "DSCnliveShopSDKCheck.h"
 #import "DSCnliveShopSDKEnum.h"
  
 NS_ASSUME_NONNULL_BEGIN
@@ -91,17 +92,9 @@ NS_ASSUME_NONNULL_BEGIN
 #pragma mark - 检测
  
 /**
- 检测分享类型
-
- @param shareUrl 分享url
- @return 分享类型 -1不是电商分享 1文创商品 2普通商品 3主题活动 4店铺首页 5达人 6动态 7达人列表 8礼物分享 9优选库首页 10电影作品详情 12服务号 ...
- 分享类型之后会有更多 不能用枚举写了 只要不是-1就是电商的
+ 检测类
  */
--(NSInteger)checkShareTypeByShareUrl:(nonnull NSString*)shareUrl;
-
-/// 检测是否有礼物
-/// @param completion 检测回调
--(void)checkIsHaveGiftCompletion:(void (^)(BOOL isHave))completion;
+@property (nonatomic,strong,nonnull,readonly) DSCnliveShopSDKCheck * check;
  
 #pragma mark - 跳转
  
@@ -160,6 +160,13 @@
 /// @param fromVC 当前控制器
 -(void)serviceSkipWithSkipType:(DSServiceSkipType)skipType fromVC:(nonnull UIViewController*)fromVC;
  
+#pragma mark - 友盟检测回调
+
+/// 友盟检测回调
+/// @param checkType 检测类型
+/// @param subType 检测子类型
+-(void)uMengCheckCallBackType:(DSUMengCheckType)checkType subType:(DSUMengCheckSLType)subType;
+
 @end
  
 #endif /* DSCnliveShopSDKProtocol_h */
@@ -92,12 +92,10 @@ NS_ASSUME_NONNULL_BEGIN
 /// @param animated 是否有动画
 -(void)successLoggedSkipTargetVCWithCurrentVC:(nonnull UIViewController*)currentVC animated:(BOOL)animated;
  
-/// 跳转收礼界面
-/// @param giftOrderId 礼物订单id (如果没传会自行获取没有填写地址订单的id,此为已登录的前提)
-/// @param receivingValidTime 礼物有效时间（收礼前需要）
+/// 跳转h5界面
+/// @param url h5链接
 /// @param currentVC 当前控制器
-/// @return YES成功跳转 NO跳转失败,没有查到礼物订单id
--(BOOL)skipReceivingGiftsVCWithGiftOrderId:(nullable NSString*)giftOrderId receivingValidTime:(NSTimeInterval)receivingValidTime currentVC:(nonnull UIViewController*)currentVC;
+-(void)skipWebVCWithUrl:(NSString*)url currentVC:(nonnull UIViewController*)currentVC;
  
 @end
  
+//
+//  DSOGiftDetailsEnum.h
+//  DSCnliveShopSDK
+//
+//  Created by zhaolin on 2019/12/2.
+//  Copyright © 2019 BIKE. All rights reserved.
+//
+
+#ifndef DSOGiftDetailsEnum_h
+#define DSOGiftDetailsEnum_h
+
+typedef NS_ENUM(NSUInteger, DSOGiftDetailsStyle) {
+    DSOGiftDetailsStyleGiving = 0,     //赠送
+    DSOGiftDetailsStyleReceiving,      //接收
+};
+
+typedef NS_ENUM(NSUInteger, DSOGiftDetailsPresentAlertStyle) {
+    DSOGiftDetailsPresentAlertStyleNone = 0,        //没有弹框
+    DSOGiftDetailsPresentAlertStyleShare,           //分享弹框
+    DSOGiftDetailsPresentAlertStyleNoPay            //没支付弹框
+};
+
+#endif /* DSOGiftDetailsEnum_h */
+//
+//  DSOGiftDetailsViewController.h
+//  DSCnliveShopSDK
+//
+//  Created by zhaolin on 2019/11/19.
+//  Copyright © 2019 BIKE. All rights reserved.
+//
+
+#import "DSCnliveShopSDKPBaseViewController.h"
+#import "DSOGiftDetailsEnum.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface DSOGiftDetailsViewController : DSCnliveShopSDKPBaseViewController
+
+/// 是否隐藏我的礼盒
+@property (nonatomic,assign) BOOL isHideMyGifts;
+/// 显示样式
+@property (nonatomic,assign) DSOGiftDetailsStyle style;
+/// 订单id
+@property (nonatomic,copy) NSString * orderId;
+/// 是否弹弹框(传对应类型弹对应类型弹框)
+@property (nonatomic,assign) DSOGiftDetailsPresentAlertStyle presentAlertStyle;
+
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  DSOGiveGiftsViewController.h
+//  DSCnliveShopSDK
+//
+//  Created by zhaolin on 2019/9/19.
+//  Copyright © 2019 BIKE. All rights reserved.
+//
+
+#import "DSCnliveShopSDKPBaseViewController.h"
+
+typedef NS_ENUM(NSUInteger, DSOGiveGiftsStyle) {
+    DSOGiveGiftsStyleGiving = 0,                //送礼样式
+    DSOGiveGiftsStyleReceiving,                 //收礼样式
+};
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface DSOGiveGiftsViewController : DSCnliveShopSDKPBaseViewController
+
+#pragma mark - 属性
+
+/**
+ 商品id style == DSOGiveGiftsStyleGiving时用
+ */
+@property (nonatomic,copy) NSString * goodsId;
+/**
+ 订单id style == DSOGiveGiftsStyleReceiving时用
+ */
+@property (nonatomic,copy) NSString * orderId;
+/**
+ 能接收礼物的截止时间 style == DSOGiveGiftsStyleReceiving时用
+ */
+@property (nonatomic,assign) NSTimeInterval receivingValidTime;
+/// 是否隐藏我的礼盒
+@property (nonatomic,assign) BOOL isHideMyGifts;
+
+#pragma mark - 创建方法
+
+/**
+ 样式
+ */
+@property (nonatomic,assign,readonly) DSOGiveGiftsStyle style;
+
+/**
+ 创建方法
+
+ @param style 样式
+ @return DSOGiveGiftsViewController
+ */
+-(instancetype)initWithStyle:(DSOGiveGiftsStyle)style;
+
+@end
+
+NS_ASSUME_NONNULL_END