From: DXY <1731678236@qq.com>
Date: Tue, 4 Jun 2024 07:56:24 +0000 (+0800)
Subject: 移动入库将适配地址修改商用地址
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=85595176cd3a5efaa7a59622025b5fdf5f6115c8;p=mirrors%2FFD230.git

移动入库将适配地址修改商用地址
---

diff --git a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
index 049c5afb0..56ed33ca3 100644
--- a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
+++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
@@ -4051,7 +4051,7 @@ void SetDMPModeCmd(uint16_t cmd,uint8_t *data,uint16_t len,uint8_t *totalData,ui
         sendBleData(value,19);
     }
 }
-// 73 01 FE 01 00 00 00 00 00 00 00 01 00 00 00 00 00 crc
+// 73 01 32 01 00 00 00 00 00 00 00 01 00 00 00 00 00 crc
 
 void GetDMPModeCmd(uint16_t cmd,uint8_t *data,uint16_t len,uint8_t *totalData,uint8_t crcvalue)//获取入库模式 0关闭 1电信 2-255移动
 {
diff --git a/code/sdk/application/wearable/service/ble_service/bleservice/bleService.c b/code/sdk/application/wearable/service/ble_service/bleservice/bleService.c
index fc71fc248..160e56aa0 100644
--- a/code/sdk/application/wearable/service/ble_service/bleservice/bleService.c
+++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleService.c
@@ -157,13 +157,6 @@ static void svr_ble_adv_data_set(int adv_id)
     unsigned int len = BLE_MAC_MAX_LEN;
     errcode_t ret = 0;
 #if 1
-    memset(addr,0,6);
-    bluetooth_get_local_addr(&addr[0],len);
-    if(addr[0] == 0 && addr[1] == 0 && addr[2] == 0 && addr[3] == 0 && addr[4] == 0 && addr[5] == 0)
-    {
-        unsigned char set_mac[6] = {0x61,0x22,0x33,0x44,0x09,0x26};
-        bluetooth_set_local_addr(set_mac,6);
-    }
     bd_addr_t addr_info;
     memset(addr,0,6);
     bluetooth_get_local_addr(&addr[0],len);
diff --git a/code/sdk/drivers/peripheral/slip/cat1Service/pyscript/china_mobile_dmp.py b/code/sdk/drivers/peripheral/slip/cat1Service/pyscript/china_mobile_dmp.py
index ebb67740b..1bc75fab1 100644
--- a/code/sdk/drivers/peripheral/slip/cat1Service/pyscript/china_mobile_dmp.py
+++ b/code/sdk/drivers/peripheral/slip/cat1Service/pyscript/china_mobile_dmp.py
@@ -57,7 +57,7 @@ class chinamobile:
         self.iccid_data = ""
         self.software_version = ""
         self.mac_data =""
-        self.address = "b.fxltsbl.com"
+        self.address = "a.fxltsbl.com"
 
         self.retryInterval = 10
         self.retryNum = 1#异常重试最大次数
@@ -472,7 +472,7 @@ class chinamobile:
             time_tmp = utime.mktime(date_tmp)#获取时间戳
             self.report_Num_old = 0#清空上报总次数 #保存本地
             self.retryNum_old = 0#清空上报错误次数 #保存本地
-            self.reportTime_Sec = time_tmp+reportTime#记录当前时间+reportTime的时间用于下次错判断
+            self.reportTime_Sec = time_tmp+self.reportTime*60#记录当前时间+reportTime的时间用于下次错判断
             self.config_data["reportTime_Sec"] = self.reportTime_Sec
             self.config_data["retryNum_old"] = self.retryNum_old
             self.config_data["report_Num_old"] = self.report_Num_old
@@ -492,7 +492,7 @@ class chinamobile:
         print("retpoertTimerCB time_tmp -self.reportTime_Sec:{} time_tmp :{} self.reportTime_Sec:{}\r\n".format(self.reportTime_Sec-time_tmp,time_tmp,self.reportTime_Sec))
         self.report_Num_old = 0#清空上报总次数 #保存本地
         self.retryNum_old = 0#清空上报错误次数 #保存本地
-        self.reportTime_Sec = time_tmp+reportTime#记录当前时间+reportTime的时间用于下次错判断
+        self.reportTime_Sec = time_tmp+self.reportTime*60#记录当前时间+reportTime的时间用于下次错判断
         self.config_data["reportTime_Sec"] = self.reportTime_Sec
         self.config_data["retryNum_old"] = self.retryNum_old
         self.config_data["report_Num_old"] = self.report_Num_old
@@ -628,7 +628,7 @@ class chinamobile:
                 self.report_Num_old = 0#保存本地
                 self.retryNum_old = 0#保存本地
 
-                self.address = "b.fxltsbl.com"#默认适配地址
+                self.address = "a.fxltsbl.com"#默认适配地址
 
                 self.config_data["retryInterval"] = self.retryInterval
                 self.config_data["retryNum"] = self.retryNum