From af6fee9961a673fef45a70030ff230f21770a603 Mon Sep 17 00:00:00 2001
From: siriling <siriling@qq.com>
Date: Sat, 30 Nov 2024 20:53:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 applications/luci-app-modem/Makefile          |  2 +
 .../luasrc/controller/modem.lua               |  2 +-
 .../luasrc/model/cbi/modem/dial_config.lua    |  2 +-
 .../luasrc/view/modem/plugin_info.htm         |  4 +-
 applications/luci-app-modem/po/zh-cn/modem.po |  2 +-
 .../luci-app-modem/po/zh_Hans/modem.po        |  2 +-
 .../luci-app-modem/root/etc/init.d/modem      |  6 +-
 .../root/usr/share/modem/a.json               | 96 +++++++++++++++++++
 .../root/usr/share/modem/modem_support.json   |  6 +-
 9 files changed, 110 insertions(+), 12 deletions(-)
 create mode 100644 applications/luci-app-modem/root/usr/share/modem/a.json

diff --git a/applications/luci-app-modem/Makefile b/applications/luci-app-modem/Makefile
index ea9ca13..1cd683a 100644
--- a/applications/luci-app-modem/Makefile
+++ b/applications/luci-app-modem/Makefile
@@ -12,6 +12,8 @@ PKG_LINCESE_FILES:=LICENSE
 PKF_MAINTAINER:=Siriling <siriling@qq.com>
 LUCI_DEPENDS:=+luci-compat \
 		+usbutils \
+		+pciutils \
+		+quectel-CM-5G \
 		+sms-tool \
 		+jq
 
diff --git a/applications/luci-app-modem/luasrc/controller/modem.lua b/applications/luci-app-modem/luasrc/controller/modem.lua
index 5e9fcaf..ad83083 100644
--- a/applications/luci-app-modem/luasrc/controller/modem.lua
+++ b/applications/luci-app-modem/luasrc/controller/modem.lua
@@ -928,7 +928,7 @@ function getPluginInfo()
 	-- 获取拨号工具信息
 	local dial_tool_info={}
 	dial_tool_info["modemmanager"]="Not installed"
-	dial_tool_info["quectel-cm"]="Not installed"
+	dial_tool_info["quectel-CM-5G"]="Not installed"
 	dial_tool_info["fibocom-dial"]="Not installed"
 	dial_tool_info["meig-cm"]="Not installed"
 	setPluginVersionInfo(dial_tool_info)
diff --git a/applications/luci-app-modem/luasrc/model/cbi/modem/dial_config.lua b/applications/luci-app-modem/luasrc/model/cbi/modem/dial_config.lua
index 3d93201..5484cfc 100644
--- a/applications/luci-app-modem/luasrc/model/cbi/modem/dial_config.lua
+++ b/applications/luci-app-modem/luasrc/model/cbi/modem/dial_config.lua
@@ -82,7 +82,7 @@ dial_tool = s:taboption("advanced", ListValue, "dial_tool", translate("Dial Tool
 dial_tool.description = translate("After switching the dialing tool, it may be necessary to restart the module or restart the router to recognize the module.")
 dial_tool.rmempty = true
 dial_tool:value("", translate("Auto Choose"))
-dial_tool:value("quectel-cm", translate("quectel-cm"))
+dial_tool:value("quectel-CM", translate("quectel-CM"))
 dial_tool:value("mmcli", translate("mmcli"))
 
 -- 网络类型
diff --git a/applications/luci-app-modem/luasrc/view/modem/plugin_info.htm b/applications/luci-app-modem/luasrc/view/modem/plugin_info.htm
index 275befa..aa96686 100644
--- a/applications/luci-app-modem/luasrc/view/modem/plugin_info.htm
+++ b/applications/luci-app-modem/luasrc/view/modem/plugin_info.htm
@@ -129,10 +129,10 @@
 					</div>
 				</div>
 				<div class="cbi-value">
-					<label class="cbi-value-title">quectel-cm <%:Version%></label>
+					<label class="cbi-value-title">quectel-CM <%:Version%></label>
 					<div class="cbi-value-field">
 						<div class="version">
-							<strong id="quectel-cm_version"></strong>
+							<strong id="quectel-CM-5G_version"></strong>
 						</div>
 						<!-- <div class="cbi-value-description">
 							<%:Select a modem for debugging%>
diff --git a/applications/luci-app-modem/po/zh-cn/modem.po b/applications/luci-app-modem/po/zh-cn/modem.po
index 49683a0..f8e7087 100644
--- a/applications/luci-app-modem/po/zh-cn/modem.po
+++ b/applications/luci-app-modem/po/zh-cn/modem.po
@@ -247,7 +247,7 @@ msgstr "切换拨号工具后，可能需要重启模组或重启路由器才能
 msgid "Auto Choose"
 msgstr "自动选择"
 
-msgid "quectel-cm"
+msgid "quectel-CM"
 msgstr "移远模组拨号工具"
 
 msgid "mmcli"
diff --git a/applications/luci-app-modem/po/zh_Hans/modem.po b/applications/luci-app-modem/po/zh_Hans/modem.po
index 49683a0..f8e7087 100644
--- a/applications/luci-app-modem/po/zh_Hans/modem.po
+++ b/applications/luci-app-modem/po/zh_Hans/modem.po
@@ -247,7 +247,7 @@ msgstr "切换拨号工具后，可能需要重启模组或重启路由器才能
 msgid "Auto Choose"
 msgstr "自动选择"
 
-msgid "quectel-cm"
+msgid "quectel-CM"
 msgstr "移远模组拨号工具"
 
 msgid "mmcli"
diff --git a/applications/luci-app-modem/root/etc/init.d/modem b/applications/luci-app-modem/root/etc/init.d/modem
index bf12185..3edd093 100755
--- a/applications/luci-app-modem/root/etc/init.d/modem
+++ b/applications/luci-app-modem/root/etc/init.d/modem
@@ -226,7 +226,7 @@ quectel_cm()
 	
 	#拨号
 	procd_open_instance
-	procd_set_param command "quectel-cm"
+	procd_set_param command "quectel-CM"
 
 	case $pdp_type in
 		"ipv4") procd_append_param command "-4" ;;
@@ -320,7 +320,7 @@ qmi()
 {
 	#选择拨号工具
 	case $dial_tool in
-		"quectel-cm") quectel_cm ;;
+		"quectel-CM") quectel_cm ;;
 		"mmcli") modemmanager ;;
 		"") quectel_cm ;;
 		*) quectel_cm ;;
@@ -825,7 +825,7 @@ stop_service()
 	#删除记录文件
 	rm -rf ${MODEM_RUN_CONFIG}
 	#停止qmi、mbim拨号
-	killall quectel-cm >/dev/null 2>&1
+	killall quectel-CM >/dev/null 2>&1
 	#停止gobinet、ecm、rndis、ncm拨号
 	local modem_number=$(uci -q get modem.@global[0].modem_number)
 	for i in $(seq 0 $((modem_number-1))); do
diff --git a/applications/luci-app-modem/root/usr/share/modem/a.json b/applications/luci-app-modem/root/usr/share/modem/a.json
new file mode 100644
index 0000000..db7abff
--- /dev/null
+++ b/applications/luci-app-modem/root/usr/share/modem/a.json
@@ -0,0 +1,96 @@
+{
+    "network_prefer":{
+        "2G":{
+            "enable":1,
+            "band":[
+                {"DCS 1800":1},
+                {"E-GSM 900":1},
+                {"P-GSM 900":1},
+                {"GSM 450":1},
+                {"GSM 480":1},
+                {"GSM 750":1},
+                {"GSM 850":1},
+                {"R-GSM 900":1},
+                {"PCS 1900":1}
+            ]
+        },
+        "3G":{
+            "enable":1,
+            "band":[
+                {"B1":1,"full_name":"WCDMA IMT EUROPE JAPAN & CHINA 2100"},
+                {"B2":1,"full_name":"WCDMA US PCS 1900"},
+                {"B3":1,"full_name":"WCDMA Europe and China DCS 1800"},
+                {"B4":1,"full_name":"WCDMA US 1700"},
+                {"B5":1,"full_name":"WCDMA US 850"},
+                {"B6":1,"full_name":"WCDMA Japan 800"},
+                {"B7":1,"full_name":"WCDMA Europe 2600"},
+                {"B8":1,"full_name":"WCDMA Europe and Japan 900"},
+                {"B9":1,"full_name":"WCDMA Japan 1700"},
+                {"B11":1,"full_name":"WCDMA 1500"},
+                {"B19":1,"full_name":"WCDMA Japan 850"}
+            ]
+        },
+        "4G":{
+            "enable":1,
+            "band":[
+                {"B1":1},
+                {"B2":1},
+                {"B3":1},
+                {"B4":1},
+                {"B5":1},
+                {"B6":1},
+                {"B7":1},
+                {"B8":1},
+                {"B9":1},
+                {"B10":1},
+                {"B11":1},
+                {"B12":1},
+                {"B13":1},
+                {"B14":1},
+                {"B17":1},
+                {"B18":1},
+                {"B19":1},
+                {"B20":1},
+                {"B21":1},
+                {"B25":1},
+                {"B26":1},
+                {"B28":1},
+                {"B29":1},
+                {"B30":1},
+                {"B32":1},
+                {"B34":1},
+                {"B38":1},
+                {"B39":1},
+                {"B40":1},
+                {"B41":1},
+                {"B42":1},
+                {"B66":1},
+                {"B71":1}
+            ]
+        },
+        "5G":{
+            "enable":1,
+            "band":[
+                {"N1":1},
+                {"N2":1},
+                {"N3":1},
+                {"N5":1},
+                {"N7":1},
+                {"N8":1},
+                {"N12":1},
+                {"N20":1},
+                {"N25":1},
+                {"N28":1},
+                {"N38":1},
+                {"N40":1},
+                {"N41":1},
+                {"N48":1},
+                {"N66":1},
+                {"N71":1},
+                {"N77":1},
+                {"N78":1},
+                {"N79":1}
+            ]
+        }
+    }
+}
diff --git a/applications/luci-app-modem/root/usr/share/modem/modem_support.json b/applications/luci-app-modem/root/usr/share/modem/modem_support.json
index aaa85f3..4be2a15 100644
--- a/applications/luci-app-modem/root/usr/share/modem/modem_support.json
+++ b/applications/luci-app-modem/root/usr/share/modem/modem_support.json
@@ -242,7 +242,7 @@
             },
             "fibocom":{
                 "unisoc":{
-                    "vendor_id":["2cb7","3c93","3763"],
+                    "vendor_id":["2cb7","3763","3c93"],
                     "product_id":["0a04","0a05","0a06","0a07","3c93","ffff"]
                 },
                 "qualcomm":{
@@ -264,8 +264,8 @@
                     "product_id":["4d22","4d23","4d38","4d45","f601"]
                 },
                 "hisilicon":{
-                    "vendor_id":["2dee","4d20"],
-                    "product_id":["7126","7127"]
+                    "vendor_id":["2dee"],
+                    "product_id":["4d20"]
                 },
                 "asrmicro":{
                     "vendor_id":["2dee"],