Merge branch 'main' of http://dev.xinyingpower.com:8081/git/xymp/TermApp

app/src/main/cpp/PhoneDevice.cpp

@@ -1702,9 +1702,11 @@ bool CPhoneDevice::TakePhoto(const IDevice::PHOTO_INFO& photoInfo, const vector<
         time_t ts = time(NULL);
         if(!GetPTZSensorsStatus() && !GetCameraStatus())
         {
+            XYLOG(XYLOG_SEVERITY_INFO, "Camera is SeltTesting, selfTestingtime = %d", photoInfo.selfTestingTime);
             OpenPTZSensors(photoInfo.selfTestingTime);
         }
         CameraPhotoCmd(ts, photoInfo.channel, 0, photoInfo.resolution, 0);
+        XYLOG(XYLOG_SEVERITY_INFO, "Takeing photo over");
         res = TakePTZPhotoCb(3, photoInfo);
     }
     else if (mPhotoInfo.usingSysCamera == 1)
@@ -3481,7 +3483,10 @@ int CPhoneDevice::GetIceData(IDevice::ICE_INFO *iceInfo, IDevice::ICE_TAIL *iceT
         {
             GetPullValue(num, &airt);
             if(airt.AiState == 2)
+            {
                 iceInfo->t_sensor_data[pullno].original_tension = airt.EuValue;
+                XYLOG(XYLOG_SEVERITY_INFO,"地址%d, 拉力 = %f", sensorParam[num].devaddr, iceInfo->t_sensor_data[pullno].original_tension);
+            }
             else
                 iceInfo->t_sensor_data[pullno].original_tension = 0xff;
             pullno++;
@@ -3489,12 +3494,18 @@ int CPhoneDevice::GetIceData(IDevice::ICE_INFO *iceInfo, IDevice::ICE_TAIL *iceT
         {
             GetAngleValue(num, &airt, 0);
             if(airt.AiState == 2)
+            {
                 iceInfo->t_sensor_data[angleno].deflection_angle = airt.EuValue;
+                XYLOG(XYLOG_SEVERITY_INFO,"地址%d, 倾斜角 = %f", sensorParam[num].devaddr, iceInfo->t_sensor_data[angleno].deflection_angle);
+            }
             else
                 iceInfo->t_sensor_data[angleno].deflection_angle = 0xff;
             GetAngleValue(num, &airt, 1);
             if(airt.AiState == 2)
+            {
                 iceInfo->t_sensor_data[angleno].windage_yaw_angle = airt.EuValue;
+                XYLOG(XYLOG_SEVERITY_INFO,"地址%d, 风偏角 = %f", sensorParam[num].devaddr, iceInfo->t_sensor_data[angleno].windage_yaw_angle);
+            }
             else
                 iceInfo->t_sensor_data[angleno].windage_yaw_angle =0xff;
             angleno++;