diff --git a/das-dn/cmg/ry.cpp b/das-dn/cmg/ry.cpp index d563c90f..007f22b6 100644 --- a/das-dn/cmg/ry.cpp +++ b/das-dn/cmg/ry.cpp @@ -2817,11 +2817,11 @@ void CRYDevice::heart_beat(int status) if (status == 1) { Json::Value jsonLink; Json::Value jsonDevice; - Json::Value jsonValue; for (int i = 0; i < PROCESSES_NUM; i++) { if ((config.processes[i].state & 0x01) == TRUE) { char linkId[32]; if (config.processes[i].irn == 0) continue; + Json::Value jsonValue; #ifdef NOPOLL_64BIT_PLATFORM snprintf(linkId, sizeof(linkId), "%ld", config.processes[i].irn); #else @@ -2830,7 +2830,7 @@ void CRYDevice::heart_beat(int status) jsonValue["linkId"] = linkId; jsonValue["online"] = (config.processes[i].real_softdog >= PROCESS_WATCHDOG_TIME) ? false : true; jsonValue["real"] = (config.processes[i].real_softdog >= PROCESS_WATCHDOG_TIME) ? false : true; - if (config.processes[i].state & 0x20) { + if ((config.processes[i].state & 0x20) == 0x20) { jsonValue["ftp"] = (config.processes[i].real_softdog >= PROCESS_WATCHDOG_TIME) ? false : true; } jsonLink.append(jsonValue); @@ -2845,6 +2845,7 @@ void CRYDevice::heart_beat(int status) if ((config.units[i].state & 0x01) == TRUE) { char deviceId[32]; if (config.units[i].irn == 0) continue; + Json::Value jsonValue; #ifdef NOPOLL_64BIT_PLATFORM snprintf(deviceId, sizeof(deviceId), "%ld", config.units[i].irn); #else diff --git a/das-dn/hostadsbf/hostadsbf.cpp b/das-dn/hostadsbf/hostadsbf.cpp index 205d9940..18590c39 100644 --- a/das-dn/hostadsbf/hostadsbf.cpp +++ b/das-dn/hostadsbf/hostadsbf.cpp @@ -538,13 +538,18 @@ static void* ryftp_process(void* param) DWORD millisec = unix_time % 1000; unix_time = localtime; unix_time *= 1000; unix_time += millisec; -#if 0 - unionCP56Time st; - st = Time_ttounionCP56Time(localtime); - vLog(LOG_DEBUG, "data<%d> time is: %04d/%02d/%02d %02d:%02d:%02d.%03d\n", \ - i, \ - st.year + 2000, st.month, st.dayofmonth, \ - st.hour, st.minute, st.millisecond/1000, st.millisecond%1000); +#if 1 + //if (mbt->GetCurID() == 29) + if (i == 2) + { + unionCP56Time st; + st = Time_ttounionCP56Time(localtime); + vLog(LOG_DEBUG, "unix_time is: %ld, localtime is: %d, and data<%d> time is: %04d/%02d/%02d %02d:%02d:%02d.%03d\n", \ + unix_time, localtime, + i, \ + st.year + 2000, st.month, st.dayofmonth, \ + st.hour, st.minute, st.millisecond/1000, millisec); + } #endif //vLog(LOG_DEBUG, "data.iPitchAngle1 is: %d, data.iPitchAngle2 is: %d, and data.iPitchAngle3 is: %d\n", data->iPitchAngle1, data->iPitchAngle2, data->iPitchAngle3); //如何将结构化数据传入,且快速获取