Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp

app/src/main/cpp/GPIOControl.cpp

@@ -66,8 +66,9 @@ size_t GpioControl::turnOnImpl(const IOT_PARAM& param)
             res = ioctl(fd, IOT_PARAM_WRITE, &param);
             close(fd);
 #ifdef OUTPUT_DBG_INFO
-            int realVal = getInt(param.cmd);
+            // int realVal = getInt(param.cmd);
-            XYLOG(XYLOG_SEVERITY_INFO, "setInt cmd=%d,value=%d,result=%d RealVal=%d",param.cmd, param.value, param.result, realVal);
+            // XYLOG(XYLOG_SEVERITY_INFO, "setInt cmd=%d,value=%d,result=%d RealVal=%d",param.cmd, param.value, param.result/*, realVal*/);
+            XYLOG(XYLOG_SEVERITY_INFO, "setInt cmd=%d,value=%d,result=%d",param.cmd, param.value, param.result);
 #endif
         }
 #ifdef _DEBUG
@@ -91,8 +92,9 @@ void GpioControl::setInt(int cmd, int value)
         int res = ioctl(fd, IOT_PARAM_WRITE, &param);
         close(fd);
 #ifdef OUTPUT_DBG_INFO
-        int realVal = getInt(param.cmd);
+        // int realVal = getInt(param.cmd);
-        XYLOG(XYLOG_SEVERITY_INFO, "setInt cmd=%d,value=%d,result=%d RealVal=%d",param.cmd, value, param.result, realVal);
+        // XYLOG(XYLOG_SEVERITY_INFO, "setInt cmd=%d,value=%d,result=%d RealVal=%d",param.cmd, value, param.result/*, realVal*/);
+        XYLOG(XYLOG_SEVERITY_INFO, "setInt cmd=%d,value=%d,result=%d",param.cmd, value, param.result);
 #endif
     }
 }

app/src/main/cpp/GPIOControl.h

@@ -529,12 +529,13 @@ public:
     virtual ~PowerControl()
     {
         GpioControl::TurnOff(m_cmds, m_delayCloseTime);
-#ifdef OUTPUT_DBG_INFO
+#if !defined(NDEBUG) && defined(OUTPUT_DBG_INFO)
         std::string status = GetStatus();
         XYLOG(XYLOG_SEVERITY_INFO, "PWR After TurnOff %s, DelayCloseTime=%u", status.c_str(), m_delayCloseTime);
 #endif
     }
 
+#if !defined(NDEBUG) && defined(OUTPUT_DBG_INFO)
     std::string GetStatus()
     {
         std::string result;
@@ -549,11 +550,12 @@ public:
 
         return result;
     }
+#endif // #if !defined(NDEBUG) && defined(OUTPUT_DBG_INFO)
 
 protected:
     void TurnOn()
     {
-#ifdef OUTPUT_DBG_INFO
+#if !defined(NDEBUG) || defined(OUTPUT_DBG_INFO)
         std::string status = GetStatus();
         XYLOG(XYLOG_SEVERITY_INFO, "PWR Before TurnOn %s", status.c_str());
 #endif

app/src/main/cpp/PhoneDevice.cpp

@@ -1585,10 +1585,15 @@ bool CPhoneDevice::TakePhotoWithNetCamera(IDevice::PHOTO_INFO& localPhotoInfo, c
         // timeout
         m_ethernetFailures++;
 
+#if !defined(NDEBUG) && defined(OUTPUT_DBG_INFO)
         std::string pwrStatus = powerCtrlPtr->GetStatus();
         pwrStatus += ethernetPowerCtrl->GetStatus();
         XYLOG(XYLOG_SEVERITY_ERROR, "Ethernet Not Existing CH=%u PR=%X PHOTOID=%u EthFailures=%u PWR:%s",
               (uint32_t)localPhotoInfo.channel, (uint32_t)localPhotoInfo.preset, localPhotoInfo.photoId, m_ethernetFailures, pwrStatus.c_str());
+#else
+        XYLOG(XYLOG_SEVERITY_ERROR, "Ethernet Not Existing CH=%u PR=%X PHOTOID=%u EthFailures=%u",
+              (uint32_t)localPhotoInfo.channel, (uint32_t)localPhotoInfo.preset, localPhotoInfo.photoId, m_ethernetFailures);
+#endif
         TakePhotoCb(0, localPhotoInfo, "", 0);
         if (m_ethernetFailures > 3)
         {

app/src/main/cpp/SensorsProtocol.cpp

@@ -831,26 +831,7 @@ void GM_StartSerialComm()
 				break;
 		}
 		// 测试查询传感器电源状态
-#if 0
+
-		LOGE("12V state=%d", getInt(CMD_SET_12V_EN_STATE));
-		LOGE("3.3V state= %d", getInt(CMD_SET_CAM_3V3_EN_STATE));
-		LOGE("485 state=%d", getInt(CMD_SET_485_EN_STATE));
-
-		set12VEnable(true);
-		setCam3V3Enable(true);
-		setRS485Enable(true);
-		sleep(1);
-		LOGV("12V state=%d", getInt(CMD_SET_12V_EN_STATE));
-		LOGV("3.3V state= %d", getInt(CMD_SET_CAM_3V3_EN_STATE));
-		LOGV("485 state=%d", getInt(CMD_SET_485_EN_STATE));
-		set12VEnable(false);
-		setCam3V3Enable(false);
-		setRS485Enable(false);
-		sleep(1);
-		LOGE("12V state=%d", getInt(CMD_SET_12V_EN_STATE));
-		LOGE("3.3V state= %d", getInt(CMD_SET_CAM_3V3_EN_STATE));
-		LOGE("485 state=%d", getInt(CMD_SET_485_EN_STATE));
-#endif
 		// 打开传感器电源
 		// 打开对应的485电源
 		// 打开串口通讯
@@ -874,7 +855,6 @@ void GM_StartSerialComm()
 		//polltime = get_msec();
 		if (GM_SerialTimer() < 0)
 		{
-			//LOGE("12V state=%d", getInt(CMD_SET_12V_EN_STATE));
 			DebugLog(8, "退出采样流程!", 'V');
 			sleep(5);
 			//GM_StartSerialComm();
@@ -925,10 +905,6 @@ void Gm_FindAllSensorsCommand()
 				Gm_OpenSerialPort(curidx);
 			if (serialport[devparam[curidx].commid].cmdlen > 0)
 				break;
-			//LOGE("12V state=%d", getInt(CMD_SET_12V_EN_STATE));
-			//LOGE("3.3V state= %d", getInt(CMD_SET_CAM_3V3_EN_STATE));
-			//LOGE("485 state=%d", getInt(CMD_SET_485_EN_STATE));
-
 
 			flag = -1;
 			switch (devparam[curidx].ProtocolIdx)
@@ -3383,7 +3359,6 @@ int GM_StartSerialCameraPhoto(int phototime, unsigned char channel, int cmdidx,
 			//polltime = get_msec();
 			if (GM_CameraSerialTimer(cameraport) < 0)
 			{
-				//LOGE("12V state=%d", getInt(CMD_SET_12V_EN_STATE));
 				DebugLog(8, "退出操作摄像机流程！", 'V');
 				//sleep(3);
 				break;
@@ -3469,7 +3444,6 @@ int QueryPtzState(PTZ_STATE *ptz_state, int cmdidx,  const char *serfile, unsign
             flag = GM_CameraSerialTimer(cameraport);
 			if (flag < 0)
 			{
-				//LOGE("12V state=%d", getInt(CMD_SET_12V_EN_STATE));
 				DebugLog(8, "退出查询云台状态流程！", 'V');
 				memmove((void*)ptz_state, &cameraport->ptz_state, sizeof(PTZ_STATE));
                 if(flag == -2)