From d0a71fe2168dfc130f77ea152be3ee8753703074 Mon Sep 17 00:00:00 2001
From: nhkefus <df@e.c>
Date: Thu, 20 Mar 2025 12:46:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E5=90=8E=E5=8F=B0=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=201=E5=88=B010=E5=87=BB=20=E5=8A=9F=E8=83=BD=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 TC1/http_server/web/index.html | 38 +++++++++++++++++++++++-----------
 TC1/user_gpio.h                |  2 +-
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/TC1/http_server/web/index.html b/TC1/http_server/web/index.html
index 4a80f0d..a536755 100644
--- a/TC1/http_server/web/index.html
+++ b/TC1/http_server/web/index.html
@@ -878,20 +878,25 @@ var tb_html = `
   </tr>
 `;
 
+
 for (var i = 0; i < actions.length; i++) {
   var rowId = `select-${i}`;
+  var index = parseInt(actions[i]);
+  var valueText = (isNaN(index) || index < 0 || index >= BTN_OPERATIONS.length) ? '未设置' : BTN_OPERATIONS[index];
+
   tb_html += `
     <tr>
       <td>${i > 0 ? '连续' : ''}短按${i + 1}次</td>
       <td>
         <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label getmdl-select getmdl-select__fix-height">
-                    <input class="mdl-textfield__input" type="text" id="${rowId}-input" readonly value="${(parseInt(actions[i])<0||parseInt(actions[i])>7)?'未设置':BTN_OPERATIONS[actions[i]]}">
-          <input type="hidden" id="${rowId}-value" value="${actions[i]}">
+          <input class="mdl-textfield__input" type="text" id="${rowId}-input" readonly value="${valueText}">
+          <input type="hidden" id="${rowId}-value" value="${index}">
           <ul class="mdl-menu mdl-menu--bottom-left mdl-js-menu" for="${rowId}-input">
-  ${BTN_OPERATIONS.map((op, idx) =>
-    `<li class="mdl-menu__item" data-val="${idx}" onclick="selectOperation('${rowId}', ${idx}, BTN_OPERATIONS)"> ${op} </li>`
-  ).join('')}
-</ul>
+            <li class="mdl-menu__item" data-val="-1" onclick="selectOperation('${rowId}', -1,BTN_OPERATIONS)">未设置</li>
+            ${BTN_OPERATIONS.map((op, idx) =>
+              `<li class="mdl-menu__item" data-val="${idx}" onclick="selectOperation('${rowId}', ${idx},BTN_OPERATIONS)">${op}</li>`
+            ).join('')}
+          </ul>
         </div>
       </td>
     </tr>
@@ -1226,18 +1231,22 @@ var tb_html = `
 
 for (var i = 0; i < actions.length; i++) {
   var rowId = `select-${i}`;
+  var index = parseInt(actions[i]);
+  var valueText = (isNaN(index) || index < 0 || index >= BTN_OPERATIONS.length) ? '未设置' : BTN_OPERATIONS[index];
+
   tb_html += `
     <tr>
       <td>${i > 0 ? '连续' : ''}短按${i + 1}次</td>
       <td>
         <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label getmdl-select getmdl-select__fix-height">
-          <input class="mdl-textfield__input" type="text" id="${rowId}-input" readonly value="${(parseInt(actions[i])<0||parseInt(actions[i])>7)?'未设置':BTN_OPERATIONS[actions[i]]}">
-          <input type="hidden" id="${rowId}-value" value="${actions[i]}">
+          <input class="mdl-textfield__input" type="text" id="${rowId}-input" readonly value="${valueText}">
+          <input type="hidden" id="${rowId}-value" value="${index}">
           <ul class="mdl-menu mdl-menu--bottom-left mdl-js-menu" for="${rowId}-input">
-  ${BTN_OPERATIONS.map((op, idx) =>
-    `<li class="mdl-menu__item" data-val="${idx}" onclick="selectOperation('${rowId}', ${idx}, BTN_OPERATIONS)"> ${op} </li>`
-  ).join('')}
-</ul>
+            <li class="mdl-menu__item" data-val="-1" onclick="selectOperation('${rowId}', -1,BTN_OPERATIONS)">未设置</li>
+            ${BTN_OPERATIONS.map((op, idx) =>
+              `<li class="mdl-menu__item" data-val="${idx}" onclick="selectOperation('${rowId}', ${idx},BTN_OPERATIONS)">${op}</li>`
+            ).join('')}
+          </ul>
         </div>
       </td>
     </tr>
@@ -1324,10 +1333,15 @@ componentHandler.upgradeDom();
       }, cmd);
     }
 function selectOperation(rowId, index, operations) {
+if (index === -1) {
+    document.getElementById(`${rowId}-input`).value = '未设置';
+    document.getElementById(`${rowId}-value`).value = -1;
+  } else {
 var witch = parseInt(rowId.split('-')[1]);
   const selectedText = operations[index];
   document.getElementById(`${rowId}-input`).value = selectedText;
   document.getElementById(`${rowId}-value`).value = index;
+  }
 HttpDel("/shortClickEvent", function (re) {
         ShowToast("已设置按钮事件");
       }, `${witch} index`);
diff --git a/TC1/user_gpio.h b/TC1/user_gpio.h
index e9abe1c..d2ac497 100644
--- a/TC1/user_gpio.h
+++ b/TC1/user_gpio.h
@@ -17,7 +17,7 @@ extern char socket_status[32];
 
 void UserLedSet(char x);
 void KeyInit(void);
-void UserRelaySet(unsigned char x,unsigned char y);
+void UserRelaySet(unsigned char x, char y);
 void UserRelaySetAll(char y);
 bool RelayOut(void);
 char* GetSocketStatus();