react-native-gizwits-sdk-v5 1.6.2 → 1.6.3

package/.idea/misc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>

package/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/react-native-gizwits-sdk-v5.iml" filepath="$PROJECT_DIR$/.idea/react-native-gizwits-sdk-v5.iml" />
+    </modules>
+  </component>
+</project>

package/.idea/react-native-gizwits-sdk-v5.iml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

package/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

package/.idea/workspace.xml

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="NONE" />
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="b2b95988-cfb1-4e9d-bf79-69c05c12f4d5" name="Changes" comment="">
+      <change beforePath="$PROJECT_DIR$/android/src/main/java/com/gizwits/reactnativegizwitssdkv5/RNGizDeviceManagerModule.kt" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/java/com/gizwits/reactnativegizwitssdkv5/RNGizDeviceManagerModule.kt" afterDir="false" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="ClangdSettings">
+    <option name="formatViaClangd" value="false" />
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="ProjectColorInfo"><![CDATA[{
+  "associatedIndex": 6
+}]]></component>
+  <component name="ProjectId" id="36H1NmpF6OqIomV64QR0jdAkvwL" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "ModuleVcsDetector.initialDetectionPerformed": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.cidr.known.project.marker": "true",
+    "RunOnceActivity.git.unshallow": "true",
+    "RunOnceActivity.readMode.enableVisualFormatting": "true",
+    "cf.first.check.clang-format": "false",
+    "cidr.known.project.marker": "true",
+    "git-widget-placeholder": "feature/rongwei",
+    "last_opened_file_path": "/Users/roc/Documents/Code/Gizwits/iot-sdk/react-native-gizwits-sdk-v5"
+  }
+}]]></component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="b2b95988-cfb1-4e9d-bf79-69c05c12f4d5" name="Changes" comment="" />
+      <created>1764648644343</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1764648644343</updated>
+    </task>
+    <servers />
+  </component>
+</project>

package/.prettierrc.js

@@ -0,0 +1,5 @@
+module.exports = {
+  jsxSingleQuote: true,
+  semi: false,
+  singleQuote: true,
+}

package/android/build.gradle

@@ -67,10 +67,10 @@ dependencies {
     // ESPTouch
     implementation 'com.github.EspressifApp:lib-esptouch-android:1.1.1'
 
-    implementation("io.github.gizwits:sdk:1.4.3")
-    implementation("io.github.gizwits:sdk-bluetooth:1.4.3")
-    implementation("io.github.gizwits:sdk-lan:1.4.3")
-    implementation("io.github.gizwits:sdk-mqtt:1.4.3")
+    implementation("io.github.gizwits:sdk:1.4.4")
+    implementation("io.github.gizwits:sdk-bluetooth:1.4.4")
+    implementation("io.github.gizwits:sdk-lan:1.4.4")
+    implementation("io.github.gizwits:sdk-mqtt:1.4.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/babel.config.js

@@ -0,0 +1,3 @@
+module.exports = {
+  presets: ['module:metro-react-native-babel-preset'],
+}

package/ios/RNGizSDKManagerModule.xcodeproj/xcuserdata/roc.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -0,0 +1,14 @@
+<?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>RNGizSDKManagerModule.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+</dict>
+</plist>

package/lib/types.d.ts

@@ -55,9 +55,10 @@ export interface GizBaseProfile {
 export type BlueToothType = 'Mesh' | 'Beacon' | 'Voice' | 'GATT';
 export type BlueToothVersion = 'BLE4' | 'BLE42' | 'BLE50';
 export type NetStatus = 0 | 1 | 2;
-export type GizWiFiActivatorEventType = 'START_WIFI_CONFIG' | 'START_CONNECT_DEVICE' | 'CONNECT_DEVICE_SUCCESS' | 'CONNECT_DEVICE_FAIL' | 'START_SEND_WIFI_CONFIG' | 'START_SEND_WIFI_CONFIG_SUCCESS' | 'START_SEND_WIFI_CONFIG_FAIL' | 'WIFI_CONFIG_RECV_SUCCESS' | 'START_SEARCH_RANDOM_CODE' | 'START_SEARCH_RANDOM_CODE_SUCCESS' | 'WIFI_CONFIG_SUCCESS' | 'WIFI_CONFIG_CANCEL' | 'WIFI_CONFIG_FAIL';
+export type GizWiFiActivatorEventTypeAndroid = 'START_WIFI_CONFIG' | 'START_CONNECT_DEVICE' | 'CONNECT_DEVICE_SUCCESS' | 'CONNECT_DEVICE_FAIL' | 'START_SEND_WIFI_CONFIG' | 'START_SEND_WIFI_CONFIG_SUCCESS' | 'START_SEND_WIFI_CONFIG_FAIL' | 'WIFI_CONFIG_RECV_SUCCESS' | 'START_SEARCH_RANDOM_CODE' | 'START_SEARCH_RANDOM_CODE_SUCCESS' | 'WIFI_CONFIG_SUCCESS' | 'WIFI_CONFIG_CANCEL' | 'WIFI_CONFIG_FAIL';
+export type GizWiFiActivatorEventTypeiOS = 1000 | 1005 | 1006 | 1007 | 1008 | 1009 | 1010 | 1001 | 1011 | 1012 | 1013 | 1014 | 1015;
 export interface GizWiFiActivatorEvent {
-    data: GizWiFiActivatorEventType;
+    data: GizWiFiActivatorEventTypeAndroid | GizWiFiActivatorEventTypeiOS;
 }
 export interface GizLanProfile extends GizBaseProfile {
     ip: string;

package/package.json

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

package/src/Base.tsx

@@ -0,0 +1,28 @@
+import { GizCallback, GizResult } from './types'
+
+class Base {
+  callbackWapper(
+    func: (callback: GizCallback<any, any>) => void
+  ): Promise<GizResult<any, any>> {
+    const promise = new Promise((res, _) => {
+      func((error, data) => {
+        if (error) {
+          res(error)
+        } else {
+          res(data)
+        }
+      })
+    })
+
+    return promise as Promise<GizResult<any, any>>
+  }
+
+  deleteCallBack = (callbacks: any[], callback: any) => {
+    const index = callbacks.findIndex((item) => item === callback)
+    if (index !== -1) {
+      callbacks.splice(index, 1)
+    }
+  }
+}
+
+export default Base

package/src/__tests__/index.test.ts

@@ -0,0 +1,5 @@
+import { addOne } from '../index'
+
+test('addOne', () => {
+  expect(addOne(0)).toEqual(1)
+})

package/src/device.tsx

@@ -0,0 +1,314 @@
+import { NativeEventEmitter, NativeModules } from 'react-native'
+
+import Base from './Base'
+import {
+  GizCallback,
+  GizCapability,
+  GizDeviceData,
+  GizDeviceInfoProfile,
+  GizOTAFirmwareType,
+  GizOtaProgressCallback,
+  GizOtaProgressEventCallback,
+  GizProvideWiFiCredentialsCallback,
+  GizResult,
+  GizMusicalRhythmCallback,
+  MusicalRhythmParseMode,
+  GizLightDanceDataEvent,
+} from './types'
+const eventEmitter = new NativeEventEmitter(
+  NativeModules.RNGizDeviceManagerModule
+)
+
+class RNGizDeviceManagerModule extends Base {
+  otaEventCallbacks: GizOtaProgressEventCallback[] = []
+  provideWiFiCredentialsCallbacks: GizProvideWiFiCredentialsCallback[] = []
+  musicalRhythmCallbacks: { [keyof: string]: GizMusicalRhythmCallback } = {}
+
+  constructor() {
+    super()
+    eventEmitter.addListener('GizOTAProgressEvent', this.otaEventCallback)
+    eventEmitter.addListener(
+      'GizProvideWiFiCredentialsEvent',
+      this.provideWiFiCredentialsCallback
+    )
+    eventEmitter.addListener(
+      'GizMusicalRhythmEvnet',
+      this.musicalRhythmCallback
+    )
+  }
+
+  otaEventCallback: GizOtaProgressEventCallback = (data) => {
+    this.otaEventCallbacks.map((item) => {
+      item(data)
+    })
+  }
+  provideWiFiCredentialsCallback: GizProvideWiFiCredentialsCallback = (
+    data
+  ) => {
+    this.provideWiFiCredentialsCallbacks.map((item) => {
+      item(data)
+    })
+  }
+
+  musicalRhythmCallback: GizMusicalRhythmCallback = ({ deviceID, data }) => {
+    const callback = this.musicalRhythmCallbacks[deviceID]
+    if (callback) {
+      callback({ deviceID, data })
+    }
+  }
+
+  sendDp(
+    id: string,
+    type: GizCapability,
+    data: Object
+  ): Promise<GizResult<GizDeviceData, any>> {
+    return this.callbackWapper((callback: GizCallback<any, any>) => {
+      const dataString = JSON.stringify(data)
+      NativeModules.RNGizDeviceManagerModule.sendDp(
+        {
+          id,
+          type,
+          data: dataString,
+        },
+        callback
+      )
+    })
+  }
+  getDp(
+    id: string,
+    type: GizCapability,
+    attrs?: string[]
+  ): Promise<GizResult<GizDeviceData, any>> {
+    return this.callbackWapper((callback: GizCallback<any, any>) => {
+      NativeModules.RNGizDeviceManagerModule.getDp(
+        {
+          id,
+          type,
+          attrs,
+        },
+        callback
+      )
+    })
+  }
+
+  getDeviceInfo(
+    id: string,
+    type: GizCapability
+  ): Promise<GizResult<GizDeviceInfoProfile, any>> {
+    return this.callbackWapper((callback: GizCallback<any, any>) => {
+      NativeModules.RNGizDeviceManagerModule.getDeviceInfo(
+        {
+          id,
+          type,
+        },
+        callback
+      )
+    })
+  }
+
+  connect(id: string, type: GizCapability): Promise<GizResult<any, any>> {
+    return this.callbackWapper((callback: GizCallback<any, any>) => {
+      NativeModules.RNGizDeviceManagerModule.connect(
+        {
+          id,
+          type,
+        },
+        callback
+      )
+    })
+  }
+  disConnect(id: string, type: GizCapability): Promise<GizResult<any, any>> {
+    return this.callbackWapper((callback: GizCallback<any, any>) => {
+      NativeModules.RNGizDeviceManagerModule.disConnect(
+        {
+          id,
+          type,
+        },
+        callback
+      )
+    })
+  }
+
+  updateDeviceInfo(
+    id: string,
+    alias?: string,
+    remark?: string
+  ): Promise<GizResult<any, any>> {
+    return this.callbackWapper((callback: GizCallback<any, any>) => {
+      NativeModules.RNGizDeviceManagerModule.updateDeviceInfo(
+        {
+          id,
+          alias,
+          remark,
+        },
+        callback
+      )
+    })
+  }
+
+  bind(
+    id: string,
+    alias?: string,
+    remark?: string
+  ): Promise<GizResult<any, any>> {
+    return this.callbackWapper((callback: GizCallback<any, any>) => {
+      NativeModules.RNGizDeviceManagerModule.bind(
+        {
+          id,
+          alias,
+          remark,
+        },
+        callback
+      )
+    })
+  }
+  unBind(id: string): Promise<GizResult<any, any>> {
+    return this.callbackWapper((callback: GizCallback<any, any>) => {
+      NativeModules.RNGizDeviceManagerModule.unBind(
+        {
+          id,
+        },
+        callback
+      )
+    })
+  }
+  register(id: string): Promise<GizResult<any, any>> {
+    return this.callbackWapper((callback: GizCallback<any, any>) => {
+      NativeModules.RNGizDeviceManagerModule.register(
+        {
+          id,
+        },
+        callback
+      )
+    })
+  }
+  checkUpdate(
+    id: string,
+    type: GizCapability,
+    firmwareType: GizOTAFirmwareType
+  ): Promise<GizResult<any, any>> {
+    return this.callbackWapper((callback: GizCallback<any, any>) => {
+      NativeModules.RNGizDeviceManagerModule.checkUpdate(
+        {
+          id,
+          type,
+          firmwareType,
+        },
+        callback
+      )
+    })
+  }
+
+  async startUpgrade(
+    id: string,
+    type: GizCapability,
+    firmwareType: GizOTAFirmwareType,
+    callback: GizOtaProgressCallback
+  ): Promise<GizResult<any, any>> {
+    // 注册监听
+    const wapperCallback: GizOtaProgressEventCallback = ({ data }) => {
+      callback(data)
+    }
+    this.otaEventCallbacks.push(wapperCallback)
+    const data = await this.callbackWapper(
+      (callback: GizCallback<any, any>) => {
+        NativeModules.RNGizDeviceManagerModule.startUpgrade(
+          {
+            id,
+            type,
+            firmwareType,
+          },
+          callback
+        )
+      }
+    )
+    // OTA结束，销毁监听
+    this.deleteCallBack(this.otaEventCallbacks, wapperCallback)
+    return data
+  }
+
+  async provideWiFiCredentials(
+    id: string,
+    type: GizCapability,
+    ssid: string,
+    password: string,
+    timeout: number,
+    processHandler: GizProvideWiFiCredentialsCallback,
+    bindWithUid?: boolean
+  ): Promise<GizResult<any, any>> {
+    const wapperCallback: GizProvideWiFiCredentialsCallback = (data) => {
+      processHandler(data)
+    }
+    this.provideWiFiCredentialsCallbacks.push(wapperCallback)
+    const data = await this.callbackWapper(
+      (callback: GizCallback<any, any>) => {
+        NativeModules.RNGizDeviceManagerModule.provideWiFiCredentials(
+          {
+            id,
+            type,
+            ssid,
+            password,
+            timeout,
+            bindWithUid: bindWithUid ?? false,
+          },
+          callback
+        )
+      }
+    )
+    this.deleteCallBack(this.provideWiFiCredentialsCallbacks, wapperCallback)
+    return data
+  }
+
+  async stopProvideWiFiCredentials(
+    id: string,
+    type: GizCapability
+  ): Promise<GizResult<any, any>> {
+    return this.callbackWapper((callback: GizCallback<any, any>) => {
+      NativeModules.RNGizDeviceManagerModule.stopProvideWiFiCredentials(
+        {
+          id,
+          type,
+        },
+        callback
+      )
+    })
+  }
+
+  async startMusicalRhythm(
+    id: string,
+    sensitivity: number,
+    mode: MusicalRhythmParseMode,
+    onData?: GizMusicalRhythmCallback
+  ): Promise<GizResult<any, any>> {
+    if (!!onData) {
+      this.musicalRhythmCallbacks[id] = onData
+    }
+    return this.callbackWapper((callback: GizCallback<any, any>) => {
+      NativeModules.RNGizDeviceManagerModule.startMusicalRhythm(
+        {
+          id,
+          sensitivity,
+          mode,
+          needMonitor: !!onData,
+        },
+        callback
+      )
+    })
+  }
+  async stopMusicalRhythm(id: string): Promise<GizResult<any, any>> {
+    delete this.musicalRhythmCallbacks[id]
+
+    return this.callbackWapper((callback: GizCallback<any, any>) => {
+      NativeModules.RNGizDeviceManagerModule.stopMusicalRhythm(
+        {
+          id,
+        },
+        callback
+      )
+    })
+  }
+}
+
+export default new RNGizDeviceManagerModule()
+
+export { RNGizDeviceManagerModule }