Commit 68659e0c by guoxuejian Committed by gdj

fix bug

parent bd8a4660
package com.dji.sdk.cloudapi.control; package com.dji.sdk.cloudapi.control;
import com.dji.sdk.cloudapi.device.MeasureTargetStateEnum;
/** /**
* @author sean * @author sean
* @version 1.7 * @version 1.7
...@@ -29,8 +27,6 @@ public class OsdInfoPush { ...@@ -29,8 +27,6 @@ public class OsdInfoPush {
private Float gimbalYaw; private Float gimbalYaw;
private MeasureTarget measureTarget;
public OsdInfoPush() { public OsdInfoPush() {
} }
...@@ -47,7 +43,6 @@ public class OsdInfoPush { ...@@ -47,7 +43,6 @@ public class OsdInfoPush {
", gimbalPitch=" + gimbalPitch + ", gimbalPitch=" + gimbalPitch +
", gimbalRoll=" + gimbalRoll + ", gimbalRoll=" + gimbalRoll +
", gimbalYaw=" + gimbalYaw + ", gimbalYaw=" + gimbalYaw +
", measureTarget=" + measureTarget +
'}'; '}';
} }
...@@ -140,83 +135,4 @@ public class OsdInfoPush { ...@@ -140,83 +135,4 @@ public class OsdInfoPush {
this.gimbalYaw = gimbalYaw; this.gimbalYaw = gimbalYaw;
return this; return this;
} }
public MeasureTarget getMeasureTarget() {
return measureTarget;
}
public OsdInfoPush setMeasureTarget(MeasureTarget measureTarget) {
this.measureTarget = measureTarget;
return this;
}
/**
* 目标测距和测高
*/
public static class MeasureTarget {
private Double measureTargetLongitude;
private Double measureTargetLatitude;
private Double measureTargetAltitude;
private Double measureTargetDistance;
private MeasureTargetStateEnum measureTargetErrorState;
public MeasureTarget() {
}
@Override
public String toString() {
return "MeasureTarget{" +
"measureTargetLongitude=" + measureTargetLongitude +
", measureTargetLatitude=" + measureTargetLatitude +
", measureTargetAltitude=" + measureTargetAltitude +
", measureTargetDistance=" + measureTargetDistance +
", measureTargetErrorState=" + measureTargetErrorState +
'}';
}
public Double getMeasureTargetLongitude() {
return measureTargetLongitude;
}
public MeasureTarget setMeasureTargetLongitude(Double measureTargetLongitude) {
this.measureTargetLongitude = measureTargetLongitude;
return this;
}
public Double getMeasureTargetLatitude() {
return measureTargetLatitude;
}
public MeasureTarget setMeasureTargetLatitude(Double measureTargetLatitude) {
this.measureTargetLatitude = measureTargetLatitude;
return this;
}
public Double getMeasureTargetAltitude() {
return measureTargetAltitude;
}
public MeasureTarget setMeasureTargetAltitude(Double measureTargetAltitude) {
this.measureTargetAltitude = measureTargetAltitude;
return this;
}
public Double getMeasureTargetDistance() {
return measureTargetDistance;
}
public MeasureTarget setMeasureTargetDistance(Double measureTargetDistance) {
this.measureTargetDistance = measureTargetDistance;
return this;
}
public MeasureTargetStateEnum getMeasureTargetErrorState() {
return measureTargetErrorState;
}
public MeasureTarget setMeasureTargetErrorState(MeasureTargetStateEnum measureTargetErrorState) {
this.measureTargetErrorState = measureTargetErrorState;
return this;
}
}
} }
...@@ -178,6 +178,8 @@ public class ChannelName { ...@@ -178,6 +178,8 @@ public class ChannelName {
public static final String INBOUND_DRC_UP_OSD_INFO_PUSH = "inboundDrcUpOsdInfoPush"; public static final String INBOUND_DRC_UP_OSD_INFO_PUSH = "inboundDrcUpOsdInfoPush";
public static final String INBOUND_DRC_UP_CAMERA_OSD_INFO_PUSH = "inboundDrcUpCameraOsdInfoPush";
public static final String INBOUND_AI_INFO = "inboundAiInfo"; public static final String INBOUND_AI_INFO = "inboundAiInfo";
} }
...@@ -25,6 +25,8 @@ public enum DrcUpMethodEnum { ...@@ -25,6 +25,8 @@ public enum DrcUpMethodEnum {
OSD_INFO_PUSH("osd_info_push", ChannelName.INBOUND_DRC_UP_OSD_INFO_PUSH, new TypeReference<OsdInfoPush>() {}), OSD_INFO_PUSH("osd_info_push", ChannelName.INBOUND_DRC_UP_OSD_INFO_PUSH, new TypeReference<OsdInfoPush>() {}),
CAMERA_OSD_INFO_PUSH("drc_camera_osd_info_push", ChannelName.INBOUND_DRC_UP_CAMERA_OSD_INFO_PUSH, new TypeReference<CameraOsdInfoPush>() {}),
UNKNOWN("", ChannelName.DEFAULT, new TypeReference<>() {}); UNKNOWN("", ChannelName.DEFAULT, new TypeReference<>() {});
private final String method; private final String method;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment