From 8d51b2a02f0493053b041e1f6c278d2301610b37 Mon Sep 17 00:00:00 2001
From: ling <1042585959@qq.com>
Date: Thu, 21 Mar 2024 19:49:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9Bbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../luasrc/view/modem/at_command_old.htm      | 46 +++++++++---
 .../luasrc/view/modem/modem_debug.htm         | 75 ++++++++++++++-----
 luci-app-modem/root/etc/config/modem          |  2 +-
 3 files changed, 91 insertions(+), 32 deletions(-)

diff --git a/luci-app-modem/luasrc/view/modem/at_command_old.htm b/luci-app-modem/luasrc/view/modem/at_command_old.htm
index fd168fb..45ac551 100644
--- a/luci-app-modem/luasrc/view/modem/at_command_old.htm
+++ b/luci-app-modem/luasrc/view/modem/at_command_old.htm
@@ -13,6 +13,39 @@
 
 <script type="text/javascript">
 
+	window.onload=function()
+	{
+		//获取快捷AT命令选择框元素
+		var command_select = document.getElementById('command_select');
+		//更换快捷AT命令时触发
+		command_select.addEventListener("change", function() {
+			//自动填写到命令输入框
+			copy_to_input();
+		});
+
+		//获取快捷AT命令选择框元素
+		command_select = document.getElementById('command_select');
+		//点击快捷AT命令时触发（解决选择第一条命令的问题）
+		command_select.addEventListener("click", function() {
+			//选择框不为空，且选中的为第一个
+			if (command_select.options.length != 0 && command_select.selectedIndex == 0) {
+				//自动填写到命令输入框
+				copy_to_input();
+			}
+		});
+	}
+	
+	//自动填写到命令输入框
+	function copy_to_input()
+	{
+		var node = document.getElementById('response');
+		node.style.visibility = 'hidden';
+
+		var command_select = document.getElementById("command_select").value;
+		document.getElementById("at_command").value = command_select;
+		document.getElementById("response").innerHTML = "";
+	}
+
 	//第一次打开界面
 	first_start=1;
 
@@ -117,17 +150,6 @@
 		}
 	);
 
-	//自动填写到命令输入框
-	function copy_to_input()
-	{
-		var node = document.getElementById('response');
-		node.style.visibility = 'hidden';
-
-		var command_select = document.getElementById("command_select").value;
-		document.getElementById("at_command").value = command_select;
-		document.getElementById("response").innerHTML = "";
-	}
-
 	function post_command(at_port,at_command)
 	{
 		XHR.post('<%=luci.dispatcher.build_url("admin", "network", "modem", "send_at_command")%>', {"port":at_port,"command":at_command},
@@ -218,7 +240,7 @@
 			<div class="tr">
 				<div class="td left" style="width:25%;"><%:Quick Commands%></div>
 				<div class="td left" style="width:50%;">
-					<select name="command_select" id="command_select" onclick="copy_to_input()"></select>
+					<select name="command_select" id="command_select"></select>
 				</div>
 				<!-- <div class="td left" style="width:50%;"></div> -->
 			</div>
diff --git a/luci-app-modem/luasrc/view/modem/modem_debug.htm b/luci-app-modem/luasrc/view/modem/modem_debug.htm
index 767d07d..10cd6bf 100644
--- a/luci-app-modem/luasrc/view/modem/modem_debug.htm
+++ b/luci-app-modem/luasrc/view/modem/modem_debug.htm
@@ -6,7 +6,6 @@
 	{
 		//获取模组选择框元素
 		var modem_select = document.getElementById('modem_select');
-
 		//更换模组（AT串口）时触发
 		modem_select.addEventListener('change', function() {
 			//获取快捷命令
@@ -25,6 +24,25 @@
 				get_quick_commands();
 			}
 		});
+		
+		//获取快捷AT命令选择框元素
+		var command_select = document.getElementById('command_select');
+		//更换快捷AT命令时触发
+		command_select.addEventListener("change", function() {
+			//自动填写到命令输入框
+			copy_to_input();
+		});
+
+		//获取快捷AT命令选择框元素
+		command_select = document.getElementById('command_select');
+		//点击快捷AT命令时触发（解决选择第一条命令的问题）
+		command_select.addEventListener("click", function() {
+			//选择框不为空，且选中的为第一个
+			if (command_select.options.length != 0 && command_select.selectedIndex == 0) {
+				//自动填写到命令输入框
+				copy_to_input();
+			}
+		});
 
 		//获取网络偏好选项元素
 		var prefer_option_auto = document.getElementById('prefer_option_auto');
@@ -49,6 +67,13 @@
 		});
 	}
 
+	// 自动填写到快捷AT命令到输入框
+	function copy_to_input()
+	{
+		var command_select = document.getElementById("command_select").value;
+		document.getElementById("at_command").value = command_select;
+	}
+
 	// 发送AT命令
 	function send(at_port,at_command)
 	{
@@ -147,13 +172,6 @@
 		}
 	}
 
-	// 自动填写到命令输入框
-	function copy_to_input()
-	{
-		var command_select = document.getElementById("command_select").value;
-		document.getElementById("at_command").value = command_select;
-	}
-
 	// 无模组界面
 	function no_modems_view()
 	{
@@ -349,7 +367,7 @@
 		//设置当前拨号模式
 		document.getElementById('current_mode').innerHTML=current_mode_view;
 
-		var first_element=document.getElementById('first-checked');
+		var first_element=document.getElementById('first_checked');
 		if (first_element.value=="true")
 		{
 			//设置支持的拨号模式
@@ -442,7 +460,7 @@
 		document.getElementById('current_prefer').innerHTML=current_prefer_view;
 
 		//设置偏好选项和复选框
-		var first_element=document.getElementById('first-checked');
+		var first_element=document.getElementById('first_checked');
 		if (first_element.value=="true")
 		{
 			if (network_prefer["3G"]&&network_prefer["4G"]&&network_prefer["5G"])
@@ -546,7 +564,7 @@
 				set_network_prefer_info(network_prefer_info);
 
 				//设置第一次获取数据标志
-				document.getElementById('first-checked').value=false;
+				document.getElementById('first_checked').value=false;
 
 				//显示全功能界面
 				all_function_view();
@@ -572,11 +590,22 @@
 			}
 			else
 			{
-				//获取快捷选项
-				var quick_option = document.querySelector('input[name="quick_option"]:checked').value;
-				if (quick_option=="auto") {
-					get_quick_commands();
+				//获取缓存的模组
+				var modem_select_cache = document.getElementById("modem_select_cache");
+				//获取当前的选择的模组名称
+				var modem_select_element = document.getElementById('modem_select');
+				var select_modem_name = modem_select_element.options[modem_select_element.selectedIndex].text;
+				
+				if (select_modem_name != modem_select_cache.value)
+				{
+					//获取快捷选项
+					var quick_option = document.querySelector('input[name="quick_option"]:checked').value;
+					if (quick_option=="auto") {
+						get_quick_commands();
+					}
+					modem_select_cache.value=select_modem_name;
 				}
+
 				//获取模组调试信息
 				get_modem_debug_info();
 			}
@@ -606,8 +635,13 @@
 			font-size: 15px;
 		} */
 
+		/* 模组选择缓存 */
+		[name="modem_select_cache"] {
+			display: none;
+		}
+
 		/* 网络偏好第一次复选框 */
-		[name="first-checked"] {
+		[name="first_checked"] {
 			display: none;
 		}
 
@@ -670,8 +704,11 @@
 					</div>
 				</div>
 			</div>
-			<div name="first-checked">
-				<input type="hidden" id="first-checked" value="true">
+			<div name="modem_select_cache">
+				<input type="hidden" id="modem_select_cache" value="">
+			</div>
+			<div name="first_checked">
+				<input type="hidden" id="first_checked" value="true">
 			</div>
 		</div>
 	</fieldset>
@@ -804,7 +841,7 @@
 					</tr>
 					<tr class="tr">
 						<td class="td left"><%:Quick Commands%></td>
-						<td class="td left"><select name="command_select" id="command_select" class="cbi-input-select" onclick="copy_to_input()"></select></td>
+						<td class="td left"><select name="command_select" id="command_select" class="cbi-input-select"></select></td>
 					</tr>
 					<tr class="tr">
 						<td class="td left"><%:Enter Command%></td>
diff --git a/luci-app-modem/root/etc/config/modem b/luci-app-modem/root/etc/config/modem
index 7048a33..33b9cca 100644
--- a/luci-app-modem/root/etc/config/modem
+++ b/luci-app-modem/root/etc/config/modem
@@ -13,7 +13,7 @@ config custom-commands
 
 config custom-commands
 	option description '查询SIM卡状态 > AT+CPIN?'
-	option command 'AT+CSQ'
+	option command 'AT+CPIN?'
 
 config custom-commands
 	option description '查询此时信号强度 > AT+CSQ'