From 7e4e80eda9a91dafab4812464e517cf87154f9d9 Mon Sep 17 00:00:00 2001 From: ling <1042585959@qq.com> Date: Tue, 19 Mar 2024 19:48:39 +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 --- luci-app-modem/luasrc/controller/modem.lua | 32 +++++++++++++++---- luci-app-modem/root/etc/config/modem | 8 +++++ .../usr/share/modem/custom_at_commands.json | 2 ++ .../usr/share/modem/quectel_at_commands.json | 2 ++ 4 files changed, 37 insertions(+), 7 deletions(-) diff --git a/luci-app-modem/luasrc/controller/modem.lua b/luci-app-modem/luasrc/controller/modem.lua index 8753bf7..04f1efd 100644 --- a/luci-app-modem/luasrc/controller/modem.lua +++ b/luci-app-modem/luasrc/controller/modem.lua @@ -204,13 +204,31 @@ function getModemInfo() end --小区信息翻译 if modem_more_info["cell_info"] then - for key in pairs(modem_more_info["cell_info"]) do - translation[key]=luci.i18n.translate(key) - local network_mode=modem_more_info["cell_info"][key] - for i = 1, #network_mode do - local info = network_mode[i] - for key in pairs(info) do - translation[key]=luci.i18n.translate(key) + for network_mode_key in pairs(modem_more_info["cell_info"]) do + --翻译网络模式 + translation[network_mode_key]=luci.i18n.translate(network_mode_key) + if network_mode_key == "EN-DC Mode" then + local network_mode=modem_more_info["cell_info"][network_mode_key] + for i = 1, #network_mode do + for key in pairs(network_mode[i]) do + --获取每个网络类型信息 + local network_type=network_mode[i][key] + for j = 1, #network_type do + local info = network_type[j] + for key in pairs(info) do + translation[key]=luci.i18n.translate(key) + end + end + end + end + else + --获取网络类型信息 + local network_type=modem_more_info["cell_info"][network_mode_key] + for i = 1, #network_type do + local info = network_type[i] + for key in pairs(info) do + translation[key]=luci.i18n.translate(key) + end end end end diff --git a/luci-app-modem/root/etc/config/modem b/luci-app-modem/root/etc/config/modem index e569bd9..7048a33 100644 --- a/luci-app-modem/root/etc/config/modem +++ b/luci-app-modem/root/etc/config/modem @@ -99,6 +99,14 @@ config custom-commands option description '锁5G > AT+QNWPREFCFG="mode_pref",NR5G' option command 'AT+QNWPREFCFG="mode_pref",NR5G' +config custom-commands + option description '锁5G NSA > AT+QNWPREFCFG="mode_pref",NR5G-NSA' + option command 'AT+QNWPREFCFG="mode_pref",NR5G-NSA' + +config custom-commands + option description '锁5G SA > AT+QNWPREFCFG="mode_pref",NR5G-SA' + option command 'AT+QNWPREFCFG="mode_pref",NR5G-SA' + config custom-commands option description '恢复自动搜索网络 > AT+QNWPREFCFG="mode_pref",AUTO' option command 'AT+QNWPREFCFG="mode_pref",AUTO' diff --git a/luci-app-modem/root/usr/share/modem/custom_at_commands.json b/luci-app-modem/root/usr/share/modem/custom_at_commands.json index ce30bd0..12f1cc4 100644 --- a/luci-app-modem/root/usr/share/modem/custom_at_commands.json +++ b/luci-app-modem/root/usr/share/modem/custom_at_commands.json @@ -23,6 +23,8 @@ {"NCM拨号 > AT+QCFG=\"usbnet\",5":"AT+QCFG=\"usbnet\",5"}, {"锁4G > AT+QNWPREFCFG=\"mode_pref\",LTE":"AT+QNWPREFCFG=\"mode_pref\",LTE"}, {"锁5G > AT+QNWPREFCFG=\"mode_pref\",NR5G":"AT+QNWPREFCFG=\"mode_pref\",NR5G"}, + {"锁5G NSA > AT+QNWPREFCFG=\"mode_pref\",NR5G-NSA":"AT+QNWPREFCFG=\"mode_pref\",NR5G-NSA"}, + {"锁5G SA > AT+QNWPREFCFG=\"mode_pref\",NR5G-SA":"AT+QNWPREFCFG=\"mode_pref\",NR5G-SA"}, {"恢复自动搜索网络 > AT+QNWPREFCFG=\"mode_pref\",AUTO":"AT+QNWPREFCFG=\"mode_pref\",AUTO"}, {"查询模组IMEI > AT+CGSN":"AT+CGSN"}, {"查询模组IMEI > AT+GSN":"AT+GSN"}, diff --git a/luci-app-modem/root/usr/share/modem/quectel_at_commands.json b/luci-app-modem/root/usr/share/modem/quectel_at_commands.json index 581104e..9d84331 100644 --- a/luci-app-modem/root/usr/share/modem/quectel_at_commands.json +++ b/luci-app-modem/root/usr/share/modem/quectel_at_commands.json @@ -21,6 +21,8 @@ {"NCM拨号 > AT+QCFG=\"usbnet\",5":"AT+QCFG=\"usbnet\",5"}, {"锁4G > AT+QNWPREFCFG=\"mode_pref\",LTE":"AT+QNWPREFCFG=\"mode_pref\",LTE"}, {"锁5G > AT+QNWPREFCFG=\"mode_pref\",NR5G":"AT+QNWPREFCFG=\"mode_pref\",NR5G"}, + {"锁5G NSA > AT+QNWPREFCFG=\"mode_pref\",NR5G-NSA":"AT+QNWPREFCFG=\"mode_pref\",NR5G-NSA"}, + {"锁5G SA > AT+QNWPREFCFG=\"mode_pref\",NR5G-SA":"AT+QNWPREFCFG=\"mode_pref\",NR5G-SA"}, {"恢复自动搜索网络 > AT+QNWPREFCFG=\"mode_pref\",AUTO":"AT+QNWPREFCFG=\"mode_pref\",AUTO"}, {"查询模组IMEI > AT+CGSN":"AT+CGSN"}, {"查询模组IMEI > AT+GSN":"AT+GSN"},