0.3.9.004 电商SDK业务模块化删除

毕珂
1 parent 14648d2f
Showing 40 changed files with 995 additions and 373 deletions
DSCnliveShopSDK.podspec
DSCnliveShopSDK/Frameworks/DSCnliveShopSDK.framework/DSCnliveShopSDK
DSCnliveShopSDK/Frameworks/DSCnliveShopSDK.framework/DSCnliveShopSDK.bundle/Assets.car
DSCnliveShopSDK/Frameworks/DSCnliveShopSDK.framework/DSCnliveShopSDK.bundle/Info.plist
DSCnliveShopSDK/Frameworks/DSCnliveShopSDK.framework/Headers/DSAddrAreaModel.h
DSCnliveShopSDK/Frameworks/DSCnliveShopSDK.framework/Headers/DSAddrSelectAreaViewController.h
DSCnliveShopSDK/Frameworks/DSCnliveShopSDK.framework/Headers/DSAddressEnum.h
DSCnliveShopSDK/Frameworks/DSCnliveShopSDK.framework/Headers/DSAddressModel.h
DSCnliveShopSDK/Frameworks/DSCnliveShopSDK.framework/Headers/DSAddressRequest.h
DSCnliveShopSDK/Frameworks/DSCnliveShopSDK.framework/Headers/DSAddressStateModel.h
DSCnliveShopSDK/Frameworks/DSCnliveShopSDK.framework/Headers/DSAddressTableViewCell.h
DSCnliveShopSDK/Frameworks/DSCnliveShopSDK.framework/Headers/DSAddressViewController.h
DSCnliveShopSDK/Frameworks/DSCnliveShopSDK.framework/Headers/DSHappinessPCDemoViewController.h → DSCnliveShopSDK/Frameworks/DSCnliveShopSDK.framework/Headers/DSAfterSaleListViewController.h
DSCnliveShopSDK/Frameworks/DSCnliveShopSDK.framework/Headers/DSCnliveShopSDK-umbrella.h
DSCnliveShopSDK/Frameworks/DSCnliveShopSDK.framework/Headers/DSCnliveShopSDK.h
DSCnliveShopSDK/Frameworks/DSCnliveShopSDK.framework/Headers/DSCnliveShopSDKEnum.h
DSCnliveShopSDK/Frameworks/DSCnliveShopSDK.framework/Headers/DSCnliveShopSDKMacro.h
DSCnliveShopSDK/Frameworks/DSCnliveShopSDK.framework/Headers/DSCnliveShopSDKPCH.h
DSCnliveShopSDK/Frameworks/DSCnliveShopSDK.framework/Headers/DSCnliveShopSDKProtocolUCM.h
DSCnliveShopSDK/Frameworks/DSCnliveShopSDK.framework/Headers/DSCommonConstant.h
 Pod::Spec.new do |s|
   s.name                   = 'DSCnliveShopSDK'
-  s.version                = '0.3.9.003'
+  s.version                = '0.3.9.004'
   s.summary                = 'cnlive电商SDK'
   s.homepage               = 'http://bj.gitlab.cnlive.com/ios-team/DSCnliveShopSDK'
   s.license                = { :type => 'MIT', :file => 'LICENSE' }
@@ -21,14 +21,13 @@ Pod::Spec.new do |s|
   s.dependency 'SDWebImage', '~> 5.2.3'
   s.dependency 'MJRefresh', '3.2.0'
   s.dependency 'MJExtension', '3.2.1'
-  s.dependency 'SAMKeychain', '1.5.3'
   s.dependency 'MBProgressHUD', '1.1.0'
-  s.dependency 'GPUImage', '0.1.7'
   s.dependency 'Qiniu', '7.2.5'
   s.dependency 'Masonry', '1.1.0'
   s.dependency 'PLPlayerKit', '~> 3.4.3'
   s.dependency 'QMUIKit', ' 4.0.2'
   s.dependency 'YYKit', '1.0.9'
+  s.dependency 'IQKeyboardManager', '~> 6.3.0'
   s.dependency 'SDAutoLayout', '2.2.1'
   s.dependency 'CNLiveRequestBastKit'
@@ -37,20 +36,7 @@ Pod::Spec.new do |s|
   s.dependency 'YBImageBrowser_DSCnliveShop'
   s.dependency 'DSBaseModuleF', '0.0.16'
-  s.dependency 'DSToolsModuleF', '0.0.15'
-  s.dependency 'DSCommonModuleF', '0.0.12'
-  s.dependency 'DSPayModuleF', '0.0.8'
-  s.dependency 'DSMapModuleF', '0.0.3'
-  s.dependency 'DSWebViewModuleF', '0.0.7'
-  s.dependency 'DSAddressModuleF', '0.0.3'
-  s.dependency 'DSUserModuleF', '0.0.2'
-  s.dependency 'DSQrCodeModuleF', '0.0.3'
-  s.dependency 'DSARModuleF', '0.0.5'
-  s.dependency 'DSShopModuleF', '0.0.3'
-  s.dependency 'DSRepastModuleF', '0.0.3'
-  s.dependency 'DSLifeServiceModuleF', '0.0.3'
-  s.dependency 'DSHappinessModuleF', '0.0.4'
-  s.dependency 'DSServiceModuleF', '0.0.3'
-  s.dependency 'DSVideoContestModuleF', '0.0.3'
+  s.dependency 'DSToolsModuleF', '0.0.16'
+  s.dependency 'DSARModuleF', '0.0.9'
 end
+//
+//  DSAddrAreaModel.h
+//  DSCnliveShopSDK
+//
+//  Created by zhaolin on 2019/5/6.
+//  Copyright © 2019 BIKE. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface DSAddrAreaModel : NSObject
+
+/**
+ id
+ */
+@property (nonatomic,copy) NSString * id;
+/**
+ 名称
+ */
+@property (nonatomic,copy) NSString * name;
+/**
+ 父级id(最上级为0)
+ */
+@property (nonatomic,copy) NSString * pid;
+/**
+ 1省 2市 3区(县)
+ */
+@property (nonatomic,copy) NSString * level;
+
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  DSAddrSelectAreaViewController.h
+//  DSCnliveShopSDK
+//
+//  Created by zhaolin on 2019/5/6.
+//  Copyright © 2019 BIKE. All rights reserved.
+//
+
+#import <DSBaseModule/DSBaseModule.h>
+#import "DSAddressEnum.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface DSAddrSelectAreaViewController : DSBaseViewController
+
+@property (nonatomic,assign) DSAddressStyle style;
+
+@property (nonatomic,copy) NSString * provinceId;
+@property (nonatomic,copy) NSString * province;
+@property (nonatomic,copy) NSString * cityId;
+@property (nonatomic,copy) NSString * city;
+@property (nonatomic,copy) NSString * areaId;
+@property (nonatomic,copy) NSString * area;
+
+-(void)display;
+
+@property (nonatomic,copy) void (^finishSelectAreaCallBack)(void);
+
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  DSAddressEnum.h
+//  DSCnliveShopSDK
+//
+//  Created by zhaolin on 2019/8/23.
+//  Copyright © 2019 BIKE. All rights reserved.
+//
+
+#ifndef DSAddressEnum_h
+#define DSAddressEnum_h
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIkit.h>
+
+typedef NS_ENUM(NSUInteger, DSAddressStyle) {
+    DSAddressStyleNormal = 0,    //默认地址样式
+    DSAddressStyleShop,          //电商
+    DSAddressStyleRepast,        //餐厅
+};
+
+#endif /* DSAddressEnum_h */
+//
+//  DSAddressModel.h
+//  iosZhaoLinNeighbouraide
+//
+//  Created by 张魁 on 2017/3/14.
+//  Copyright © 2017年 BIKE. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface DSAddressModel : NSObject
+
+/**
+ 地址id
+ */
+@property (nonatomic,copy) NSString * id;
+/**
+ 名称
+ */
+@property (nonatomic,copy) NSString * name;
+/**
+ 联系电话
+ */
+@property (nonatomic,copy) NSString * phone;
+/**
+ 用户填写的详细地址
+ */
+@property (nonatomic,copy) NSString * write_address;
+/**
+ 详细地址
+ */
+@property (nonatomic,copy) NSString * address;
+/**
+ 省id 0为没选择
+ */
+@property (nonatomic,copy) NSString * province_id;
+/**
+ 市id 0为没选择
+ */
+@property (nonatomic,copy) NSString * city_id;
+/**
+ 区县id 0为没选择
+ */
+@property (nonatomic,copy) NSString * area_id;
+/**
+ 2为默认地址 其他为普通
+ */
+@property (nonatomic,assign) NSUInteger state;
+/**
+ 用户id
+ */
+@property (nonatomic,copy) NSString * uid;
+/**
+ 省市县名称
+ */
+@property (nonatomic,copy) NSString * city_name;
+/**
+ 定位地址
+ */
+@property (nonatomic,copy) NSString * position_address;
+/**
+ 1男 2女
+ */
+@property (nonatomic,assign) NSUInteger sex;
+/**
+ 经度
+ */
+@property (nonatomic,assign) double longitude;
+/**
+ 纬度
+ */
+@property (nonatomic,assign) double latitude;
+
+@end
+//
+//  DSAddressRequest.h
+//  DSCnliveShopSDK
+//
+//  Created by zhaolin on 2019/4/24.
+//  Copyright © 2019 BIKE. All rights reserved.
+//
+//
+//  如果[errorMessage length]>0时为接口请求失败 当errorMessage=="网络不给力"时为接口请求失败 其余为接口请求成功，但是后台返回错误
+//
+
+#import <Foundation/Foundation.h>
+#import "DSAddressStateModel.h"
+#import "DSAddrAreaModel.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface DSAddressRequest : NSObject
+
+/**
+ 获取我的地址列表
+ 
+ @param uid 用户id
+ @param storeId 店铺id 外卖用
+ @param result 回调
+ */
++(void)postMyAddressNewWithUid:(NSString*)uid storeId:(nullable NSString*)storeId result:(void (^)(DSAddressStateModel * model, NSString * errorMessage))result;
+
+/**
+ 获取地址详情
+
+ @param addressId 地址id
+ @param result 地址详情
+ */
++(void)postAddressInfoWithAddressId:(NSString*)addressId result:(void (^)(DSAddressModel * model, NSString * errorMessage))result;
+
+/**
+ 获取省市县列表
+
+ @param pid 对应级id
+ @param result 结果
+ */
++(void)postGetCityListWithPid:(NSString*)pid result:(void (^)(NSArray<DSAddrAreaModel*> * dataArr, NSString * errorMessage))result;
+
+/**
+ 添加地址
+
+ @param uid 用户id
+ @param contactPhone 电话
+ @param contactName 名称
+ @param address 详细地址
+ @param positionAddress 定位的地址
+ @param provinceId 省id
+ @param cityId 市id
+ @param areaId 区(县)id
+ @param state 2默认地址 其他为普通
+ @param longitude 经度
+ @param latitude 纬度
+ @param sex 1 先生 2 女士
+ @param result 结果
+ */
++(void)postAddAddressNewWithUid:(NSString*)uid contactPhone:(NSString*)contactPhone contactName:(NSString*)contactName address:(NSString*)address positionAddress:(NSString*)positionAddress provinceId:(NSString*)provinceId cityId:(NSString*)cityId areaId:(NSString*)areaId state:(NSUInteger)state longitude:(double)longitude latitude:(double)latitude sex:(NSUInteger)sex result:(void (^)(DSAddressModel * model, NSString * errorMessage))result;
+
+/**
+ 修改地址
+
+ @param addressId 地址id
+ @param uid 用户id
+ @param contactPhone 电话
+ @param contactName 名称
+ @param address 详细地址
+ @param provinceId 省id
+ @param cityId 市id
+ @param areaId 区(县)id
+ @param state 2默认地址 其他为普通
+ @param sex 1 先生 2 女士
+ @param positionAddress 定位的地址
+ @param longitude 经度
+ @param latitude 纬度
+ @param result 结果
+ */
++(void)postEditAddressNewWithAddressId:(NSString*)addressId uid:(NSString*)uid contactPhone:(nullable NSString*)contactPhone contactName:(nullable NSString*)contactName address:(nullable NSString*)address provinceId:(nullable NSString*)provinceId cityId:(nullable NSString*)cityId areaId:(nullable NSString*)areaId state:(NSUInteger)state sex:(NSUInteger)sex positionAddress:(nullable NSString*)positionAddress longitude:(double)longitude latitude:(double)latitude result:(void (^)(DSAddressModel * model, NSString * errorMessage))result;
+
+/**
+ 删除地址
+ 
+ @param uid 用户id
+ @param addressId 地址id
+ @param result 回调
+ */
++(void)postDelAddressWithUid:(NSString*)uid addressId:(NSString*)addressId result:(void (^)(NSString * errorMessage))result;
+
+/**
+ 我的首选地址
+ 
+ @param uid 用户id
+ @param storeId 店铺id 店铺id 外卖用
+ @param result 回调
+ */
++(void)postMyFirstAddressWithUid:(NSString*)uid storeId:(nullable NSString*)storeId result:(void (^)(DSAddressModel * addressModel, NSString * errorMessage))result;
+
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  DSAddressStateModel.h
+//  DSCnliveShopSDK
+//
+//  Created by zhaolin on 2019/8/23.
+//  Copyright © 2019 BIKE. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "DSAddressModel.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface DSAddressStateModel : NSObject
+
+/**
+ 可用地址
+ */
+@property (nonatomic,copy) NSArray<DSAddressModel*> * enable;
+/**
+ 不可用地址
+ */
+@property (nonatomic,copy) NSArray<DSAddressModel*> * unable;
+
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  DSAddressTableViewCell.h
+//  iosZhaoLinNeighbouraide
+//
+//  Created by 张魁 on 2017/2/20.
+//  Copyright © 2017年 张魁. All rights reserved.
+//
+
+#import <DSBaseModule/DSBaseModule.h>
+#import "DSAddressModel.h"
+#import "DSAddressEnum.h"
+
+@interface DSAddressTableViewCell : DSTableViewCell
+
+#pragma mark - 赋值
+
+@property (nonatomic,strong,readonly) DSAddressModel * model;
+@property (nonatomic,assign,readonly) DSAddressStyle addressStyle;
+
+-(void)setModel:(DSAddressModel*)model addressStyle:(DSAddressStyle)addressStyle;
+
+#pragma mark - 回调
+
+@property (nonatomic,copy) void (^clickEditCallBack)(DSAddressModel * addressModel);
+@property (nonatomic,copy) void (^clickDeleteCallBack)(DSAddressModel * addressModel);
+
+@end
+//
+//  DSAddressViewController.h
+//  iosZhaoLinNeighbouraide
+//
+//  Created by 张魁 on 2017/2/20.
+//  Copyright © 2017年 张魁. All rights reserved.
+//
+
+#import <DSBaseModule/DSBaseModule.h>
+#import "DSAddressModel.h"
+#import "DSAddressEnum.h"
+
+@interface DSAddressViewController : DSBaseViewController
+
+/**
+ 样式
+ */
+@property (nonatomic,assign) DSAddressStyle style;
+/**
+ 店铺id 餐厅传入
+ */
+@property (nonatomic,copy) NSString * storeId;
+/**
+ 上一次选取的地址 餐厅传入
+ */
+@property (nonatomic,strong) DSAddressModel * lastSelectModel;
+
+#pragma mark - 回调
+
+/**
+ 选择地址对象回调 (有此方法才会点击cell返回上一页)
+ */
+@property (nonatomic,copy) void (^selectAddressCallBack)(DSAddressModel *addressObj);
+
+@end
 //
-//  DSHappinessPCDemoViewController.h
+//  DSAfterSaleListViewController.h
 //  DSCnliveShopSDK
 //
-//  Created by zhaolin on 2019/8/21.
+//  Created by zhaolin on 2019/5/20.
 //  Copyright © 2019 BIKE. All rights reserved.
 //
@@ -10,7 +10,12 @@
 NS_ASSUME_NONNULL_BEGIN
-@interface DSHappinessPCDemoViewController : DSBaseViewController
+@interface DSAfterSaleListViewController : DSBaseViewController
+
+/**
+ 是否需要导航条(默认不需要)
+ */
+@property (nonatomic,assign) BOOL isNeedNavigationBar;
 @end
@@ -10,27 +10,36 @@
 #endif
 #endif
-#import "DSCnliveShopSDKMacro.h"
-#import "DSCnliveShopSDKPCH.h"
-#import "DSCnliveShopSDKRouter.h"
-#import "DSCommonDelegateImplementation.h"
 #import "DSCnliveShopSDK.h"
 #import "DSCnliveShopSDKCheck.h"
 #import "DSCnliveShopSDKEnum.h"
 #import "DSCnliveShopSDKManager.h"
 #import "DSCnliveShopSDKProtocol.h"
+#import "DSCnliveShopSDKProtocolUCM.h"
 #import "DSCnliveShopSDKShareModel.h"
 #import "DSCnliveShopSDKSkip.h"
+#import "DSCommonConstant.h"
+#import "DSOGiveGiftsViewController.h"
+#import "DSOMyGivingGiftsListViewController.h"
+#import "DSOGiftDetailsViewController.h"
+#import "DSOGiftDetailsEnum.h"
+#import "DSOrderListViewController.h"
+#import "DSAfterSaleListViewController.h"
+#import "DSAddressRequest.h"
+#import "DSAddressViewController.h"
+#import "DSAddrSelectAreaViewController.h"
+#import "DSEditAddressViewController.h"
+#import "DSAddrAreaModel.h"
+#import "DSAddressEnum.h"
+#import "DSAddressModel.h"
+#import "DSAddressStateModel.h"
+#import "DSAddressTableViewCell.h"
+#import "DSEditAddressTableViewCell.h"
+#import "DSRAddressTableViewCell.h"
+#import "DSHappHPParentViewController.h"
+#import "DSROrderListViewController.h"
+#import "DSServiceHPViewController.h"
 #import "DSCnliveShopSDKExampleListViewController.h"
-#import "DSHappinessPCDemoViewController.h"
-#import "DSPlayControlView.h"
-#import "DSPlayerMacro.h"
-#import "DSSlider.h"
-#import "DSStaticData.h"
-#import "DSSWCourseListViewController.h"
-#import "DSSWPlayViewController.h"
-#import "UIDevice+DSOrientation.h"
-#import "UIImage+UIColor.h"
 FOUNDATION_EXPORT double DSCnliveShopSDKVersionNumber;
 FOUNDATION_EXPORT const unsigned char DSCnliveShopSDKVersionString[];
@@ -4,13 +4,16 @@
 //
 //  Created by zhaolin on 2019/4/13.
 //  Copyright © 2019年 BIKE. All rights reserved.
-//  当前版本0.3.9.003
+//  当前版本0.3.9.004
 #import <UIKit/UIKit.h>
 FOUNDATION_EXPORT double DSCnliveShopSDKVersionNumber;
 FOUNDATION_EXPORT const unsigned char DSCnliveShopSDKVersionString[];
+#import <DSBaseModule/DSBaseModule.h>
+#import <DSToolsModule/DSToolsModule.h>
+
 #import "DSCnliveShopSDKManager.h"
 #import "DSCnliveShopSDKSkip.h"
 #import "DSCnliveShopSDKCheck.h"
@@ -18,27 +21,26 @@ FOUNDATION_EXPORT const unsigned char DSCnliveShopSDKVersionString[];
 #import "DSCnliveShopSDKShareModel.h"
 #import "DSCnliveShopSDKEnum.h"
-#import <DSCommonModule/DSCommonConstant.h>
-#import <DSCommonModule/DSCommonEnum.h>
+#import "DSCommonConstant.h"
-#import <DSShopModule/DSOGiveGiftsViewController.h>
-#import <DSShopModule/DSOMyGivingGiftsListViewController.h>
-#import <DSShopModule/DSOGiftDetailsViewController.h>
-#import <DSShopModule/DSOGiftDetailsEnum.h>
-#import <DSShopModule/DSOrderListViewController.h>
-#import <DSShopModule/DSAfterSaleListViewController.h>
+#import "DSOGiveGiftsViewController.h"
+#import "DSOMyGivingGiftsListViewController.h"
+#import "DSOGiftDetailsViewController.h"
+#import "DSOGiftDetailsEnum.h"
+#import "DSOrderListViewController.h"
+#import "DSAfterSaleListViewController.h"
-#import <DSAddressModule/DSAddressRequest.h>
-#import <DSAddressModule/DSAddressEnum.h>
-#import <DSAddressModule/DSAddressStateModel.h>
-#import <DSAddressModule/DSAddressModel.h>
-#import <DSAddressModule/DSAddrAreaModel.h>
-#import <DSAddressModule/DSAddressViewController.h>
-#import <DSAddressModule/DSEditAddressViewController.h>
+#import "DSAddressRequest.h"
+#import "DSAddressEnum.h"
+#import "DSAddressStateModel.h"
+#import "DSAddressModel.h"
+#import "DSAddrAreaModel.h"
+#import "DSAddressViewController.h"
+#import "DSEditAddressViewController.h"
-#import <DSHappinessModule/DSHappHPParentViewController.h>
+#import "DSHappHPParentViewController.h"
-#import <DSRepastModule/DSROrderListViewController.h>
-#import <DSServiceModule/DSServiceHPViewController.h>
+#import "DSROrderListViewController.h"
+#import "DSServiceHPViewController.h"
 #import "DSCnliveShopSDKExampleListViewController.h"
@@ -19,4 +19,23 @@ typedef NS_ENUM(NSUInteger, DSClearSTVCType) {//皜靽蝐
     DSClearSTVCTypeLoginProcess,              //敶
 };
+typedef NS_ENUM(NSUInteger, DSUMengCheckType) {//掩
+    DSUMengCheckTypeViewController = 0,        //
+    DSUMengCheckTypeActionMethod,              //辣瘜
+};
+
+typedef NS_ENUM(NSUInteger, DSUMengCheckSLType) {//漣蝐餃
+    //
+    DSUMengCheckSLTypeServiceHP = 0,             //擐△
+    //辣瘜
+    DSUMengCheckSLTypeServiceHPClickSearch,      //擐△揣
+    DSUMengCheckSLTypeServiceHPClickItem,        //擐△item
+};
+
+typedef NS_ENUM(NSUInteger, DSServiceSkipType) {//頝唾蓮蝐餃
+    DSServiceSkipTypeReleaseInterface = 0,      //頝唾蓮
+    DSServiceSkipTypeOnlineGamesVC,             //頝唾蓮蝥蹂
+    DSServiceSkipTypeGlobalGoodsShopVC,         //頝唾蓮
+};
+
 #endif /* DSCnliveShopSDKEnum_h */
-//
-//  DSCnliveShopSDKMacro.h
-//  DSCnliveShopSDK
-//
-//  Created by zhaolin on 2020/3/5.
-//
-
-#ifndef DSCnliveShopSDKMacro_h
-#define DSCnliveShopSDKMacro_h
-
-//aes加密key
-#define DS_SHARE_AES_KEY @"cnlive!$@cnlive_"
-
-#endif /* DSCnliveShopSDKMacro_h */
-//
-//  DSCnliveShopSDKPCH.h
-//  DSCnliveShopSDK
-//
-//  Created by zhaolin on 2020/3/2.
-//
-
-#ifndef DSCnliveShopSDKPCH_h
-#define DSCnliveShopSDKPCH_h
-
-#import <DSBaseModule/DSBaseModule.h>
-#import <DSToolsModule/DSToolsModule.h>
-#import <DSCommonModule/DSCommonModule.h>
-
-#import "DSCnliveShopSDKMacro.h"
-#import "DSCnliveShopSDKRouter.h"
-#import "DSCommonDelegateImplementation.h"
-
-#endif /* DSCnliveShopSDKPCH_h */
+//
+//  DSCnliveShopSDKProtocolUCM.h
+//  DSCnliveShopSDK
+//
+//  Created by zhaolin on 2020/3/16.
+//
+
+#import <Foundation/Foundation.h>
+#import "DSCnliveShopSDKProtocol.h"
+#import "DSCnliveShopSDKShareModel.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface DSCnliveShopSDKProtocolUCM : NSObject
+
+#pragma mark - 跳转登录
+
+/// 跳转登录
++(void)skipLoginWithCurrentVC:(nonnull UIViewController*)currentVC;
+
+#pragma mark - 分享
+
+/// 分享事件
+/// @param shareType 分享类型
+/// @param shareId 分享物的id
+/// @param ext 附加参数
+/// @param isCanShareWjjLife 是否能分享网家家生活圈
+/// @param isCanShareWjjFriend 是否能分享网家家好友
+/// @param isCanShareSafari 是否能分享Safari
+/// @param currentVC 当前控制器
++(void)shareType:(NSUInteger)shareType shareId:(nonnull NSString*)shareId ext:(nullable NSString*)ext isCanShareWjjLife:(BOOL)isCanShareWjjLife isCanShareWjjFriend:(BOOL)isCanShareWjjFriend isCanShareSafari:(BOOL)isCanShareSafari currentVC:(nonnull UIViewController*)currentVC;
+
+/**
+ 分享老达人
+
+ @param darenId 达人id
+ @param shopName 达⼈店铺名称
+ @param darenHeader 达人头像
+ @param vc 当前控制器
+ */
++(void)shareWithDarenId:(nonnull NSString*)darenId shopName:(nonnull NSString*)shopName darenHeader:(nonnull NSString*)darenHeader vc:(nonnull UIViewController*)vc;
+
+#pragma mark - 跳转用户主页
+
+/// 跳转用户主页
+/// @param userId 用户主页
+/// @param userHeader 用户头像
+/// @param shopName 用户名称
+/// @param vc 当前控制器
++(void)skipUserHomePageWithUserId:(nonnull NSString *)userId userHeader:(nonnull NSString *)userHeader shopName:(nonnull NSString *)shopName vc:(nonnull UIViewController *)vc;
+
+#pragma mark - TIM
+
+/// 跳转TIM单聊
+/// @param userId 用户id
+/// @param userHeader 用户头像
+/// @param userName 用户名称
+/// @param fromVC 当前控制器
++(void)skipTIMChat:(nonnull NSString*)userId userHeader:(nonnull NSString*)userHeader userName:(nonnull NSString*)userName fromVC:(nonnull UIViewController*)fromVC;
+
+/// TIM检测是否互为好友
+/// @param uid 用户id
+/// @param result 结果
++(void)TIMCheckIsFriend:(nonnull NSString*)uid result:(nullable void (^)(BOOL flag))result;
+
+/// 跳转TIM群组聊天
+/// @param groupId 群组id
+/// @param groupName 群组名称
+/// @param fromVC 当前控制器
++(void)skipTIMGroupChat:(nonnull NSString*)groupId groupName:(nonnull NSString*)groupName fromVC:(nonnull UIViewController*)fromVC;
+
+/// 跳转TIM群组详情
+/// @param groupId 群组id
+/// @param groupName 群组名称
+/// @param fromVC 当前控制器
++(void)skipTIMGroupDetails:(nonnull NSString*)groupId groupName:(nonnull NSString*)groupName fromVC:(nonnull UIViewController*)fromVC;
+
+/// 跳转TIM群组聊天信息
+/// @param groupId 群组id
+/// @param groupName 群组名称
+/// @param fromVC 当前控制器
++(void)skipTIMGroupMessage:(nonnull NSString*)groupId groupName:(nonnull NSString*)groupName fromVC:(nonnull UIViewController*)fromVC;
+
+#pragma mark - 友盟
+
+/// 友盟统计
+/// @param checkType 统计类型
+/// @param subType 统计子类型
++(void)uMengCheckCallBackType:(DSUMengCheckType)checkType subType:(DSUMengCheckSLType)subType;
+
+#pragma mark - 服务号跳转
+
+/// 服务号跳转
+/// @param skipType 跳转目标
+/// @param fromVC 当前控制器
++(void)serviceSkipWithSkipType:(DSServiceSkipType)skipType fromVC:(nonnull UIViewController*)fromVC;
+
+#pragma mark - (一部)url跳转
+
+/// (一部)url跳转
+/// @param url url链接
+/// @param fromVC 当前控制器
++(void)skipByUrl:(nonnull NSString*)url fromVC:(nonnull UIViewController*)fromVC;
+
+#pragma mark - 支付
+
+/// 显示添加金币界面
+/// @param count 金币数
+/// @param desc 描述
++(void)displayAddGoldConinsViewWithCount:(nonnull NSString*)count desc:(nonnull NSString*)desc;
+
+/// 跳转设置密码控制器
+/// @param currentVC 当前控制器
++(void)skipSetPasswordVCWithCurrentVC:(nonnull UIViewController*)currentVC;
+
+/// 跳转忘记密码控制器
+/// @param currentVC 当前控制器
++(void)skipForgetPasswordVCWithCurrentVC:(nonnull UIViewController*)currentVC;
+
+#pragma mark - 电商中国
+
+/**
+ 预览图片
+
+ @param imageUrlsArr 图⽚ url
+ @param thumbUrlsArr 缩略图 url
+ @param imageViews 将要显示的所有 imageView
+ @param selectView 当前选中的 imageView
+ @param index 当前点击图⽚的索引
+ @param vc 当前控制器
+ @param isCollect 当前预览图片是否支持收藏
+ @param text 内容描述(isCollect == NO时 为nil)
+ @param userId 达人 ID(isCollect == NO时 为nil)
+ @param itemId 动态 ID(isCollect == NO时 为nil)
+ */
++(void)previewImageUrlsArr:(nonnull NSArray*)imageUrlsArr thumbUrlsArr:(nonnull NSArray*)thumbUrlsArr imageViews:(nonnull NSArray*)imageViews selectView:(nonnull UIImageView*)selectView index:(NSUInteger)index vc:(nonnull UIViewController*)vc isCollect:(BOOL)isCollect text:(nullable NSString*)text userId:(nullable NSString*)userId itemId:(nullable NSString*)itemId;
+
+/**
+ 预览视频
+
+ @param videoUrl 视频播放地址(vId 或 url)
+ @param currentImageView 当前选择视频的占位 imageView
+ @param vc 当前控制器
+ @param isCollect 当前预览图⽚是否支持收藏
+ @param text 内容描述(isCollect == NO时 为nil)
+ @param imageUrl 视频占位图地址(isCollect == NO时 为nil)
+ @param userId 达⼈ ID(isCollect == NO时 为nil)
+ @param itemId 动态 ID(isCollect == NO时 为nil)
+ */
++(void)previewVideoUrl:(nonnull NSString*)videoUrl currentImageView:(nonnull UIImageView*)currentImageView vc:(nonnull UIViewController*)vc isCollect:(BOOL)isCollect text:(nullable NSString*)text imageUrl:(nullable NSString*)imageUrl userId:(nullable NSString*)userId itemId:(nullable NSString*)itemId;
+
+/**
+ 电商中国导航颜色变化通知
+
+ @param statusState 状态栏文字颜色 0-->白色，1-->黑色
+ @param naviBackgroundColor 导航背景颜色
+ @param naviNormalTitleColor 导航未选中的文字颜色
+ @param naviSelectTitleColor 导航选中的文字颜色
+ */
++(void)happinessHomepageChangeNaviPropertyActionWithStatusState:(NSUInteger)statusState naviBackgroundColor:(nonnull NSString *)naviBackgroundColor naviNormalTitleColor:(nonnull NSString *)naviNormalTitleColor naviSelectTitleColor:(nonnull NSString *)naviSelectTitleColor;
+
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  DSCommonConstant.h
+//  DSCommonModule
+//
+//  Created by zhaolin on 2020/3/8.
+//
+
+#import <Foundation/Foundation.h>
+
+#pragma mark - 常量
+#pragma mark - 存储
+UIKIT_EXTERN NSString * const kDSSaveShopSearchHistroyData;//储存商城历史搜索列表
+
+#pragma mark - 通知
+#pragma mark - 用户
+UIKIT_EXTERN NSString * const kDSChangeUserNotification;//用户修改通知 object为用户id
+
+#pragma mark - 支付
+UIKIT_EXTERN NSString * const kDSSuccessPayOrderNotification;//支付订单成功通知 object为订单id
+
+#pragma mark - 商城订单
+UIKIT_EXTERN NSString * const kDSDeleteOrderNotification;//删除订单通知
+UIKIT_EXTERN NSString * const kDSFinishOrderNotification;//完成订单通知
+UIKIT_EXTERN NSString * const kDSCancelOrderNotification;//取消订单通知 object为订单id
+UIKIT_EXTERN NSString * const kDSRefundOrderNotification;//申请订单退款通知 userInfo为@{@"orderId":@"订单id", @"refundId":@"退款id"}
+UIKIT_EXTERN NSString * const kDSEditRefundOrderNotification;//修改订单退款通知
+UIKIT_EXTERN NSString * const kDSCancelRefundOrderNotification;//取消订单退款通知 object为订单id
+UIKIT_EXTERN NSString * const kDSOrderApplyAfterSaleNotification;//申请订单售后通知
+UIKIT_EXTERN NSString * const kDSOrderEditAfterSaleNotification;//修改订单售后通知
+UIKIT_EXTERN NSString * const kDSOrderCancelAfterSaleNotification;//取消订单售后通知
+UIKIT_EXTERN NSString * const kDSGiftOrderWriteAddressNotification;//礼物填写地址通知 object为订单id
+
+#pragma mark - 餐厅订单
+UIKIT_EXTERN NSString * const kDSChangeRepastShopCartNotification;//修改餐厅购物车商品数量通知 userInfo为@{@"storeId":@"餐厅门店id", @"goodsId":@"商品id", @"changeCount":@(修改的数量), @"shopCartModel":[DSRSSelectMenuShopCartModel class], @"type":@(1外卖点餐, 2到店就餐)}
+UIKIT_EXTERN NSString * const kDSClearRepastShopCartNotification;//清空餐厅购物车商品通知 userInfo为@{@"storeId":@"餐厅门店id", @"type":@(1外卖点餐，2到店就餐)}
+UIKIT_EXTERN NSString * const kDSSuccessPayRepastOrderNotification;//支付餐厅订单通知 object为订单id
+UIKIT_EXTERN NSString * const kDSCancelRepastOrderNotification;//餐厅取消除订单通知 object为订单id
+UIKIT_EXTERN NSString * const kDSRefundRepastOrderNotification;//餐厅订单退款通知 object为订单id
+UIKIT_EXTERN NSString * const kDSDeleteRepastOrderNotification;//餐厅删除订单通知 object为订单id
+UIKIT_EXTERN NSString * const kDSConfirmDeliveryRepastOrderNotification;//餐厅确认送达订单通知 object为订单id
+UIKIT_EXTERN NSString * const kDSComplaintRepastOrderNotification;//餐厅投诉订单通知 object为订单id
+UIKIT_EXTERN NSString * const kDSCancelComplaintRepastOrderNotification;//餐厅取消投诉订单通知 object为订单id
+UIKIT_EXTERN NSString * const kDSSuccessValidateRepastOrderNotification;//成功核销餐厅订单通知 object为订单id
+
+#pragma mark - 生活服务订单
+UIKIT_EXTERN NSString * const kDSLSSuccessPayOrderNotification;//生活服务支付订单成功通知
+UIKIT_EXTERN NSString * const kDSLSAuditionSuccessNotification;//生活服务面试成功通知
+UIKIT_EXTERN NSString * const kDSLSFinishOrderNotification;//生活服务服务完成通知
+UIKIT_EXTERN NSString * const kDSLSCancelOrderNotification;//生活服务取消订单通知
+UIKIT_EXTERN NSString * const kDSLSDeleteOrderNotification;//生活服务删除订单通知
+UIKIT_EXTERN NSString * const kDSLSOrderApplyRefundNotification;//生活服务申请退款通知
+UIKIT_EXTERN NSString * const kDSLSOrderCancelRefundNotification;//生活服务取消退款通知
+
+#pragma mark - 新达人
+UIKIT_EXTERN NSString * const kDSDarenAttentionNotification;//达人关注通知 object为DSHPDRFansListModel userInfo为@{@"isAttention":@(YES为关注, NO为取消取消)}
+UIKIT_EXTERN NSString * const kDSDarenSupportDynamicNotification;//达人动态点赞/取消点赞通知 userInfo为@{@"id":@"动态id", @"isSupport":@(YES为点赞, NO为取消点赞), @"count":@(点赞数量)}
+UIKIT_EXTERN NSString * const kDSDarenReleaseDynamicNotification;//达人发布动态通知
+
+#pragma mark - 老达人(原一部达人)
+UIKIT_EXTERN NSString * const kDSHPAttentDarenNotification;//关注/取消关注达人通知 object为达人id
+
+#pragma mark - 视频播放开关
+UIKIT_EXTERN NSString * const kDSSwitchOffVideoPlayerNotification;//停止播放视频，且不允许播放视频
+UIKIT_EXTERN NSString * const kDSSwitchOnVideoPlayerNotification;//允许播放视频
+
+#pragma mark - 收货地址
+UIKIT_EXTERN NSString * const kDSAddAddressNotification;//添加地址通知 object为地址model<DSAddressModel>
+UIKIT_EXTERN NSString * const kDSEditAddressNotification;//修改地址通知 object为地址model<DSAddressModel>
+UIKIT_EXTERN NSString * const kDSDeleteAddressNotification;//删除地址通知 object为地址id
+
+#pragma mark - 电商中国首页
+UIKIT_EXTERN NSString * const kDSHappinessPageControlScrollEnableNotification;//首页分页控制器在显示电商中国时是否可以滑动 [object boolValue] YES可以滑动 NO不可以滑动
+
+#pragma mark - 分享
+UIKIT_EXTERN NSString * const kDSShareSuccessNotification;//分享成功通知 object为分享的数据字典<DSCnliveShopSDKShareModel转字典>
+UIKIT_EXTERN NSString * const kDSShareFailureNotification;//分享失败通知 object为分享的数据字典<DSCnliveShopSDKShareModel转字典>
-//
-//  DSCommonDelegateImplementation.h
-//  DSCnliveShopSDK
-//
-//  Created by zhaolin on 2020/3/9.
-//
-
-#import <Foundation/Foundation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface DSCommonDelegateImplementation : NSObject
-
-#pragma mark - 公开方法
-
-/// 跳转登录
-/// @param currentVC 当前所在控制器
-+(void)skipLoginWithCurrentVC:(nonnull UIViewController*)currentVC;
-
-@end
-
-NS_ASSUME_NONNULL_END
+//
+//  DSEditAddressTableViewCell.h
+//  iosZhaoLinNeighbouraide
+//
+//  Created by 张魁 on 2017/2/21.
+//  Copyright © 2017年 张魁. All rights reserved.
+//
+
+#import <DSBaseModule/DSBaseModule.h>
+#import "DSAddressModel.h"
+#import "DSAddressEnum.h"
+
+@interface DSEditAddressTableViewCell : DSTableViewCell
+
+#pragma mark - UI
+
+@property (nonatomic,strong) UILabel * markTitleLab;
+@property (nonatomic,strong) UITextField * contentTextField;
+@property (nonatomic,strong) UIView * sexView; //tag=1为先生 tag=2为女士
+@property (nonatomic,strong) DSImageView * rightImageView;
+
+#pragma mark - 赋值
+
+@property (nonatomic,strong,readonly) DSAddressModel * model;
+@property (nonatomic,assign,readonly) DSAddressStyle style;
+
+-(void)setModel:(DSAddressModel *)model style:(DSAddressStyle)style;
+
+#pragma mark - 回调
+
+/**
+ 切换性别回调 sex=1为先生 sex=2为女士
+ */
+@property (nonatomic,copy) void (^switchSexCallBack)(NSUInteger sex);
+
+@end
+//
+//  ZKEditAddressViewController.h
+//  iosZhaoLinNeighbouraide
+//
+//  Created by 张魁 on 2017/2/21.
+//  Copyright © 2017年 张魁. All rights reserved.
+//
+
+#import <DSBaseModule/DSBaseModule.h>
+#import "DSAddressEnum.h"
+
+@interface DSEditAddressViewController : DSBaseViewController
+
+/**
+ 地址id 根据地址id有还是没有来判断是否是编辑还是添加
+ */
+@property (nonatomic,copy) NSString * addressId;
+/**
+ 样式
+ */
+@property (nonatomic,assign) DSAddressStyle style;
+
+@end
+//
+//  DSHappHPParentViewController.h
+//  DSCnliveShopSDK
+//
+//  Created by zhaolin on 2019/4/13.
+//  Copyright © 2019年 BIKE. All rights reserved.
+//
+
+#import <DSBaseModule/DSBaseModule.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface DSHappHPParentViewController : DSBaseViewController
+
+/**
+ 创建
+ 
+ @param isDisplayNav 是否显示导航
+ @return DSHappHPViewController
+ */
+-(instancetype)initWithIsDisplayNav:(BOOL)isDisplayNav;
+
+-(void)isNeedTorefresh;
+
+@end
+
+NS_ASSUME_NONNULL_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 <DSBaseModule/DSBaseModule.h>
+#import "DSOGiftDetailsEnum.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface DSOGiftDetailsViewController : DSBaseViewController
+
+/// 是否隐藏我的礼盒
+@property (nonatomic,assign) BOOL isHideMyGifts;
+/// 订单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 <DSBaseModule/DSBaseModule.h>
+
+typedef NS_ENUM(NSUInteger, DSOGiveGiftsStyle) {
+    DSOGiveGiftsStyleGiving = 0,                //送礼样式
+    DSOGiveGiftsStyleReceiving,                 //收礼样式
+};
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface DSOGiveGiftsViewController : DSBaseViewController
+
+#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;
+/// 收礼人uid 从h5跳转入app需要传receivingUid来判断在h5收礼的人和登录收礼的人一不一致
+@property (nonatomic,copy,nullable) NSString * receivingUid;
+/// 是否隐藏我的礼盒
+@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
+//
+//  DSOMyGivingGiftsListViewController.h
+//  DSCnliveShopSDK
+//
+//  Created by zhaolin on 2019/9/21.
+//  Copyright © 2019 BIKE. All rights reserved.
+//
+
+#import <DSBaseModule/DSBaseModule.h>
+
+typedef NS_ENUM(NSUInteger, DSOMyGivingGiftsListDisplayType) {
+    DSOMyGivingGiftsListDisplayTypeReceiving = 0,   //收礼
+    DSOMyGivingGiftsListDisplayTypeGiving          //送礼
+};
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface DSOMyGivingGiftsListViewController : DSBaseViewController
+
+/**
+ 显示类型
+ */
+@property (nonatomic,assign) DSOMyGivingGiftsListDisplayType displayType;
+
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  DSOrderListViewController.h
+//  iosZhaoLinNeighbouraide
+//
+//  Created by 张魁 on 2017/2/24.
+//  Copyright © 2017年 张魁. All rights reserved.
+//
+
+#import <DSBaseModule/DSBaseModule.h>
+
+typedef NS_ENUM(NSUInteger, DSOrderListDisplay) {
+    DSOrderListDisplayTotal = 0,                     //全部
+    DSOrderListDisplayWaitingPayment,                //待付款
+    DSOrderListDisplayWaitingShipment,               //待发货
+    DSOrderListDisplayWaitingReceiving,              //待收货
+};
+
+@interface DSOrderListViewController : DSBaseViewController
+
+/**
+ 是否需要导航条(默认不需要)
+ */
+@property (nonatomic,assign) BOOL isNeedNavigationBar;
+/**
+ 查看界面
+ */
+@property (nonatomic,assign) DSOrderListDisplay display;
+/**
+ 电商目录背景颜色(默认白色)
+ */
+@property (nonatomic,strong) UIColor * menuColor;
+
+@end
-//
-//  DSPlayControlView.h
-//  DSSocialWorkCloud
-//
-//  Created by admin on 2020/1/14.
-//  Copyright © 2020 CNLive. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-#import <AVKit/AVKit.h>
-
-#import "DSPlayerMacro.h"
-
-UIKIT_EXTERN const float kDSPlayerAnimateTimeInterval;//动画时间
-
-typedef enum _PlayMenuType
-{
-    PlayMenuTypeRate = 0,
-    PlayMenuTypeFluence,
-    PlayMenuTypeCourse
-}PlayMenuType;
-
-NS_ASSUME_NONNULL_BEGIN
-
-@protocol DSPlayControlViewDelegate <NSObject>
-
-- (void)playControlWillBack;
-
-- (void)playControlChangeOrientation:(UIInterfaceOrientation)orientation;
-
-- (void)playControlWillShowMenu:(PlayMenuType)menuType;
-
-- (void)playControlWillPlayNext;
-
-
-@end
-
-@interface DSPlayControlView : UIView
-
-@property (nonatomic, assign) BOOL viewEnabled;
-
-@property (nonatomic, strong) UIView * bottomMenuView;
-
-// 横屏竖屏
-@property (nonatomic, strong) DSNavButton * changeOrientationBtn;
-
-@property (nonatomic, weak) id <DSPlayControlViewDelegate> delegate;
-
-- (void)changePlayOrientation:(UIInterfaceOrientation)orientation;
-
-- (void)playUrl:(NSString *)urlString;
-
-- (void)setPlayRate:(CGFloat)rate;
-
-- (void)pausePlay;
-
-- (void)removePlayer;
-
-- (void)setVolume:(CGFloat)volumeValue;
-
-- (CGFloat)getVolumeValue;
-
-- (void)asyncSeekToTime:(CGFloat)secondTime;
-
-@end
-
-NS_ASSUME_NONNULL_END
-//
-//  DSPlayerMacro.h
-//  DSCnliveShopSDK
-//
-//  Created by admin on 2020/2/14.
-//  Copyright © 2020 BIKE. All rights reserved.
-//
-
-#ifndef DSPlayerMacro_h
-#define DSPlayerMacro_h
-
-#define kTagNowOrientationPortrait          @"kTagNowOrientationPortrait"
-#define kTagNowOrientationLandscape        @"kTagNowOrientationUpsideDown"
-
-// SCREEN_HEIGHT 屏幕高度
-#define SCREEN_HEIGHT                       [UIScreen mainScreen].bounds.size.height
-// SCREEN_WIDTH 屏幕宽度
-#define SCREEN_WIDTH                        [UIScreen mainScreen].bounds.size.width
-
-#define SWRightMenuHeight  SCREEN_HEIGHT-65
-
-#define SWRightPortraitHeight SCREEN_WIDTH/5*3
-
-#define PortraitStartY      5
-#define LandScapeStartY    20
-#define RightMenuWidth     SCREEN_WIDTH/5
-#define RightMenuStartX    SCREEN_WIDTH/5*4
-
-#define DS_ISIPHONEX \
-({BOOL isPhoneX = NO;\
-if (@available(iOS 11.0, *)) {\
-isPhoneX = [[UIApplication sharedApplication] delegate].window.safeAreaInsets.bottom > 0.0;\
-}\
-(isPhoneX);})
-
-#define WeakSelf __weak typeof(self) weakSelf = self;
-
-
-#endif /* DSPlayerMacro_h */
+//
+//  DSRAddressTableViewCell.h
+//  DSCnliveShopSDK
+//
+//  Created by zhaolin on 2019/7/26.
+//  Copyright © 2019 BIKE. All rights reserved.
+//
+
+#import <DSBaseModule/DSBaseModule.h>
+#import "DSAddressModel.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface DSRAddressTableViewCell : DSTableViewCell
+
+#pragma mark - 赋值
+
+@property (nonatomic,strong,readonly) DSAddressModel * model;
+@property (nonatomic,assign,readonly) BOOL isSelect;
+@property (nonatomic,assign,readonly) BOOL isCanSelect;
+
+-(void)setModel:(DSAddressModel*)model isSelect:(BOOL)isSelect isCanSelect:(BOOL)isCanSelect;
+
+#pragma mark - 回调
+
+/**
+ 点击编辑回调
+ */
+@property (nonatomic,copy) void (^clickEditCallBack)(DSAddressModel * model);
+
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  DSROrderListViewController.h
+//  guoguanjuyanglao
+//
+//  Created by 兆林 on 2017/5/19.
+//  Copyright © 2017年 zhaolin. All rights reserved.
+//
+
+#import <DSBaseModule/DSBaseModule.h>
+
+typedef NS_ENUM(NSUInteger, DSROrderListDisplay) {
+    DSROrderListDisplayTotal = 0,                     //全部
+    DSROrderListDisplayFinish,                        //待付款
+    DSROrderListDisplayCancel                         //待发货
+};
+
+@interface DSROrderListViewController : DSBaseViewController
+
+/**
+ 查看界面
+ */
+@property (nonatomic,assign) DSROrderListDisplay display;
+/**
+ 是否需要导航条(默认不需要)
+ */
+@property (nonatomic,assign) BOOL isNeedNavigationBar;
+/**
+ 餐厅目录背景颜色(默认白色)
+ */
+@property (nonatomic,strong) UIColor * menuColor;
+
+@end
-//
-//  DSSWCourseListViewController.h
-//  DSSocialWorkCloud
-//
-//  Created by admin on 2020/1/7.
-//  Copyright © 2020 CNLive. All rights reserved.
-//
-
-#import <DSBaseModule/DSBaseModule.h>
-#import "DSPlayerMacro.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface DSSWCourseListViewController : DSBaseViewController
-
-@end
-
-NS_ASSUME_NONNULL_END
-//
-//  DSSWPlayViewController.h
-//  DSSocialWorkCloud
-//
-//  Created by admin on 2020/1/7.
-//  Copyright © 2020 CNLive. All rights reserved.
-//
-
-#import <DSBaseModule/DSBaseModule.h>
-
-#import "DSPlayerMacro.h"
-
-typedef enum _DSPlayType
-{
-    DSPlayTypeSimple = 0,
-    DSPlayTypeNormal,
-    DSPlayTypeCourse
-}DSPlayType;
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface DSSWPlayViewController : DSBaseViewController
-
-@property (nonatomic, copy) NSString * onPlayUrl;
-
-@property (nonatomic, assign) DSPlayType playType;
-
-// 主要负责AVPlayer 其他控件
-@property (nonatomic, strong) UIView * contentView;
-
-@end
-
-NS_ASSUME_NONNULL_END
 //
-//  DSCnliveShopSDKRouter.h
+//  DSServiceHPViewController.h
 //  DSCnliveShopSDK
 //
-//  Created by zhaolin on 2020/3/9.
+//  Created by zhaolin on 2019/10/25.
+//  Copyright © 2019 BIKE. All rights reserved.
 //
-#import <Foundation/Foundation.h>
+#import <DSBaseModule/DSBaseModule.h>
 NS_ASSUME_NONNULL_BEGIN
-@interface DSCnliveShopSDKRouter : NSObject
+@interface DSServiceHPViewController : DSBaseViewController
+
+#pragma mark - 初始化方法
+
+@property (nonatomic,assign,readonly) BOOL isDisplayTabBar;
+
+/// 初始化方法
+/// @param isDisplayTabBar 是否显示tabBar
+-(instancetype)initWithIsDisplayTabBar:(BOOL)isDisplayTabBar;
 @end
-//
-//  DSSlider.h
-//  DSSocialWorkCloud
-//
-//  Created by admin on 2020/1/13.
-//  Copyright © 2020 CNLive. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface DSSlider : UISlider
-
-@end
-
-NS_ASSUME_NONNULL_END
-//
-//  DSStaticData.h
-//  DSSocialWorkCloud
-//
-//  Created by admin on 2020/1/8.
-//  Copyright © 2020 CNLive. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-#define kTagSavedKeyLastPlayUrl     @"kTagSavedKeyLastPlayUrl"
-
-#define kTagOutThisAppBrightness    @"kTagOutThisAppBrightness"
-#define kTagInThisAppBrightness     @"kTagInThisAppBrightness"
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface DSStaticData : NSObject
-
-
-+ (BOOL)saveObject:(id)object forKey:(NSString *)key;
-
-+ (id)getObjectForKey:(NSString *)key;
-
-+ (BOOL)saveObject:(id)data forKey:(NSString *)key forUser:(NSString *)user;
-
-+ (id)getObjectForKey:(NSString *)key forUser:(NSString *)user;
-
-@end
-
-NS_ASSUME_NONNULL_END
-//
-//  UIDevice+DSOrientation.h
-//  DSSocialWorkCloud
-//
-//  Created by admin on 2020/1/16.
-//  Copyright © 2020 CNLive. All rights reserved.
-//
-
-
-#import <UIKit/UIKit.h>
-
-#import "DSPlayerMacro.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface UIDevice (DSOrientation)
-
-+ (void)switchNewOrientation:(UIInterfaceOrientation)interfaceOrientation;
-
-+ (CGFloat)iPhoneXSeriesHeight;
-
-+ (CGFloat)statusBarHeight;
-
-@end
-
-NS_ASSUME_NONNULL_END
-//
-//  UIImage+UIColor.h
-//  UBoxOnline
-//
-//  Created by ubox on 13-3-21.
-//  Copyright (c) 2013年 ubox. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-// 用于扩展UIImage,转换背景色
-@interface UIImage (UIColor)
-
-// 给透明区域上上色
-- (UIImage *)changeImageColor:(UIColor *)theColor;
-
-// 图片置灰
-- (UIImage *)changeImageToGrayColor;
-
-@end
-
-
-// 通过颜色返回一个1*1大小的纯色图片
-@interface UIColor (UIImage)
-
-// 通过颜色返回一个1*1大小的纯色图片
-- (UIImage *)image;
-
-@end