重构服务器地址，默认北科

diff --git a/2.sdk/project/7PIN_1_5/images/customer_fs.bin b/2.sdk/project/7PIN_1_5/images/customer_fs.bin
index eed12da..c347d98 100644 (file)
Binary files a/2.sdk/project/7PIN_1_5/images/customer_fs.bin and b/2.sdk/project/7PIN_1_5/images/customer_fs.bin differ

diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/ai_VC.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/ai_VC.py
index 1592833..e3befa2 100644 (file)
--- a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/ai_VC.py
+++ b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/ai_VC.py
@@ -1898,10 +1898,7 @@ class device_res_author(Abstract):
             if dev_type == "7PIN_BK_EU":#英文小瑞
                 url = "http://dmp-global.raisound.com/bz-api/dev/time"
             else:
-                url = "https://dmp-api.qipai.com/qp-dmp-api/dev/time"
-                #url = "https://dmp-dev.raisound.com/dmp-api/dev/time"
-                url = "http://dmp.raisound.com/bz-api/dev/time"#金三
-                url = "http://kxc.raisound.com/bz-api/dev/time"#科学城demo
+                url = constants.DMP_BASE + "/dev/time"
             print("dev_NTP:{}".format(url))
             response = request.get(url,timeout=5)
             data = response.json()
@@ -2032,10 +2029,7 @@ class device_res_author(Abstract):
                 if dev_type == "7PIN_BK_EU":#英文小瑞
                     url = "http://dmp-global.raisound.com/bz-api/dev/auth/active"
                 else:
-                    url = "https://dmp-api.qipai.com/qp-dmp-api/dev/auth/active"
-                    url = "http://dmp.raisound.com/bz-api/dev/auth/active"#金三
-                    # url = "https://dmp-dev.raisound.com/dmp-api/dev/auth/active"
-                    url = "http://kxc.raisound.com/bz-api/dev/auth/active"#科学城demo
+                    url = constants.DMP_BASE + "/dev/auth/active"
                 print("dev_active:{}".format(url))
                 data =ujson.dumps(data)
                 response = None
@@ -2148,10 +2142,7 @@ class device_res_author(Abstract):
                 if dev_type == "7PIN_BK_EU":#英文小瑞
                     sign_url = "http://dmp-global.raisound.com/bz-api/dev/auth/sign_in" #登入地址
                 else:
-                    sign_url = "https://dmp-api.qipai.com/qp-dmp-api/dev/auth/sign_in"
-                    sign_url = "http://dmp.raisound.com/bz-api/dev/auth/sign_in"#金三
-                    sign_url = "http://kxc.raisound.com/bz-api/dev/auth/sign_in"#科学城demo
-                    # sign_url = "https://dmp-dev.raisound.com/dmp-api/dev/auth/sign_in" #登入地址
+                    sign_url = constants.DMP_BASE + "/dev/auth/sign_in"
                 #获取验证码
                 #url = "http://dmp.qipai.com.cn:30461/dev/device/bind-code/860132066060377"
                 # token = EventMesh.publish("get_dev_token")
@@ -2224,9 +2215,7 @@ class device_res_author(Abstract):
                 if dev_type == "7PIN_BK_EU":#英文小瑞
                     url = "http://dmp-global.raisound.com/bz-api/dev/iccid?deviceId={}&iccid={}".format(modem.getDevImei(),iccid)
                 else:
-                    url = "https://dmp-api.qipai.com/qp-dmp-api/dev/iccid?deviceId={}&iccid={}".format(modem.getDevImei(),iccid)
-                    url = "http://dmp.raisound.com/bz-api/dev/iccid?deviceId={}&iccid={}".format(modem.getDevImei(),iccid)#金三
-                    # url = "https://dmp-dev.raisound.com/dmp-api/dev/iccid?deviceId={}&iccid={}".format(modem.getDevImei(),iccid) #北科地址
+                    url = (constants.DMP_BASE + "/dev/iccid?deviceId={}&iccid={}").format(modem.getDevImei(),iccid)
                 print("{} H:{}".format(url,headers_T))
                 response = request.post(url,headers = headers_T)
                 if response.status_code == 200:
@@ -2264,10 +2253,7 @@ class device_res_author(Abstract):
             if dev_type == "7PIN_BK_EU":#英文小瑞
                 dev_tokenip = "http://dmp-global.raisound.com/bz-api/dev/auth/token" #设备新令牌更新地址
             else:
-                dev_tokenip = "https://dmp-api.qipai.com/qp-dmp-api/dev/auth/token"
-                dev_tokenip = "http://dmp.raisound.com/bz-api/dev/auth/token"#金三
-                dev_tokenip = "http://kxc.raisound.com/bz-api/dev/auth/token"#科学城demo
-                # dev_tokenip = "https://dmp-dev.raisound.com/dmp-api/dev/auth/token" #设备新令牌更新地址
+                dev_tokenip = constants.DMP_BASE + "/dev/auth/token"
                      
             token = self.dev_token
             if token == None:
@@ -2508,8 +2494,7 @@ class OTA():
             # if dev_type == "7PIN" or dev_type == "7PIN_1_5" or dev_type == "7PIN_coze":#柒牌
             #     url = "http://ota.qipai.com/bz-cmp-api/api/result?deviceId={}&currentVersion={}".format(modem.getDevImei(),currentVersion)
             # else:
-            url = "https://dmp-api.qipai.com/qp-dmp-api/ota/result?deviceId={}&currentVersion={}".format(modem.getDevImei(),currentVersion)
-            url = "http://dmp.raisound.com/bz-api/ota/result?deviceId={}&currentVersion={}".format(modem.getDevImei(),currentVersion)#金三
+            url = (constants.DMP_BASE + "/ota/result?deviceId={}&currentVersion={}").format(modem.getDevImei(),currentVersion)
             print(url)
             response = request.post(url,timeout=5)
             if response.status_code == 200:
@@ -2541,8 +2526,7 @@ class OTA():
                 if dev_type == "7PIN_BK_EU":#英文小瑞
                     url = "http://dmp-global.raisound.com/bz-api/dev/iccid?deviceId={}&iccid={}".format(modem.getDevImei(),iccid)
                 else:
-                    url = "https://dmp-api.qipai.com/qp-dmp-api/dev/iccid?deviceId={}&iccid={}".format(modem.getDevImei(),iccid)
-                    url = "http://dmp.raisound.com/bz-api/dev/iccid?deviceId={}&iccid={}".format(modem.getDevImei(),iccid) #北科地址
+                    url = (constants.DMP_BASE + "/dev/iccid?deviceId={}&iccid={}").format(modem.getDevImei(),iccid)
                 print("{} H:{}".format(url,headers_T))
                 response = request.post(url,headers = headers_T,timeout=5)
                 if response.status_code == 200:
@@ -2706,16 +2690,7 @@ class AI_VC(Abstract):
                 #self.server_ip="115.190.94.208:22080"
                 self.server_ip="118.145.158.207:22086"   
             elif dev_type == "7PIN" or dev_type == "7PIN_1_5":
-                #self.server_ip="sevenpin.qipai.com.cn"
-                # self.server_ip="220.160.104.34"
-                # self.server_ip="118.145.158.207:22080"
-                # self.server_ip="amp-dev-global.raisound.com:22080"
-                # self.server_ip="118.145.158.207:22080/22087"
-                #self.server_ip="ai.qipai.com"
-                self.server_ip="dmp-api.qipai.com/qp-amp-api"
-                self.server_ip="115.190.94.208:22080"
-                self.server_ip="kxc.raisound.com/amp-api"#科学城demo
-                #self.server_ip="sevenpin1.qipai.com.cn:22082"
+                self.server_ip=constants.AMP_SERVER
             elif dev_type == "G10":
                 self.server_ip="115.190.94.208:22080"
             elif dev_type == "sjgq":

diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/constants.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/constants.py
index a37f880..4537d34 100644 (file)
--- a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/constants.py
+++ b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/constants.py
@@ -182,6 +182,28 @@ class PROTOCOL:
     CALLCANCEL_RECV = "CALLCANCEL_RECV"\r
     \r
 \r
+# 服务器环境配置，切换只需修改 SERVER_ENV\r
+# "beike" = 北科测试, "kxc" = 科学城demo\r
+SERVER_ENV = "beike"\r
+\r
+_SERVER_CFG = {\r
+    "beike": {\r
+        "dmp_base": "http://dmp.raisound.com/bz-api",\r
+        "amp_server": "115.190.94.208:22080",\r
+        "iot_ws_url": "ws://wsiot-nocdn.raisound.com/ws-hub/dev/v1",\r
+    },\r
+    "kxc": {\r
+        "dmp_base": "http://kxc.raisound.com/bz-api",\r
+        "amp_server": "kxc.raisound.com/amp-api",\r
+        "iot_ws_url": "ws://kxc.raisound.com/iot-api/ws-hub/dev/v1",\r
+    },\r
+}\r
+\r
+DMP_BASE = _SERVER_CFG[SERVER_ENV]["dmp_base"]\r
+AMP_SERVER = _SERVER_CFG[SERVER_ENV]["amp_server"]\r
+IOT_WS_URL = _SERVER_CFG[SERVER_ENV]["iot_ws_url"]\r
+\r
+\r
 class EVENT:\r
     CHANNEL_SOCKET_SEND = "CHANNEL_SOCKET_SEND"\r
     START_LOCATION = "START_LOCATION" \r

diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/protocol.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/protocol.py
index b77b699..8a2aa1f 100644 (file)
--- a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/protocol.py
+++ b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/protocol.py
@@ -1459,10 +1459,7 @@ class SockMangager(Abstract):
         try:
             if token != None:
                 self.connect_web_timer_count = 0
-                url_t = "wss://dmp-api.qipai.com/qp-iot-api/ws-hub/dev/v1?qp-dt={}".format(token)#柒牌测试
-                url_t = "ws://wsiot-nocdn.raisound.com/ws-hub/dev/v1?bz-dt={}".format(token)#北科三代
-                url_t = "ws://kxc.raisound.com/iot-api/ws-hub/dev/v1?bz-dt={}".format(token)#科学城demo
-                # url_t = "wss://dmp-dev.raisound.com/iot-api/ws-hub/dev/v1?bz-dt={}".format(token)#北科测试
+                url_t = "{}?bz-dt={}".format(constants.IOT_WS_URL, token)
                 try:
                     self.iot_protocol_client=uwebsocket.Client.connect(url_t, debug=True)
                     self.reconnect_count=0

diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/versions.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/versions.py
index 95c16fd..84ef5ad 100644 (file)
--- a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/versions.py
+++ b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/versions.py
@@ -1,2 +1,2 @@
 Version="V1.0" \r
-Build_Time="2026-02-27 11:40:26" \r
+Build_Time="2026-04-11 17:03:08" \r

diff --git a/2.sdk/project/7PIN_1_5/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/images/firmware_base_release_pack.zip b/2.sdk/project/7PIN_1_5/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/images/firmware_base_release_pack.zip
index 2dd9720..39bf01c 100644 (file)
Binary files a/2.sdk/project/7PIN_1_5/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/images/firmware_base_release_pack.zip and b/2.sdk/project/7PIN_1_5/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/images/firmware_base_release_pack.zip differ