react-native-gizwits-sdk-v5 1.4.33 → 1.4.34-2

package/android/build.gradle

@@ -63,10 +63,10 @@ dependencies {
 
     implementation "androidx.startup:startup-runtime:$startup_version"
 
-    implementation("io.github.gizwits:sdk:1.1.3")
-    implementation("io.github.gizwits:sdk-bluetooth:1.1.3")
-    implementation("io.github.gizwits:sdk-lan:1.1.3")
-    implementation("io.github.gizwits:sdk-mqtt:1.1.3")
+    implementation("io.github.gizwits:sdk:1.1.4")
+    implementation("io.github.gizwits:sdk-bluetooth:1.1.4")
+    implementation("io.github.gizwits:sdk-lan:1.1.4")
+    implementation("io.github.gizwits:sdk-mqtt:1.1.4")
     //  implementation files('libs/sdk-release.aar', 'libs/sdk-bluetooth-release.aar', 'libs/sdk-lan-release.aar', 'libs/sdk-mqtt-release.aar')
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutine_version")
     // retrofit

package/ios/RNGizUserManagerModule.m

@@ -17,4 +17,16 @@ RCT_EXTERN_METHOD(loginByAnonymous:(NSDictionary *)options result:(RCTResponseSe
 RCT_EXTERN_METHOD(loginWithAccount:(NSDictionary *)options result:(RCTResponseSenderBlock)result)
 RCT_EXTERN_METHOD(registerWithAccount:(NSDictionary *)options result:(RCTResponseSenderBlock)result)
 
+RCT_EXTERN_METHOD(sendMobileLoginVerifyCode:(NSDictionary *)options result:(RCTResponseSenderBlock)result)
+RCT_EXTERN_METHOD(loginWithMobile:(NSDictionary *)options result:(RCTResponseSenderBlock)result)
+
+RCT_EXTERN_METHOD(loginWithEmail:(NSDictionary *)options result:(RCTResponseSenderBlock)result)
+RCT_EXTERN_METHOD(sendEmailLoginVerifyCode:(NSDictionary *)options result:(RCTResponseSenderBlock)result)
+
+RCT_EXTERN_METHOD(sendEmailRegisterVerifyCode:(NSDictionary *)options result:(RCTResponseSenderBlock)result)
+RCT_EXTERN_METHOD(sendMobileRegisterVerifyCode:(NSDictionary *)options result:(RCTResponseSenderBlock)result)
+
+RCT_EXTERN_METHOD(registerWithEmail:(NSDictionary *)options result:(RCTResponseSenderBlock)result)
+RCT_EXTERN_METHOD(registerWithPhone:(NSDictionary *)options result:(RCTResponseSenderBlock)result)
+
 @end

package/ios/RNGizUserManagerModule.swift

@@ -18,7 +18,37 @@ struct AccountParams: Decodable {
     public var username: String;
     public var password: String;
 }
+struct SendMobileLoginVerifyCodeParams: Decodable {
+    public var phoneCode: String;
+    public var phone: String;
+    public var lang: String?;
+}
+struct SendEmailLoginVerifyCodeParams: Decodable {
+    public var email: String;
+    public var lang: String?;
+}
+struct LoginWithMobileParams: Decodable {
+    public var phoneCode: String;
+    public var phone: String;
+    public var code: String;
+}
+struct LoginWithEmailParams: Decodable {
+    public var email: String;
+    public var code: String;
+}
 
+struct RegisterWithEmailParams: Decodable {
+    public var email: String;
+    public var code: String;
+    public var password: String;
+}
+
+struct RegisterWithMobileParams: Decodable {
+    public var phoneCode: String;
+    public var phone: String;
+    public var code: String;
+    public var password: String;
+}
 
 @objc(RNGizUserManagerModule)
 class RNGizUserManagerModule: RCTEventEmitter  {
@@ -75,7 +105,82 @@ class RNGizUserManagerModule: RCTEventEmitter  {
             }
         }
     }
+    
+    @objc
+    public func sendMobileLoginVerifyCode(_ options: NSDictionary, result: @escaping RCTResponseSenderBlock) {
+        if let userinfo = RNGizParamsChecker.check(options: options, result: result, paramsType: SendMobileLoginVerifyCodeParams.self) {
+            Task {
+                let data = await GizUserManager.sharedInstance.sendMobileLoginVerifyCode(phoneCode: userinfo.phoneCode, phone: userinfo.phone, lang: userinfo.lang)
+                GizRNCallbackManager.callbackWithResult(callback: result, result: data)
+            }
+        }
+    }
+    @objc
+    public func sendEmailLoginVerifyCode(_ options: NSDictionary, result: @escaping RCTResponseSenderBlock) {
+        if let userinfo = RNGizParamsChecker.check(options: options, result: result, paramsType: SendEmailLoginVerifyCodeParams.self) {
+            Task {
+                let data = await GizUserManager.sharedInstance.sendEmailLoginVerifyCode(email: userinfo.email, lang: userinfo.lang)
+                GizRNCallbackManager.callbackWithResult(callback: result, result: data)
+            }
+        }
+    }
+    @objc
+    public func loginWithMobile(_ options: NSDictionary, result: @escaping RCTResponseSenderBlock) {
+        if let userinfo = RNGizParamsChecker.check(options: options, result: result, paramsType: LoginWithMobileParams.self) {
+            Task {
+                let data = await GizUserManager.sharedInstance.loginWithMobile(phoneCode: userinfo.phoneCode, phone: userinfo.phone, code: userinfo.code)
+                GizRNCallbackManager.callbackWithResult(callback: result, result: data)
+            }
+        }
+    }
+    @objc
+    public func loginWithEmail(_ options: NSDictionary, result: @escaping RCTResponseSenderBlock) {
+        if let userinfo = RNGizParamsChecker.check(options: options, result: result, paramsType: LoginWithEmailParams.self) {
+            Task {
+                let data = await GizUserManager.sharedInstance.loginWithEmail(email: userinfo.email, code: userinfo.code)
+                GizRNCallbackManager.callbackWithResult(callback: result, result: data)
+            }
+        }
+    }
+    
+    @objc
+    public func sendEmailRegisterVerifyCode(_ options: NSDictionary, result: @escaping RCTResponseSenderBlock) {
+        if let userinfo = RNGizParamsChecker.check(options: options, result: result, paramsType: SendEmailLoginVerifyCodeParams.self) {
+            Task {
+                let data = await GizUserManager.sharedInstance.sendEmailRegisterVerifyCode(email: userinfo.email, lang: userinfo.lang)
+                GizRNCallbackManager.callbackWithResult(callback: result, result: data)
+            }
+        }
+    }
+    @objc
+    public func sendMobileRegisterVerifyCode(_ options: NSDictionary, result: @escaping RCTResponseSenderBlock) {
+        if let userinfo = RNGizParamsChecker.check(options: options, result: result, paramsType: SendMobileLoginVerifyCodeParams.self) {
+            Task {
+                let data = await GizUserManager.sharedInstance.sendMobileRegisterVerifyCode(phoneCode: userinfo.phoneCode, phone: userinfo.phone, lang: userinfo.lang)
+                GizRNCallbackManager.callbackWithResult(callback: result, result: data)
+            }
+        }
+    }
+    
+    @objc
+    public func registerWithEmail(_ options: NSDictionary, result: @escaping RCTResponseSenderBlock) {
+        if let userinfo = RNGizParamsChecker.check(options: options, result: result, paramsType: RegisterWithEmailParams.self) {
+            Task {
+                let data = await GizUserManager.sharedInstance.registerWithEmail(email: userinfo.email, password: userinfo.password, code: userinfo.code)
+                GizRNCallbackManager.callbackWithResult(callback: result, result: data)
+            }
+        }
+    }
 
+    @objc
+    public func registerWithPhone(_ options: NSDictionary, result: @escaping RCTResponseSenderBlock) {
+        if let userinfo = RNGizParamsChecker.check(options: options, result: result, paramsType: RegisterWithMobileParams.self) {
+            Task {
+                let data = await GizUserManager.sharedInstance.registerWithPhone(phoneCode: userinfo.phoneCode, phone: userinfo.phone, password: userinfo.password, code: userinfo.code);
+                GizRNCallbackManager.callbackWithResult(callback: result, result: data)
+            }
+        }
+    }
 
     @objc
     override static func requiresMainQueueSetup() -> Bool {

package/lib/user.d.ts

@@ -7,6 +7,14 @@ declare class RNGizUserManagerModule extends Base {
     loginByAnonymous(): Promise<GizResult<IUpdateAuthorizeDataParams, any>>;
     registerWithAccount(username: string, password: string): Promise<GizResult<IUpdateAuthorizeDataParams, any>>;
     loginWithAccount(username: string, password: string): Promise<GizResult<IUpdateAuthorizeDataParams, any>>;
+    sendMobileLoginVerifyCode(phoneCode: string, phone: string, lang?: string): Promise<GizResult<any, any>>;
+    loginWithMobile(phoneCode: string, phone: string, code: string): Promise<GizResult<IUpdateAuthorizeDataParams, any>>;
+    loginWithEmail(email: string, code: string): Promise<GizResult<IUpdateAuthorizeDataParams, any>>;
+    sendEmailLoginVerifyCode(email: string, lang?: string): Promise<GizResult<any, any>>;
+    registerWithPhone(phoneCode: string, phone: string, password: string, code: string): Promise<GizResult<any, any>>;
+    registerWithEmail(email: string, password: string, code: string): Promise<GizResult<any, any>>;
+    sendMobileRegisterVerifyCode(phoneCode: string, phone: string, lang?: string): Promise<GizResult<any, any>>;
+    sendEmailRegisterVerifyCode(email: string, lang?: string): Promise<GizResult<any, any>>;
 }
 declare const _default: RNGizUserManagerModule;
 export default _default;

package/lib/user.js

@@ -31,6 +31,46 @@ class RNGizUserManagerModule extends Base {
             NativeModules.RNGizUserManagerModule.loginWithAccount({ username, password }, callback);
         });
     }
+    sendMobileLoginVerifyCode(phoneCode, phone, lang) {
+        return this.callbackWapper((callback) => {
+            NativeModules.RNGizUserManagerModule.sendMobileLoginVerifyCode({ phoneCode, phone, lang }, callback);
+        });
+    }
+    loginWithMobile(phoneCode, phone, code) {
+        return this.callbackWapper((callback) => {
+            NativeModules.RNGizUserManagerModule.loginWithMobile({ phoneCode, phone, code }, callback);
+        });
+    }
+    loginWithEmail(email, code) {
+        return this.callbackWapper((callback) => {
+            NativeModules.RNGizUserManagerModule.loginWithEmail({ email, code }, callback);
+        });
+    }
+    sendEmailLoginVerifyCode(email, lang) {
+        return this.callbackWapper((callback) => {
+            NativeModules.RNGizUserManagerModule.sendEmailLoginVerifyCode({ email, lang }, callback);
+        });
+    }
+    registerWithPhone(phoneCode, phone, password, code) {
+        return this.callbackWapper((callback) => {
+            NativeModules.RNGizUserManagerModule.registerWithPhone({ phoneCode, phone, code, password }, callback);
+        });
+    }
+    registerWithEmail(email, password, code) {
+        return this.callbackWapper((callback) => {
+            NativeModules.RNGizUserManagerModule.registerWithEmail({ email, password, code }, callback);
+        });
+    }
+    sendMobileRegisterVerifyCode(phoneCode, phone, lang) {
+        return this.callbackWapper((callback) => {
+            NativeModules.RNGizUserManagerModule.sendMobileRegisterVerifyCode({ phoneCode, phone, lang }, callback);
+        });
+    }
+    sendEmailRegisterVerifyCode(email, lang) {
+        return this.callbackWapper((callback) => {
+            NativeModules.RNGizUserManagerModule.sendEmailRegisterVerifyCode({ email, lang }, callback);
+        });
+    }
 }
 export default new RNGizUserManagerModule();
 export { RNGizUserManagerModule };

package/lib/user.js.map

@@ -1 +1 @@
-{"version":3,"file":"user.js","sourceRoot":"","sources":["../src/user.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAE5C,OAAO,IAAI,MAAM,QAAQ,CAAA;AAGzB,MAAM,sBAAuB,SAAQ,IAAI;IACvC,MAAM;QACJ,OAAO,IAAI,CAAC,cAAc,CAAC,CAAC,QAA+B,EAAE,EAAE;YAC7D,aAAa,CAAC,sBAAsB,CAAC,MAAM,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAA;QAC3D,CAAC,CAAC,CAAA;IACJ,CAAC;IACD,mBAAmB,CACjB,MAAkC;QAElC,OAAO,IAAI,CAAC,cAAc,CAAC,CAAC,QAA+B,EAAE,EAAE;YAC7D,aAAa,CAAC,sBAAsB,CAAC,mBAAmB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;QAC5E,CAAC,CAAC,CAAA;IACJ,CAAC;IACD,gBAAgB;QACd,OAAO,IAAI,CAAC,cAAc,CAAC,CAAC,QAA+B,EAAE,EAAE;YAC7D,aAAa,CAAC,sBAAsB,CAAC,gBAAgB,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAA;QACrE,CAAC,CAAC,CAAA;IACJ,CAAC;IACD,gBAAgB;QACd,OAAO,IAAI,CAAC,cAAc,CAAC,CAAC,QAA+B,EAAE,EAAE;YAC7D,aAAa,CAAC,sBAAsB,CAAC,gBAAgB,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAA;QACrE,CAAC,CAAC,CAAA;IACJ,CAAC;IACD,mBAAmB,CAAC,QAAgB,EAAE,QAAgB;QACpD,OAAO,IAAI,CAAC,cAAc,CAAC,CAAC,QAA+B,EAAE,EAAE;YAC7D,aAAa,CAAC,sBAAsB,CAAC,mBAAmB,CAAC,EAAC,QAAQ,EAAE,QAAQ,EAAC,EAAE,QAAQ,CAAC,CAAA;QAC1F,CAAC,CAAC,CAAA;IACJ,CAAC;IACD,gBAAgB,CAAC,QAAgB,EAAE,QAAgB;QACjD,OAAO,IAAI,CAAC,cAAc,CAAC,CAAC,QAA+B,EAAE,EAAE;YAC7D,aAAa,CAAC,sBAAsB,CAAC,gBAAgB,CAAC,EAAC,QAAQ,EAAE,QAAQ,EAAC,EAAE,QAAQ,CAAC,CAAA;QACvF,CAAC,CAAC,CAAA;IACJ,CAAC;CAEF;AAED,eAAe,IAAI,sBAAsB,EAAE,CAAA;AAE3C,OAAO,EAAE,sBAAsB,EAAE,CAAA"}
+{"version":3,"file":"user.js","sourceRoot":"","sources":["../src/user.tsx"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-gizwits-sdk-v5",
-  "version": "1.4.33",
+  "version": "1.4.34-2",
   "description": "Gizwits",
   "homepage": "https://github.com/demchenkoalex/react-native-gizwits-sdk-v5#readme",
   "main": "lib/index.js",

package/react-native-gizwits-sdk-v5.podspec

@@ -19,6 +19,6 @@ Pod::Spec.new do |s|
 
   s.dependency 'React'
   s.dependency 'CryptoSwift', '~> 1.8.0'
-  s.dependency 'GizwitsiOSSDK', '~> 1.4.7'
+  s.dependency 'GizwitsiOSSDK', '~> 1.4.9'
 
 end