nayota-show-sdk 1.3.73 → 1.3.75

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nayota-show-sdk",
-  "version": "1.3.73",
+  "version": "1.3.75",
   "description": "nayota-show-server rest-api",
   "type": "module",
   "main": "index.js",

package/utils/iot-module-specs.js

@@ -360,6 +360,60 @@ function normalizeLegacyPropLine(source = {}, prop = {}, row = {}) {
   return null
 }
 
+const LEGACY_SWITCH_STATUS_KEYWORDS = [
+  '开关',
+  '电源',
+  '启停',
+  '启动',
+  '运行',
+  'switch',
+  'power'
+]
+
+const LEGACY_SWITCH_STATUS_EXCLUDE_KEYWORDS = [
+  '模式',
+  '温度',
+  '风速',
+  '设定',
+  '设置',
+  '锁屏',
+  '锁定',
+  'lock',
+  'mode',
+  'temp',
+  'speed',
+  'set'
+]
+
+function isLegacyBinaryInterval(interval) {
+  try {
+    const payload = typeof interval === 'string' ? JSON.parse(interval) : interval
+    return Array.isArray(payload) && Array.isArray(payload[0]) && payload[0].length === 2
+  } catch {
+    return false
+  }
+}
+
+function isLegacySwitchOperateStatus(source = {}, interval = '') {
+  if (source.propType !== 'Operate' || !isLegacyBinaryInterval(interval)) {
+    return false
+  }
+
+  const normalized = [
+    source.propertyKey,
+    source.propName,
+    source.name,
+    source.code,
+    source.shortAddress
+  ].filter(Boolean).join(' ').toLowerCase()
+
+  if (LEGACY_SWITCH_STATUS_EXCLUDE_KEYWORDS.some(keyword => normalized.includes(keyword))) {
+    return false
+  }
+
+  return LEGACY_SWITCH_STATUS_KEYWORDS.some(keyword => normalized.includes(keyword))
+}
+
 function normalizeLegacyNumber(value) {
   if (value === undefined || value === null || value === '') {
     return null
@@ -370,15 +424,85 @@ function normalizeLegacyNumber(value) {
   return Number.isFinite(num) ? num : null
 }
 
+const LEGACY_OPEN_STATUS_KEYWORDS = ['开', '开启', '运行', '启动']
+
+function normalizeLegacyStatusText(value) {
+  if (value === undefined || value === null) {
+    return ''
+  }
+
+  if (value && typeof value === 'object') {
+    return String(value.valueStr ?? value.label ?? value.name ?? value.value ?? '').trim()
+  }
+
+  return String(value).trim()
+}
+
+function isLegacyOpenStatusText(value) {
+  const text = normalizeLegacyStatusText(value)
+  if (!text) return false
+
+  return LEGACY_OPEN_STATUS_KEYWORDS.some(keyword => text.includes(keyword))
+}
+
+function isLegacyOpenStatusProp(prop = {}) {
+  return (
+    normalizeLegacyNumber(prop.rawValue) === 1 ||
+    normalizeLegacyNumber(prop.value) === 1 ||
+    normalizeLegacyNumber(prop.prop?.value) === 1 ||
+    isLegacyOpenStatusText(prop.rawValue) ||
+    isLegacyOpenStatusText(prop.value) ||
+    isLegacyOpenStatusText(prop.valueStr) ||
+    isLegacyOpenStatusText(prop.prop?.valueStr)
+  )
+}
+
 function getLegacyStatusCounts(props = []) {
   const statusProps = props.filter(prop => prop && prop.isStatus)
   return {
     total: statusProps.length,
-    open: statusProps.filter(prop =>
-      normalizeLegacyNumber(prop.rawValue) === 1 ||
-      normalizeLegacyNumber(prop.value) === 1 ||
-      normalizeLegacyNumber(prop.prop?.value) === 1
-    ).length
+    open: statusProps.filter(prop => isLegacyOpenStatusProp(prop)).length
+  }
+}
+
+function getLegacyOpenStatusProp(props = []) {
+  return props.find(prop => prop && prop.isStatus && isLegacyOpenStatusProp(prop))
+}
+
+function normalizeLegacyStatus(status, props = []) {
+  if (!status) {
+    return undefined
+  }
+
+  const statusCounts = getLegacyStatusCounts(props)
+  const openStatusProp = getLegacyOpenStatusProp(props)
+  const shouldUseOpenStatus =
+    statusCounts.open > 0 &&
+    normalizeLegacyNumber(status.value) !== 1 &&
+    openStatusProp
+
+  const displayStatus = shouldUseOpenStatus
+    ? {
+        value: 1,
+        label:
+          openStatusProp.prop?.valueStr ||
+          openStatusProp.valueStr ||
+          openStatusProp.name ||
+          openStatusProp.propName ||
+          '开',
+        valueStr:
+          openStatusProp.prop?.valueStr ||
+          openStatusProp.valueStr ||
+          openStatusProp.name ||
+          openStatusProp.propName ||
+          '开'
+      }
+    : status
+
+  return {
+    ...displayStatus,
+    total: status.total ?? statusCounts.total,
+    open: status.open ?? statusCounts.open
   }
 }
 
@@ -398,7 +522,7 @@ function normalizeLegacyEasyListProp(source = {}, row = {}) {
   const interval = prop.interval || source.interval || source.valueMap || ''
   const line = normalizeLegacyPropLine(source, prop, row)
   const isMain = Boolean(source.isMain)
-  const isStatus = Boolean(source.isStatus)
+  const isStatus = Boolean(source.isStatus || isLegacySwitchOperateStatus(source, interval))
   const isNumber = Boolean(source.isNumber)
   const isImport = Boolean(source.isImport || isMain || isStatus || isNumber)
 
@@ -448,18 +572,11 @@ function normalizeLegacyEasyListRow(item = {}) {
   const props = Array.isArray(row.props)
     ? row.props.map(prop => normalizeLegacyEasyListProp(prop, row))
     : []
-  const statusCounts = getLegacyStatusCounts(props)
 
   return removeUndefinedFields({
     ...row,
     props,
-    status: row.status
-      ? {
-          ...row.status,
-          total: row.status.total ?? statusCounts.total,
-          open: row.status.open ?? statusCounts.open
-        }
-      : undefined,
+    status: normalizeLegacyStatus(row.status, props),
     lineTime: row.lineTime || props.find(prop => prop.isImport && prop.valueAt)?.valueAt || row.updatedAt || null
   })
 }

package/utils/iot-module-specs.test.js

@@ -141,11 +141,26 @@ describe('iotModuleSpecs devices easyList legacy compatibility', () => {
             name: '会议室空调',
             line: false,
             status: {
-              value: 1,
-              label: '制热',
-              valueStr: '制热'
+              value: 0,
+              label: '解锁',
+              valueStr: '解锁'
             },
             props: [
+              {
+                id: 'twin-prop-lock',
+                propId: 'device-prop-lock',
+                propertyKey: 'lock',
+                name: '锁屏',
+                isStatus: true,
+                line: true,
+                value: 0,
+                valueStr: '解锁',
+                interval: '[["解锁","锁屏"],[0,1]]',
+                valueAt: '2026-04-25T06:29:00.000Z',
+                prop: {
+                  id: 'device-prop-lock'
+                }
+              },
               {
                 id: 'twin-prop-mode',
                 propId: 'device-prop-mode',
@@ -153,14 +168,29 @@ describe('iotModuleSpecs devices easyList legacy compatibility', () => {
                 name: '模式设定',
                 isStatus: true,
                 line: true,
-                value: 1,
-                valueStr: '制热',
+                value: 0,
+                valueStr: '制冷',
                 interval: '[["制冷","制热"],[0,1]]',
                 valueAt: '2026-04-25T06:30:00.000Z',
                 prop: {
                   id: 'device-prop-mode'
                 }
               },
+              {
+                id: 'twin-prop-switch',
+                propId: 'device-prop-switch',
+                propertyKey: 'powerSwitch',
+                name: '开关',
+                propType: 'Operate',
+                line: true,
+                value: 1,
+                valueStr: '开',
+                interval: '[["关","开"],[0,1]]',
+                valueAt: '2026-04-25T06:30:30.000Z',
+                prop: {
+                  id: 'device-prop-switch'
+                }
+              },
               {
                 id: 'twin-prop-electric',
                 propId: 'device-prop-electric',
@@ -183,15 +213,16 @@ describe('iotModuleSpecs devices easyList legacy compatibility', () => {
     })
 
     const row = response.data.rows[0]
-    const modeProp = row.props[0]
-    const electricProp = row.props[1]
+    const modeProp = row.props[1]
+    const switchProp = row.props[2]
+    const electricProp = row.props[3]
 
     expect(row._id).toBe('twin-1')
     expect(row.status).toEqual({
       value: 1,
-      label: '制热',
-      valueStr: '制热',
-      total: 1,
+      label: '开',
+      valueStr: '开',
+      total: 3,
       open: 1
     })
     expect(modeProp).toEqual(
@@ -201,8 +232,8 @@ describe('iotModuleSpecs devices easyList legacy compatibility', () => {
         isStatus: true,
         isImport: true,
         line: true,
-        value: 1,
-        valueStr: '制热',
+        value: 0,
+        valueStr: '制冷',
         interval: '[["制冷","制热"],[0,1]]',
         valueAt: '2026-04-25T06:30:00.000Z'
       })
@@ -211,12 +242,21 @@ describe('iotModuleSpecs devices easyList legacy compatibility', () => {
       expect.objectContaining({
         _id: 'device-prop-mode',
         line: true,
-        value: 1,
-        valueStr: '制热',
+        value: 0,
+        valueStr: '制冷',
         interval: '[["制冷","制热"],[0,1]]',
         valueAt: '2026-04-25T06:30:00.000Z'
       })
     )
+    expect(switchProp).toEqual(
+      expect.objectContaining({
+        propType: 'Operate',
+        isStatus: true,
+        isImport: true,
+        value: 1,
+        valueStr: '开'
+      })
+    )
     expect(electricProp).toEqual(
       expect.objectContaining({
         isMain: true,