From cbfc5b27949d7ce8c626d468fb1d42d8a6192190 Mon Sep 17 00:00:00 2001
From: zhangsheng <zhangs1125@sina.com>
Date: Wed, 14 May 2025 20:17:21 +0800
Subject: [PATCH] fix bugs

---
 jsonparse/web_cmd_parse3.cpp   |  4 ++--
 uart/uart_cmd.cpp              |  2 +-
 uart/uart_feature_parse.cpp    |  4 ++++
 uart/uart_parameter_config.cpp | 11 +++++------
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/jsonparse/web_cmd_parse3.cpp b/jsonparse/web_cmd_parse3.cpp
index f457f85..e4e7b87 100644
--- a/jsonparse/web_cmd_parse3.cpp
+++ b/jsonparse/web_cmd_parse3.cpp
@@ -1186,8 +1186,8 @@ std::string JsonData::JsonCmd_Cgi_65(Param_65 &param){
             std::vector<std::string> vRssi;
             boost::split(vRssi, vetRes[i][2], boost::is_any_of(","), boost::token_compress_on);
             if (vRssi.size() > 0 ){
-                iTem.append(vRssi[0]);
-                iTem.append(vRssi[1]);
+                iTem.append(atof(vRssi[0].c_str())/float(255));
+                iTem.append(atof(vRssi[1].c_str())/float(255));
             }
             
             jsBody.append(iTem);
diff --git a/uart/uart_cmd.cpp b/uart/uart_cmd.cpp
index 17286fc..4aa8256 100644
--- a/uart/uart_cmd.cpp
+++ b/uart/uart_cmd.cpp
@@ -170,7 +170,7 @@ void Uart::WriteTranTimeout2Zigbee(unsigned char Time) {
 
     unsigned short tmp = GlobalConfig::Zigbee_G.MyAddr;
     GlobalConfig::Zigbee_G.PowerLevel = 0x03;
-    GlobalConfig::Zigbee_G.RetryNum = 0x64;
+    GlobalConfig::Zigbee_G.RetryNum = 0x05;
     GlobalConfig::Zigbee_G.TranTimeout = Time;
     modify_info(tmp, (char *)&GlobalConfig::Zigbee_G);
 
diff --git a/uart/uart_feature_parse.cpp b/uart/uart_feature_parse.cpp
index ac144f7..94bb806 100644
--- a/uart/uart_feature_parse.cpp
+++ b/uart/uart_feature_parse.cpp
@@ -156,6 +156,10 @@ int Uart::DealDataNodeFeature(const char *pData, int flag) {
         std::vector<uint8_t>& data_vec = map_send_data[u_short_addr];
         const uint8_t* send_data = data_vec.data();
         WriteToUart((const char*)send_data, 100);
+        mssleep(50000);
+        WriteToUart((const char*)send_data, 100);
+        mssleep(50000);
+        WriteToUart((const char*)send_data, 100);
         return -3;
     }
     memset(whereCon, 0x00, sizeof(whereCon));
diff --git a/uart/uart_parameter_config.cpp b/uart/uart_parameter_config.cpp
index aeb2d64..a7bf56a 100644
--- a/uart/uart_parameter_config.cpp
+++ b/uart/uart_parameter_config.cpp
@@ -589,17 +589,16 @@ int Uart::TaskResp(ScheduleTask scheduleTask){
         tmp += send_data[k];
     }
     send_data[99] = tmp;
-    if (scheduleTask.cmd != REVIVE_DURATION)
+    if (scheduleTask.cmd == REVIVE_DURATION)
     {
-        mssleep(50000);
-        WriteToUart((const char*)send_data, 100);
-        mssleep(50000);
-        WriteToUart((const char*)send_data, 100);
-    }else {
         map_send_data[scheduleTask.shortAddr] = std::vector<uint8_t>(send_data, send_data + 100);
     }
     mssleep(50000);
     WriteToUart((const char*)send_data, 100);
+    mssleep(50000);
+    WriteToUart((const char*)send_data, 100);
+    mssleep(50000);
+    WriteToUart((const char*)send_data, 100);
     
     int iRet = CheckZigbeeACK();
     if (iRet == 0) {