no message

朱林
1 parent 2649c044
Showing 11 changed files with 211 additions and 28 deletions
CNLiveUserSystemDemo.xcodeproj/project.xcworkspace/xcuserdata/iOS.xcuserdatad/UserInterfaceState.xcuserstate
CNLiveUserSystemDemo/CNLiveUserSystemSDK/CNLiveUploadIcon.h
CNLiveUserSystemDemo/CNLiveUserSystemSDK/CNLiveUserManager.h
CNLiveUserSystemDemo/CNLiveUserSystemSDK/CNLiveUserSystemTools.m
CNLiveUserSystemSDK.xcodeproj/project.pbxproj
CNLiveUserSystemSDK.xcodeproj/project.xcworkspace/xcuserdata/iOS.xcuserdatad/UserInterfaceState.xcuserstate
CNLiveUserSystemSDK/CNLiveUserSystemSDK.h
Products/CNLiveUserSystemSDK.framework/CNLiveUserSystemSDK
Products/CNLiveUserSystemSDK.framework/Headers/CNLiveUserSystemCenter.h
Products/CNLiveUserSystemSDK.framework/Headers/CNLiveUserSystemTypeDef.h
Products/CNLiveUserSystemSDK.framework/Info.plist
@@ -7,6 +7,7 @@
 //
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 @interface CNLiveUploadIcon : NSObject
@@ -7,6 +7,7 @@
 //
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 @interface CNLiveUserManager : NSObject
@@ -88,11 +88,20 @@
 //null处理
 + (NSString *)verify:(NSString *)string
 {
-    if ([string isKindOfClass:[NSString class]] || string.length > 0) {
+    NSString *newString;
+    
+    if ([string isKindOfClass:[NSNumber class]]) {
+        newString = [NSString stringWithFormat:@"%@",string];
+    } else {
+        newString = string;
+    }
+    
+    if ([newString isKindOfClass:[NSString class]] || newString.length > 0) {
         return string;
     } else {
         return @"";
     }
+
 }
 + (void)errorStat:(NSString *)errorString 
@@ -7,7 +7,7 @@
 	objects = {
 /* Begin PBXBuildFile section */
-		818734E61DA8F5B900046D84 /* CNLiveUserSystemSDK.h in Headers */ = {isa = PBXBuildFile; fileRef = 818734E41DA8F5B900046D84 /* CNLiveUserSystemSDK.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		8131D9251DA9E55B00F03C91 /* Common.h in Headers */ = {isa = PBXBuildFile; fileRef = 8131D9241DA9E55B00F03C91 /* Common.h */; };
 		818735071DA8F60100046D84 /* CNLiveNetworkManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 818734ED1DA8F60100046D84 /* CNLiveNetworkManager.h */; };
 		818735081DA8F60100046D84 /* CNLiveNetworkManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 818734EE1DA8F60100046D84 /* CNLiveNetworkManager.m */; };
 		818735091DA8F60100046D84 /* CNLiveURLRequestSerialization.h in Headers */ = {isa = PBXBuildFile; fileRef = 818734EF1DA8F60100046D84 /* CNLiveURLRequestSerialization.h */; };
@@ -24,11 +24,11 @@
 		818735141DA8F60100046D84 /* CNLiveUserInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 818734FB1DA8F60100046D84 /* CNLiveUserInfo.m */; };
 		818735151DA8F60100046D84 /* CNLiveUserManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 818734FC1DA8F60100046D84 /* CNLiveUserManager.h */; };
 		818735161DA8F60100046D84 /* CNLiveUserManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 818734FD1DA8F60100046D84 /* CNLiveUserManager.m */; };
-		818735171DA8F60100046D84 /* CNLiveUserSystemCenter.h in Headers */ = {isa = PBXBuildFile; fileRef = 818734FE1DA8F60100046D84 /* CNLiveUserSystemCenter.h */; };
+		818735171DA8F60100046D84 /* CNLiveUserSystemCenter.h in Headers */ = {isa = PBXBuildFile; fileRef = 818734FE1DA8F60100046D84 /* CNLiveUserSystemCenter.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		818735181DA8F60100046D84 /* CNLiveUserSystemCenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 818734FF1DA8F60100046D84 /* CNLiveUserSystemCenter.m */; };
 		818735191DA8F60100046D84 /* CNLiveUserSystemTools.h in Headers */ = {isa = PBXBuildFile; fileRef = 818735001DA8F60100046D84 /* CNLiveUserSystemTools.h */; };
 		8187351A1DA8F60100046D84 /* CNLiveUserSystemTools.m in Sources */ = {isa = PBXBuildFile; fileRef = 818735011DA8F60100046D84 /* CNLiveUserSystemTools.m */; };
-		8187351B1DA8F60100046D84 /* CNLiveUserSystemTypeDef.h in Headers */ = {isa = PBXBuildFile; fileRef = 818735021DA8F60100046D84 /* CNLiveUserSystemTypeDef.h */; };
+		8187351B1DA8F60100046D84 /* CNLiveUserSystemTypeDef.h in Headers */ = {isa = PBXBuildFile; fileRef = 818735021DA8F60100046D84 /* CNLiveUserSystemTypeDef.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		8187351C1DA8F60100046D84 /* CNLiveVerificationCode.h in Headers */ = {isa = PBXBuildFile; fileRef = 818735031DA8F60100046D84 /* CNLiveVerificationCode.h */; };
 		8187351D1DA8F60100046D84 /* CNLiveVerificationCode.m in Sources */ = {isa = PBXBuildFile; fileRef = 818735041DA8F60100046D84 /* CNLiveVerificationCode.m */; };
 		8187351E1DA8F60100046D84 /* NSDictionary+Safety.h in Headers */ = {isa = PBXBuildFile; fileRef = 818735051DA8F60100046D84 /* NSDictionary+Safety.h */; };
@@ -36,8 +36,8 @@
 /* End PBXBuildFile section */
 /* Begin PBXFileReference section */
+		8131D9241DA9E55B00F03C91 /* Common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Common.h; sourceTree = "<group>"; };
 		818734E11DA8F5B900046D84 /* CNLiveUserSystemSDK.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CNLiveUserSystemSDK.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		818734E41DA8F5B900046D84 /* CNLiveUserSystemSDK.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CNLiveUserSystemSDK.h; sourceTree = "<group>"; };
 		818734E51DA8F5B900046D84 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		818734ED1DA8F60100046D84 /* CNLiveNetworkManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNLiveNetworkManager.h; sourceTree = "<group>"; };
 		818734EE1DA8F60100046D84 /* CNLiveNetworkManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNLiveNetworkManager.m; sourceTree = "<group>"; };
@@ -98,7 +98,6 @@
 		818734E31DA8F5B900046D84 /* CNLiveUserSystemSDK */ = {
 			isa = PBXGroup;
 			children = (
-				818734E41DA8F5B900046D84 /* CNLiveUserSystemSDK.h */,
 				818734E51DA8F5B900046D84 /* Info.plist */,
 			);
 			path = CNLiveUserSystemSDK;
@@ -119,6 +118,7 @@
 		818734F11DA8F60100046D84 /* CNLiveUserSystemSDK */ = {
 			isa = PBXGroup;
 			children = (
+				8131D9241DA9E55B00F03C91 /* Common.h */,
 				818734F21DA8F60100046D84 /* CNLiveFeedback.h */,
 				818734F31DA8F60100046D84 /* CNLiveFeedback.m */,
 				818734F41DA8F60100046D84 /* CNLiveLogin.h */,
@@ -152,20 +152,20 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				8187351B1DA8F60100046D84 /* CNLiveUserSystemTypeDef.h in Headers */,
+				818735171DA8F60100046D84 /* CNLiveUserSystemCenter.h in Headers */,
 				8187351C1DA8F60100046D84 /* CNLiveVerificationCode.h in Headers */,
 				8187350F1DA8F60100046D84 /* CNLiveRegister.h in Headers */,
-				8187351B1DA8F60100046D84 /* CNLiveUserSystemTypeDef.h in Headers */,
+				8131D9251DA9E55B00F03C91 /* Common.h in Headers */,
 				8187350D1DA8F60100046D84 /* CNLiveLogin.h in Headers */,
 				818735151DA8F60100046D84 /* CNLiveUserManager.h in Headers */,
 				818735131DA8F60100046D84 /* CNLiveUserInfo.h in Headers */,
-				818735171DA8F60100046D84 /* CNLiveUserSystemCenter.h in Headers */,
 				818735191DA8F60100046D84 /* CNLiveUserSystemTools.h in Headers */,
 				8187350B1DA8F60100046D84 /* CNLiveFeedback.h in Headers */,
 				8187351E1DA8F60100046D84 /* NSDictionary+Safety.h in Headers */,
 				818735091DA8F60100046D84 /* CNLiveURLRequestSerialization.h in Headers */,
 				818735071DA8F60100046D84 /* CNLiveNetworkManager.h in Headers */,
 				818735111DA8F60100046D84 /* CNLiveUploadIcon.h in Headers */,
-				818734E61DA8F5B900046D84 /* CNLiveUserSystemSDK.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -180,6 +180,7 @@
 				818734DD1DA8F5B900046D84 /* Frameworks */,
 				818734DE1DA8F5B900046D84 /* Headers */,
 				818734DF1DA8F5B900046D84 /* Resources */,
+				8131D9261DA9E5A000F03C91 /* ShellScript */,
 			);
 			buildRules = (
 			);
@@ -232,6 +233,22 @@
 		};
 /* End PBXResourcesBuildPhase section */
+/* Begin PBXShellScriptBuildPhase section */
+		8131D9261DA9E5A000F03C91 /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			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";
+		};
+/* End PBXShellScriptBuildPhase section */
+
 /* Begin PBXSourcesBuildPhase section */
 		818734DC1DA8F5B900046D84 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
-//
-//  CNLiveUserSystemSDK.h
-//  CNLiveUserSystemSDK
-//
-//  Created by iOS on 16/10/8.
-//  Copyright © 2016年 zhulin. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for CNLiveUserSystemSDK.
-FOUNDATION_EXPORT double CNLiveUserSystemSDKVersionNumber;
-
-//! Project version string for CNLiveUserSystemSDK.
-FOUNDATION_EXPORT const unsigned char CNLiveUserSystemSDKVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <CNLiveUserSystemSDK/PublicHeader.h>
-
-
+//
+//  CNLiveUserSystemCenter.h
+//  CNLiveUserSystemDemo
+//
+//  Created by iOS on 16/9/12.
+//  Copyright © 2016年 zhulin. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "CNLiveUserSystemTypeDef.h"
+#import <UIKit/UIKit.h>
+
+@interface CNLiveUserSystemCenter : NSObject
+
+/**
+ @abstract      初始化
+ @param         appId                   注册成功获得应用ID
+ @param         appKey                  注册成功获得应用key
+ @param         appSecret               注册成功获得应用secret
+ @warning       必传参数
+                必须在 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions; 方法中调用
+ */
++ (void)setAppId:(NSString *)appId appKey:(NSString *)appKey appSecret:(NSString *)appSecret;
+
+/**
+ @abstract      注册
+ @param         userName                邮箱或手机
+ @param         password                密码
+ @param         verificationCode        手机验证码（手机号注册时必填）
+ @param         invitationCode          邀请码（非必填）
+ @param         frmId                   渠道ID（非必填）
+ @param         success                 成功回调
+ @param         failure                 失败回调
+ */
++ (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;
+
+/**
+ @abstract      第三方登录
+ @param         plat                    第三方平台编号（如plat: 1:sina weibo 2:qq weibo 3:weixin 4:renren 注:如qq登录,plat=@"2"）
+ @param         thirdPartyId            第三方用户ID
+ @param         nickName                用户昵称
+ @param         gender                  性别，m：男、f：女、n：未知（非必填）
+ @param         location                用户所在地（非必填）
+ @param         faceUrl                 头像，约100*100（非必填）
+ @param         frmId                   渠道ID（非必填）
+ @param         success                 成功回调
+ @param         failure                 失败回调
+ */
++ (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;
+
+/**
+ @abstract      快捷登录
+ @param         userName                手机号
+ @param         verificationCode        验证码
+ @param         frmId                   渠道ID（非必填）
+ @param         success                 成功回调
+ @param         failure                 失败回调
+ */
++ (void)shortcutLoginWithUserName:(NSString *)userName verificationCode:(NSString *)verificationCode frmId:(NSString *)frmId success:(void (^)(id result))success failure :(void (^)(NSError *error))failure;
+
+/**
+ @abstract      登录
+ @param         userName                手机号或邮箱
+ @param         password                密码
+ @param         frmId                   渠道ID（非必填）
+ @param         success                 成功回调
+ @param         failure                 失败回调
+ */
++ (void)loginWithUserName:(NSString *)userName password:(NSString *)password frmId:(NSString *)frmId success:(void (^)(id result))success failure :(void (^)(NSError *error))failure;
+
+/**
+ @abstract      发送验证码
+ @param         mobile                  手机号
+ @param         type                    发送验证码类型（详见VerificationCodeType）
+ @param         success                 成功回调
+ @param         failure                 失败回调
+ */
++ (void)verificationCodeType:(VerificationCodeType)type mobile:(NSString *)mobile success:(void (^)(id result))success failure :(void (^)(NSError *error))failure;
+
+/**
+ @abstract      更新用户附加信息
+ @param         uid                     用户ID
+ @param         extInfo                 扩展信息（格式由对方自己组织，平台只负责存储和原样读取，NSString类型）
+ @param         success                 成功回调
+ @param         failure                 失败回调
+ */
++ (void)updateOtherInfoWithUid:(NSString *)uid extInfo:(NSString *)extInfo success:(void (^)(id result))success failure :(void (^)(NSError *error))failure;
+
+/**
+ @abstract      修改用户单项信息
+ @param         type                    修改类型（nickName-昵称，gender-性别，email-邮箱, location-联系方式（地址））
+ @param         uid                     用户ID
+ @param         info                    对应的信息（注gender对应f/m/n）
+ @param         success                 成功回调
+ @param         failure                 失败回调
+ */
++ (void)modifyUserInfoType:(UserInfoType)type uid:(NSString *)uid modifyInfo:(NSString *)info success:(void (^)(id result))success failure :(void (^)(NSError *error))failure;
+
+/**
+ @abstract      更新手机号
+ @param         uid                     用户ID
+ @param         mobile                  手机号
+ @param         verificationCode        验证码
+ @param         success                 成功回调
+ @param         failure                 失败回调
+ */
++ (void)updateMobileWithUid:(NSString *)uid mobile:(NSString *)mobile verificationCode:(NSString *)verificationCode success:(void (^)(id result))success failure :(void (^)(NSError *error))failure;
+
+/**
+ @abstract      修改密码（通过手机号修改）
+ @param         mobile                  手机号
+ @param         verificationCode        验证码
+ @param         newPassword             新密码
+ @param         success                 成功回调
+ @param         failure                 失败回调
+ */
++ (void)changePasswordWithMobile:(NSString *)mobile verificationCode:(NSString *)verificationCode newPassword:(NSString *)newPassword success:(void (^)(id result))success failure :(void (^)(NSError *error))failure;
+
+/**
+ @abstract      上传头像
+ @param         uid                     用户ID
+ @param         icon                    头像
+ @param         success                 成功回调
+ @param         failure                 失败回调
+ */
++ (void)uploadIconWithUid:(NSString *)uid icon:(UIImage *)icon success:(void (^)(id result))success failure :(void (^)(NSError *error))failure;
+
+/**
+ @abstract      查询用户信息
+ @param         uid                     用户ID
+ @param         srcUid                  被查询用户ID
+ @param         success                 成功回调
+ @param         failure                 失败回调
+ */
++ (void)queryUserInfoWithUid:(NSString *)uid srcUid:(NSString *)srcUid success:(void (^)(id result))success failure :(void (^)(NSError *error))failure;
+
+/**
+ @abstract      用户反馈
+ @param         contentId               举报内容ID
+ @param         message                 举报内容(app自己组织-不能带特殊字符&号等)
+ @param         success                 成功回调
+ @param         failure                 失败回调
+ */
++ (void)feedbackWithContentId:(NSString *)contentId message:(NSString *)message success:(void (^)(id result))success failure :(void (^)(NSError *error))failure;
+
+
+@end
+//
+//  CNLiveUserSystemTypeDef.h
+//  CNLiveUserSystemDemo
+//
+//  Created by iOS on 16/9/12.
+//  Copyright © 2016年 zhulin. All rights reserved.
+//
+
+#ifndef CNLiveUserSystemTypeDef_h
+#define CNLiveUserSystemTypeDef_h
+
+//获取验证码
+typedef NS_ENUM(NSUInteger, VerificationCodeType) {
+    VerificationCodeTypeShortcutLogin = 0,      //快捷登录
+    VerificationCodeTypeRegister,               //注册或修改手机号
+    VerificationCodeTypeRetrievePassword        //找回或修改密码
+};
+
+//修改单项用户信息类型
+typedef NS_ENUM(NSUInteger, UserInfoType) {
+    UserInfoTypeNickName = 0,                   //昵称
+    UserInfoTypeGender,                         //性别（f/m/n）
+    UserInfoTypeEmail,                          //邮箱
+    UserInfoTypeLocation,                       //联系方式（地址）
+};
+
+#endif /* CNLiveUserSystemTypeDef_h */