mini_program_gizwits_sdk 3.6.2 → 3.6.4

package/dist/src/types/index.d.ts

@@ -43,6 +43,7 @@ export interface IDevice {
     did: string;
     bleWorkStatus?: number;
     name: string;
+    localName: string;
     isBind: boolean;
     rootDeviceId?: string;
     bleDeviceID?: string;

package/index.ts

@@ -3,7 +3,6 @@ import gizwitsSdk from './src/sdk';
 import errorCode from './src/errorCode';
 import { BleHandle } from './src/handler/ble';
 
-import * as types from './src/types';
 export { errorCode, BleHandle };
-export { types }
-export default gizwitsSdk;
+export default gizwitsSdk;
+export * from './src/types';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mini_program_gizwits_sdk",
-  "version": "3.6.2",
+  "version": "3.6.4",
   "description": "更新类型",
   "main": "./dist/index.js",
   "scripts": {

package/src/handler/lan.ts

@@ -202,6 +202,7 @@ export class LanHandle extends EventListener<TLanHandleEvent> {
         expandData: updateDevice,
         name: "",
         isBind: false,
+        localName: '',
         connectType: "NONE",
         isOnline: false,
         isLanOnline: true,

package/src/services/devices.ts

@@ -75,6 +75,7 @@ export const getBindingList = async (): Promise<IServiceResult<IDevice[]>> => {
         mac: item.mac,
         did: item.did,
         host: item.host,
+        localName: '',
         port_s: item.port_s,
         port: item.port,
         ws_port: item.ws_port,

package/src/types/index.ts

@@ -55,6 +55,7 @@ export interface IDevice {
   did: string;
   bleWorkStatus?: number; // 0 默认状态 1 配网状态
   name: string;
+  localName: string;
   isBind: boolean;
   rootDeviceId?: string;
   bleDeviceID?: string;

package/src/utils.ts

@@ -248,7 +248,8 @@ export const BTDevice2GDevice = (
     isBleOnline: true,
     isLanOnline: false,
     isOnline: false,
-    name: BTDevice.name,
+    name: BTDevice.localName,
+    localName: BTDevice.localName,
     isBind: false,
     bleDeviceID: BTDevice.deviceId,
     ctime: new Date().getTime(),

package/src/wifiConfig/ap.ts

@@ -153,6 +153,7 @@ class ApConfig extends ConfigBase {
             did: item.did,
             name: '',
             isBind: false,
+            localName: '',
             connectType: 'NONE',
             isBleOnline: false,
             isLanOnline: false,

package/src/wifiConfig/ble.ts

@@ -244,31 +244,9 @@ class BLEConfig extends ConfigBase {
     return (
       !softAPSSIDPrefix ||
       (device.name && device.name.startsWith(softAPSSIDPrefix))
+      || (device.localName && device.localName.startsWith(softAPSSIDPrefix))
     )
   }
-  // isValidBleDevice = (
-  //   bleDevice: WechatMiniprogram.BlueToothDevice,
-  //   softAPSSIDPrefix?: string
-  // ) => {
-  //   if (!bleDevice || !bleDevice.advertisData) {
-  //     // 无效蓝牙设备或者蓝牙设备广播数据为空，返回失败
-  //     return false;
-  //   }
-  //   const {productKey, mac, bleWorkStatus} = advertisData2PkAndMac(bleDevice.advertisData, this.specialProductKeys)
-  //   if (!this.specialProductKeys.includes(productKey)) {
-  //     // 不在PK列表
-  //     return false;
-  //   }
-  //   // 判断广播包是否可以配网
-  //   if (bleWorkStatus !== 1) return;
-  //   GizLog.debug(`GIZ_SDK: isValidBleDevice mac: ${mac} pk: ${productKey} name: ${bleDevice.name}`)
-  //   GizLog.debug(`GIZ_SDK: softAPSSIDPrefix: ${softAPSSIDPrefix} ismatch : ${bleDevice.name && bleDevice.name.startsWith(softAPSSIDPrefix)}`)
-  //   return (
-  //     !softAPSSIDPrefix ||
-  //     (bleDevice.name && bleDevice.name.startsWith(softAPSSIDPrefix))
-  //   );
-  // };
-
 
   enableBluetoothDevicesDescovery = async (): Promise<
     { success: false; err: IError } | { success: true }
@@ -348,6 +326,7 @@ class BLEConfig extends ConfigBase {
             productKey: item.product_key,
             did: item.did,
             name: '',
+            localName: '',
             isBind: false,
             connectType: 'NONE',
             isBleOnline: false,

package/src/wifiConfig/nfc/index.ts

@@ -100,6 +100,7 @@ class NFCConfig extends ConfigBase {
             mac: item.mac,
             productKey: item.product_key,
             did: item.did,
+            localName: '',
             name: '',
             isBind: false,
             connectType: 'NONE',

package/dist/package.json

@@ -1,55 +0,0 @@
-{
-    "name": "mini_program_gizwits_sdk",
-    "version": "3.6.2",
-    "description": "更新类型",
-    "main": "./dist/index.js",
-    "scripts": {
-        "test": "node_modules/mocha/bin/_mocha -r ts-node/register tests/**/*.spec.ts -file ./tests/setup-wx.js -timeout 60s",
-        "testBle": "node_modules/mocha/bin/_mocha -r ts-node/register tests/utils/randomCode.spec.ts -file ./tests/setup-wx.js -timeout 60s",
-        "build": "rm -rf ./dist && webpack",
-        "release": "npm run build && release-it",
-        "cover": "istanbul cover node_modules/mocha/bin/_mocha -- -r ts-node/register tests/**/*.spec.ts -file ./tests/setup-wx.js -timeout 60s",
-        "coveralls": "npm run cover -- --report lcovonly && cat ./coverage/lcov.info | coveralls"
-    },
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/gizwits/mini_program_gizwits_sdk.git"
-    },
-    "keywords": [
-        "gizwits",
-        "miniprogram",
-        "sdk"
-    ],
-    "devDependencies": {
-        "@babel/plugin-transform-modules-commonjs": "^7.12.1",
-        "@release-it/conventional-changelog": "^2.0.0",
-        "@types/chai": "^4.2.11",
-        "@types/crypto-js": "^4.0.2",
-        "@types/mocha": "^7.0.2",
-        "@types/node": "^12.12.14",
-        "@types/sinon": "^10.0.6",
-        "chai": "^4.2.0",
-        "coveralls": "^3.0.11",
-        "istanbul": "^1.1.0-alpha.1",
-        "miniprogram-api-typings": "^3.9.0",
-        "mocha": "^7.1.1",
-        "release-it": "^14.2.2",
-        "sinon": "^9.2.4",
-        "ts-loader": "^6.2.2",
-        "ts-node": "^8.8.1",
-        "typescript": "^4.9.5",
-        "uglifyjs-webpack-plugin": "^2.2.0",
-        "webpack": "^4.42.1",
-        "webpack-bundle-analyzer": "^4.5.0",
-        "webpack-cli": "^3.3.11"
-    },
-    "author": "gizwits",
-    "license": "ISC",
-    "bugs": {
-        "url": "https://github.com/gizwits/mini_program_gizwits_sdk/issues"
-    },
-    "homepage": "https://github.com/gizwits/mini_program_gizwits_sdk#readme",
-    "dependencies": {
-        "crypto-js": "^4.1.1"
-    }
-}