diff --git a/applications/luci-app-modem/luasrc/controller/modem.lua b/applications/luci-app-modem/luasrc/controller/modem.lua index 3e57a65..89a23b2 100644 --- a/applications/luci-app-modem/luasrc/controller/modem.lua +++ b/applications/luci-app-modem/luasrc/controller/modem.lua @@ -5,7 +5,6 @@ local fs = require "nixio.fs" local json = require("luci.jsonc") uci = luci.model.uci.cursor() local script_path="/usr/share/modem/" -local run_path="/tmp/run/modem/" function index() if not nixio.fs.access("/etc/config/modem") then @@ -23,8 +22,6 @@ function index() entry({"admin", "network", "modem", "index"},cbi("modem/index"),translate("Dial Config"),20).leaf = true entry({"admin", "network", "modem", "config"}, cbi("modem/config")).leaf = true entry({"admin", "network", "modem", "get_modems"}, call("getModems"), nil).leaf = true - entry({"admin", "network", "modem", "get_dial_log_info"}, call("getDialLogInfo"), nil).leaf = true - entry({"admin", "network", "modem", "clean_dial_log"}, call("cleanDialLog"), nil).leaf = true entry({"admin", "network", "modem", "status"}, call("act_status")).leaf = true --模块调试 @@ -358,68 +355,6 @@ function getModems() luci.http.write_json(data) end ---[[ -@Description 获取拨号日志信息 -]] -function getDialLogInfo() - - local command="find "..run_path.." -name \"modem*_dial.cache\"" - local result=shell(command) - - local log_paths=string.split(result, "\n") - - local logs={} - for i = #log_paths, 1, -1 do --倒序遍历 - - local log_path=log_paths[i] - - if log_path ~= "" then - --获取模组 - local tmp=string.gsub(log_path, run_path, "") - local modem=string.gsub(tmp, "_dial.cache", "") - - --获取日志内容 - local command="cat "..log_path - log=shell(command) - - --排序插入 - modem_log={} - modem_log[modem]=log - table.insert(logs, modem_log) - end - end - - -- 设置值 - local data={} - data["dial_log_info"]=logs - -- data["translation"]=translation - - -- 写入Web界面 - luci.http.prepare_content("application/json") - luci.http.write_json(data) -end - ---[[ -@Description 清空拨号日志 -]] -function cleanDialLog() - - -- 获取拨号日志路径 - local dial_log_path = http.formvalue("path") - - -- 清空拨号日志 - local command=": > "..dial_log_path - shell(command) - - -- 设置值 - local data={} - data["clean_result"]="clean dial log" - - -- 写入Web界面 - luci.http.prepare_content("application/json") - luci.http.write_json(data) -end - --[[ @Description 模块列表状态函数 ]] diff --git a/applications/luci-app-modem/luasrc/model/cbi/modem/index.lua b/applications/luci-app-modem/luasrc/model/cbi/modem/index.lua index b6746ec..9afb953 100644 --- a/applications/luci-app-modem/luasrc/model/cbi/modem/index.lua +++ b/applications/luci-app-modem/luasrc/model/cbi/modem/index.lua @@ -93,9 +93,6 @@ o.cfgvalue = function(t, n) return apn end --- 添加模块拨号日志 -m:append(Template("modem/modem_dial_log")) - -- m:append(Template("modem/list_status")) return m diff --git a/applications/luci-app-modem/luasrc/view/modem/modem_debug.htm b/applications/luci-app-modem/luasrc/view/modem/modem_debug.htm index 03b4e52..926b989 100644 --- a/applications/luci-app-modem/luasrc/view/modem/modem_debug.htm +++ b/applications/luci-app-modem/luasrc/view/modem/modem_debug.htm @@ -15,7 +15,7 @@ get_modem_debug_info(debug_params); }); - //获取标签菜单 + //获取tab菜单 var tab_menu = document.getElementsByClassName('cbi-tabmenu')[0]; set_tab_event(tab_menu); @@ -69,7 +69,7 @@ }); } - //设置标签菜单事件 + //设置tab菜单事件 function set_tab_event(parent_element) { //获取子元素 @@ -78,7 +78,7 @@ for (var i = 0; i < childElements.length; i++) { // childElements[i].addEventListener('click', function(event) { - // var debug_params={first_cache:true}; + // var debug_params={first_cache:true}; // get_modem_debug_info(debug_params); // }); @@ -123,8 +123,7 @@ function(x, data) { responseElement=document.getElementById("response"); - if ("response" in data) - { + if ("response" in data) { //显示当前时间 responseElement.value+=data["time"]+" "; //显示返回值 @@ -234,7 +233,7 @@ return disenable_element; } - // 设置标签显示 + // 设置tab显示 function set_tab_view(disenable_element,enable_element) { //获取tab内容父元素 @@ -283,6 +282,17 @@ document.getElementById("tab_context").style.display="none"; } + // 有模组界面 + function modems_view() + { + //显示模组选择界面 + document.getElementById("cbi-modem").style.display="block"; + //显示AT命令标题 + document.getElementById("at_command_title").style.display="block"; + //隐藏提示信息 + // document.getElementById("cbi-info").style.display="none"; + } + // 未适配模组界面 function not_adapted_modems_view() { @@ -290,30 +300,26 @@ document.getElementById("info_message").innerHTML="<%:Not adapted to this modem%>"; //显示提示信息 document.getElementById("cbi-info").style.display="block"; - //显示模组选择界面 - document.getElementById("cbi-modem").style.display="block"; - //显示标签内容界面 + //显示tab内容界面 document.getElementById("tab_context").style.display="block"; //显示AT命令标题 document.getElementById("at_command_title").style.display="block"; - //隐藏标签菜单界面 + //隐藏tab菜单界面 document.getElementsByClassName("cbi-tabmenu")[0].style.display="none"; - //在标签菜单选中AT命令 + //在tab菜单选中AT命令 var data_tab="at_command_tab" var at_command_tab_element = document.querySelector('li[data-tab="'+data_tab+'"]'); tab_event(at_command_tab_element); + //隐藏tab内容界面 + // document.getElementById("tab_context").style.display="none"; } // 全功能界面 function all_function_view() { - //更新提示信息 - document.getElementById("info_message").innerHTML='<%:Loading%><%:Loading modem%>...'; - //显示模组选择界面 - document.getElementById("cbi-modem").style.display="block"; - //显示标签菜单界面 + //显示tab菜单界面 document.getElementsByClassName("cbi-tabmenu")[0].style.display="block"; - //显示标签内容界面 + //显示tab内容界面 document.getElementById("tab_context").style.display="block"; //隐藏AT命令标题 document.getElementById("at_command_title").style.display="none"; @@ -384,6 +390,9 @@ var command_select = document.getElementById('command_select'); //更新选项 update_option(command_select,data["quick_commands"],true); + + //显示有模组界面 + modems_view(); } ); } @@ -724,6 +733,8 @@ var mode_info=data["mode_info"]; if (Object.keys(mode_info).length==0) { + //显示未适配模组界面 + not_adapted_modems_view(); return false } @@ -732,6 +743,9 @@ //设置第一次获取数据标志 debug_params.first_cache=false; + + //显示全功能界面 + all_function_view(); } ); } @@ -743,6 +757,8 @@ var network_prefer_info=data["network_prefer_info"]; if (Object.keys(network_prefer_info).length==0) { + //显示未适配模组界面 + not_adapted_modems_view(); return false } @@ -751,6 +767,9 @@ //设置第一次获取数据标志 debug_params.first_cache=false; + + //显示全功能界面 + all_function_view(); } ); } @@ -762,6 +781,8 @@ var self_test_info=data["self_test_info"]; if (Object.keys(self_test_info).length==0) { + //显示未适配模组界面 + not_adapted_modems_view(); return false } @@ -770,9 +791,43 @@ //设置第一次获取数据标志 // debug_params.first_cache=false; + + //显示全功能界面 + all_function_view(); } ); } + + //获取调试信息 + // XHR.get('<%=luci.dispatcher.build_url("admin", "network", "modem", "get_modem_debug_info")%>', {"port":at_port}, + // function(x, data) + // { + // var mode_info=data["mode_info"]; + // var network_prefer_info=data["network_prefer_info"]; + // var self_test_info=data["self_test_info"]; + // if (Object.keys(mode_info).length==0||Object.keys(network_prefer_info).length==0) { + // //显示未适配模组界面 + // not_adapted_modems_view(); + // return false + // } + + // //设置模式信息 + // set_mode_info(mode_info,debug_params.first_cache); + + // //设置网络偏好信息 + // set_network_prefer_info(network_prefer_info,debug_params.first_cache); + + // //设置模组自检信息 + // set_modem_self_test_info(self_test_info); + + // //设置第一次获取数据标志 + // debug_params.first_cache=false; + + // //显示全功能界面 + // all_function_view(); + // } + // ); + } // 定时触发更新AT串口 @@ -781,7 +836,7 @@ { //缓存当前选择的模组 var modem_select_cache=""; - var debug_params={first_cache:true,view:0}; + var debug_params={first_cache:true}; return function(x, data) { var at_ports=data["at_ports"]; @@ -793,7 +848,8 @@ //获取快捷命令 if (Object.keys(at_ports).length==0) { - debug_params.view=0; + //显示无模组界面 + no_modems_view(); } else { @@ -801,15 +857,6 @@ 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.includes("ttyUSB")||select_modem_name.includes("at")||select_modem_name.includes("DUN")) - { - debug_params.view=2; - } - else - { - debug_params.view=1; - } - if (select_modem_name != modem_select_cache) { //获取快捷选项 @@ -817,7 +864,6 @@ if (quick_option=="auto") { get_quick_commands(); } - //缓存当前选中的模组 modem_select_cache=select_modem_name; //设置第一次获取数据标志 @@ -827,20 +873,6 @@ //获取模组调试信息 get_modem_debug_info(debug_params); } - - //设置界面 - if (debug_params.view==0) { - //显示无模组界面 - no_modems_view(); - } - else if (debug_params.view==1) { - //显示全功能界面 - all_function_view(); - } - else if (debug_params.view==2) { - //显示未适配模组界面 - not_adapted_modems_view(); - } }; })() ); @@ -881,7 +913,7 @@ display: none; } - /* AT命令响应 */ + /* 终端 */ textarea { background:#373737; border:none; @@ -1118,8 +1150,8 @@
<%:Response%>

- - + +
diff --git a/applications/luci-app-modem/luasrc/view/modem/modem_dial_log.htm b/applications/luci-app-modem/luasrc/view/modem/modem_dial_log.htm deleted file mode 100644 index 7cc2710..0000000 --- a/applications/luci-app-modem/luasrc/view/modem/modem_dial_log.htm +++ /dev/null @@ -1,277 +0,0 @@ - - - - -
-
- -

<%:Dial Log%>

-
- - - - - - - -
-
    -
    - -
    -
    - - -
    -
    -
    diff --git a/applications/luci-app-modem/po/zh-cn/modem.po b/applications/luci-app-modem/po/zh-cn/modem.po index 724ac76..3339794 100644 --- a/applications/luci-app-modem/po/zh-cn/modem.po +++ b/applications/luci-app-modem/po/zh-cn/modem.po @@ -58,12 +58,6 @@ msgstr "在此页面给所有模组添加拨号配置" msgid "Global Config" msgstr "全局配置" -msgid "Dial Log" -msgstr "拨号日志" - -msgid "Download Log" -msgstr "下载日志" - msgid "connect" msgstr "已连接" diff --git a/applications/luci-app-modem/po/zh_Hans b/applications/luci-app-modem/po/zh_Hans deleted file mode 100644 index 41451e4..0000000 --- a/applications/luci-app-modem/po/zh_Hans +++ /dev/null @@ -1 +0,0 @@ -zh-cn \ No newline at end of file diff --git a/applications/luci-app-modem/po/zh_Hans/modem.po b/applications/luci-app-modem/po/zh_Hans/modem.po new file mode 100644 index 0000000..3339794 --- /dev/null +++ b/applications/luci-app-modem/po/zh_Hans/modem.po @@ -0,0 +1,512 @@ +msgid "" +msgstr "" +"Project-Id-Version: \n" +"POT-Creation-Date: \n" +"PO-Revision-Date: 2024-04-10 09:38+0000\n" +"Last-Translator: MkQtS \n" +"Language-Team: Chinese (Simplified) \n" +"Language: zh_Hans\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Weblate 5.5-dev\n" + +msgid "Base Setting" +msgstr "基本设置" + +msgid "Modem" +msgstr "移动通信模组" + +msgid "Modem Config" +msgstr "模组配置" + +msgid "Modem Status" +msgstr "模组状态" + +msgid "Modem Name" +msgstr "模组名称" + +msgid "Modem Debug" +msgstr "模组调试" + +msgid "Modem Select" +msgstr "模组选择" + +msgid "Check information about adapted modem on this page" +msgstr "在此页面查看已适配模组的信息" + +msgid "Not adapted to this modem" +msgstr "未适配该模组" + +msgid "Loading modem information" +msgstr "正在加载模组信息" + +msgid "Loading modem status" +msgstr "正在加载模组状态" + +msgid "Loading modem" +msgstr "正在加载模组" + +msgid "Dial Config" +msgstr "拨号配置" + +msgid "Add dialing configuration to all modules on this page" +msgstr "在此页面给所有模组添加拨号配置" + +msgid "Global Config" +msgstr "全局配置" + +msgid "connect" +msgstr "已连接" + +msgid "disconnect" +msgstr "未连接" + +msgid "disabled" +msgstr "未启用" + +msgid "Data Interface" +msgstr "数据接口" + +msgid "Mode" +msgstr "模式" + +msgid "Connect Status" +msgstr "连接状态" + +msgid "Config List" +msgstr "配置列表" + +msgid "Debug Your Module" +msgstr "调试你的模组" + +msgid "Select a modem for debugging" +msgstr "选择一个模组进行调试" + +msgid "Network Preferences" +msgstr "网络偏好" + +msgid "Self Test" +msgstr "自检" + +msgid "Current" +msgstr "当前" + +msgid "Option" +msgstr "选项" + +msgid "Config" +msgstr "配置" + +msgid "Item" +msgstr "项目" + +msgid "Voltage" +msgstr "电压" + +msgid "Status" +msgstr "状态" + +msgid "Abnormal" +msgstr "异常" + +msgid "Normal" +msgstr "正常" + +msgid "Low" +msgstr "偏低" + +msgid "Somewhat High" +msgstr "偏高" + +msgid "Excessively High" +msgstr "过高" + +msgid "AT Command" +msgstr "AT命令" + +msgid "Quick Option" +msgstr "快捷选项" + +msgid "Auto" +msgstr "自动" + +msgid "Custom" +msgstr "自定义" + +msgid "Quick Commands" +msgstr "快捷命令" + +msgid "Enter Command" +msgstr "输入命令" + +msgid "Apply" +msgstr "应用" + +msgid "Send" +msgstr "发送" + +msgid "Clean" +msgstr "清空" + +msgid "Response" +msgstr "响应" + +msgid "Return to old page" +msgstr "返回旧界面" + +msgid "Return to modem debug" +msgstr "返回模组调试界面" + +msgid "Custom quick commands" +msgstr "自定义快捷命令" + +msgid "Customize your quick commands" +msgstr "自定义你的快捷命令" + +msgid "Custom Commands" +msgstr "自定义命令" + +msgid "Serial Number" +msgstr "序号" + +msgid "Description" +msgstr "描述" + +msgid "Command" +msgstr "命令" + +msgid "Modem Information" +msgstr "模组信息" + +msgid "No modems found" +msgstr "没有找到模组" + +msgid "Check to enable all configurations" +msgstr "勾选启用全部配置" + +msgid "General Settings" +msgstr "通用配置" + +msgid "Advanced Settings" +msgstr "高级配置" + +msgid "Remarks" +msgstr "备注" + +msgid "Mobile Network" +msgstr "移动网络" + +msgid "UNKNOWN" +msgstr "未知" + +msgid "Unknown" +msgstr "未知" + +msgid "unknown" +msgstr "未知" + +msgid "Mobile network not found" +msgstr "未发现移动网络" + +msgid "The network device was not found" +msgstr "找不到网络设备" + +msgid "Only display the modes available for the adaptation modem" +msgstr "仅显示适配模组可用的拨号模式" + +msgid "Config ID" +msgstr "配置 ID" + +msgid "Dial Tool" +msgstr "拨号工具" + +msgid "After switching the dialing tool, it may be necessary to restart the module or restart the router to recognize the module." +msgstr "切换拨号工具后，可能需要重启模组或重启路由器才能识别模组。" + +msgid "Auto Choose" +msgstr "自动选择" + +msgid "quectel-CM" +msgstr "移远模组拨号工具" + +msgid "mmcli" +msgstr "调制解调器管理工具" + +msgid "PDP Type" +msgstr "网络类型" + +msgid "Network Bridge" +msgstr "网络桥接" + +msgid "After checking, enable network interface bridge." +msgstr "勾选后，启用网络接口桥接。" + +msgid "APN" +msgstr "接入点" + +msgid "China Mobile" +msgstr "中国移动" + +msgid "China Unicom" +msgstr "中国联通" + +msgid "China Telecom" +msgstr "中国电信" + +msgid "China Broadcast" +msgstr "中国广电" + +msgid "Skytone" +msgstr "天际通" + +msgid "Authentication Type" +msgstr "认证类型" + +msgid "PAP/CHAP (both)" +msgstr "PAP/CHAP (均使用)" + +msgid "NONE" +msgstr "无" + +msgid "PAP/CHAP Username" +msgstr "PAP/CHAP 用户名" + +msgid "PAP/CHAP Password" +msgstr "PAP/CHAP 密码" + +msgid "Message" +msgstr "信息" + +msgid "Base Information" +msgstr "基本信息" + +msgid "Manufacturer" +msgstr "制造商" + +msgid "Revision" +msgstr "固件版本" + +msgid "AT Port" +msgstr "AT串口" + +msgid "Temperature" +msgstr "温度" + +msgid "Update Time" +msgstr "更新时间" + +msgid "SIM Information" +msgstr "SIM卡信息" + +msgid "Unknown SIM card status" +msgstr "未知SIM卡状态" + +msgid "SIM card not inserted" +msgstr "SIM卡未插入" + +msgid "ISP" +msgstr "运营商" + +msgid "SIM Status" +msgstr "SIM卡状态" + +msgid "miss" +msgstr "未插入" + +msgid "locked" +msgstr "锁定" + +msgid "SIM Slot" +msgstr "SIM卡卡槽" + +msgid "SIM Number" +msgstr "SIM卡号码" + +msgid "IMEI" +msgstr "国际移动设备识别码" + +msgid "IMSI" +msgstr "国际移动用户识别码" + +msgid "ICCID" +msgstr "集成电路卡识别码" + +msgid "Network Information" +msgstr "网络信息" + +msgid "Network Type" +msgstr "网络类型" + +msgid "Tx Rate" +msgstr "上传速率" + +msgid "Rx Rate" +msgstr "下载速率" + +msgid "RSSI" +msgstr "接收信号强度指示" + +msgid "BER" +msgstr "信道误码率" + +msgid "Cell Information" +msgstr "小区信息" + +msgid "Network Mode" +msgstr "网络模式" + +msgid "NR5G-SA Mode" +msgstr "NR5G-SA 模式" + +msgid "EN-DC Mode" +msgstr "EN-DC 模式" + +msgid "LTE Mode" +msgstr "LTE 模式" + +msgid "WCDMA Mode" +msgstr "WCDMA 模式" + +msgid "MCC" +msgstr "移动国家代码" + +msgid "MNC" +msgstr "移动网络代码" + +msgid "Duplex Mode" +msgstr "双工模式" + +msgid "LAC" +msgstr "位置区码" + +msgid "Cell ID" +msgstr "小区ID" + +msgid "Physical Cell ID" +msgstr "物理小区ID" + +msgid "TAC" +msgstr "跟踪区编码" + +msgid "ARFCN" +msgstr "绝对射频信道号" + +msgid "EARFCN" +msgstr "E-UTRA绝对射频信道号" + +msgid "UARFCN" +msgstr "UTRA绝对射频信道号" + +msgid "Band" +msgstr "频段" + +msgid "Freq band indicator" +msgstr "频带指示" + +msgid "UL Bandwidth" +msgstr "上行带宽" + +msgid "DL Bandwidth" +msgstr "下行带宽" + +msgid "RSRP" +msgstr "参考信号接收功率" + +msgid "RSRQ" +msgstr "参考信号接收质量" + +msgid "RSSI" +msgstr "接收信号强度指示" + +msgid "SINR" +msgstr "信号与干扰加噪声比" + +msgid "RSSNR" +msgstr "信号干扰比" + +msgid "SCS" +msgstr "NR子载波间隔" + +msgid "CQI" +msgstr "信道质量指示" + +msgid "TX Power" +msgstr "TX 功率" + +msgid "PSC" +msgstr "主扰码" + +msgid "RAC" +msgstr "路由区域码" + +msgid "RSCP" +msgstr "接收信号码功率" + +msgid "每比特能量与干扰功率密度(干扰比)之比" +msgstr "Eb/Io" + +msgid "每比特能量与噪声功率密度(噪声比)之比" +msgstr "Eb/No" + +msgid "每码片能量与干扰功率密度(干扰比)之比" +msgstr "Ec/Io" + +msgid "每码片能量与噪声功率密度(噪声比)之比" +msgstr "Ec/No" + +msgid "Physical Channel" +msgstr "物理信道" + +msgid "Spreading Factor" +msgstr "扩频因子" + +msgid "Slot" +msgstr "插槽格式" + +msgid "Speech Code" +msgstr "语音编码" + +msgid "Compression Mode" +msgstr "压缩模式" + +msgid "RxLev" +msgstr "接收信号功率" + +msgid "CHN-CMCC" +msgstr "中国移动" + +msgid "CMCC" +msgstr "中国移动" + +msgid "46000" +msgstr "中国移动" + +msgid "CHN-UNICOM" +msgstr "中国联通" + +msgid "UNICOM" +msgstr "中国联通" + +msgid "CUCC" +msgstr "中国联通" + +msgid "46001" +msgstr "中国联通" + +msgid "CHN-CT" +msgstr "中国电信" + +msgid "CHN-TELECOM" +msgstr "中国电信" + +msgid "CTCC" +msgstr "中国电信" + +msgid "CT" +msgstr "中国电信" + +msgid "46011" +msgstr "中国电信"