From 846545fbc952d639fc8b4cd234421b670b86fb2a Mon Sep 17 00:00:00 2001
From: ling <1042585959@qq.com>
Date: Thu, 7 Mar 2024 18:59:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E7=BB=84=E4=BF=A1=E6=81=AF=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2=E6=B7=BB=E5=8A=A0=E5=AE=9E=E6=97=B6=E9=80=9F=E7=8E=87?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
luci-app-modem/luasrc/controller/modem.lua | 20 +--
.../luasrc/view/modem/modem_info.htm | 119 ++++++++++++++----
luci-app-modem/po/zh-cn/modem.po | 12 ++
.../root/usr/share/modem/fibocom.sh | 97 +++++++++-----
.../root/usr/share/modem/modem_info.sh | 38 ++----
.../root/usr/share/modem/quectel.sh | 99 +++++++++------
6 files changed, 259 insertions(+), 126 deletions(-)
diff --git a/luci-app-modem/luasrc/controller/modem.lua b/luci-app-modem/luasrc/controller/modem.lua
index b2ef176..4de6065 100644
--- a/luci-app-modem/luasrc/controller/modem.lua
+++ b/luci-app-modem/luasrc/controller/modem.lua
@@ -188,14 +188,18 @@ function getModemInfo()
end
--网络信息翻译
if modem_more_info["network_info"] then
- for key in pairs(modem_more_info["network_info"]) do
- --翻译键
- translation[key]=luci.i18n.translate(key)
- -- local value=modem_more_info["network_info"][key]
- -- if hasLetters(value) then
- -- --翻译值
- -- translation[value]=luci.i18n.translate(value)
- -- end
+ local network_info=modem_more_info["network_info"]
+ for i = 1, #network_info do
+ local info = network_info[i]
+ for key in pairs(info) do
+ --翻译键
+ translation[key]=luci.i18n.translate(key)
+ -- local value=info[key]
+ -- if hasLetters(value) then
+ -- --翻译值
+ -- translation[value]=luci.i18n.translate(value)
+ -- end
+ end
end
end
--小区信息翻译
diff --git a/luci-app-modem/luasrc/view/modem/modem_info.htm b/luci-app-modem/luasrc/view/modem/modem_info.htm
index bee3063..132fec1 100644
--- a/luci-app-modem/luasrc/view/modem/modem_info.htm
+++ b/luci-app-modem/luasrc/view/modem/modem_info.htm
@@ -52,6 +52,28 @@ end
});
}
+ //获取SIM卡信息视图
+ function get_rate_view(rate)
+ {
+ const b=parseFloat(rate);
+ const kb=b/1024;
+ const mb=kb/1024;
+
+ var rate_view;
+ if (mb>=1) {
+ console.log(mb);
+ rate_view=mb.toFixed(2)+" MB/s";
+ }
+ else if (kb>=1) {
+ rate_view=kb.toFixed(2)+" KB/s";
+ }
+ else {
+ rate_view=b+" B/s";
+ }
+
+ return rate_view;
+ }
+
//获取SIM卡信息视图
function get_sim_info_view(sim_info,translation)
{
@@ -63,6 +85,12 @@ end
//遍历每一条信息里的键
for (var key in info)
{
+ //跳过全名
+ if (key=="full_name")
+ {
+ continue;
+ }
+
//获取全名
var full_name=info["full_name"];
if (full_name==null)
@@ -71,7 +99,7 @@ end
}
//写入视图（不显示空的信息）
var value=info[key];
- if (key!="full_name"&&value!="-"&&value!=""&&value!="ready")
+ if (value!="-"&&value!=""&&value!="ready")
{
// value=translation[value]; //是否翻译
sim_info_view+='| '+translation[key]+' | '+value+' |
';
@@ -92,6 +120,60 @@ end
sim_info_Element.innerHTML=sim_info_view;
}
+ //获取网络信息视图
+ function get_network_info_view(network_info,translation)
+ {
+ //初始化视图
+ var network_info_view='';
+ //遍历每一条信息
+ for (var info of network_info)
+ {
+ //遍历每一条信息里的键
+ for (var key in info)
+ {
+ //跳过全名
+ if (key=="full_name")
+ {
+ continue;
+ }
+
+ //获取全名
+ var full_name=info["full_name"];
+ if (full_name==null)
+ {
+ full_name='';
+ }
+ //写入视图（不显示空的信息）
+ var value=info[key];
+ if (value!="-"&&value!="")
+ {
+ //添加单位
+ if (key=="RSSI") {
+ value=value+" dBm";
+ }
+ else if (key=="Tx Rate"||key=="Rx Rate")
+ {
+ value=get_rate_view(value);
+ }
+ // value=translation[value]; //是否翻译
+ network_info_view+='| '+translation[key]+' | '+value+' |
';
+ break;
+ }
+ }
+ }
+ return network_info_view;
+ }
+
+ //设置网络信息
+ function set_network_info(network_info,translation)
+ {
+ //获取网络信息视图
+ var network_info_view=get_network_info_view(network_info,translation);
+ //获取网络信息表格
+ var network_info_Element=document.getElementById("network_info");
+ network_info_Element.innerHTML=network_info_view;
+ }
+
//获取小区信息视图
function get_cell_info_view(network_mode_info,network_type,translation)
{
@@ -103,6 +185,12 @@ end
//遍历每一条信息里的键
for (var key in info)
{
+ //跳过全名
+ if (key=="full_name")
+ {
+ continue;
+ }
+
//获取全名
var full_name=info["full_name"];
if (full_name==null)
@@ -111,7 +199,7 @@ end
}
//写入视图（不显示空的信息）
var value=info[key];
- if (key!="full_name"&&value!="-"&&value!="")
+ if (value!="-"&&value!="")
{
//添加单位
if (key=="Band") {
@@ -145,7 +233,7 @@ end
return cell_info_view;
}
- //获取小区信息
+ //设置小区信息
function set_cell_info(cell_info,translation)
{
//获取网络模式
@@ -334,7 +422,7 @@ end
//网络信息
var network_info=more_info["network_info"];
- set_info(network_info);
+ set_network_info(network_info,translation);
//小区信息
var cell_info=more_info["cell_info"];
@@ -486,11 +574,7 @@ end
@@ -501,22 +585,7 @@ end
-