react-native-gizwits-sdk-v5 1.3.2 → 1.3.3

package/android/src/main/java/com/gizwits/reactnativegizwitssdkv5/RNGizSDKManagerModule.kt

@@ -17,7 +17,6 @@ import com.gizwits.smart.sdk.bluetooth.startBleScan
 import com.gizwits.smart.sdk.bluetooth.stopBleScan
 import com.gizwits.smart.sdk.bluetooth.subscribeBluetoothDeviceList
 import com.gizwits.smart.sdk.common.GizConfiguration
-import com.gizwits.smart.sdk.common.combineLatest
 import com.gizwits.smart.sdk.exception.GizException
 import com.gizwits.smart.sdk.lan.lanCapacity
 import com.gizwits.smart.sdk.lan.subscribeLanDeviceList
@@ -27,13 +26,16 @@ import com.gizwits.smart.sdk.mqtt.subscribeBoundDeviceList
 import com.google.gson.annotations.SerializedName
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.flow.drop
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.last
+import kotlinx.coroutines.flow.mapLatest
 import kotlinx.coroutines.flow.take
 import kotlinx.coroutines.flow.toList
 import kotlinx.coroutines.launch
@@ -57,6 +59,21 @@ class RNGizSDKManagerModule(reactContext: ReactApplicationContext) : ReactContex
         DeviceStateListener("DeviceStateListener")
     }
 
+    /** @hide */
+    @OptIn(ExperimentalCoroutinesApi::class)
+    fun <T1, T2, T3, R> combineLatest(
+        flow1: Flow<T1>,
+        flow2: Flow<T2>,
+        flow3: Flow<T3>,
+        transform: suspend (a: T1, b: T2, c: T3) -> R
+    ): Flow<R> {
+        return combine(flow1, flow2, flow3) { value1, value2, value3 ->
+            Triple(value1, value2, value3)
+        }.mapLatest {
+            transform(it.first, it.second, it.third)
+        }
+    }
+
     override fun getName() = "RNGizSDKManagerModule"
     private val deviceListState: Flow<List<GizDevice>> =
         combineLatest(

package/android/src/main/java/com/gizwits/reactnativegizwitssdkv5/RNGizUserManagerModule.kt

@@ -5,8 +5,7 @@ import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.ReadableMap
-import com.gizwits.smart.sdk.GizUserManagerImpl
-import com.gizwits.smart.sdk.common.GizConfiguration
+import com.gizwits.smart.sdk.GizSDKManager
 import com.gizwits.smart.sdk.core.data.model.UserToken
 import com.google.gson.annotations.SerializedName
 import kotlinx.coroutines.CoroutineScope
@@ -26,7 +25,7 @@ class RNGizUserManagerModule(reactContext: ReactApplicationContext) : ReactConte
 
     @ReactMethod
     fun getAuthorizeData(options: ReadableMap, result: Callback) {
-        val tokenInfo = GizUserManagerImpl.getUserTokenStream().value
+        val tokenInfo = GizSDKManager.getUserManager().getUserTokenStream().value
         val authData = UpdateAuthorizeDataParams(tokenInfo?.token ?: "", tokenInfo?.userId ?: "")
         GizRNCallbackManager.callbackWithResult(callback = result, result = Result.success(authData))
     }
@@ -35,7 +34,7 @@ class RNGizUserManagerModule(reactContext: ReactApplicationContext) : ReactConte
         var config = RNGizParamsChecker.check(options, result, UpdateAuthorizeDataParams::class.java)
         config?.let {
             // Date 暂时没有用到
-            GizUserManagerImpl.updateAuthorizeData(UserToken(config.token, config.uid, Date()))
+            GizSDKManager.getUserManager().updateAuthorizeData(UserToken(config.token, config.uid, Date()))
             GizRNCallbackManager.callbackWithResult(callback = result, result = Result.success(0))
         }
 
@@ -43,14 +42,14 @@ class RNGizUserManagerModule(reactContext: ReactApplicationContext) : ReactConte
     @ReactMethod
     fun loginByAnonymous(options: ReadableMap, result: Callback) {
         CoroutineScope(Dispatchers.Main).launch {
-            val res = GizUserManagerImpl.loginByAnonymous()
+            val res = GizSDKManager.getUserManager().loginByAnonymous()
             GizRNCallbackManager.callbackWithResult(callback = result, result = res)
         }
     }
     @ReactMethod
     fun logout(options: ReadableMap, result: Callback) {
         CoroutineScope(Dispatchers.Main).launch {
-            val res = GizUserManagerImpl.logout()
+            val res = GizSDKManager.getUserManager().logout()
             GizRNCallbackManager.callbackWithResult(callback = result, result = res)
         }
     }

package/package.json

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

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

@@ -14,10 +14,12 @@ Pod::Spec.new do |s|
 
   s.source       = { :git => "https://github.com/demchenkoalex/react-native-module-template.git", :tag => "v#{s.version}" }
   s.source_files  = "ios/**/*.{h,m,swift}"
-  s.vendored_frameworks = "ios/GizwitsiOSSDK.framework"
+  # s.vendored_frameworks = "ios/GizwitsiOSSDK.framework"
   s.requires_arc = true
 
   s.dependency 'React'
   s.dependency 'Sentry', '~> 8.0'
   s.dependency 'CryptoSwift', '~> 1.8.0'
+  s.dependency 'GizwitsiOSSDK', '~> 1.0.0'
+
 end

package/ios/GizwitsiOSSDK.framework/Headers/CocoaAsyncSocket.h

@@ -1,18 +0,0 @@
-//
-//  CocoaAsyncSocket.h
-//  CocoaAsyncSocket
-//
-//  Created by Derek Clarkson on 10/08/2015.
-//  CocoaAsyncSocket project is in the public domain.
-//
-
-#import <Foundation/Foundation.h>
-
-//! Project version number for CocoaAsyncSocket.
-FOUNDATION_EXPORT double _cocoaAsyncSocketVersionNumber;
-
-//! Project version string for CocoaAsyncSocket.
-FOUNDATION_EXPORT const unsigned char _cocoaAsyncSocketVersionString[];
-
-#import "_GCDAsyncSocket.h"
-#import "_GCDAsyncUdpSocket.h"

package/ios/GizwitsiOSSDK.framework/Headers/DDASLLogger.h

@@ -1,41 +0,0 @@
-#import <Foundation/Foundation.h>
-#import <asl.h>
-
-#import "DDLog.h"
-
-/**
- * Welcome to Cocoa Lumberjack!
- * 
- * The project page has a wealth of documentation if you have any questions.
- * https://github.com/CocoaLumberjack/CocoaLumberjack
- * 
- * If you're new to the project you may wish to read the "Getting Started" wiki.
- * https://github.com/CocoaLumberjack/CocoaLumberjack/wiki/GettingStarted
- * 
- * 
- * This class provides a logger for the Apple System Log facility.
- * 
- * As described in the "Getting Started" page,
- * the traditional NSLog() function directs it's output to two places:
- * 
- * - Apple System Log
- * - StdErr (if stderr is a TTY) so log statements show up in Xcode console
- * 
- * To duplicate NSLog() functionality you can simply add this logger and a tty logger.
- * However, if you instead choose to use file logging (for faster performance),
- * you may choose to use a file logger and a tty logger.
-**/
-
-@interface DDASLLogger : DDAbstractLogger <DDLogger>
-{
-    aslclient client;
-}
-
-+ (instancetype)sharedInstance;
-
-// Inherited from DDAbstractLogger
-
-// - (id <DDLogFormatter>)logFormatter;
-// - (void)setLogFormatter:(id <DDLogFormatter>)formatter;
-
-@end

package/ios/GizwitsiOSSDK.framework/Headers/DDAbstractDatabaseLogger.h

@@ -1,102 +0,0 @@
-#import <Foundation/Foundation.h>
-
-#import "DDLog.h"
-
-/**
- * Welcome to Cocoa Lumberjack!
- * 
- * The project page has a wealth of documentation if you have any questions.
- * https://github.com/CocoaLumberjack/CocoaLumberjack
- * 
- * If you're new to the project you may wish to read the "Getting Started" wiki.
- * https://github.com/CocoaLumberjack/CocoaLumberjack/wiki/GettingStarted
- * 
- * 
- * This class provides an abstract implementation of a database logger.
- * 
- * That is, it provides the base implementation for a database logger to build atop of.
- * All that is needed for a concrete database logger is to extend this class
- * and override the methods in the implementation file that are prefixed with "db_".
-**/
-
-@interface DDAbstractDatabaseLogger : DDAbstractLogger {
-@protected
-    NSUInteger saveThreshold;
-    NSTimeInterval saveInterval;
-    NSTimeInterval maxAge;
-    NSTimeInterval deleteInterval;
-    BOOL deleteOnEverySave;
-    
-    BOOL saveTimerSuspended;
-    NSUInteger unsavedCount;
-    dispatch_time_t unsavedTime;
-    dispatch_source_t saveTimer;
-    dispatch_time_t lastDeleteTime;
-    dispatch_source_t deleteTimer;
-}
-
-/**
- * Specifies how often to save the data to disk.
- * Since saving is an expensive operation (disk io) it is not done after every log statement.
- * These properties allow you to configure how/when the logger saves to disk.
- * 
- * A save is done when either (whichever happens first):
- * 
- * - The number of unsaved log entries reaches saveThreshold
- * - The amount of time since the oldest unsaved log entry was created reaches saveInterval
- * 
- * You can optionally disable the saveThreshold by setting it to zero.
- * If you disable the saveThreshold you are entirely dependent on the saveInterval.
- * 
- * You can optionally disable the saveInterval by setting it to zero (or a negative value).
- * If you disable the saveInterval you are entirely dependent on the saveThreshold.
- * 
- * It's not wise to disable both saveThreshold and saveInterval.
- * 
- * The default saveThreshold is 500.
- * The default saveInterval is 60 seconds.
-**/
-@property (assign, readwrite) NSUInteger saveThreshold;
-@property (assign, readwrite) NSTimeInterval saveInterval;
-
-/**
- * It is likely you don't want the log entries to persist forever.
- * Doing so would allow the database to grow infinitely large over time.
- * 
- * The maxAge property provides a way to specify how old a log statement can get
- * before it should get deleted from the database.
- * 
- * The deleteInterval specifies how often to sweep for old log entries.
- * Since deleting is an expensive operation (disk io) is is done on a fixed interval.
- * 
- * An alternative to the deleteInterval is the deleteOnEverySave option.
- * This specifies that old log entries should be deleted during every save operation.
- * 
- * You can optionally disable the maxAge by setting it to zero (or a negative value).
- * If you disable the maxAge then old log statements are not deleted.
- * 
- * You can optionally disable the deleteInterval by setting it to zero (or a negative value).
- * 
- * If you disable both deleteInterval and deleteOnEverySave then old log statements are not deleted.
- * 
- * It's not wise to enable both deleteInterval and deleteOnEverySave.
- * 
- * The default maxAge is 7 days.
- * The default deleteInterval is 5 minutes.
- * The default deleteOnEverySave is NO.
-**/
-@property (assign, readwrite) NSTimeInterval maxAge;
-@property (assign, readwrite) NSTimeInterval deleteInterval;
-@property (assign, readwrite) BOOL deleteOnEverySave;
-
-/**
- * Forces a save of any pending log entries (flushes log entries to disk).
-**/
-- (void)savePendingLogEntries;
-
-/**
- * Removes any log entries that are older than maxAge.
-**/
-- (void)deleteOldLogEntries;
-
-@end

package/ios/GizwitsiOSSDK.framework/Headers/DDContextFilterLogFormatter.h

@@ -1,63 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "DDLog.h"
-
-/**
- * Welcome to Cocoa Lumberjack!
- * 
- * The project page has a wealth of documentation if you have any questions.
- * https://github.com/CocoaLumberjack/CocoaLumberjack
- * 
- * If you're new to the project you may wish to read the "Getting Started" page.
- * https://github.com/CocoaLumberjack/CocoaLumberjack/wiki/GettingStarted
- * 
- * 
- * This class provides a log formatter that filters log statements from a logging context not on the whitelist.
- * 
- * A log formatter can be added to any logger to format and/or filter its output.
- * You can learn more about log formatters here:
- * https://github.com/CocoaLumberjack/CocoaLumberjack/wiki/CustomFormatters
- * 
- * You can learn more about logging context's here:
- * https://github.com/CocoaLumberjack/CocoaLumberjack/wiki/CustomContext
- *
- * But here's a quick overview / refresher:
- * 
- * Every log statement has a logging context.
- * These come from the underlying logging macros defined in DDLog.h.
- * The default logging context is zero.
- * You can define multiple logging context's for use in your application.
- * For example, logically separate parts of your app each have a different logging context.
- * Also 3rd party frameworks that make use of Lumberjack generally use their own dedicated logging context.
-**/
-@interface DDContextWhitelistFilterLogFormatter : NSObject <DDLogFormatter>
-
-- (id)init;
-
-- (void)addToWhitelist:(int)loggingContext;
-- (void)removeFromWhitelist:(int)loggingContext;
-
-- (NSArray *)whitelist;
-
-- (BOOL)isOnWhitelist:(int)loggingContext;
-
-@end
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-#pragma mark -
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-/**
- * This class provides a log formatter that filters log statements from a logging context on the blacklist.
-**/
-@interface DDContextBlacklistFilterLogFormatter : NSObject <DDLogFormatter>
-
-- (id)init;
-
-- (void)addToBlacklist:(int)loggingContext;
-- (void)removeFromBlacklist:(int)loggingContext;
-
-- (NSArray *)blacklist;
-
-- (BOOL)isOnBlacklist:(int)loggingContext;
-
-@end

package/ios/GizwitsiOSSDK.framework/Headers/DDDispatchQueueLogFormatter.h

@@ -1,128 +0,0 @@
-#import <Foundation/Foundation.h>
-#import <libkern/OSAtomic.h>
-#import "DDLog.h"
-
-
-/**
- * Welcome to Cocoa Lumberjack!
- * 
- * The project page has a wealth of documentation if you have any questions.
- * https://github.com/CocoaLumberjack/CocoaLumberjack
- * 
- * If you're new to the project you may wish to read the "Getting Started" page.
- * https://github.com/CocoaLumberjack/CocoaLumberjack/wiki/GettingStarted
- * 
- * 
- * This class provides a log formatter that prints the dispatch_queue label instead of the mach_thread_id.
- * 
- * A log formatter can be added to any logger to format and/or filter its output.
- * You can learn more about log formatters here:
- * https://github.com/CocoaLumberjack/CocoaLumberjack/wiki/CustomFormatters
- * 
- * A typical NSLog (or DDTTYLogger) prints detailed info as [<process_id>:<thread_id>].
- * For example:
- * 
- * 2011-10-17 20:21:45.435 AppName[19928:5207] Your log message here
- * 
- * Where:
- * - 19928 = process id
- * -  5207 = thread id (mach_thread_id printed in hex)
- * 
- * When using grand central dispatch (GCD), this information is less useful.
- * This is because a single serial dispatch queue may be run on any thread from an internally managed thread pool.
- * For example:
- * 
- * 2011-10-17 20:32:31.111 AppName[19954:4d07] Message from my_serial_dispatch_queue
- * 2011-10-17 20:32:31.112 AppName[19954:5207] Message from my_serial_dispatch_queue
- * 2011-10-17 20:32:31.113 AppName[19954:2c55] Message from my_serial_dispatch_queue
- * 
- * This formatter allows you to replace the standard [box:info] with the dispatch_queue name.
- * For example:
- * 
- * 2011-10-17 20:32:31.111 AppName[img-scaling] Message from my_serial_dispatch_queue
- * 2011-10-17 20:32:31.112 AppName[img-scaling] Message from my_serial_dispatch_queue
- * 2011-10-17 20:32:31.113 AppName[img-scaling] Message from my_serial_dispatch_queue
- * 
- * If the dispatch_queue doesn't have a set name, then it falls back to the thread name.
- * If the current thread doesn't have a set name, then it falls back to the mach_thread_id in hex (like normal).
- * 
- * Note: If manually creating your own background threads (via NSThread/alloc/init or NSThread/detachNeThread),
- * you can use [[NSThread currentThread] setName:(NSString *)].
-**/
-@interface DDDispatchQueueLogFormatter : NSObject <DDLogFormatter> {
-@protected
-    
-    NSString *dateFormatString;
-}
-
-/**
- * Standard init method.
- * Configure using properties as desired.
-**/
-- (id)init;
-
-/**
- * The minQueueLength restricts the minimum size of the [detail box].
- * If the minQueueLength is set to 0, there is no restriction.
- * 
- * For example, say a dispatch_queue has a label of "diskIO":
- * 
- * If the minQueueLength is 0: [diskIO]
- * If the minQueueLength is 4: [diskIO]
- * If the minQueueLength is 5: [diskIO]
- * If the minQueueLength is 6: [diskIO]
- * If the minQueueLength is 7: [diskIO ]
- * If the minQueueLength is 8: [diskIO  ]
- * 
- * The default minQueueLength is 0 (no minimum, so [detail box] won't be padded).
- * 
- * If you want every [detail box] to have the exact same width,
- * set both minQueueLength and maxQueueLength to the same value.
-**/
-@property (assign) NSUInteger minQueueLength;
-
-/**
- * The maxQueueLength restricts the number of characters that will be inside the [detail box].
- * If the maxQueueLength is 0, there is no restriction.
- * 
- * For example, say a dispatch_queue has a label of "diskIO":
- *
- * If the maxQueueLength is 0: [diskIO]
- * If the maxQueueLength is 4: [disk]
- * If the maxQueueLength is 5: [diskI]
- * If the maxQueueLength is 6: [diskIO]
- * If the maxQueueLength is 7: [diskIO]
- * If the maxQueueLength is 8: [diskIO]
- * 
- * The default maxQueueLength is 0 (no maximum, so [detail box] won't be truncated).
- * 
- * If you want every [detail box] to have the exact same width,
- * set both minQueueLength and maxQueueLength to the same value.
-**/
-@property (assign) NSUInteger maxQueueLength;
-
-/**
- * Sometimes queue labels have long names like "com.apple.main-queue",
- * but you'd prefer something shorter like simply "main".
- * 
- * This method allows you to set such preferred replacements.
- * The above example is set by default.
- * 
- * To remove/undo a previous replacement, invoke this method with nil for the 'shortLabel' parameter.
-**/
-- (NSString *)replacementStringForQueueLabel:(NSString *)longLabel;
-- (void)setReplacementString:(NSString *)shortLabel forQueueLabel:(NSString *)longLabel;
-
-@end
-
-/**
- * Method declarations that make it easier to extend/modify DDDispatchQueueLogFormatter
-**/
-@interface DDDispatchQueueLogFormatter (OverridableMethods)
-
-- (NSString *)stringFromDate:(NSDate *)date;
-- (NSString *)queueThreadLabelForLogMessage:(DDLogMessage *)logMessage;
-- (NSString *)formatLogMessage:(DDLogMessage *)logMessage;
-
-@end
-