礼物流程修改(未完成) 添加openInstall跳转方法添加是否有未填写地址礼物检测方法添加跳转礼物详情方法

毕珂
1 parent 04bd0033
Showing 106 changed files with 28 additions and 13 deletions
DSCnliveShopSDK.podspec
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/DSCnliveShopSDK
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/DSGiftResource.bundle/ConfirmOrder/DS_Gift_ConOrd_add@2x.png
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/DSGiftResource.bundle/ConfirmOrder/DS_Gift_ConOrd_add@3x.png
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/DSGiftResource.bundle/ConfirmOrder/DS_Gift_ConOrd_edit@2x.png
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/DSGiftResource.bundle/ConfirmOrder/DS_Gift_ConOrd_edit@3x.png
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/DSGiftResource.bundle/ConfirmOrder/DS_Gift_ConOrd_subtract_b@2x.png
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/DSGiftResource.bundle/ConfirmOrder/DS_Gift_ConOrd_subtract_b@3x.png
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/DSGiftResource.bundle/ConfirmOrder/DS_Gift_ConOrd_subtract_g@2x.png
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/DSGiftResource.bundle/ConfirmOrder/DS_Gift_ConOrd_subtract_g@3x.png
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/DSGiftResource.bundle/GiftAlert/DS_GiftAlert_bg@3x.png
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/DSGiftResource.bundle/GiftAlert/DS_GiftAlert_giftBox@2x.png
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/DSGiftResource.bundle/GiftAlert/DS_GiftAlert_giftBox@3x.png
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/DSGiftResource.bundle/GiftAlert/DS_GiftAlert_giftBox_empty@2x.png
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/DSGiftResource.bundle/GiftAlert/DS_GiftAlert_giftBox_empty@3x.png
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/DSGiftResource.bundle/GiveGift/SelectAddressAlert/DS_Opt_Give_SAA_close@2x.png
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/DSGiftResource.bundle/GiveGift/SelectAddressAlert/DS_Opt_Give_SAA_close@3x.png
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/Headers/DSAddressEnum.h
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/Headers/DSCnliveShopSDKEnum.h
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/Headers/DSCnliveShopSDKManager.h
 Pod::Spec.new do |s|
   s.name             = 'DSCnliveShopSDK'
-  s.version          = '0.3.4.003'
+  s.version          = '0.3.4.005'
   s.summary          = 'cnlive电商SDK'
   s.homepage         = 'http://bj.gitlab.cnlive.com/ios-team/DSCnliveShopSDK'
   s.license          = { :type => 'MIT', :file => 'LICENSE' }
@@ -30,7 +30,7 @@ Pod::Spec.new do |s|
   s.dependency 'SDAutoLayout', '2.2.1'
   s.dependency 'BKTimer', '~> 1.0.1'
-  s.dependency 'BKCycleScrollView', '~> 2.0.5'
+  s.dependency 'BKCycleScrollView', '~> 2.0.6'
   s.dependency 'BKPickerView', '~> 1.1.1'
   s.vendored_frameworks = 'DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework'
@@ -13,7 +13,8 @@
 #import <UIKit/UIkit.h>
 typedef NS_ENUM(NSUInteger, DSAddressStyle) {
-    DSAddressStyleShop = 0,      //电商
+    DSAddressStyleNormal = 0,    //默认地址样式
+    DSAddressStyleShop,          //电商
     DSAddressStyleRepast,        //餐厅
 };
@@ -19,4 +19,10 @@ typedef NS_ENUM(NSUInteger, DSClearSTVCType) {//清除保存的目标控制器
     DSClearSTVCTypeLoginProcess,        //登录流程保存的控制器
 };
+typedef NS_ENUM(NSUInteger, DSServiceSkipType) {//服务号跳转类型
+    DSServiceSkipTypeReleaseInterface = 0,  //跳转发布界面
+    DSServiceSkipTypeOnlineGamesVC,         //跳转线上赛事界面
+    DSServiceSkipTypeGlobalGoodsShopVC,     //跳转环球优物界面
+};
+
 #endif /* DSCnliveShopSDKEnum_h */
@@ -88,7 +88,7 @@ NS_ASSUME_NONNULL_BEGIN
 /// @param type 清除类型
 -(void)clearSavedTargetViewController:(DSClearSTVCType)type;
-#pragma mark - 检测分享类型
+#pragma mark - 检测
 /**
  检测分享类型
@@ -99,6 +99,10 @@ NS_ASSUME_NONNULL_BEGIN
  */
 -(NSInteger)checkShareTypeByShareUrl:(nonnull NSString*)shareUrl;
+/// 检测是否有礼物
+/// @param completion 检测回调
+-(void)checkIsHaveGiftCompletion:(void (^)(BOOL isHave))completion;
+
 #pragma mark - 跳转
 /**
@@ -155,13 +155,10 @@
 #pragma mark - 服务号
-/// 跳转发布界面
-/// @param currentVC 当前显示控制器
--(void)skipReleaseInterfaceWithCurrentViewController:(nonnull UIViewController*)currentVC;
-
-/// 跳转线上赛事界面
-/// @param vc 当前控制器
--(void)skipOnlineGamesVCWithFrom:(nonnull UIViewController*)vc;
+/// 服务号跳转
+/// @param skipType 跳转目标
+/// @param fromVC 当前控制器
+-(void)serviceSkipWithSkipType:(DSServiceSkipType)skipType fromVC:(nonnull UIViewController*)fromVC;
 @end
@@ -59,11 +59,12 @@ NS_ASSUME_NONNULL_BEGIN
 /// 24 达人首页 to商家id 0不跳转
 /// 25 达人动态详情 to动态id 0不跳转
 /// 26 分享礼物订单详情 to订单id 0不跳转 shop_type礼物接收剩余有效时间
-/// 27 优选库首页 to礼物订单id shop_type"{time:礼物接收剩余有效时间, uid:赠送人id}"
+/// 27 优选库首页
 /// 28 发布界面(原项目发现界面)
 /// 29 线上赛事界面
 /// 30 服务号 to为url 0不跳转
 /// 31 附近美食
+/// 32 环球优物
 /// @param type 按着后台给的传
 /// @param to 按着后台给的传
 /// @param shopType 按着后台给的传
@@ -74,7 +75,7 @@ NS_ASSUME_NONNULL_BEGIN
 /// @param currentVC 当前控制器
 -(void)skipArRecognizeWithCurrentVC:(nonnull UIViewController*)currentVC;
-/// 跳转 1.电商分享目标界面 2.通用链接目标界面
+/// 跳转 1.电商分享目标界面 2.通用链接目标界面 3.openInstall目标界面
 /// @param shareUrl url
 /// @param currentVC 当前显示控制器
 /// @return YES成功跳转 NO跳转失败,不是电商的分享
@@ -91,6 +92,12 @@ NS_ASSUME_NONNULL_BEGIN
 /// @param animated 是否有动画
 -(void)successLoggedSkipTargetVCWithCurrentVC:(nonnull UIViewController*)currentVC animated:(BOOL)animated;
+/// 跳转收礼界面
+/// @param giftOrderId 礼物订单id 如果没传会自行获取没有填写地址订单的id,此为已登录的前提
+/// @param currentVC 当前控制器
+/// @return YES成功跳转 NO跳转失败,没有查到礼物订单id
+-(BOOL)skipReceivingGiftsVCWithGiftOrderId:(nullable NSString*)giftOrderId currentVC:(nonnull UIViewController*)currentVC;
+
 @end
 NS_ASSUME_NONNULL_END