Merge branch 'master' of https://github.com/MobClub/SMSSDK-for-Cocos2d

Classes/HelloWorldScene.cpp

@@ -37,7 +37,7 @@ bool HelloWorld::init()
     box->setPlaceHolder("请输入手机号");
     box->setPlaceholderFont("Arial", 8);
     box->setFont("Arial", 8);
-    box->setFontColor(Color3B(255,255,255));
+    box->setFontColor(Color3B(255,0,0));
     box->setMaxLength(20);
     this->addChild(box);
     phoneBox = box;
@@ -49,7 +49,7 @@ bool HelloWorld::init()
     zBox->setPlaceHolder("请输入区号");
     zBox->setPlaceholderFont("Arial", 8);
     zBox->setFont("Arial", 8);
-    zBox->setFontColor(Color3B(255,255,255));
+    zBox->setFontColor(Color3B(255,0,0));
     zBox->setMaxLength(5);
     this->addChild(zBox);
     zoneBox = zBox;
@@ -62,7 +62,7 @@ bool HelloWorld::init()
     vBox->setPlaceholderFont("Arial", 8);
     vBox->setMaxLength(6);
     vBox->setFont("Arial", 8);
-    vBox->setFontColor(Color3B(255,255,255));
+    vBox->setFontColor(Color3B(255,0,0));
     this->addChild(vBox);
     codeBox = vBox;
 

Classes/SMSSDK/SMSSDK.cpp

@@ -45,7 +45,7 @@ bool SMSSDK::getCode(SMSSDKCodeType codeType, string phone, string zone, string
 #elif CC_TARGET_PLATFORM == CC_PLATFORM_IOS
 
     //iOS
-    return iOSSMSSDK::getCode(codeType, phone,zone);
+    return iOSSMSSDK::getCode(codeType, phone,zone,tempCode);
 
 #endif
 }

Classes/SMSSDK/SMSSDK.h

@@ -1,4 +1,4 @@
-//
+//
 //  C2DXSMSSDK.h
 //  C2DXSMSSDKSample
 //

Classes/SMSSDK/ios/iOSSMSSDK.h

@@ -29,7 +29,7 @@ namespace smssdk
             /// <summsary>
             /// Get vertificationCode
             /// </summary>
-            static bool getCode(SMSSDKCodeType type, string phoneNumber, string zone);
+            static bool getCode(SMSSDKCodeType type, string phoneNumber, string zone, string tempCode);
 
 
             /// <summary>

Classes/SMSSDK/ios/iOSSMSSDK.mm

@@ -29,15 +29,18 @@
     return true;
 }
 
-bool iOSSMSSDK::getCode(SMSSDKCodeType codeType, string phoneNumber, string zone)
+bool iOSSMSSDK::getCode(SMSSDKCodeType codeType, string phoneNumber, string zone, string tempCode)
 {
-    NSString  *phoneNumberStr = [NSString stringWithCString:phoneNumber.c_str() encoding:NSUTF8StringEncoding];
-    NSString *zoneStr = [NSString stringWithCString:zone.c_str() encoding:NSUTF8StringEncoding];
+    NSString *phoneNumberStr = [NSString stringWithCString:phoneNumber.c_str() encoding:NSUTF8StringEncoding];
+    NSString *zoneStr = [NSString stringWithCString:zone.c_str() encoding:NSUTF8StringEncoding];
+    NSString *tempCodeStr = [NSString stringWithCString:tempCode.c_str() encoding:NSUTF8StringEncoding];
     SMSGetCodeMethod smsGetCodeMethod = (SMSGetCodeMethod)codeType;
+
+    NSLog(@"Send:%@,tempCode:%@",phoneNumberStr,tempCodeStr);
 
     if (phoneNumber.length() != 0 && zone.length() != 0)
     {
-        [SMSSDK getVerificationCodeByMethod:smsGetCodeMethod phoneNumber:phoneNumberStr zone:zoneStr result:^(NSError *error) {
+        [SMSSDK getVerificationCodeByMethod:smsGetCodeMethod phoneNumber:phoneNumberStr zone:zoneStr template:tempCodeStr result:^(NSError *error) {
 
             NSLog(@"%@",error);
 
@@ -238,7 +241,7 @@
 
 string iOSSMSSDK::getVersion ()
 {
-    NSString *versionString = [SMSSDK version];
+    NSString *versionString = [SMSSDK sdkVersion];
     string resultString = [versionString cStringUsingEncoding: NSUTF8StringEncoding];
     string res (resultString);
 

proj.ios_mac/MyCppGame.xcodeproj/project.pbxproj

@@ -647,7 +647,7 @@
 					"$(_COCOS_LIB_IOS_BEGIN)",
 					"$(_COCOS_LIB_IOS_END)",
 				);
-				PROVISIONING_PROFILE = "d90da0c0-814f-4301-88cc-4724afc68181";
+				PROVISIONING_PROFILE = "58b21a8b-09ee-418f-a4b2-1092cd2cb717";
 				PROVISIONING_PROFILE_SPECIFIER = MobProvisioningProfiles;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";

proj.ios_mac/MyCppGame.xcodeproj/xcuserdata/max.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Bucket
+   type = "1"
+   version = "2.0">
+   <Breakpoints>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../Classes/SMSSDK/ios/iOSSMSSDK.mm"
+            timestampString = "534924348.820236"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "43"
+            endingLineNumber = "43"
+            landmarkName = "iOSSMSSDK::getCode(SMSSDKCodeType codeType, string phoneNumber, string zone, string tempCode)"
+            landmarkType = "7">
+            <Locations>
+               <Location
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "smssdk::iOSSMSSDK::getCode(smssdk::SMSSDKCodeType, std::__1::basic_string&lt;char, std::__1::char_traits&lt;char&gt;, std::__1::allocator&lt;char&gt; &gt;, std::__1::basic_string&lt;char, std::__1::char_traits&lt;char&gt;, std::__1::allocator&lt;char&gt; &gt;, std::__1::basic_string&lt;char, std::__1::char_traits&lt;char&gt;, std::__1::allocator&lt;char&gt; &gt;)"
+                  moduleName = "MyCppGame iOS"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/max/Documents/Github/Cocos2dFull-For-SMSSDK/Classes/SMSSDK/ios/iOSSMSSDK.mm"
+                  timestampString = "534918521.184217"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "43"
+                  endingLineNumber = "43"
+                  offsetFromSymbolStart = "1044">
+               </Location>
+               <Location
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "___ZN6smssdk9iOSSMSSDK7getCodeENS_14SMSSDKCodeTypeENSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEES8_S8__block_invoke"
+                  moduleName = "MyCppGame iOS"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/max/Documents/Github/Cocos2dFull-For-SMSSDK/Classes/SMSSDK/ios/iOSSMSSDK.mm"
+                  timestampString = "534918521.186367"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "45"
+                  endingLineNumber = "45"
+                  offsetFromSymbolStart = "28">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
+   </Breakpoints>
+</Bucket>

proj.ios_mac/MyCppGame.xcodeproj/xcuserdata/max.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>MyCppGame Mac.xcscheme</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>1</integer>
+		</dict>
+		<key>MyCppGame iOS.xcscheme</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+</dict>
+</plist>

proj.ios_mac/SDK/Required/MOBFoundation.framework/Headers/IMOBBaseUser.h

@@ -0,0 +1,38 @@
+//
+//  IMOBBaseUser.h
+//  MOBFoundation
+//
+//  Created by 冯鸿杰 on 2017/9/5.
+//  Copyright © 2017年 MOB. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "IMOBFDataModel.h"
+
+/**
+ 基础用户信息
+ */
+@protocol IMOBBaseUser <IMOBFDataModel>
+
+/**
+ 获取用户ID
+ 
+ @return 用户ID
+ */
+- (NSString *)uid;
+
+/**
+ 获取用户头像
+ 
+ @return 头像
+ */
+- (NSString *)avatar;
+
+/**
+ 获取用户昵称
+ 
+ @return 昵称
+ */
+- (NSString *)nickname;
+
+@end

proj.ios_mac/SDK/Required/MOBFoundation.framework/Headers/IMOBFDataModel.h

@@ -13,25 +13,27 @@
  */
 @protocol IMOBFDataModel <NSObject>
 
+@required
+
 /**
  初始化数据模型
-
+ 
  @param dict 初始化数据
  @return 数据模型
  */
 - (instancetype)initWithDict:(NSDictionary *)dict;
 
 /**
  设置数据
-
+ 
  @param data 数据
  @param key 名称
  */
 - (void)set:(id)data key:(NSString *)key;
 
 /**
  获取数据
-
+ 
  @param key 名称
  */
 - (id)get:(NSString *)key;
@@ -43,4 +45,44 @@
  */
 - (NSDictionary *)dictionaryValue;
 
+/**
+ 返回字段映射字典
+ 
+ 说明:类如果实现此方法,并返回映射字典,在使用initWithDict初始化时,则会按照映射查找属性;key 为真正想要设定的、存在的属性 ,value为需要映射的字段
+ 
+ @return 字段映射字典
+ */
++ (NSDictionary <NSString *, NSString *> *)propertyMappingDictionary;
+
+/**
+ 当类中有属性为数组,且数组元素同为MOBFDataModel时,应该置制定该属性属性及其元素类型
+ 例如有 @property NSArray <OtherDataModel *> *array;
+ 应主动实现本方法,并返回 @{@"array" : @"OtherDataModel"}
+ 
+ @return 映射配置
+ */
++ (NSDictionary <NSString *, NSString *> *)elementTypeOfCollectionPropertyDictionary;
+
+/**
+ 当属性定义类型不支持从原始数据直接转换时触发此方法，该方法默认返回nil，表示不进行转换
+ 
+ @param rawData 原始数据
+ @param targetType 目标类型
+ @param propertyName 属性名称
+ @return 目标类型对象
+ */
++ (id)unsupportTypeWithRawData:(id)rawData
+                    targetType:(Class)targetType
+                  propertyName:(NSString *)propertyName;
+
+/**
+ 当设置属性对象不支持转化为原始数据时触发此方法，默认返回nil，表示不进行转换
+ 
+ @param object 对象
+ @param propertyName 属性名称
+ @return 原始数据，仅包含NSDictionary、NSArray、NSString、NSNumber类型的返回。
+ */
++ (id)rawDataWithUnsupportTypeObject:(id)object
+                        propertyName:(NSString *)propertyName;
+
 @end