zhangwen/front_linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '测试2' of http://192.168.1.22:3000/zhangwen/front_linux into 测试2

Browse Source
This commit is contained in:
lnk
2026-01-23 16:11:13 +08:00
parent 529abd4d55 a4cd9cf62f
commit 6f0ee17da2
2 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
LFtid1056/PQSMsg.h
View File

@@ -757,7 +757,10 @@ public:
// 12-14λ<34><CEBB>UU_Deviation<6F><6E>UL_Deviation<6F><6E><EFBFBD><EFBFBD>ȡǰ<C8A1><C7B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȡ<EFBFBD><C8A1>Ϊ0<CEAA><30>ֵ
for (int i = 0; i < 3; ++i) {
float val = (UU_Deviation[i] != 0.0f) ? UU_Deviation[i] : UL_Deviation[i];
// ֱ<><D6B1>ѡ<EFBFBD><D1A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֵ<EFBFBD><D6B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ǹ<EFBFBD><C7B8><EFBFBD><EFBFBD><EFBFBD>Ȼ<EFBFBD><C8BB><EFBFBD><EFBFBD>Ч<EFBFBD><D0A7>ֵ<EFBFBD><D6B5>
float val = (fabs(UU_Deviation[i]) > fabs(UL_Deviation[i]))
? UU_Deviation[i]
: -UL_Deviation[i];
float_buffer.push_back(val);
}
@@ -1032,7 +1035,10 @@ public:
// 9-11λ<31><CEBB>UU_Deviation<6F><6E>UL_Deviation<6F><6E><EFBFBD><EFBFBD>ȡǰ<C8A1><C7B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȡ<EFBFBD><C8A1>Ϊ0<CEAA><30>ֵ
for (int i = 0; i < 3; ++i) {
float val = (UU_Deviation[i] != 0.0f) ? UU_Deviation[i] : UL_Deviation[i];
// ֱ<><D6B1>ѡ<EFBFBD><D1A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֵ<EFBFBD><D6B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ǹ<EFBFBD><C7B8><EFBFBD><EFBFBD><EFBFBD>Ȼ<EFBFBD><C8BB><EFBFBD><EFBFBD>Ч<EFBFBD><D0A7>ֵ<EFBFBD><D6B5>
float val = (fabs(UU_Deviation[i]) > fabs(UL_Deviation[i]))
? UU_Deviation[i]
: -UL_Deviation[i];
float_buffer.push_back(val);
}
@@ -1809,7 +1815,11 @@ public:
// 9-11: <20><>ѹƫ<D1B9>ȡ<EEA3A8><C8A1>Ϊ0<CEAA><30>ֵ<EFBFBD><D6B5>
for (int i = 0; i < 3; ++i) {
float val = (UU_Deviation[i] != 0.0f) ? UU_Deviation[i] : UL_Deviation[i];
//float val = (UU_Deviation[i] != 0.0f) ? UU_Deviation[i] : UL_Deviation[i];
// ֱ<><D6B1>ѡ<EFBFBD><D1A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֵ<EFBFBD><D6B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ǹ<EFBFBD><C7B8><EFBFBD><EFBFBD><EFBFBD>Ȼ<EFBFBD><C8BB><EFBFBD><EFBFBD>Ч<EFBFBD><D0A7>ֵ<EFBFBD><D6B5>
float val = (fabs(UU_Deviation[i]) > fabs(UL_Deviation[i]))
? UU_Deviation[i]
: -UL_Deviation[i];
float_buffer.push_back(val);
}
@@ -1836,7 +1846,12 @@ public:
// 26-33: <20><>ѹ<EFBFBD><D1B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǰ8<C7B0><38>Ԫ<EFBFBD>أ<EFBFBD>
for (int i = 0; i < 2; ++i) {
for (int j = 0; j < 4; ++j) { // ȡÿ<C8A1>е<EFBFBD>ǰ4<C7B0><34>Ԫ<EFBFBD><D4AA>
float_buffer.push_back(UI_Seq[i][j]);
if (j == 3) {
float_buffer.push_back(UI_Seq[i][j+1]);
}
else {
float_buffer.push_back(UI_Seq[i][j]);
}
}
}
@@ -1948,7 +1963,11 @@ public:
// 12-14: <20><>ѹƫ<D1B9>ȡ<EEA3A8><C8A1>Ϊ0<CEAA><30>ֵ<EFBFBD><D6B5>
for (int i = 0; i < 3; ++i) {
float val = (UU_Deviation[i] != 0.0f) ? UU_Deviation[i] : UL_Deviation[i];
//float val = (UU_Deviation[i] != 0.0f) ? UU_Deviation[i] : UL_Deviation[i];
// ֱ<><D6B1>ѡ<EFBFBD><D1A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֵ<EFBFBD><D6B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ǹ<EFBFBD><C7B8><EFBFBD><EFBFBD><EFBFBD>Ȼ<EFBFBD><C8BB><EFBFBD><EFBFBD>Ч<EFBFBD><D0A7>ֵ<EFBFBD><D6B5>
float val = (fabs(UU_Deviation[i]) > fabs(UL_Deviation[i]))
? UU_Deviation[i]
: -UL_Deviation[i];
float_buffer.push_back(val);
}
@@ -1975,7 +1994,12 @@ public:
// 26-33: <20><>ѹ<EFBFBD><D1B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǰ8<C7B0><38>Ԫ<EFBFBD>أ<EFBFBD>
for (int i = 0; i < 2; ++i) {
for (int j = 0; j < 4; ++j) {
float_buffer.push_back(UI_Seq[i][j]);
if (j == 3) {
float_buffer.push_back(UI_Seq[i][j + 1]);
}
else {
float_buffer.push_back(UI_Seq[i][j]);
}
}
}

2
LFtid1056/dealMsg.cpp
View File

@@ -490,7 +490,7 @@ void process_received_message(string mac, string id,const char* data, size_t len
std::string min_base64Str = min_data.ConvertToBase64(nPTType);
std::string avg_base64Str = avg_data.ConvertToBase64(nPTType);
std::string cp95_base64Str = cp95_data.ConvertToBase64(nPTType);
//std::cout << "New star base64Str0:" << max_base64Str << std::endl;
//std::cout << "New del base64Str1:" << avg_data.ConvertToBase64(1) << std::endl;
//lnk20250708使用接口发送
time_t data_time = ConvertToTimestamp(avg_data.time);