eco-access-specifications 2.0.9 → 2.0.11

package/lib/base/CommandQueue.js

@@ -83,7 +83,7 @@ var createCommandQueue = function createCommandQueue(specMethod, DeviceEvent, De
   };
   var _checkAndExecute = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var command, rawResult, result, extracted;
+      var command, typeMap, rawResult, result, extracted;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -94,11 +94,32 @@ var createCommandQueue = function createCommandQueue(specMethod, DeviceEvent, De
             return _context.abrupt("return");
           case 2:
             isProcessing = true;
-            command = commandArray.shift();
-            _context.prev = 4;
-            _context.next = 7;
+            command = commandArray.shift(); // ✅ 类型映射逻辑
+            if (command.specWay === 'setPropertiesValue' && command.entity && Array.isArray(command.entity.objects)) {
+              typeMap = {
+                bool: 0,
+                uint8: 1,
+                int8: 2,
+                uint16: 3,
+                int16: 4,
+                uint32: 5,
+                int32: 6,
+                uint64: 7,
+                int64: 8,
+                "float": 9,
+                string: 10
+              };
+              command.entity.objects.forEach(function (obj) {
+                if (typeof obj.type === 'string' && typeMap.hasOwnProperty(obj.type)) {
+                  obj.type = typeMap[obj.type];
+                }
+              });
+            }
+            _context.prev = 5;
+            addLog("spec\u6307\u4EE4\u4E0B\u53D1\u6210\u529F:".concat((Device.mac, JSON.stringify(command.entity))));
+            _context.next = 9;
             return specMethod[command.specWay](Device.mac, JSON.stringify(command.entity));
-          case 7:
+          case 9:
             rawResult = _context.sent;
             result = parseToObject(rawResult);
             addLog("spec\u6307\u4EE4\u54CD\u5E94\u6210\u529F\u2705:".concat(JSON.stringify(result)));
@@ -116,11 +137,11 @@ var createCommandQueue = function createCommandQueue(specMethod, DeviceEvent, De
                 result: result
               });
             }
-            _context.next = 17;
+            _context.next = 19;
             break;
-          case 13:
-            _context.prev = 13;
-            _context.t0 = _context["catch"](4);
+          case 15:
+            _context.prev = 15;
+            _context.t0 = _context["catch"](5);
             addLog("spec\u274C\u5931\u8D25:".concat(JSON.stringify(_context.t0)));
             if (typeof command.onResult === 'function') {
               command.onResult({
@@ -133,14 +154,14 @@ var createCommandQueue = function createCommandQueue(specMethod, DeviceEvent, De
                 error: _context.t0
               });
             }
-          case 17:
+          case 19:
             isProcessing = false;
             _checkAndExecute();
-          case 19:
+          case 21:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[4, 13]]);
+      }, _callee, null, [[5, 15]]);
     }));
     return function checkAndExecute() {
       return _ref.apply(this, arguments);

package/lib/index.min.js

@@ -1 +1 @@
-import{bleSpec}from"./main/specMethod";var appName="",Device={},DeviceEvent={},Service={},addLog=function(){},Bluetooth={},localLog=function(){},bleSpecQueue=function(){},initSpecifications=function(e){appName=e.name,Device=e.Device,DeviceEvent=e.DeviceEvent,localLog=e.localLog,Service=e.Service,addLog=e.addLog,bleSpecQueue=bleSpec(Bluetooth=e.Bluetooth,DeviceEvent,Device)};import{initSpecifications,bleSpecQueue}from"./global";import EcoService from"./main/EcoService.js";import{addLog,LogPage}from"./main/log";import{oneTrackReport,allTrackPoints}from"./eco-track-report";import{bleSpec}from"./main/specMethod";appName="",Device={},DeviceEvent={},Service={},addLog=function(){},Bluetooth={},localLog=function(){},bleSpecQueue=function(){},initSpecifications=function(e){appName=e.name,Device=e.Device,DeviceEvent=e.DeviceEvent,localLog=e.localLog,Service=e.Service,addLog=e.addLog,bleSpecQueue=bleSpec(Bluetooth=e.Bluetooth,DeviceEvent,Device)};import{initSpecifications,bleSpecQueue}from"./global";import EcoService from"./main/EcoService.js";import{addLog,LogPage}from"./main/log";import{oneTrackReport,allTrackPoints}from"./eco-track-report";import{bleSpec}from"./main/specMethod";Device={},DeviceEvent={},Service={},addLog=function(){},Bluetooth={},localLog=function(){},bleSpecQueue=function(){},initSpecifications=function(e){appName=e.name,Device=e.Device,DeviceEvent=e.DeviceEvent,localLog=e.localLog,Service=e.Service,addLog=e.addLog,bleSpecQueue=bleSpec(Bluetooth=e.Bluetooth,DeviceEvent,Device)};import{initSpecifications,bleSpecQueue}from"./global";import EcoService from"./main/EcoService.js";import{addLog,LogPage}from"./main/log";import{oneTrackReport,allTrackPoints}from"./eco-track-report";import{bleSpec}from"./main/specMethod";Device={},DeviceEvent={},Service={},addLog=function(){},Bluetooth={},localLog=function(){},bleSpecQueue=function(){},initSpecifications=function(e){appName=e.name,Device=e.Device,DeviceEvent=e.DeviceEvent,localLog=e.localLog,Service=e.Service,addLog=e.addLog,bleSpecQueue=bleSpec(Bluetooth=e.Bluetooth,DeviceEvent,Device)};import{initSpecifications,bleSpecQueue}from"./global";import EcoService from"./main/EcoService.js";import{addLog,LogPage}from"./main/log";import{oneTrackReport,allTrackPoints}from"./eco-track-report";import{bleSpec}from"./main/specMethod";Device={},DeviceEvent={},Service={},addLog=function(){},Bluetooth={},localLog=function(){},bleSpecQueue=function(){},initSpecifications=function(e){appName=e.name,Device=e.Device,DeviceEvent=e.DeviceEvent,localLog=e.localLog,Service=e.Service,addLog=e.addLog,bleSpecQueue=bleSpec(Bluetooth=e.Bluetooth,DeviceEvent,Device)};import{initSpecifications,bleSpecQueue}from"./global";import EcoService from"./main/EcoService.js";import{addLog,LogPage}from"./main/log";import{oneTrackReport,allTrackPoints}from"./eco-track-report";import{bleSpec}from"./main/specMethod";appName=appName="",Device={},DeviceEvent={},Service={},addLog=function(){},Bluetooth={},localLog=function(){},bleSpecQueue=function(){},initSpecifications=function(e){appName=e.name,Device=e.Device,DeviceEvent=e.DeviceEvent,localLog=e.localLog,Service=e.Service,addLog=e.addLog,bleSpecQueue=bleSpec(Bluetooth=e.Bluetooth,DeviceEvent,Device)};import{initSpecifications,bleSpecQueue}from"./global";import EcoService from"./main/EcoService.js";import{addLog,LogPage}from"./main/log";import{oneTrackReport,allTrackPoints}from"./eco-track-report";export{appName,Device,Service,initSpecifications,addLog,Bluetooth,bleSpecQueue,localLog,DeviceEvent,LogPage,addLog,bleSpecQueue,initSpecifications,EcoService,oneTrackReport,allTrackPoints,appName,Device,Service,initSpecifications,addLog,Bluetooth,bleSpecQueue,localLog,DeviceEvent,LogPage,addLog,bleSpecQueue,initSpecifications,EcoService,oneTrackReport,allTrackPoints,appName,Device,Service,initSpecifications,addLog,Bluetooth,bleSpecQueue,localLog,DeviceEvent,LogPage,addLog,bleSpecQueue,initSpecifications,EcoService,oneTrackReport,allTrackPoints,appName,Device,Service,initSpecifications,addLog,Bluetooth,bleSpecQueue,localLog,DeviceEvent,LogPage,addLog,bleSpecQueue,initSpecifications,EcoService,oneTrackReport,allTrackPoints,appName,Device,Service,initSpecifications,addLog,Bluetooth,bleSpecQueue,localLog,DeviceEvent,LogPage,addLog,bleSpecQueue,initSpecifications,EcoService,oneTrackReport,allTrackPoints,appName,Device,Service,initSpecifications,addLog,Bluetooth,bleSpecQueue,localLog,DeviceEvent,LogPage,addLog,bleSpecQueue,initSpecifications,EcoService,oneTrackReport,allTrackPoints};
+import{bleSpec}from"./main/specMethod";var appName="",Device={},DeviceEvent={},Service={},addLog=function(){},Bluetooth={},localLog=function(){},bleSpecQueue=function(){},initSpecifications=function(e){appName=e.name,Device=e.Device,DeviceEvent=e.DeviceEvent,localLog=e.localLog,Service=e.Service,addLog=e.addLog,bleSpecQueue=bleSpec(Bluetooth=e.Bluetooth,DeviceEvent,Device)};import{initSpecifications,bleSpecQueue}from"./global";import EcoService from"./main/EcoService.js";import{addLog,LogPage}from"./main/log";import{oneTrackReport,allTrackPoints}from"./eco-track-report";import{bleSpec}from"./main/specMethod";appName="",Device={},DeviceEvent={},Service={},addLog=function(){},Bluetooth={},localLog=function(){},bleSpecQueue=function(){},initSpecifications=function(e){appName=e.name,Device=e.Device,DeviceEvent=e.DeviceEvent,localLog=e.localLog,Service=e.Service,addLog=e.addLog,bleSpecQueue=bleSpec(Bluetooth=e.Bluetooth,DeviceEvent,Device)};import{initSpecifications,bleSpecQueue}from"./global";import EcoService from"./main/EcoService.js";import{addLog,LogPage}from"./main/log";import{oneTrackReport,allTrackPoints}from"./eco-track-report";import{bleSpec}from"./main/specMethod";Device={},DeviceEvent={},Service={},addLog=function(){},Bluetooth={},localLog=function(){},bleSpecQueue=function(){},initSpecifications=function(e){appName=e.name,Device=e.Device,DeviceEvent=e.DeviceEvent,localLog=e.localLog,Service=e.Service,addLog=e.addLog,bleSpecQueue=bleSpec(Bluetooth=e.Bluetooth,DeviceEvent,Device)};import{initSpecifications,bleSpecQueue}from"./global";import EcoService from"./main/EcoService.js";import{addLog,LogPage}from"./main/log";import{oneTrackReport,allTrackPoints}from"./eco-track-report";import{bleSpec}from"./main/specMethod";Device={},DeviceEvent={},Service={},addLog=function(){},Bluetooth={},localLog=function(){},bleSpecQueue=function(){},initSpecifications=function(e){appName=e.name,Device=e.Device,DeviceEvent=e.DeviceEvent,localLog=e.localLog,Service=e.Service,addLog=e.addLog,bleSpecQueue=bleSpec(Bluetooth=e.Bluetooth,DeviceEvent,Device)};import{initSpecifications,bleSpecQueue}from"./global";import EcoService from"./main/EcoService.js";import{addLog,LogPage}from"./main/log";import{oneTrackReport,allTrackPoints}from"./eco-track-report";import{bleSpec}from"./main/specMethod";Device={},DeviceEvent={},Service={},addLog=function(){},Bluetooth={},localLog=function(){},bleSpecQueue=function(){},initSpecifications=function(e){appName=e.name,Device=e.Device,DeviceEvent=e.DeviceEvent,localLog=e.localLog,Service=e.Service,addLog=e.addLog,bleSpecQueue=bleSpec(Bluetooth=e.Bluetooth,DeviceEvent,Device)};import{initSpecifications,bleSpecQueue}from"./global";import EcoService from"./main/EcoService.js";import{addLog,LogPage}from"./main/log";import{oneTrackReport,allTrackPoints}from"./eco-track-report";import{bleSpec}from"./main/specMethod";Device={},DeviceEvent={},Service={},addLog=function(){},Bluetooth={},localLog=function(){},bleSpecQueue=function(){},initSpecifications=function(e){appName=e.name,Device=e.Device,DeviceEvent=e.DeviceEvent,localLog=e.localLog,Service=e.Service,addLog=e.addLog,bleSpecQueue=bleSpec(Bluetooth=e.Bluetooth,DeviceEvent,Device)};import{initSpecifications,bleSpecQueue}from"./global";import EcoService from"./main/EcoService.js";import{addLog,LogPage}from"./main/log";import{oneTrackReport,allTrackPoints}from"./eco-track-report";import{bleSpec}from"./main/specMethod";Device={},DeviceEvent={},Service={},addLog=function(){},Bluetooth={},localLog=function(){},bleSpecQueue=function(){},initSpecifications=function(e){appName=e.name,Device=e.Device,DeviceEvent=e.DeviceEvent,localLog=e.localLog,Service=e.Service,addLog=e.addLog,bleSpecQueue=bleSpec(Bluetooth=e.Bluetooth,DeviceEvent,Device)};import{initSpecifications,bleSpecQueue}from"./global";import EcoService from"./main/EcoService.js";import{addLog,LogPage}from"./main/log";import{oneTrackReport,allTrackPoints}from"./eco-track-report";import{bleSpec}from"./main/specMethod";Device={},DeviceEvent={},Service={},addLog=function(){},Bluetooth={},localLog=function(){},bleSpecQueue=function(){},initSpecifications=function(e){appName=e.name,Device=e.Device,DeviceEvent=e.DeviceEvent,localLog=e.localLog,Service=e.Service,addLog=e.addLog,bleSpecQueue=bleSpec(Bluetooth=e.Bluetooth,DeviceEvent,Device)};import{initSpecifications,bleSpecQueue}from"./global";import EcoService from"./main/EcoService.js";import{addLog,LogPage}from"./main/log";import{oneTrackReport,allTrackPoints}from"./eco-track-report";import{bleSpec}from"./main/specMethod";Device={},DeviceEvent={},Service={},addLog=function(){},Bluetooth={},localLog=function(){},bleSpecQueue=function(){},initSpecifications=function(e){appName=e.name,Device=e.Device,DeviceEvent=e.DeviceEvent,localLog=e.localLog,Service=e.Service,addLog=e.addLog,bleSpecQueue=bleSpec(Bluetooth=e.Bluetooth,DeviceEvent,Device)};import{initSpecifications,bleSpecQueue}from"./global";import EcoService from"./main/EcoService.js";import{addLog,LogPage}from"./main/log";import{oneTrackReport,allTrackPoints}from"./eco-track-report";import{bleSpec}from"./main/specMethod";appName=appName="",Device={},DeviceEvent={},Service={},addLog=function(){},Bluetooth={},localLog=function(){},bleSpecQueue=function(){},initSpecifications=function(e){appName=e.name,Device=e.Device,DeviceEvent=e.DeviceEvent,localLog=e.localLog,Service=e.Service,addLog=e.addLog,bleSpecQueue=bleSpec(Bluetooth=e.Bluetooth,DeviceEvent,Device)};import{initSpecifications,bleSpecQueue}from"./global";import EcoService from"./main/EcoService.js";import{addLog,LogPage}from"./main/log";import{oneTrackReport,allTrackPoints}from"./eco-track-report";export{appName,Device,Service,initSpecifications,addLog,Bluetooth,bleSpecQueue,localLog,DeviceEvent,LogPage,addLog,bleSpecQueue,initSpecifications,EcoService,oneTrackReport,allTrackPoints,appName,Device,Service,initSpecifications,addLog,Bluetooth,bleSpecQueue,localLog,DeviceEvent,LogPage,addLog,bleSpecQueue,initSpecifications,EcoService,oneTrackReport,allTrackPoints,appName,Device,Service,initSpecifications,addLog,Bluetooth,bleSpecQueue,localLog,DeviceEvent,LogPage,addLog,bleSpecQueue,initSpecifications,EcoService,oneTrackReport,allTrackPoints,appName,Device,Service,initSpecifications,addLog,Bluetooth,bleSpecQueue,localLog,DeviceEvent,LogPage,addLog,bleSpecQueue,initSpecifications,EcoService,oneTrackReport,allTrackPoints,appName,Device,Service,initSpecifications,addLog,Bluetooth,bleSpecQueue,localLog,DeviceEvent,LogPage,addLog,bleSpecQueue,initSpecifications,EcoService,oneTrackReport,allTrackPoints,appName,Device,Service,initSpecifications,addLog,Bluetooth,bleSpecQueue,localLog,DeviceEvent,LogPage,addLog,bleSpecQueue,initSpecifications,EcoService,oneTrackReport,allTrackPoints,appName,Device,Service,initSpecifications,addLog,Bluetooth,bleSpecQueue,localLog,DeviceEvent,LogPage,addLog,bleSpecQueue,initSpecifications,EcoService,oneTrackReport,allTrackPoints,appName,Device,Service,initSpecifications,addLog,Bluetooth,bleSpecQueue,localLog,DeviceEvent,LogPage,addLog,bleSpecQueue,initSpecifications,EcoService,oneTrackReport,allTrackPoints,appName,Device,Service,initSpecifications,addLog,Bluetooth,bleSpecQueue,localLog,DeviceEvent,LogPage,addLog,bleSpecQueue,initSpecifications,EcoService,oneTrackReport,allTrackPoints,appName,Device,Service,initSpecifications,addLog,Bluetooth,bleSpecQueue,localLog,DeviceEvent,LogPage,addLog,bleSpecQueue,initSpecifications,EcoService,oneTrackReport,allTrackPoints};

package/lib/page/LogPage.js

@@ -133,4 +133,5 @@ _defineProperty(LogPage, "navigationOptions", function (_ref) {
     header: null
   };
 });
-export { LogPage as default };
+export { LogPage as default };
+LogPage.displayName = 'LogPage';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eco-access-specifications",
-  "version": "2.0.9",
+  "version": "2.0.11",
   "description": "生态链公司插件接入规范,帮助生态链公司提高生产效率.",
   "main": "index.js",
   "scripts": {