nayota-show-sdk 1.3.73 → 1.3.74

package/package.json

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

package/utils/iot-module-specs.js

@@ -370,15 +370,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
   }
 }
 
@@ -448,18 +518,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',
@@ -183,15 +198,15 @@ 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 electricProp = row.props[2]
 
     expect(row._id).toBe('twin-1')
     expect(row.status).toEqual({
       value: 1,
       label: '制热',
       valueStr: '制热',
-      total: 1,
+      total: 2,
       open: 1
     })
     expect(modeProp).toEqual(