iOS Team / CNLiveUserSystem · Commits

Commit 5e55de640318e5aa0f29db056781567db2ed70f7

Authored by 朱林
1 parent 2649c044

no message

Inline Side-by-side
Showing 11 changed files with 211 additions and 28 deletions
CNLiveUserSystemDemo.xcodeproj/project.xcworkspace/xcuserdata/iOS.xcuserdatad/UserInterfaceState.xcuserstate
View file @5e55de6
No preview for this file type
CNLiveUserSystemDemo/CNLiveUserSystemSDK/CNLiveUploadIcon.h
  View file @5e55de6
... ... @@ -7,6 +7,7 @@
7 7 //
8 8  
9 9 #import <Foundation/Foundation.h>
  10 +#import <UIKit/UIKit.h>
10 11  
11 12 @interface CNLiveUploadIcon : NSObject
12 13  
... ...
CNLiveUserSystemDemo/CNLiveUserSystemSDK/CNLiveUserManager.h
  View file @5e55de6
... ... @@ -7,6 +7,7 @@
7 7 //
8 8  
9 9 #import <Foundation/Foundation.h>
  10 +#import <UIKit/UIKit.h>
10 11  
11 12 @interface CNLiveUserManager : NSObject
12 13  
... ...
CNLiveUserSystemDemo/CNLiveUserSystemSDK/CNLiveUserSystemTools.m
  View file @5e55de6
... ... @@ -88,11 +88,20 @@
88 88 //null处理
89 89 + (NSString *)verify:(NSString *)string
90 90 {
91   - if ([string isKindOfClass:[NSString class]] || string.length > 0) {
  91 + NSString *newString;
  92 +
  93 + if ([string isKindOfClass:[NSNumber class]]) {
  94 + newString = [NSString stringWithFormat:@"%@",string];
  95 + } else {
  96 + newString = string;
  97 + }
  98 +
  99 + if ([newString isKindOfClass:[NSString class]] || newString.length > 0) {
92 100 return string;
93 101 } else {
94 102 return @"";
95 103 }
  104 +
96 105 }
97 106  
98 107 + (void)errorStat:(NSString *)errorString
... ...
CNLiveUserSystemSDK.xcodeproj/project.pbxproj
  View file @5e55de6
... ... @@ -7,7 +7,7 @@
7 7 objects = {
8 8  
9 9 /* Begin PBXBuildFile section */
10   - 818734E61DA8F5B900046D84 /* CNLiveUserSystemSDK.h in Headers */ = {isa = PBXBuildFile; fileRef = 818734E41DA8F5B900046D84 /* CNLiveUserSystemSDK.h */; settings = {ATTRIBUTES = (Public, ); }; };
  10 + 8131D9251DA9E55B00F03C91 /* Common.h in Headers */ = {isa = PBXBuildFile; fileRef = 8131D9241DA9E55B00F03C91 /* Common.h */; };
11 11 818735071DA8F60100046D84 /* CNLiveNetworkManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 818734ED1DA8F60100046D84 /* CNLiveNetworkManager.h */; };
12 12 818735081DA8F60100046D84 /* CNLiveNetworkManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 818734EE1DA8F60100046D84 /* CNLiveNetworkManager.m */; };
13 13 818735091DA8F60100046D84 /* CNLiveURLRequestSerialization.h in Headers */ = {isa = PBXBuildFile; fileRef = 818734EF1DA8F60100046D84 /* CNLiveURLRequestSerialization.h */; };
... ... @@ -24,11 +24,11 @@
24 24 818735141DA8F60100046D84 /* CNLiveUserInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 818734FB1DA8F60100046D84 /* CNLiveUserInfo.m */; };
25 25 818735151DA8F60100046D84 /* CNLiveUserManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 818734FC1DA8F60100046D84 /* CNLiveUserManager.h */; };
26 26 818735161DA8F60100046D84 /* CNLiveUserManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 818734FD1DA8F60100046D84 /* CNLiveUserManager.m */; };
27   - 818735171DA8F60100046D84 /* CNLiveUserSystemCenter.h in Headers */ = {isa = PBXBuildFile; fileRef = 818734FE1DA8F60100046D84 /* CNLiveUserSystemCenter.h */; };
  27 + 818735171DA8F60100046D84 /* CNLiveUserSystemCenter.h in Headers */ = {isa = PBXBuildFile; fileRef = 818734FE1DA8F60100046D84 /* CNLiveUserSystemCenter.h */; settings = {ATTRIBUTES = (Public, ); }; };
28 28 818735181DA8F60100046D84 /* CNLiveUserSystemCenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 818734FF1DA8F60100046D84 /* CNLiveUserSystemCenter.m */; };
29 29 818735191DA8F60100046D84 /* CNLiveUserSystemTools.h in Headers */ = {isa = PBXBuildFile; fileRef = 818735001DA8F60100046D84 /* CNLiveUserSystemTools.h */; };
30 30 8187351A1DA8F60100046D84 /* CNLiveUserSystemTools.m in Sources */ = {isa = PBXBuildFile; fileRef = 818735011DA8F60100046D84 /* CNLiveUserSystemTools.m */; };
31   - 8187351B1DA8F60100046D84 /* CNLiveUserSystemTypeDef.h in Headers */ = {isa = PBXBuildFile; fileRef = 818735021DA8F60100046D84 /* CNLiveUserSystemTypeDef.h */; };
  31 + 8187351B1DA8F60100046D84 /* CNLiveUserSystemTypeDef.h in Headers */ = {isa = PBXBuildFile; fileRef = 818735021DA8F60100046D84 /* CNLiveUserSystemTypeDef.h */; settings = {ATTRIBUTES = (Public, ); }; };
32 32 8187351C1DA8F60100046D84 /* CNLiveVerificationCode.h in Headers */ = {isa = PBXBuildFile; fileRef = 818735031DA8F60100046D84 /* CNLiveVerificationCode.h */; };
33 33 8187351D1DA8F60100046D84 /* CNLiveVerificationCode.m in Sources */ = {isa = PBXBuildFile; fileRef = 818735041DA8F60100046D84 /* CNLiveVerificationCode.m */; };
34 34 8187351E1DA8F60100046D84 /* NSDictionary+Safety.h in Headers */ = {isa = PBXBuildFile; fileRef = 818735051DA8F60100046D84 /* NSDictionary+Safety.h */; };
... ... @@ -36,8 +36,8 @@
36 36 /* End PBXBuildFile section */
37 37  
38 38 /* Begin PBXFileReference section */
  39 + 8131D9241DA9E55B00F03C91 /* Common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Common.h; sourceTree = "<group>"; };
39 40 818734E11DA8F5B900046D84 /* CNLiveUserSystemSDK.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CNLiveUserSystemSDK.framework; sourceTree = BUILT_PRODUCTS_DIR; };
40   - 818734E41DA8F5B900046D84 /* CNLiveUserSystemSDK.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CNLiveUserSystemSDK.h; sourceTree = "<group>"; };
41 41 818734E51DA8F5B900046D84 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
42 42 818734ED1DA8F60100046D84 /* CNLiveNetworkManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNLiveNetworkManager.h; sourceTree = "<group>"; };
43 43 818734EE1DA8F60100046D84 /* CNLiveNetworkManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNLiveNetworkManager.m; sourceTree = "<group>"; };
... ... @@ -98,7 +98,6 @@
98 98 818734E31DA8F5B900046D84 /* CNLiveUserSystemSDK */ = {
99 99 isa = PBXGroup;
100 100 children = (
101   - 818734E41DA8F5B900046D84 /* CNLiveUserSystemSDK.h */,
102 101 818734E51DA8F5B900046D84 /* Info.plist */,
103 102 );
104 103 path = CNLiveUserSystemSDK;
... ... @@ -119,6 +118,7 @@
119 118 818734F11DA8F60100046D84 /* CNLiveUserSystemSDK */ = {
120 119 isa = PBXGroup;
121 120 children = (
  121 + 8131D9241DA9E55B00F03C91 /* Common.h */,
122 122 818734F21DA8F60100046D84 /* CNLiveFeedback.h */,
123 123 818734F31DA8F60100046D84 /* CNLiveFeedback.m */,
124 124 818734F41DA8F60100046D84 /* CNLiveLogin.h */,
... ... @@ -152,20 +152,20 @@
152 152 isa = PBXHeadersBuildPhase;
153 153 buildActionMask = 2147483647;
154 154 files = (
  155 + 8187351B1DA8F60100046D84 /* CNLiveUserSystemTypeDef.h in Headers */,
  156 + 818735171DA8F60100046D84 /* CNLiveUserSystemCenter.h in Headers */,
155 157 8187351C1DA8F60100046D84 /* CNLiveVerificationCode.h in Headers */,
156 158 8187350F1DA8F60100046D84 /* CNLiveRegister.h in Headers */,
157   - 8187351B1DA8F60100046D84 /* CNLiveUserSystemTypeDef.h in Headers */,
  159 + 8131D9251DA9E55B00F03C91 /* Common.h in Headers */,
158 160 8187350D1DA8F60100046D84 /* CNLiveLogin.h in Headers */,
159 161 818735151DA8F60100046D84 /* CNLiveUserManager.h in Headers */,
160 162 818735131DA8F60100046D84 /* CNLiveUserInfo.h in Headers */,
161   - 818735171DA8F60100046D84 /* CNLiveUserSystemCenter.h in Headers */,
162 163 818735191DA8F60100046D84 /* CNLiveUserSystemTools.h in Headers */,
163 164 8187350B1DA8F60100046D84 /* CNLiveFeedback.h in Headers */,
164 165 8187351E1DA8F60100046D84 /* NSDictionary+Safety.h in Headers */,
165 166 818735091DA8F60100046D84 /* CNLiveURLRequestSerialization.h in Headers */,
166 167 818735071DA8F60100046D84 /* CNLiveNetworkManager.h in Headers */,
167 168 818735111DA8F60100046D84 /* CNLiveUploadIcon.h in Headers */,
168   - 818734E61DA8F5B900046D84 /* CNLiveUserSystemSDK.h in Headers */,
169 169 );
170 170 runOnlyForDeploymentPostprocessing = 0;
171 171 };
... ... @@ -180,6 +180,7 @@
180 180 818734DD1DA8F5B900046D84 /* Frameworks */,
181 181 818734DE1DA8F5B900046D84 /* Headers */,
182 182 818734DF1DA8F5B900046D84 /* Resources */,
  183 + 8131D9261DA9E5A000F03C91 /* ShellScript */,
183 184 );
184 185 buildRules = (
185 186 );
... ... @@ -232,6 +233,22 @@
232 233 };
233 234 /* End PBXResourcesBuildPhase section */
234 235  
  236 +/* Begin PBXShellScriptBuildPhase section */
  237 + 8131D9261DA9E5A000F03C91 /* ShellScript */ = {
  238 + isa = PBXShellScriptBuildPhase;
  239 + buildActionMask = 2147483647;
  240 + files = (
  241 + );
  242 + inputPaths = (
  243 + );
  244 + outputPaths = (
  245 + );
  246 + runOnlyForDeploymentPostprocessing = 0;
  247 + shellPath = /bin/sh;
  248 + shellScript = "if [ \"${ACTION}\" = \"build\" ]\nthen\nINSTALL_DIR=${SRCROOT}/Products/${PROJECT_NAME}.framework\n\nDEVICE_DIR=${BUILD_ROOT}/${CONFIGURATION}-iphoneos/${PROJECT_NAME}.framework\n\nSIMULATOR_DIR=${BUILD_ROOT}/${CONFIGURATION}-iphonesimulator/${PROJECT_NAME}.framework\n\nif [ -d \"${INSTALL_DIR}\" ]\nthen\nrm -rf \"${INSTALL_DIR}\"\nfi\n\nmkdir -p \"${INSTALL_DIR}\"\n\ncp -R \"${DEVICE_DIR}/\" \"${INSTALL_DIR}/\"\n#ditto \"${DEVICE_DIR}/Headers\" \"${INSTALL_DIR}/Headers\"\n\nlipo -create \"${DEVICE_DIR}/${PROJECT_NAME}\" \"${SIMULATOR_DIR}/${PROJECT_NAME}\" -output \"${INSTALL_DIR}/${PROJECT_NAME}\"\n\n#open \"${DEVICE_DIR}\"\n#open \"${SRCROOT}/Products\"\nfi";
  249 + };
  250 +/* End PBXShellScriptBuildPhase section */
  251 +
235 252 /* Begin PBXSourcesBuildPhase section */
236 253 818734DC1DA8F5B900046D84 /* Sources */ = {
237 254 isa = PBXSourcesBuildPhase;
... ...
CNLiveUserSystemSDK.xcodeproj/project.xcworkspace/xcuserdata/iOS.xcuserdatad/UserInterfaceState.xcuserstate
View file @5e55de6
No preview for this file type
CNLiveUserSystemSDK/CNLiveUserSystemSDK.h deleted 100644 → 0
  View file @2649c04
1   -//
2   -// CNLiveUserSystemSDK.h
3   -// CNLiveUserSystemSDK
4   -//
5   -// Created by iOS on 16/10/8.
6   -// Copyright © 2016年 zhulin. All rights reserved.
7   -//
8   -
9   -#import <UIKit/UIKit.h>
10   -
11   -//! Project version number for CNLiveUserSystemSDK.
12   -FOUNDATION_EXPORT double CNLiveUserSystemSDKVersionNumber;
13   -
14   -//! Project version string for CNLiveUserSystemSDK.
15   -FOUNDATION_EXPORT const unsigned char CNLiveUserSystemSDKVersionString[];
16   -
17   -// In this header, you should import all the public headers of your framework using statements like #import <CNLiveUserSystemSDK/PublicHeader.h>
18   -
19   -
Products/CNLiveUserSystemSDK.framework/CNLiveUserSystemSDK 0 → 100755
View file @5e55de6
No preview for this file type
Products/CNLiveUserSystemSDK.framework/Headers/CNLiveUserSystemCenter.h 0 → 100644
  View file @5e55de6
  1 +//
  2 +// CNLiveUserSystemCenter.h
  3 +// CNLiveUserSystemDemo
  4 +//
  5 +// Created by iOS on 16/9/12.
  6 +// Copyright © 2016年 zhulin. All rights reserved.
  7 +//
  8 +
  9 +#import <Foundation/Foundation.h>
  10 +#import "CNLiveUserSystemTypeDef.h"
  11 +#import <UIKit/UIKit.h>
  12 +
  13 +@interface CNLiveUserSystemCenter : NSObject
  14 +
  15 +/**
  16 + @abstract 初始化
  17 + @param appId 注册成功获得应用ID
  18 + @param appKey 注册成功获得应用key
  19 + @param appSecret 注册成功获得应用secret
  20 + @warning 必传参数
  21 + 必须在 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions; 方法中调用
  22 + */
  23 ++ (void)setAppId:(NSString *)appId appKey:(NSString *)appKey appSecret:(NSString *)appSecret;
  24 +
  25 +/**
  26 + @abstract 注册
  27 + @param userName 邮箱或手机
  28 + @param password 密码
  29 + @param verificationCode 手机验证码（手机号注册时必填）
  30 + @param invitationCode 邀请码（非必填）
  31 + @param frmId 渠道ID（非必填）
  32 + @param success 成功回调
  33 + @param failure 失败回调
  34 + */
  35 ++ (void)registerWithUserName:(NSString *)userName password:(NSString *)password verificationCode:(NSString *)verificationCode invitationCode:(NSString *)invitationCode frmId:(NSString *)frmId success:(void (^)(id result))success failure :(void (^)(NSError *error))failure;
  36 +
  37 +/**
  38 + @abstract 第三方登录
  39 + @param plat 第三方平台编号（如plat: 1:sina weibo 2:qq weibo 3:weixin 4:renren 注:如qq登录,plat=@"2"）
  40 + @param thirdPartyId 第三方用户ID
  41 + @param nickName 用户昵称
  42 + @param gender 性别，m：男、f：女、n：未知（非必填）
  43 + @param location 用户所在地（非必填）
  44 + @param faceUrl 头像，约100*100（非必填）
  45 + @param frmId 渠道ID（非必填）
  46 + @param success 成功回调
  47 + @param failure 失败回调
  48 + */
  49 ++ (void)thirdPartyLoginWithThirdPartyPlatType:(NSString *)plat thirdPartyId:(NSString *)thirdPartyId nickName:(NSString *)nickName gender:(NSString *)gender location:(NSString *)location faceUrl:(NSString *)faceUrl frmId:(NSString *)frmId success:(void (^)(id result))success failure :(void (^)(NSError *error))failure;
  50 +
  51 +/**
  52 + @abstract 快捷登录
  53 + @param userName 手机号
  54 + @param verificationCode 验证码
  55 + @param frmId 渠道ID（非必填）
  56 + @param success 成功回调
  57 + @param failure 失败回调
  58 + */
  59 ++ (void)shortcutLoginWithUserName:(NSString *)userName verificationCode:(NSString *)verificationCode frmId:(NSString *)frmId success:(void (^)(id result))success failure :(void (^)(NSError *error))failure;
  60 +
  61 +/**
  62 + @abstract 登录
  63 + @param userName 手机号或邮箱
  64 + @param password 密码
  65 + @param frmId 渠道ID（非必填）
  66 + @param success 成功回调
  67 + @param failure 失败回调
  68 + */
  69 ++ (void)loginWithUserName:(NSString *)userName password:(NSString *)password frmId:(NSString *)frmId success:(void (^)(id result))success failure :(void (^)(NSError *error))failure;
  70 +
  71 +/**
  72 + @abstract 发送验证码
  73 + @param mobile 手机号
  74 + @param type 发送验证码类型（详见VerificationCodeType）
  75 + @param success 成功回调
  76 + @param failure 失败回调
  77 + */
  78 ++ (void)verificationCodeType:(VerificationCodeType)type mobile:(NSString *)mobile success:(void (^)(id result))success failure :(void (^)(NSError *error))failure;
  79 +
  80 +/**
  81 + @abstract 更新用户附加信息
  82 + @param uid 用户ID
  83 + @param extInfo 扩展信息（格式由对方自己组织，平台只负责存储和原样读取，NSString类型）
  84 + @param success 成功回调
  85 + @param failure 失败回调
  86 + */
  87 ++ (void)updateOtherInfoWithUid:(NSString *)uid extInfo:(NSString *)extInfo success:(void (^)(id result))success failure :(void (^)(NSError *error))failure;
  88 +
  89 +/**
  90 + @abstract 修改用户单项信息
  91 + @param type 修改类型（nickName-昵称，gender-性别，email-邮箱, location-联系方式（地址））
  92 + @param uid 用户ID
  93 + @param info 对应的信息（注gender对应f/m/n）
  94 + @param success 成功回调
  95 + @param failure 失败回调
  96 + */
  97 ++ (void)modifyUserInfoType:(UserInfoType)type uid:(NSString *)uid modifyInfo:(NSString *)info success:(void (^)(id result))success failure :(void (^)(NSError *error))failure;
  98 +
  99 +/**
  100 + @abstract 更新手机号
  101 + @param uid 用户ID
  102 + @param mobile 手机号
  103 + @param verificationCode 验证码
  104 + @param success 成功回调
  105 + @param failure 失败回调
  106 + */
  107 ++ (void)updateMobileWithUid:(NSString *)uid mobile:(NSString *)mobile verificationCode:(NSString *)verificationCode success:(void (^)(id result))success failure :(void (^)(NSError *error))failure;
  108 +
  109 +/**
  110 + @abstract 修改密码（通过手机号修改）
  111 + @param mobile 手机号
  112 + @param verificationCode 验证码
  113 + @param newPassword 新密码
  114 + @param success 成功回调
  115 + @param failure 失败回调
  116 + */
  117 ++ (void)changePasswordWithMobile:(NSString *)mobile verificationCode:(NSString *)verificationCode newPassword:(NSString *)newPassword success:(void (^)(id result))success failure :(void (^)(NSError *error))failure;
  118 +
  119 +/**
  120 + @abstract 上传头像
  121 + @param uid 用户ID
  122 + @param icon 头像
  123 + @param success 成功回调
  124 + @param failure 失败回调
  125 + */
  126 ++ (void)uploadIconWithUid:(NSString *)uid icon:(UIImage *)icon success:(void (^)(id result))success failure :(void (^)(NSError *error))failure;
  127 +
  128 +/**
  129 + @abstract 查询用户信息
  130 + @param uid 用户ID
  131 + @param srcUid 被查询用户ID
  132 + @param success 成功回调
  133 + @param failure 失败回调
  134 + */
  135 ++ (void)queryUserInfoWithUid:(NSString *)uid srcUid:(NSString *)srcUid success:(void (^)(id result))success failure :(void (^)(NSError *error))failure;
  136 +
  137 +/**
  138 + @abstract 用户反馈
  139 + @param contentId 举报内容ID
  140 + @param message 举报内容(app自己组织-不能带特殊字符&号等)
  141 + @param success 成功回调
  142 + @param failure 失败回调
  143 + */
  144 ++ (void)feedbackWithContentId:(NSString *)contentId message:(NSString *)message success:(void (^)(id result))success failure :(void (^)(NSError *error))failure;
  145 +
  146 +
  147 +@end
... ...
Products/CNLiveUserSystemSDK.framework/Headers/CNLiveUserSystemTypeDef.h 0 → 100644
  View file @5e55de6
  1 +//
  2 +// CNLiveUserSystemTypeDef.h
  3 +// CNLiveUserSystemDemo
  4 +//
  5 +// Created by iOS on 16/9/12.
  6 +// Copyright © 2016年 zhulin. All rights reserved.
  7 +//
  8 +
  9 +#ifndef CNLiveUserSystemTypeDef_h
  10 +#define CNLiveUserSystemTypeDef_h
  11 +
  12 +//获取验证码
  13 +typedef NS_ENUM(NSUInteger, VerificationCodeType) {
  14 + VerificationCodeTypeShortcutLogin = 0, //快捷登录
  15 + VerificationCodeTypeRegister, //注册或修改手机号
  16 + VerificationCodeTypeRetrievePassword //找回或修改密码
  17 +};
  18 +
  19 +//修改单项用户信息类型
  20 +typedef NS_ENUM(NSUInteger, UserInfoType) {
  21 + UserInfoTypeNickName = 0, //昵称
  22 + UserInfoTypeGender, //性别（f/m/n）
  23 + UserInfoTypeEmail, //邮箱
  24 + UserInfoTypeLocation, //联系方式（地址）
  25 +};
  26 +
  27 +#endif /* CNLiveUserSystemTypeDef_h */
... ...
Products/CNLiveUserSystemSDK.framework/Info.plist 0 → 100644
View file @5e55de6
No preview for this file type