From 4f67d454ad214476f43b03327fa9db5599be3c35 Mon Sep 17 00:00:00 2001
From: ling <1042585959@qq.com>
Date: Thu, 11 Jan 2024 22:29:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=A8=A1=E5=9D=97=E6=8F=92?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 luci-app-modem/luasrc/controller/modem.lua    |   2 +
 .../luasrc/model/cbi/modem/config.lua         |   8 +-
 .../luasrc/model/cbi/modem/index.lua          |   4 +-
 luci-app-modem/luasrc/view/modem/at.htm       | 150 ++++++++++++++++++
 .../luasrc/view/modem/modem_status.htm        |   2 +-
 5 files changed, 159 insertions(+), 7 deletions(-)
 create mode 100644 luci-app-modem/luasrc/view/modem/at.htm

diff --git a/luci-app-modem/luasrc/controller/modem.lua b/luci-app-modem/luasrc/controller/modem.lua
index aa9ef30..7a5bf85 100644
--- a/luci-app-modem/luasrc/controller/modem.lua
+++ b/luci-app-modem/luasrc/controller/modem.lua
@@ -29,6 +29,8 @@ function index()
 	entry({"admin", "network", "modem", "send_at_command"}, call("sendATCommand"), nil).leaf = true
 	entry({"admin", "network", "modem", "user_at_command"}, call("userATCommand"), nil).leaf = true
 	entry({"admin", "network", "modem", "get_at_port"}, call("getATPort"), nil).leaf = true
+
+	entry({"admin", "network", "modem", "at"},template("modem/at"),translate("AT"),40).leaf = true
 end
 
 -- 判断字符串是否含有字母
diff --git a/luci-app-modem/luasrc/model/cbi/modem/config.lua b/luci-app-modem/luasrc/model/cbi/modem/config.lua
index 5e6783d..d40cb70 100644
--- a/luci-app-modem/luasrc/model/cbi/modem/config.lua
+++ b/luci-app-modem/luasrc/model/cbi/modem/config.lua
@@ -26,13 +26,13 @@ remarks = s:taboption("general", Value, "remarks", translate("Remarks"))
 remarks.rmempty = true
 
 -- 移动网络
--- network = s:taboption("general", Value, "network", translate("Moblie Network"))
-network = s:taboption("general", ListValue, "network", translate("Moblie Network"))
+-- network = s:taboption("general", Value, "network", translate("Mobile Network"))
+network = s:taboption("general", ListValue, "network", translate("Mobile Network"))
 -- network.default = ""
 network.rmempty = false
 
 -- 获取移动网络，并显示设备名
-function getMoblieNetwork()
+function getMobileNetwork()
 	local modem_number=uci:get('modem','global','modem_number')
 	if modem_number == "0" then
 		network:value("",translate("Mobile network not found"))
@@ -52,7 +52,7 @@ function getMoblieNetwork()
 	end
 end
 
-getMoblieNetwork()
+getMobileNetwork()
 
 -- 拨号模式
 -- mode = s:taboption("general", ListValue, "mode", translate("Mode"))
diff --git a/luci-app-modem/luasrc/model/cbi/modem/index.lua b/luci-app-modem/luasrc/model/cbi/modem/index.lua
index d08fe88..249a9a3 100644
--- a/luci-app-modem/luasrc/model/cbi/modem/index.lua
+++ b/luci-app-modem/luasrc/model/cbi/modem/index.lua
@@ -45,7 +45,7 @@ o.rmempty = false
 
 o = s:option(DummyValue, "remarks", translate("Remarks"))
 
-o = s:option(DummyValue, "network", translate("Moblie Network"))
+o = s:option(DummyValue, "network", translate("Mobile Network"))
 o.cfgvalue = function(t, n)
     -- 检测移动网络是否存在
     local network = (Value.cfgvalue(t, n) or "")
@@ -76,7 +76,7 @@ end
 
 o = s:option(DummyValue, "apn", translate("APN"))
 o.cfgvalue = function(t, n)
-    local apn = (Value.cfgvalue(t, n) or ""):gsub("_","/"):upper():gsub("V","v")
+    local apn = (Value.cfgvalue(t, n) or "")
     if apn == "" then
         apn=translate("Auto Choose")
     end
diff --git a/luci-app-modem/luasrc/view/modem/at.htm b/luci-app-modem/luasrc/view/modem/at.htm
new file mode 100644
index 0000000..4ca2c2f
--- /dev/null
+++ b/luci-app-modem/luasrc/view/modem/at.htm
@@ -0,0 +1,150 @@
+<%+header%>
+<% 
+local sys = require "luci.sys" 
+local utl = require "luci.util" 
+local fs = require "nixio.fs"
+local uci = require "luci.model.uci".cursor()
+local s = uci:get("custom", "bandlock", "enabled")
+local a = uci:get("custom", "atcmd", "enabled")
+
+local multilock = uci:get("custom", "multiuser", "multi") or "0"
+local rootlock = uci:get("custom", "multiuser", "root") or "0"
+nomulti=1
+if (multilock == "0") or (multilock == "1" and rootlock == "1") then
+	nosms = 1
+	if a == "1" then
+		nosms = 0
+	end
+else
+	nosms = 1
+	nomulti = 0
+end
+block = 1
+if s == "1" then
+	block = 0
+end
+
+function showicon(lck)
+end
+
+-%>
+<script type="text/javascript" src="<%=resource%>/xhr.js"></script>
+<script type="text/javascript">//<![CDATA[
+
+
+	function sendcmd(event)
+	{
+		
+		var v = document.getElementById("drop1").value;
+		var s = document.getElementById("atcmd").value;
+		var r =document.getElementById("attxt").value;
+		if ( s.length == 0 )
+		{
+
+			document.getElementById("attxt").value= '<%:请输入AT命令!%>\r' + r;
+			return false;
+		}
+		XHR.get('<%=luci.dispatcher.build_url("admin", "modem", "send_atcmd")%>',
+				{ set: s , p: v},
+				function(x, rv)
+				{
+					 var pd = rv.result;
+					 document.getElementById("attxt").value=pd  + r;
+				}
+			);
+		
+	       
+	}
+	function sendclean(event)
+	{
+		document.getElementById("attxt").value='';
+	}
+//]]></script>
+
+
+<div class="cbi-map" id="cbi-at-commands">
+	<h2 id="content" name="content"><%:AT Commands%></h2>
+	<div class="cbi-map-descr"><%:Debugging Your Module with AT Command%></div>
+	<head>
+		<style>
+		input {
+			vertical-align: bottom;
+		}
+		
+		#popup {
+			width:560px;
+			height:190px;
+			padding:20px;
+			background-color:gainsboro;  
+			border-style : solid;	
+			position:fixed;
+			top : 40%;
+			margin-left: auto;
+			margin-right: auto;
+			left: 0;
+			right: 0;
+			text-align: center;
+			display:none;
+		}
+		textarea{
+			background:#373737;
+			border:none;
+			color:#FFF;
+		}
+		</style>
+	</head>
+
+	<fieldset class="cbi-section" id="cbi-term">
+		<!-- <legend><%:AT Command Console%></legend> -->
+		<h3><%:AT Command Console%></h3>
+		<!-- <div id="popup">
+			<table width="500" border="0">
+				<tr>
+					<td width="50px"><div><%:Enter Password to Unlock Full Terminal%></div></td>
+				</tr>
+				<tr>
+					<td width="200px"><input id="pass" type="password"/></td>
+				</tr>
+				<tr>
+					<td><input type="image" src="<%=showicon(0)%>" style="width:48px;height:48px;" onclick="return done()" /></td>
+				</tr>
+			</table>
+		</div> -->
+		
+		<table width="700" border="0" id="droptxt">
+			<tr>
+				<td width="10%"><div align="right"><%:Quick Option%>:</div></td>
+				<td width="15%">
+					<div align="left">
+						<input type="radio" name="quick_option" value="auto" checked="checked">自动
+						<input type="radio" name="quick_option" value="custom">自定义
+					</div>
+				</td>
+				<td width="10%"><div align="right"><%:Quick Commands%>:</div></td>
+				<td width="15%"><select name="command_choose" id="command_choose" onclick="copyToSend()"></select></td>
+				<td width="10%"></td>
+				<td width="15%"></td>
+			</tr>
+			<tr>
+				<td width="10%"><div align="right"><%:Modem Select%>:</div></td>
+				<td width="15%"><select style="width:200px" name="modem_select" id="modem_select"></select></td>
+				<td width="10%"><div align="right"><%:AT Commands%>:</div></td>
+				<td width="15%"><input style="visibility:visible;width: 200px;maxlength="200" type="text" name="atcmdlck" id="atcmd" class="cbi-input-text"></input></td>
+				<td width="10%">
+					<input style="visibility:visible" type="submit" id="sendat" class="cbi-button cbi-button-apply" value="<%:发送%>" onclick="return sendcmd()" />
+					<input style="visibility:visible" type="submit" id="sendclean" class="cbi-button cbi-button-reset" value="<%:清除%>" onclick="return sendclean()" />
+				</td>
+				<td width="15%"></td>
+				<!-- <td width="47%">&nbsp;</td> -->
+			</tr>
+		</table>
+		<textarea readonly="readonly"  name="attxt" id="attxt" rows="50" style="width: 100%;" maxlength="160"></textarea>
+		<div class="table" width="100%">
+			<h2 name="content"><%=translate("TTYD Terminal")%></h2>
+			<iframe id="terminal" style="width: 100%; min-height: 500px; border: none; border-radius: 3px;" src="http://192.168.10.1:7681"></iframe>
+		</div>
+	</fieldset>
+	
+</div>
+
+<%+footer%>
diff --git a/luci-app-modem/luasrc/view/modem/modem_status.htm b/luci-app-modem/luasrc/view/modem/modem_status.htm
index 9c54ed1..910ebd5 100644
--- a/luci-app-modem/luasrc/view/modem/modem_status.htm
+++ b/luci-app-modem/luasrc/view/modem/modem_status.htm
@@ -105,7 +105,7 @@
 						mode
 					);
 					modem_view += String.format(
-						'<div><strong><%:Moblie Network%>: </strong>%s</div>',
+						'<div><strong><%:Mobile Network%>: </strong>%s</div>',
 						modem.network
 					);
 					modem_view += String.format(