iOS Team / DSCnliveShopSDK · Commits

Commit 93f1835b290c5b66c909930567e2f6a2905f8ff5

Authored by 毕珂
1 parent 1e4ebeb1

0.3.8.003 模块化继续

Inline Side-by-side
Showing 13 changed files with 31 additions and 221 deletions
DSCnliveShopSDK.podspec
  View file @93f1835
1 1  
2 2 Pod::Spec.new do |s|
3 3 s.name = 'DSCnliveShopSDK'
4   - s.version = '0.3.8.002'
  4 + s.version = '0.3.8.003'
5 5 s.summary = 'cnlive电商SDK'
6 6 s.homepage = 'http://bj.gitlab.cnlive.com/ios-team/DSCnliveShopSDK'
7 7 s.license = { :type => 'MIT', :file => 'LICENSE' }
... ... @@ -31,7 +31,9 @@ Pod::Spec.new do |s|
31 31  
32 32 s.dependency 'DSBaseModule'
33 33 s.dependency 'DSExtensionModule'
  34 + s.dependency 'DSBaseControlsModule'
34 35 s.dependency 'DSToolsModule'
  36 + s.dependency 'YBImageBrowser_DSCnliveShop'
35 37  
36 38 s.vendored_frameworks = 'DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework'
37 39  
... ...
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/DSCnliveShopSDK
View file @93f1835
No preview for this file type
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/Headers/DSCnliveShopSDK.h
  View file @93f1835
... ... @@ -4,7 +4,7 @@
4 4 //
5 5 // Created by zhaolin on 2019/4/13.
6 6 // Copyright © 2019年 BIKE. All rights reserved.
7   -// 当前版本0.3.8.002
  7 +// 当前版本0.3.8.003
8 8  
9 9 #import <UIKit/UIKit.h>
10 10  
... ... @@ -22,7 +22,6 @@ FOUNDATION_EXPORT const unsigned char DSCnliveShopSDKVersionString[];
22 22 #import <DSCnliveShopSDK/DSCnliveShopSDKEnum.h>
23 23  
24 24 #import <DSCnliveShopSDK/DSCnliveShopSDKPBaseViewController.h>
25   -#import <DSCnliveShopSDK/DSNavButton.h>
26 25  
27 26 #import <DSCnliveShopSDK/DSOGiveGiftsViewController.h>
28 27 #import <DSCnliveShopSDK/DSOMyGivingGiftsListViewController.h>
... ... @@ -56,7 +55,6 @@ FOUNDATION_EXPORT const unsigned char DSCnliveShopSDKVersionString[];
56 55 #import "DSCnliveShopSDKEnum.h"
57 56  
58 57 #import "DSCnliveShopSDKPBaseViewController.h"
59   -#import "DSNavButton.h"
60 58  
61 59 #import "DSOGiveGiftsViewController.h"
62 60 #import "DSOMyGivingGiftsListViewController.h"
... ...
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/Headers/DSCnliveShopSDKManager.h
  View file @93f1835
... ... @@ -16,9 +16,7 @@ NS_ASSUME_NONNULL_BEGIN
16 16  
17 17 @interface DSCnliveShopSDKManager : NSObject
18 18  
19   -/**
20   - 代理
21   - */
  19 +/// 代理
22 20 @property (nonatomic,weak) id<DSCnliveShopSDKDelegate> delegate;
23 21  
24 22 #pragma mark - 单例
... ... @@ -27,60 +25,37 @@ NS_ASSUME_NONNULL_BEGIN
27 25  
28 26 #pragma mark - 初始化电商SDK
29 27  
30   -/**
31   - appId
32   - */
  28 +/// appId
33 29 @property (nonatomic,copy,nonnull,readonly) NSString * appId;
34   -
35   -/**
36   - appKey
37   - */
  30 +/// appKey
38 31 @property (nonatomic,copy,nonnull,readonly) NSString * appKey;
39   -
40   -/**
41   - 是否是测试版 YES为测试版 NO为正式版
42   - */
  32 +/// 是否是测试版 YES为测试版 NO为正式版
43 33 @property (nonatomic,assign,readonly) BOOL isDebug;
44 34  
45   -/**
46   - 初始化电商SDK
47   -
48   - @param appId appId
49   - @param appkey appKey
50   - @param isDebug 是否是测试版 YES为测试版 NO为正式版
51   - */
  35 +/// 初始化电商SDK
  36 +/// @param appId appId
  37 +/// @param appkey appKey
  38 +/// @param isDebug 是否是测试版 YES为测试版 NO为正式版
52 39 -(void)initWithAppId:(nonnull NSString *)appId appKey:(nonnull NSString *)appkey isDebug:(BOOL)isDebug;
53 40  
54 41 #pragma mark - IQKeyboardManager默认是打开还是关闭
55 42  
56   -/**
57   - 默认打开
58   - 本SDK使用了IQKeyboardManager 该字段用于判断主项目是否需要使用IQKeyboardManager 不使用请传NO
59   - */
  43 +/// 默认打开
  44 +/// 本SDK使用了IQKeyboardManager 该字段用于判断主项目是否需要使用IQKeyboardManager 不使用请传NO
60 45 @property (nonatomic,assign) BOOL defaultIQKeyboardManagerState;
61 46  
62 47 #pragma mark - 用户信息
63 48  
64   -/**
65   - 用户id
66   - */
  49 +/// 用户id
67 50 @property (nonatomic,copy,nullable,readonly) NSString * userId;
68   -
69   -/**
70   - 用户登录状态
71   - */
  51 +/// 用户登录状态
72 52 @property (nonatomic,assign,readonly) DSUserLoginStatus userLoginStatus;
73 53  
74   -/**
75   - 用户登录
76   -
77   - @param userId 用户id
78   - */
  54 +/// 用户登录
  55 +/// @param userId 用户id
79 56 -(void)loginUser:(nonnull NSString*)userId;
80 57  
81   -/**
82   - 用户退出
83   - */
  58 +/// 用户退出
84 59 -(void)quitUser;
85 60  
86 61 #pragma mark - 清除保存的目标控制器
... ... @@ -91,51 +66,34 @@ NS_ASSUME_NONNULL_BEGIN
91 66  
92 67 #pragma mark - 检测
93 68  
94   -/**
95   - 检测类
96   - */
  69 +/// 检测类
97 70 @property (nonatomic,strong,nonnull,readonly) DSCnliveShopSDKCheck * check;
98 71  
99 72 #pragma mark - 跳转
100 73  
101   -/**
102   - 跳转类
103   - */
  74 +/// 跳转类
104 75 @property (nonatomic,strong,nonnull,readonly) DSCnliveShopSDKSkip * skip;
105 76  
106 77 #pragma mark - 储存
107 78  
108   -/**
109   - 存储基础路径 ~/Document/DS
110   - */
  79 +/// 存储基础路径 ~/Document/DS
111 80 @property (nonatomic,copy,nonnull,readonly) NSString * dsFileDir;
112 81  
113   -/**
114   - 计算电商储存文件目录下所有文件大小 单位字节b (目前包含1.电商全局plist存储文件 2.网络请求缓存)
115   - */
  82 +/// 计算电商储存文件目录下所有文件大小 单位字节b (目前包含1.电商全局plist存储文件 2.网络请求缓存)
116 83 -(CGFloat)calcDSFileDirContentSize;
117 84  
118   -/**
119   - 清空电商储存文件目录下所有文件 (目前包含1.电商全局plist存储文件 2.网络请求缓存)
120   -
121   - @param clearComplete 清空完成回调
122   - */
  85 +/// 清空电商储存文件目录下所有文件 (目前包含1.电商全局plist存储文件 2.网络请求缓存)
  86 +/// @param clearComplete 清空完成回调
123 87 -(void)clearDSFileDir:(void (^)(void))clearComplete;
124 88  
125 89 #pragma mark - 版本
126 90  
127   -/**
128   - 获取电商发布版本
129   -
130   - @return 版本x.x.x
131   - */
  91 +/// 获取电商发布版本
  92 +/// @return 版本x.x.x
132 93 -(nonnull NSString*)getCnliveShopSDKVersion;
133 94  
134   -/**
135   - 获取电商内部版本
136   -
137   - @return 构建版本x.x.x.x
138   - */
  95 +/// 获取电商内部版本
  96 +/// @return 构建版本x.x.x.x
139 97 -(nonnull NSString*)getCnliveShopSDKBuild;
140 98  
141 99 @end
... ...
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/Headers/DSCnliveShopSDKPBaseViewController.h
  View file @93f1835
... ... @@ -6,93 +6,17 @@
6 6 // Copyright © 2019 BIKE. All rights reserved.
7 7 // 公开基类
8 8  
9   -#import <UIKit/UIKit.h>
10   -#import <Foundation/Foundation.h>
11   -#import "DSNavButton.h"
12   -
13   -UIKIT_EXTERN const CGFloat kTopNavLeftRightOffset;
  9 +#import <DSBaseControlsModule/DSBaseControlsModuleHeader.h>
14 10  
15 11 NS_ASSUME_NONNULL_BEGIN
16 12  
17   -@interface DSCnliveShopSDKPBaseViewController : UIViewController
18   -
19   -#pragma mark - 通用属性
20   -
21   -@property (nonatomic,copy,nullable) NSDictionary * baseMessage;
22   -/// 控制器唯一标识
23   -@property (nonatomic,copy,nonnull,readonly) NSString * uniqueIdentity;
  13 +@interface DSCnliveShopSDKPBaseViewController : DSBCMBaseViewController
24 14  
25 15 #pragma mark - 通用方法
26 16  
27 17 /// 获取数据方法 切换用户后，回到此界面会重新调用此方法
28 18 -(void)requestDataMethod;
29 19  
30   -#pragma mark - 顶部导航
31   -
32   -@property (nonatomic,strong) UIView * topNavView;//高度为 get_system_nav_height()
33   -@property (nonatomic,strong) UILabel * titleLab;
34   -@property (nonatomic,strong,nullable) NSArray<DSNavButton*> * leftNavBtns;
35   -@property (nonatomic,strong,nullable) NSArray<DSNavButton*> * rightNavBtns;
36   -@property (nonatomic,strong) UIImageView * topLine;
37   -@property (nonatomic,assign) CGFloat topNavViewHeight;//topNavView的高度 默认高度为 get_system_nav_height()
38   -@property (nonatomic,assign) CGFloat topNavViewSubUIContentOffsetY;//顶部导航内容(不带topLine)偏移量Y 初始值为0
39   -
40   -/**
41   - 添加左边返回按钮(特殊情况时使用)
42   - */
43   --(void)addLeftBackNavBtn;
44   -
45   -/**
46   - 左边导航按钮事件
47   - */
48   --(void)leftNavBtnAction;
49   -
50   -#pragma mark - 底部导航
51   -
52   -@property (nonatomic,strong) UIView * bottomNavView;//高度为 0
53   -@property (nonatomic,strong) UIImageView * bottomLine;
54   -@property (nonatomic,assign) CGFloat bottomNavViewHeight;//bottomNavView的高度 默认高度为 0
55   -@property (nonatomic,assign) CGFloat bottomLineOffsetY;//底部导航分割线偏移量Y 初始值为0
56   -#pragma mark - 是否禁止右滑返回
57   -
58   -/**
59   - 是否禁止右滑返回
60   - */
61   -@property (nonatomic,assign) BOOL popGestureRecognizerEnable;
62   -
63   -/**
64   - 侧滑返回指定控制器
65   - */
66   -@property (nonatomic,weak) UIViewController * interactivePopViewController;
67   -
68   -/**
69   - 在导航中删除指定控制器
70   -
71   - @param controller 控制器
72   - */
73   --(void)removeControllerInNavigation:(UIViewController*)controller;
74   -
75   -/**
76   - 在导航中删除指定控制器数组
77   -
78   - @param controllers 控制器数组
79   - */
80   --(void)removeControllersInNavigation:(NSArray<UIViewController*>*)controllers;
81   -
82   -#pragma mark - 状态栏
83   -
84   -@property (nonatomic,assign) UIStatusBarStyle statusBarStyle;//状态栏样式
85   -@property (nonatomic,assign) BOOL statusBarHidden;//状态栏是否隐藏
86   -@property (nonatomic,assign) UIStatusBarAnimation statusBarUpdateAnimation;//状态栏更新动画
87   -
88   -/**
89   - 状态栏是否隐藏(带动画)
90   -
91   - @param hidden 是否隐藏
92   - @param animation 动画类型
93   - */
94   --(void)setStatusBarHidden:(BOOL)hidden withAnimation:(UIStatusBarAnimation)animation;
95   -
96 20 @end
97 21  
98 22 NS_ASSUME_NONNULL_END
... ...
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/Headers/DSNavButton.h deleted 100644 → 0
  View file @1e4ebeb
1   -//
2   -// DSNavButton.h
3   -//
4   -//
5   -// Created by BIKE on 2018/7/12.
6   -// Copyright © 2018年 BIKE. All rights reserved.
7   -//
8   -
9   -#import <UIKit/UIKit.h>
10   -
11   -/**
12   - 当图片和标题同时存在时 图片相对于标题的位置
13   -
14   - - DSImagePositionLeft: 左边
15   - - DSImagePositionTop: 上边
16   - - DSImagePositionRight: 右边
17   - - DSImagePositionBottom: 下边
18   - */
19   -typedef NS_ENUM(NSUInteger, DSImagePosition) {
20   - DSImagePositionLeft = 0,
21   - DSImagePositionTop,
22   - DSImagePositionRight,
23   - DSImagePositionBottom,
24   -};
25   -
26   -@interface DSNavButton : UIControl
27   -
28   -/***************************************************************************************************
29   - 默认frame = CGRectMake(自动排列间距0, get_system_statusBar_height(), get_system_nav_ui_height(), get_system_nav_ui_height())
30   - ***************************************************************************************************/
31   -
32   -#pragma mark - 图片init
33   -
34   --(nonnull instancetype)initWithImage:(nonnull UIImage *)image;
35   --(nonnull instancetype)initWithImage:(nonnull UIImage *)image imageSize:(CGSize)imageSize;
36   -
37   -#pragma mark - 标题init
38   -
39   --(nonnull instancetype)initWithTitle:(nonnull NSString*)title;
40   --(nonnull instancetype)initWithTitle:(nonnull NSString*)title font:(nonnull UIFont*)font;
41   --(nonnull instancetype)initWithTitle:(nonnull NSString*)title titleColor:(nonnull UIColor*)titleColor;
42   --(nonnull instancetype)initWithTitle:(nonnull NSString*)title font:(nonnull UIFont*)font titleColor:(nonnull UIColor*)titleColor;
43   -
44   -#pragma mark - 图片&标题init
45   -
46   --(nonnull instancetype)initWithImage:(nonnull UIImage *)image title:(nonnull NSString*)title;
47   --(nonnull instancetype)initWithImage:(nonnull UIImage *)image title:(nonnull NSString*)title imagePosition:(DSImagePosition)imagePosition;
48   --(nonnull instancetype)initWithImage:(nonnull UIImage *)image imageSize:(CGSize)imageSize title:(nonnull NSString*)title;
49   --(nonnull instancetype)initWithImage:(nonnull UIImage *)image imageSize:(CGSize)imageSize title:(nonnull NSString*)title imagePosition:(DSImagePosition)imagePosition;
50   --(nonnull instancetype)initWithImage:(nonnull UIImage *)image imageSize:(CGSize)imageSize title:(nonnull NSString*)title font:(nonnull UIFont*)font titleColor:(nonnull UIColor*)titleColor imagePosition:(DSImagePosition)imagePosition;
51   -
52   -#pragma mark - 标题属性
53   -
54   -/// 标题
55   -@property (nonatomic,copy,nonnull) NSString * title;
56   -/// 标题大小
57   -@property (nonatomic,strong,nonnull) UIFont * font;
58   -/// 标题颜色
59   -@property (nonatomic,strong,nonnull) UIColor * titleColor;
60   -
61   -#pragma mark - 图片属性
62   -
63   -/// 图片
64   -@property (nonatomic,strong,nonnull) UIImage * image;
65   -/// 图片大小
66   -@property (nonatomic,assign) CGSize imageSize;
67   -/// 图片颜色
68   -@property (nonatomic,strong,nullable) UIColor * imageColor;
69   -/// 图片位置
70   -@property (nonatomic,assign) DSImagePosition imagePosition;
71   -
72   -@end
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/Info.plist
View file @93f1835
No preview for this file type
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/YBImageBrowser.bundle/ybib_loading@2x.png deleted 100755 → 0
View file @1e4ebeb

2.44 KB
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/YBImageBrowser.bundle/ybib_loading@3x.png deleted 100755 → 0
View file @1e4ebeb

3.97 KB
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/YBImageBrowser.bundle/ybib_more@2x.png deleted 100755 → 0
View file @1e4ebeb

844 Bytes
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/YBImageBrowser.bundle/ybib_more@3x.png deleted 100755 → 0
View file @1e4ebeb

1.13 KB
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/YBImageBrowser.bundle/ybib_save@2x.png deleted 100755 → 0
View file @1e4ebeb

862 Bytes
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/YBImageBrowser.bundle/ybib_save@3x.png deleted 100755 → 0
View file @1e4ebeb

960 Bytes