node-red-contrib-symi-modbus 2.7.5 → 2.7.7

package/nodes/modbus-slave-switch.html

@@ -5,15 +5,20 @@
         defaults: {
             name: {value: "从站开关"},
             // RS-485连接配置（共享配置节点）
-            serialPortConfig: {value: "", type: "serial-port-config", required: true},
+            serialPortConfig: {value: "", type: "serial-port-config", required: false},
             // MQTT配置（可选）
             enableMqtt: {value: false},  // 默认不启用MQTT
             mqttServer: {value: "", type: "mqtt-server-config", required: false},
             // 开关面板配置
             switchBrand: {value: "symi"},  // 品牌选择
-            buttonType: {value: "switch"},  // 按钮类型：switch=开关模式，scene=场景模式
+            buttonType: {value: "switch"},  // 按钮类型：switch=开关模式，scene=场景模式，mesh=Mesh模式
             switchId: {value: 0, validate: RED.validators.number()},
             buttonNumber: {value: 1, validate: RED.validators.number()},
+            // Mesh模式配置
+            meshMacAddress: {value: ""},  // Mesh设备MAC地址
+            meshShortAddress: {value: 0},  // Mesh设备短地址
+            meshButtonNumber: {value: 1, validate: RED.validators.number()},  // Mesh按键编号（1-6）
+            meshTotalButtons: {value: 1, validate: RED.validators.number()},  // Mesh开关总路数（1-6）
             // 映射到继电器
             targetSlaveAddress: {value: 10, validate: RED.validators.number()},
             targetCoilNumber: {value: 1, validate: RED.validators.number()}  // 默认值改为1（显示为1路）
@@ -22,11 +27,21 @@
         outputs: 1,
         icon: "light.png",
         label: function() {
-            // 显示时直接使用用户输入的路数（1-32）
-            const coilDisplay = this.targetCoilNumber || 1;
-            return this.name || `开关${this.switchId}-按钮${this.buttonNumber} → 继电器${this.targetSlaveAddress}-${coilDisplay}路`;
+            if (this.buttonType === 'mesh') {
+                // Mesh模式显示
+                const mac = this.meshMacAddress || '未选择';
+                const btn = this.meshButtonNumber || 1;
+                const coilDisplay = this.targetCoilNumber || 1;
+                return this.name || `Mesh[${mac}]-按钮${btn} → 继电器${this.targetSlaveAddress}-${coilDisplay}路`;
+            } else {
+                // 开关模式和场景模式显示
+                const coilDisplay = this.targetCoilNumber || 1;
+                return this.name || `开关${this.switchId}-按钮${this.buttonNumber} → 继电器${this.targetSlaveAddress}-${coilDisplay}路`;
+            }
         },
         oneditprepare: function() {
+            const node = this;
+
             // MQTT开关控制显示/隐藏
             $("#node-input-enableMqtt").on("change", function() {
                 if ($(this).is(":checked")) {
@@ -35,9 +50,139 @@
                     $(".form-row-mqtt-slave").hide();
                 }
             });
-            
+
+            // 按钮类型切换控制显示/隐藏
+            $("#node-input-buttonType").on("change", function() {
+                const buttonType = $(this).val();
+                if (buttonType === 'mesh') {
+                    // Mesh模式：显示Mesh配置，隐藏RS-485配置
+                    $(".form-row-mesh").show();
+                    $(".form-row-rs485").hide();
+                    $("#btn-discover-mesh").show();
+                } else {
+                    // 开关/场景模式：显示RS-485配置，隐藏Mesh配置
+                    $(".form-row-mesh").hide();
+                    $(".form-row-rs485").show();
+                    $("#btn-discover-mesh").hide();
+                }
+            });
+
+            // Mesh设备发现按钮
+            $("#btn-discover-mesh").on("click", function() {
+                const serialPortConfig = $("#node-input-serialPortConfig").val();
+                if (!serialPortConfig) {
+                    RED.notify("请先选择RS-485连接配置", "warning");
+                    return;
+                }
+
+                // 禁用按钮，显示加载状态
+                $(this).prop("disabled", true).html('<i class="fa fa-spinner fa-spin"></i> 正在扫描...');
+
+                // 发送设备发现请求
+                $.ajax({
+                    url: "symi-mesh/discover",
+                    type: "POST",
+                    data: JSON.stringify({
+                        serialPortConfig: serialPortConfig
+                    }),
+                    contentType: "application/json",
+                    success: function(devices) {
+                        // 更新设备列表
+                        const select = $("#node-input-meshMacAddress");
+                        select.empty();
+                        select.append('<option value="">请选择Mesh开关</option>');
+
+                        devices.forEach(function(device) {
+                            if (device.type === 0x01 && device.buttons > 0) {
+                                // 只显示开关类型设备
+                                const mac = device.mac;
+                                const label = `${mac} (${device.buttons}路开关)`;
+                                select.append(`<option value="${mac}" data-short-addr="${device.shortAddr}" data-buttons="${device.buttons}">${label}</option>`);
+                            }
+                        });
+
+                        RED.notify(`发现 ${devices.length} 个Mesh设备`, "success");
+                        $("#btn-discover-mesh").prop("disabled", false).html('<i class="fa fa-search"></i> 扫描设备');
+                    },
+                    error: function(xhr, status, error) {
+                        RED.notify("设备发现失败: " + error, "error");
+                        $("#btn-discover-mesh").prop("disabled", false).html('<i class="fa fa-search"></i> 扫描设备');
+                    }
+                });
+            });
+
+            // Mesh设备选择变化时更新短地址和按钮数
+            $("#node-input-meshMacAddress").on("change", function() {
+                const selected = $(this).find("option:selected");
+                const shortAddr = selected.data("short-addr");
+                const buttons = selected.data("buttons");
+
+                if (shortAddr !== undefined) {
+                    $("#node-input-meshShortAddress").val(shortAddr);
+                    $("#node-input-meshTotalButtons").val(buttons);
+
+                    // 更新按钮编号选项
+                    const btnSelect = $("#node-input-meshButtonNumber");
+                    btnSelect.empty();
+                    for (let i = 1; i <= buttons; i++) {
+                        btnSelect.append(`<option value="${i}">按钮 ${i}</option>`);
+                    }
+                }
+            });
+
+            // 加载已保存的Mesh设备列表
+            function loadSavedMeshDevices() {
+                $.ajax({
+                    url: "symi-mesh/devices",
+                    type: "GET",
+                    success: function(devices) {
+                        if (devices && devices.length > 0) {
+                            const select = $("#node-input-meshMacAddress");
+                            select.empty();
+                            select.append('<option value="">请选择Mesh开关</option>');
+
+                            devices.forEach(function(device) {
+                                if (device.type === 0x01 && device.buttons > 0) {
+                                    const mac = device.mac;
+                                    const label = `${mac} (${device.buttons}路开关)`;
+                                    const option = $(`<option value="${mac}" data-short-addr="${device.shortAddr}" data-buttons="${device.buttons}">${label}</option>`);
+                                    select.append(option);
+
+                                    // 如果是当前配置的设备，选中它
+                                    if (mac === node.meshMacAddress) {
+                                        option.prop("selected", true);
+                                        $("#node-input-meshShortAddress").val(device.shortAddr);
+                                        $("#node-input-meshTotalButtons").val(device.buttons);
+
+                                        // 更新按钮编号选项
+                                        const btnSelect = $("#node-input-meshButtonNumber");
+                                        btnSelect.empty();
+                                        for (let i = 1; i <= device.buttons; i++) {
+                                            const btnOption = $(`<option value="${i}">按钮 ${i}</option>`);
+                                            if (i === node.meshButtonNumber) {
+                                                btnOption.prop("selected", true);
+                                            }
+                                            btnSelect.append(btnOption);
+                                        }
+                                    }
+                                }
+                            });
+                        }
+                    },
+                    error: function(xhr, status, error) {
+                        console.log("加载Mesh设备列表失败: " + error);
+                    }
+                });
+            }
+
             // 初始化显示状态
             $("#node-input-enableMqtt").trigger("change");
+            $("#node-input-buttonType").trigger("change");
+
+            // 如果是Mesh模式，加载已保存的设备列表
+            if (node.buttonType === 'mesh') {
+                loadSavedMeshDevices();
+            }
         }
     });
 </script>
@@ -119,16 +264,19 @@
     <div class="form-row">
         <label for="node-input-buttonType" style="width: 110px;"><i class="fa fa-cog"></i> 按钮类型</label>
         <select id="node-input-buttonType" style="width: 200px;">
-            <option value="switch">开关按钮</option>
-            <option value="scene">场景按钮</option>
+            <option value="switch">开关按钮（RS-485）</option>
+            <option value="scene">场景按钮（RS-485）</option>
+            <option value="mesh">Mesh开关（蓝牙Mesh）</option>
         </select>
         <div style="font-size: 11px; color: #888; margin-left: 110px; margin-top: 3px;">
-            <strong>开关按钮</strong>：灯光、插座等开关控制，有开/关状态<br>
-            <strong>场景按钮</strong>：场景触发、一键全开/全关等，只触发动作
+            <strong>开关按钮</strong>：RS-485开关，有开/关状态<br>
+            <strong>场景按钮</strong>：RS-485场景触发<br>
+            <strong>Mesh开关</strong>：蓝牙Mesh开关（1-6路）
         </div>
     </div>
 
-    <div class="form-row">
+    <!-- RS-485模式配置 -->
+    <div class="form-row form-row-rs485">
         <label for="node-input-switchId" style="width: 110px;"><i class="fa fa-id-card"></i> 开关ID</label>
         <input type="number" id="node-input-switchId" placeholder="0" min="0" max="255" style="width: 90px; padding: 5px 8px; border: 1px solid #ccc; border-radius: 4px; font-size: 13px;">
         <span style="margin-left: 10px; color: #666; font-size: 12px;">物理面板地址：<strong>0-255</strong></span>
@@ -137,7 +285,7 @@
         </div>
     </div>
 
-    <div class="form-row">
+    <div class="form-row form-row-rs485">
         <label for="node-input-buttonNumber" style="width: 110px;"><i class="fa fa-hand-pointer-o"></i> 按钮编号</label>
         <select id="node-input-buttonNumber" style="width: 150px;">
             <option value="1">按钮 1</option>
@@ -151,6 +299,42 @@
         </select>
         <span style="margin-left: 10px; font-size: 11px; color: #666; font-style: italic;">面板物理按键</span>
     </div>
+
+    <!-- Mesh模式配置 -->
+    <div class="form-row form-row-mesh" style="display: none;">
+        <button type="button" id="btn-discover-mesh" class="red-ui-button" style="margin-left: 110px;">
+            <i class="fa fa-search"></i> 扫描设备
+        </button>
+        <div style="font-size: 11px; color: #888; margin-left: 110px; margin-top: 5px;">
+            点击扫描按钮自动发现Mesh网关中的所有开关设备
+        </div>
+    </div>
+
+    <div class="form-row form-row-mesh" style="display: none;">
+        <label for="node-input-meshMacAddress" style="width: 110px;"><i class="fa fa-bluetooth"></i> Mesh设备</label>
+        <select id="node-input-meshMacAddress" style="width: 300px;">
+            <option value="">请选择Mesh开关</option>
+        </select>
+        <div style="font-size: 11px; color: #888; margin-left: 110px; margin-top: 3px;">
+            选择要控制的Mesh开关设备（MAC地址）
+        </div>
+    </div>
+
+    <div class="form-row form-row-mesh" style="display: none;">
+        <label for="node-input-meshButtonNumber" style="width: 110px;"><i class="fa fa-hand-pointer-o"></i> 按钮编号</label>
+        <select id="node-input-meshButtonNumber" style="width: 150px;">
+            <option value="1">按钮 1</option>
+            <option value="2">按钮 2</option>
+            <option value="3">按钮 3</option>
+            <option value="4">按钮 4</option>
+            <option value="5">按钮 5</option>
+            <option value="6">按钮 6</option>
+        </select>
+        <span style="margin-left: 10px; font-size: 11px; color: #666; font-style: italic;">Mesh开关按键（1-6路）</span>
+    </div>
+
+    <input type="hidden" id="node-input-meshShortAddress">
+    <input type="hidden" id="node-input-meshTotalButtons">
     
     <!-- 映射到继电器配置 -->
     <hr style="margin: 15px 0; border: 0; border-top: 2px solid #e0e0e0;">