Browse Source

Merge b25556a977 into 9fb39873fa

pull/75/merge
Vincent Chan 8 months ago committed by GitHub
parent
commit
bf6c0dcc7b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 2
      README.md
  2. 2
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/config/ProductConfigResponse.java
  3. 6
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/CameraAimRequest.java
  4. 2
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/CameraExposureModeSetRequest.java
  5. 2
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/CameraExposureSetRequest.java
  6. 6
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/CameraFocalLengthSetRequest.java
  7. 2
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/CameraFocusModeSetRequest.java
  8. 2
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/CameraFocusValueSetRequest.java
  9. 99
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/CameraFrameZoomRequest.java
  10. 28
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/CameraLookAtRequest.java
  11. 2
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/CameraModeSwitchRequest.java
  12. 2
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/CameraPhotoStopRequest.java
  13. 2
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/CameraPhotoTakeRequest.java
  14. 6
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/CameraPointFocusActionRequest.java
  15. 2
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/CameraRecordingStartRequest.java
  16. 2
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/CameraRecordingStopRequest.java
  17. 2
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/CameraScreenSplitRequest.java
  18. 11
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/ControlMethodEnum.java
  19. 8
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/DrcModeEnterRequest.java
  20. 6
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/DrcModeMqttBroker.java
  21. 6
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/DroneControlRequest.java
  22. 6
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/FlyToPointRequest.java
  23. 10
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/FlyToPointUpdateRequest.java
  24. 2
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/GimbalResetRequest.java
  25. 4
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/HeartBeatRequest.java
  26. 6
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/IrMeteringAreaSetRequest.java
  27. 2
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/IrMeteringModeSetRequest.java
  28. 6
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/IrMeteringPointSetRequest.java
  29. 51
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/PSDKUiResourceUploadResult.java
  30. 2
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/PayloadAuthorityGrabRequest.java
  31. 11
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/PayloadControlMethodEnum.java
  32. 4
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/PhotoStorageSetRequest.java
  33. 2
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/PoiCircleSpeedSetRequest.java
  34. 6
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/PoiModeEnterRequest.java
  35. 6
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/Point.java
  36. 29
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/PsdkFloatingWindowText.java
  37. 19
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/PsdkInputBoxTextSetRequest.java
  38. 23
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/PsdkRequest.java
  39. 45
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/PsdkWidgetValueSetRequest.java
  40. 37
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/SpeakerAudioPlayStartRequest.java
  41. 55
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/SpeakerAudioPlayStartRequestFile.java
  42. 37
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/SpeakerPlayModeSetRequest.java
  43. 29
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/SpeakerPlayProgress.java
  44. 48
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/SpeakerPlayStartProgress.java
  45. 40
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/SpeakerPlayVolumeSetRequest.java
  46. 36
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/SpeakerTTSPlayStartRequest.java
  47. 43
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/SpeakerTTSPlayStartRequestTTS.java
  48. 12
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/TakeoffToPointRequest.java
  49. 4
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/VideoStorageSetRequest.java
  50. 85
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/api/AbstractControlService.java
  51. 2
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/debug/AirConditionerModeSwitchRequest.java
  52. 2
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/debug/AlarmStateSwitchRequest.java
  53. 2
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/debug/BatteryMaintenanceSwitchRequest.java
  54. 2
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/debug/BatteryStoreModeSwitchRequest.java
  55. 2
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/debug/EsimActivateRequest.java
  56. 2
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/debug/EsimOperatorSwitchRequest.java
  57. 7
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/debug/RemoteDebugStepKeyEnum.java
  58. 2
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/debug/SdrWorkmodeSwitchRequest.java
  59. 2
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/debug/SimSlotSwitchRequest.java
  60. 2
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/debug/api/AbstractDebugService.java
  61. 2
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/device/CameraModeEnum.java
  62. 2
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/device/DeviceOsdHost.java
  63. 4
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/device/DeviceOsdWsResponse.java
  64. 2
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/device/DockDroneCurrentRthMode.java
  65. 3
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/device/DockLiveErrorStatus.java
  66. 2
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/device/DockSilentMode.java
  67. 3
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/device/GearEnum.java
  68. 2
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/device/PayloadIndex.java
  69. 2
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/device/VideoId.java
  70. 4
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/firmware/OtaCreateDevice.java
  71. 6
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/firmware/OtaCreateRequest.java
  72. 2
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/firmware/api/AbstractFirmwareService.java
  73. 2
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/flightarea/FeatureProperty.java
  74. 8
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/flightarea/FlightAreaFeature.java
  75. 4
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/flightarea/FlightAreaGetFile.java
  76. 2
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/flightarea/FlightAreaJson.java
  77. 4
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/flightarea/FlightAreasGetResponse.java
  78. 2
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/flightarea/api/AbstractFlightAreaService.java
  79. 2
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/interconnection/CustomDataTransmissionToEsdkRequest.java
  80. 2
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/interconnection/CustomDataTransmissionToPsdkRequest.java
  81. 9
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/interconnection/api/AbstractInterconnectionService.java
  82. 2
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/livestream/LiveLensChangeRequest.java
  83. 2
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/livestream/LiveSetQualityRequest.java
  84. 5
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/livestream/LiveStartPushRequest.java
  85. 2
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/livestream/LiveStopPushRequest.java
  86. 2
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/livestream/LivestreamAgoraUrl.java
  87. 2
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/livestream/LivestreamGb28181Url.java
  88. 2
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/livestream/LivestreamRtmpUrl.java
  89. 2
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/livestream/LivestreamRtspUrl.java
  90. 2
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/livestream/LivestreamWhipUrl.java
  91. 2
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/livestream/api/AbstractLivestreamService.java
  92. 6
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/log/FileUploadListRequest.java
  93. 4
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/log/FileUploadStartFile.java
  94. 6
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/log/FileUploadStartParam.java
  95. 4
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/log/FileUploadStartRequest.java
  96. 6
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/log/FileUploadUpdateRequest.java
  97. 2
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/log/LogFileIndex.java
  98. 2
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/log/api/AbstractLogService.java
  99. 6
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/map/CreateMapElementRequest.java
  100. 4
      cloud-sdk/src/main/java/com/dji/sdk/cloudapi/map/CreateMapElementResponse.java
  101. Some files were not shown because too many files have changed in this diff Show More

2
README.md

@ -14,7 +14,7 @@ For more documentation, please visit the [DJI Developer Documentation](https://d
## Latest Release ## Latest Release
Cloud API 1.10.0 was released on 7 Apr 2024.. For more information, please visit the [Release Note](https://developer.dji.com/doc/cloud-api-tutorial/cn/). Cloud API 1.10.0 was released on 7 Apr 2024. For more information, please visit the [Release Note](https://developer.dji.com/doc/cloud-api-tutorial/cn/).
## License ## License

2
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/config/ProductConfigResponse.java

@ -2,7 +2,7 @@ package com.dji.sdk.cloudapi.config;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
/** /**
* @author sean * @author sean

6
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/CameraAimRequest.java

@ -3,9 +3,9 @@ package com.dji.sdk.cloudapi.control;
import com.dji.sdk.cloudapi.device.PayloadIndex; import com.dji.sdk.cloudapi.device.PayloadIndex;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import javax.validation.constraints.Max; import jakarta.validation.constraints.Max;
import javax.validation.constraints.Min; import jakarta.validation.constraints.Min;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
/** /**
* @author sean * @author sean

2
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/CameraExposureModeSetRequest.java

@ -3,7 +3,7 @@ package com.dji.sdk.cloudapi.control;
import com.dji.sdk.cloudapi.device.PayloadIndex; import com.dji.sdk.cloudapi.device.PayloadIndex;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
/** /**
* @author sean * @author sean

2
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/CameraExposureSetRequest.java

@ -3,7 +3,7 @@ package com.dji.sdk.cloudapi.control;
import com.dji.sdk.cloudapi.device.PayloadIndex; import com.dji.sdk.cloudapi.device.PayloadIndex;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
/** /**
* @author sean * @author sean

6
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/CameraFocalLengthSetRequest.java

@ -3,9 +3,9 @@ package com.dji.sdk.cloudapi.control;
import com.dji.sdk.cloudapi.device.PayloadIndex; import com.dji.sdk.cloudapi.device.PayloadIndex;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import javax.validation.constraints.Max; import jakarta.validation.constraints.Max;
import javax.validation.constraints.Min; import jakarta.validation.constraints.Min;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
/** /**
* @author sean * @author sean

2
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/CameraFocusModeSetRequest.java

@ -3,7 +3,7 @@ package com.dji.sdk.cloudapi.control;
import com.dji.sdk.cloudapi.device.PayloadIndex; import com.dji.sdk.cloudapi.device.PayloadIndex;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
/** /**
* @author sean * @author sean

2
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/CameraFocusValueSetRequest.java

@ -3,7 +3,7 @@ package com.dji.sdk.cloudapi.control;
import com.dji.sdk.cloudapi.device.PayloadIndex; import com.dji.sdk.cloudapi.device.PayloadIndex;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
/** /**
* @author sean * @author sean

99
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/CameraFrameZoomRequest.java

@ -0,0 +1,99 @@
/*************************************************
* @copyright 2017 Flision Corporation Inc.
* @author: Vincent Chan @ Canton
* @date: 2024年04月19日
* @version: 1.0.0
* @description:
**************************************************/
package com.dji.sdk.cloudapi.control;
import com.dji.sdk.cloudapi.device.PayloadIndex;
import com.dji.sdk.common.BaseModel;
import jakarta.validation.constraints.Max;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotNull;
public class CameraFrameZoomRequest extends BaseModel {
@NotNull
private PayloadIndex payloadIndex;
@NotNull
private CameraTypeEnum cameraType;
@NotNull
private Boolean locked;
@Min(0)
@Max(1)
private Float x;
@Min(0)
@Max(1)
private Float y;
@Min(0)
@Max(1)
private Float width;
@Min(0)
@Max(1)
private Float height;
public PayloadIndex getPayloadIndex() {
return payloadIndex;
}
public void setPayloadIndex(PayloadIndex payloadIndex) {
this.payloadIndex = payloadIndex;
}
public CameraTypeEnum getCameraType() {
return cameraType;
}
public void setCameraType(CameraTypeEnum cameraType) {
this.cameraType = cameraType;
}
public Boolean getLocked() {
return locked;
}
public void setLocked(Boolean locked) {
this.locked = locked;
}
public Float getX() {
return x;
}
public void setX(Float x) {
this.x = x;
}
public Float getY() {
return y;
}
public void setY(Float y) {
this.y = y;
}
public Float getWidth() {
return width;
}
public void setWidth(Float width) {
this.width = width;
}
public Float getHeight() {
return height;
}
public void setHeight(Float height) {
this.height = height;
}
}

28
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/CameraLookAtRequest.java

@ -2,10 +2,10 @@ package com.dji.sdk.cloudapi.control;
import com.dji.sdk.cloudapi.device.PayloadIndex; import com.dji.sdk.cloudapi.device.PayloadIndex;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import jakarta.validation.constraints.Max;
import javax.validation.constraints.Max; import jakarta.validation.constraints.NotNull;
import javax.validation.constraints.Min; import jakarta.validation.constraints.Min;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
/** /**
* @author sean * @author sean
@ -95,4 +95,24 @@ public class CameraLookAtRequest extends BaseModel {
this.height = height; this.height = height;
return this; return this;
} }
public PayloadIndex getPayloadIndex() {
return payloadIndex;
}
public Boolean getLocked() {
return locked;
}
public Float getLatitude() {
return latitude;
}
public Float getLongitude() {
return longitude;
}
public Float getHeight() {
return height;
}
} }

2
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/CameraModeSwitchRequest.java

@ -4,7 +4,7 @@ import com.dji.sdk.cloudapi.device.CameraModeEnum;
import com.dji.sdk.cloudapi.device.PayloadIndex; import com.dji.sdk.cloudapi.device.PayloadIndex;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
/** /**
* @author sean * @author sean

2
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/CameraPhotoStopRequest.java

@ -3,7 +3,7 @@ package com.dji.sdk.cloudapi.control;
import com.dji.sdk.cloudapi.device.PayloadIndex; import com.dji.sdk.cloudapi.device.PayloadIndex;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
/** /**
* @author sean * @author sean

2
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/CameraPhotoTakeRequest.java

@ -3,7 +3,7 @@ package com.dji.sdk.cloudapi.control;
import com.dji.sdk.cloudapi.device.PayloadIndex; import com.dji.sdk.cloudapi.device.PayloadIndex;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
/** /**
* @author sean * @author sean

6
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/CameraPointFocusActionRequest.java

@ -3,9 +3,9 @@ package com.dji.sdk.cloudapi.control;
import com.dji.sdk.cloudapi.device.PayloadIndex; import com.dji.sdk.cloudapi.device.PayloadIndex;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import javax.validation.constraints.Max; import jakarta.validation.constraints.Max;
import javax.validation.constraints.Min; import jakarta.validation.constraints.Min;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
/** /**
* @author sean * @author sean

2
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/CameraRecordingStartRequest.java

@ -3,7 +3,7 @@ package com.dji.sdk.cloudapi.control;
import com.dji.sdk.cloudapi.device.PayloadIndex; import com.dji.sdk.cloudapi.device.PayloadIndex;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
/** /**
* @author sean * @author sean

2
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/CameraRecordingStopRequest.java

@ -3,7 +3,7 @@ package com.dji.sdk.cloudapi.control;
import com.dji.sdk.cloudapi.device.PayloadIndex; import com.dji.sdk.cloudapi.device.PayloadIndex;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
/** /**
* @author sean * @author sean

2
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/CameraScreenSplitRequest.java

@ -3,7 +3,7 @@ package com.dji.sdk.cloudapi.control;
import com.dji.sdk.cloudapi.device.PayloadIndex; import com.dji.sdk.cloudapi.device.PayloadIndex;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
/** /**
* @author sean * @author sean

11
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/ControlMethodEnum.java

@ -62,6 +62,7 @@ public enum ControlMethodEnum {
IR_METERING_AREA_SET("ir_metering_area_set"), IR_METERING_AREA_SET("ir_metering_area_set"),
CAMERA_POINT_FOCUS_ACTION("camera_point_focus_action"), CAMERA_POINT_FOCUS_ACTION("camera_point_focus_action"),
CAMERA_FRAME_ZOOM("camera_frame_zoom"),
DRONE_CONTROL("drone_control"), DRONE_CONTROL("drone_control"),
@ -75,6 +76,16 @@ public enum ControlMethodEnum {
POI_CIRCLE_SPEED_SET("poi_circle_speed_set"), POI_CIRCLE_SPEED_SET("poi_circle_speed_set"),
//add by witcom@2024-06-03
SPEAKER_AUDIO_PLAY_START("speaker_audio_play_start"),
SPEAKER_TTS_PLAY_START("speaker_tts_play_start"),
SPEAKER_REPLAY("speaker_replay"),
SPEAKER_PLAY_STOP("speaker_play_stop"),
SPEAKER_PLAY_MODE_SET("speaker_play_mode_set"),
SPEAKER_PLAY_VOLUME_SET("speaker_play_volume_set"),
PSDK_WIDGET_VALUE_SET("psdk_widget_value_set"),
PSDK_INPUT_BOX_TEXT_SET("psdk_input_box_text_set"),
; ;
private final String method; private final String method;

8
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/DrcModeEnterRequest.java

@ -2,10 +2,10 @@ package com.dji.sdk.cloudapi.control;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import javax.validation.Valid; import jakarta.validation.Valid;
import javax.validation.constraints.Max; import jakarta.validation.constraints.Max;
import javax.validation.constraints.Min; import jakarta.validation.constraints.Min;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
/** /**
* @author sean * @author sean

6
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/DrcModeMqttBroker.java

@ -1,8 +1,8 @@
package com.dji.sdk.cloudapi.control; package com.dji.sdk.cloudapi.control;
import javax.validation.constraints.Max; import jakarta.validation.constraints.Max;
import javax.validation.constraints.Min; import jakarta.validation.constraints.Min;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
/** /**
* @author sean * @author sean

6
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/DroneControlRequest.java

@ -2,9 +2,9 @@ package com.dji.sdk.cloudapi.control;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import javax.validation.constraints.Max; import jakarta.validation.constraints.Max;
import javax.validation.constraints.Min; import jakarta.validation.constraints.Min;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
/** /**
* @author sean * @author sean

6
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/FlyToPointRequest.java

@ -2,8 +2,8 @@ package com.dji.sdk.cloudapi.control;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import javax.validation.Valid; import jakarta.validation.Valid;
import javax.validation.constraints.*; import jakarta.validation.constraints.*;
import java.util.List; import java.util.List;
/** /**
@ -13,7 +13,7 @@ import java.util.List;
*/ */
public class FlyToPointRequest extends BaseModel { public class FlyToPointRequest extends BaseModel {
@Pattern(regexp = "^[^<>:\"/|?*._\\\\]+$") //@Pattern(regexp = "^[^<>:\"/|?*._\\\\]+$")
@NotNull @NotNull
private String flyToId; private String flyToId;

10
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/FlyToPointUpdateRequest.java

@ -2,11 +2,11 @@ package com.dji.sdk.cloudapi.control;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import javax.validation.Valid; import jakarta.validation.Valid;
import javax.validation.constraints.Max; import jakarta.validation.constraints.Max;
import javax.validation.constraints.Min; import jakarta.validation.constraints.Min;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import javax.validation.constraints.Size; import jakarta.validation.constraints.Size;
import java.util.List; import java.util.List;
/** /**

2
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/GimbalResetRequest.java

@ -3,7 +3,7 @@ package com.dji.sdk.cloudapi.control;
import com.dji.sdk.cloudapi.device.PayloadIndex; import com.dji.sdk.cloudapi.device.PayloadIndex;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
/** /**
* @author sean * @author sean

4
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/HeartBeatRequest.java

@ -2,8 +2,8 @@ package com.dji.sdk.cloudapi.control;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import javax.validation.constraints.Min; import jakarta.validation.constraints.Min;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
/** /**
* @author sean * @author sean

6
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/IrMeteringAreaSetRequest.java

@ -3,9 +3,9 @@ package com.dji.sdk.cloudapi.control;
import com.dji.sdk.cloudapi.device.PayloadIndex; import com.dji.sdk.cloudapi.device.PayloadIndex;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import javax.validation.constraints.Max; import jakarta.validation.constraints.Max;
import javax.validation.constraints.Min; import jakarta.validation.constraints.Min;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
/** /**
* @author sean * @author sean

2
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/IrMeteringModeSetRequest.java

@ -3,7 +3,7 @@ package com.dji.sdk.cloudapi.control;
import com.dji.sdk.cloudapi.device.PayloadIndex; import com.dji.sdk.cloudapi.device.PayloadIndex;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
/** /**
* @author sean * @author sean

6
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/IrMeteringPointSetRequest.java

@ -3,9 +3,9 @@ package com.dji.sdk.cloudapi.control;
import com.dji.sdk.cloudapi.device.PayloadIndex; import com.dji.sdk.cloudapi.device.PayloadIndex;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import javax.validation.constraints.Max; import jakarta.validation.constraints.Max;
import javax.validation.constraints.Min; import jakarta.validation.constraints.Min;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
/** /**
* @author sean * @author sean

51
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/PSDKUiResourceUploadResult.java

@ -0,0 +1,51 @@
/*************************************************
* @copyright 2017 Flision Corporation Inc.
* @author: Vincent Chan @ Canton
* @date: 2024年06月03日
* @version: 1.0.0
* @description:
**************************************************/
package com.dji.sdk.cloudapi.control;
public class PSDKUiResourceUploadResult {
String objectKey;
Integer psdk_index;
Integer result;
Integer size;
public String getObjectKey() {
return objectKey;
}
public void setObjectKey(String objectKey) {
this.objectKey = objectKey;
}
public Integer getPsdk_index() {
return psdk_index;
}
public void setPsdk_index(Integer psdk_index) {
this.psdk_index = psdk_index;
}
public Integer getResult() {
return result;
}
public void setResult(Integer result) {
this.result = result;
}
public Integer getSize() {
return size;
}
public void setSize(Integer size) {
this.size = size;
}
}

2
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/PayloadAuthorityGrabRequest.java

@ -3,7 +3,7 @@ package com.dji.sdk.cloudapi.control;
import com.dji.sdk.cloudapi.device.PayloadIndex; import com.dji.sdk.cloudapi.device.PayloadIndex;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
/** /**
* @author sean * @author sean

11
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/PayloadControlMethodEnum.java

@ -52,6 +52,17 @@ public enum PayloadControlMethodEnum {
CAMERA_POINT_FOCUS_ACTION(ControlMethodEnum.CAMERA_POINT_FOCUS_ACTION, CameraPointFocusActionRequest.class), CAMERA_POINT_FOCUS_ACTION(ControlMethodEnum.CAMERA_POINT_FOCUS_ACTION, CameraPointFocusActionRequest.class),
CAMERA_FRAME_ZOOM(ControlMethodEnum.CAMERA_FRAME_ZOOM, CameraFrameZoomRequest.class),
SPEAKER_AUDIO_PLAY_START(ControlMethodEnum.SPEAKER_AUDIO_PLAY_START,SpeakerAudioPlayStartRequest.class),
SPEAKER_TTS_PLAY_START(ControlMethodEnum.SPEAKER_TTS_PLAY_START,SpeakerTTSPlayStartRequest.class),
SPEAKER_REPLAY(ControlMethodEnum.SPEAKER_REPLAY,PsdkRequest.class),
SPEAKER_PLAY_STOP(ControlMethodEnum.SPEAKER_PLAY_STOP,PsdkRequest.class),
SPEAKER_PLAY_MODE_SET(ControlMethodEnum.SPEAKER_PLAY_MODE_SET, SpeakerPlayModeSetRequest.class),
SPEAKER_PLAY_VOLUME_SET(ControlMethodEnum.SPEAKER_PLAY_VOLUME_SET, SpeakerPlayVolumeSetRequest.class),
PSDK_WIDGET_VALUE_SET(ControlMethodEnum.PSDK_WIDGET_VALUE_SET,PsdkWidgetValueSetRequest.class),
PSDK_INPUT_BOX_TEXT_SET(ControlMethodEnum.PSDK_INPUT_BOX_TEXT_SET, PsdkInputBoxTextSetRequest.class),
; ;
private final ControlMethodEnum payloadMethod; private final ControlMethodEnum payloadMethod;

4
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/PhotoStorageSetRequest.java

@ -3,8 +3,8 @@ package com.dji.sdk.cloudapi.control;
import com.dji.sdk.cloudapi.device.PayloadIndex; import com.dji.sdk.cloudapi.device.PayloadIndex;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import javax.validation.constraints.Size; import jakarta.validation.constraints.Size;
import java.util.List; import java.util.List;
/** /**

2
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/PoiCircleSpeedSetRequest.java

@ -2,7 +2,7 @@ package com.dji.sdk.cloudapi.control;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
/** /**
* @author sean * @author sean

6
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/PoiModeEnterRequest.java

@ -2,9 +2,9 @@ package com.dji.sdk.cloudapi.control;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import javax.validation.constraints.Max; import jakarta.validation.constraints.Max;
import javax.validation.constraints.Min; import jakarta.validation.constraints.Min;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
/** /**
* @author sean * @author sean

6
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/Point.java

@ -1,8 +1,8 @@
package com.dji.sdk.cloudapi.control; package com.dji.sdk.cloudapi.control;
import javax.validation.constraints.Max; import jakarta.validation.constraints.Max;
import javax.validation.constraints.Min; import jakarta.validation.constraints.Min;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
/** /**
* @author sean * @author sean

29
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/PsdkFloatingWindowText.java

@ -0,0 +1,29 @@
/*************************************************
* @copyright 2017 Flision Corporation Inc.
* @author: Vincent Chan @ Canton
* @date: 2024年06月03日
* @version: 1.0.0
* @description:
**************************************************/
package com.dji.sdk.cloudapi.control;
public class PsdkFloatingWindowText {
String value;
Integer psdkIndex;
public String getValue() {
return value;
}
public void setValue(String value) {
this.value = value;
}
public Integer getPsdkIndex() {
return psdkIndex;
}
public void setPsdkIndex(Integer psdkIndex) {
this.psdkIndex = psdkIndex;
}
}

19
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/PsdkInputBoxTextSetRequest.java

@ -0,0 +1,19 @@
/*************************************************
* @copyright 2017 Flision Corporation Inc.
* @author: Vincent Chan @ Canton
* @date: 2024年06月04日
* @version: 1.0.0
* @description:
**************************************************/
package com.dji.sdk.cloudapi.control;
import com.dji.sdk.common.BaseModel;
import jakarta.validation.constraints.NotNull;
public class PsdkInputBoxTextSetRequest extends BaseModel {
@NotNull
Integer psdkIndex;
String value;
}

23
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/PsdkRequest.java

@ -0,0 +1,23 @@
/*************************************************
* @copyright 2017 Flision Corporation Inc.
* @author: Vincent Chan @ Canton
* @date: 2024年06月03日
* @version: 1.0.0
* @description:
**************************************************/
package com.dji.sdk.cloudapi.control;
import com.dji.sdk.common.BaseModel;
public class PsdkRequest extends BaseModel {
Integer psdkIndex;
public Integer getPsdkIndex() {
return psdkIndex;
}
public void setPsdkIndex(Integer psdkIndex) {
this.psdkIndex = psdkIndex;
}
}

45
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/PsdkWidgetValueSetRequest.java

@ -0,0 +1,45 @@
/*************************************************
* @copyright 2017 Flision Corporation Inc.
* @author: Vincent Chan @ Canton
* @date: 2024年06月04日
* @version: 1.0.0
* @description:
**************************************************/
package com.dji.sdk.cloudapi.control;
import com.dji.sdk.common.BaseModel;
import jakarta.validation.constraints.NotNull;
public class PsdkWidgetValueSetRequest extends BaseModel {
@NotNull
Integer index;
@NotNull
Integer psdkIndex;
Integer value;
public Integer getIndex() {
return index;
}
public void setIndex(Integer index) {
this.index = index;
}
public Integer getPsdkIndex() {
return psdkIndex;
}
public void setPsdkIndex(Integer psdkIndex) {
this.psdkIndex = psdkIndex;
}
public Integer getValue() {
return value;
}
public void setValue(Integer value) {
this.value = value;
}
}

37
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/SpeakerAudioPlayStartRequest.java

@ -0,0 +1,37 @@
/*************************************************
* @copyright 2017 Flision Corporation Inc.
* @author: Vincent Chan @ Canton
* @date: 2024年06月03日
* @version: 1.0.0
* @description:
**************************************************/
package com.dji.sdk.cloudapi.control;
import com.dji.sdk.common.BaseModel;
import jakarta.validation.constraints.NotNull;
public class SpeakerAudioPlayStartRequest extends BaseModel {
@NotNull
Integer psdkIndex;
@NotNull
SpeakerAudioPlayStartRequestFile file;
public Integer getPsdkIndex() {
return psdkIndex;
}
public void setPsdkIndex(Integer psdkIndex) {
this.psdkIndex = psdkIndex;
}
public SpeakerAudioPlayStartRequestFile getFile() {
return file;
}
public void setFile(SpeakerAudioPlayStartRequestFile file) {
this.file = file;
}
}

55
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/SpeakerAudioPlayStartRequestFile.java

@ -0,0 +1,55 @@
/*************************************************
* @copyright 2017 Flision Corporation Inc.
* @author: Vincent Chan @ Canton
* @date: 2024年06月03日
* @version: 1.0.0
* @description:
**************************************************/
package com.dji.sdk.cloudapi.control;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
public class SpeakerAudioPlayStartRequestFile {
String format = "pcm";
@NotEmpty
String md5;
@NotEmpty
String name;
@NotEmpty
String url;
public String getFormat() {
return format;
}
public void setFormat(String format) {
this.format = format;
}
public String getMd5() {
return md5;
}
public void setMd5(String md5) {
this.md5 = md5;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getUrl() {
return url;
}
public void setUrl(String url) {
this.url = url;
}
}

37
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/SpeakerPlayModeSetRequest.java

@ -0,0 +1,37 @@
/*************************************************
* @copyright 2017 Flision Corporation Inc.
* @author: Vincent Chan @ Canton
* @date: 2024年06月03日
* @version: 1.0.0
* @description:
**************************************************/
package com.dji.sdk.cloudapi.control;
import com.dji.sdk.common.BaseModel;
import jakarta.validation.constraints.NotNull;
public class SpeakerPlayModeSetRequest extends BaseModel {
//"0":"单次播放","1":"循环播放(单曲)"
@NotNull
Integer playMode;
@NotNull
Integer psdkIndex;
public Integer getPlayMode() {
return playMode;
}
public void setPlayMode(Integer playMode) {
this.playMode = playMode;
}
public Integer getPsdkIndex() {
return psdkIndex;
}
public void setPsdkIndex(Integer psdkIndex) {
this.psdkIndex = psdkIndex;
}
}

29
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/SpeakerPlayProgress.java

@ -0,0 +1,29 @@
/*************************************************
* @copyright 2017 Flision Corporation Inc.
* @author: Vincent Chan @ Canton
* @date: 2024年06月03日
* @version: 1.0.0
* @description:
**************************************************/
package com.dji.sdk.cloudapi.control;
public class SpeakerPlayProgress {
Integer percent;
String stepKey;
public Integer getPercent() {
return percent;
}
public void setPercent(Integer percent) {
this.percent = percent;
}
public String getStepKey() {
return stepKey;
}
public void setStepKey(String stepKey) {
this.stepKey = stepKey;
}
}

48
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/SpeakerPlayStartProgress.java

@ -0,0 +1,48 @@
/*************************************************
* @copyright 2017 Flision Corporation Inc.
* @author: Vincent Chan @ Canton
* @date: 2024年06月03日
* @version: 1.0.0
* @description:
**************************************************/
package com.dji.sdk.cloudapi.control;
public class SpeakerPlayStartProgress {
String md5;
Integer psdkIndex;
String status;
SpeakerPlayProgress progress;
public String getMd5() {
return md5;
}
public void setMd5(String md5) {
this.md5 = md5;
}
public Integer getPsdkIndex() {
return psdkIndex;
}
public void setPsdkIndex(Integer psdkIndex) {
this.psdkIndex = psdkIndex;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public SpeakerPlayProgress getProgress() {
return progress;
}
public void setProgress(SpeakerPlayProgress progress) {
this.progress = progress;
}
}

40
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/SpeakerPlayVolumeSetRequest.java

@ -0,0 +1,40 @@
/*************************************************
* @copyright 2017 Flision Corporation Inc.
* @author: Vincent Chan @ Canton
* @date: 2024年06月03日
* @version: 1.0.0
* @description:
**************************************************/
package com.dji.sdk.cloudapi.control;
import com.dji.sdk.common.BaseModel;
import jakarta.validation.constraints.Max;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotNull;
public class SpeakerPlayVolumeSetRequest extends BaseModel {
@NotNull
Integer psdkIndex;
@NotNull
@Min(0)
@Max(100)
Integer playVolume;
public Integer getPsdkIndex() {
return psdkIndex;
}
public void setPsdkIndex(Integer psdkIndex) {
this.psdkIndex = psdkIndex;
}
public Integer getPlayVolume() {
return playVolume;
}
public void setPlayVolume(Integer playVolume) {
this.playVolume = playVolume;
}
}

36
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/SpeakerTTSPlayStartRequest.java

@ -0,0 +1,36 @@
/*************************************************
* @copyright 2017 Flision Corporation Inc.
* @author: Vincent Chan @ Canton
* @date: 2024年06月03日
* @version: 1.0.0
* @description:
**************************************************/
package com.dji.sdk.cloudapi.control;
import com.dji.sdk.common.BaseModel;
import jakarta.validation.constraints.NotNull;
public class SpeakerTTSPlayStartRequest extends BaseModel {
@NotNull
Integer psdkIndex;
@NotNull
SpeakerTTSPlayStartRequestTTS tts;
public Integer getPsdkIndex() {
return psdkIndex;
}
public void setPsdkIndex(Integer psdkIndex) {
this.psdkIndex = psdkIndex;
}
public SpeakerTTSPlayStartRequestTTS getTts() {
return tts;
}
public void setTts(SpeakerTTSPlayStartRequestTTS tts) {
this.tts = tts;
}
}

43
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/SpeakerTTSPlayStartRequestTTS.java

@ -0,0 +1,43 @@
/*************************************************
* @copyright 2017 Flision Corporation Inc.
* @author: Vincent Chan @ Canton
* @date: 2024年06月03日
* @version: 1.0.0
* @description:
**************************************************/
package com.dji.sdk.cloudapi.control;
import com.google.common.base.Charsets;
import com.google.common.hash.Hashing;
import java.beans.Encoder;
public class SpeakerTTSPlayStartRequestTTS {
String md5;
String name;
String text;
public String getMd5() {
return md5;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getText() {
return text;
}
public void setText(String text) {
this.text = text;
this.md5 = Hashing.md5().newHasher().putString(text, Charsets.UTF_8)
.hash().toString();
}
}

12
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/TakeoffToPointRequest.java

@ -8,11 +8,11 @@ import com.dji.sdk.cloudapi.wayline.SimulateMission;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import com.dji.sdk.config.version.CloudSDKVersionEnum; import com.dji.sdk.config.version.CloudSDKVersionEnum;
import javax.validation.Valid; import jakarta.validation.Valid;
import javax.validation.constraints.Max; import jakarta.validation.constraints.Max;
import javax.validation.constraints.Min; import jakarta.validation.constraints.Min;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import javax.validation.constraints.Pattern; import jakarta.validation.constraints.Pattern;
/** /**
* @author sean * @author sean
@ -21,7 +21,7 @@ import javax.validation.constraints.Pattern;
*/ */
public class TakeoffToPointRequest extends BaseModel { public class TakeoffToPointRequest extends BaseModel {
@Pattern(regexp = "^[^<>:\"/|?*._\\\\]+$") //@Pattern(regexp = "^[^<>:\"/|?*._\\\\]+$")
@NotNull @NotNull
private String flightId; private String flightId;

4
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/VideoStorageSetRequest.java

@ -3,8 +3,8 @@ package com.dji.sdk.cloudapi.control;
import com.dji.sdk.cloudapi.device.PayloadIndex; import com.dji.sdk.cloudapi.device.PayloadIndex;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import javax.validation.constraints.Size; import jakarta.validation.constraints.Size;
import java.util.List; import java.util.List;
/** /**

85
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/api/AbstractControlService.java

@ -24,7 +24,7 @@ import org.springframework.integration.annotation.ServiceActivator;
import org.springframework.messaging.Message; import org.springframework.messaging.Message;
import org.springframework.messaging.MessageHeaders; import org.springframework.messaging.MessageHeaders;
import javax.annotation.Resource; import jakarta.annotation.Resource;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
@ -486,6 +486,89 @@ public abstract class AbstractControlService {
request); request);
} }
@CloudSDKVersion(since = CloudSDKVersionEnum.V1_0_2, include = GatewayTypeEnum.DOCK2)
public TopicServicesResponse<ServicesReplyData> cameraFrameZoom(GatewayManager gateway, CameraFrameZoomRequest request) {
return servicesPublish.publish(
gateway.getGatewaySn(),
ControlMethodEnum.CAMERA_FRAME_ZOOM.getMethod(),
request);
}
//============================== Psdk ==============================
@ServiceActivator(inputChannel = ChannelName.INBOUND_EVENTS_PSDK_UI_RESOURCE_UPLOAD_RESULT, outputChannel = ChannelName.OUTBOUND_EVENTS)
public TopicEventsResponse<MqttReply> psdkUiResourceUploadResult(TopicEventsRequest<PSDKUiResourceUploadResult> request, MessageHeaders headers) {
throw new UnsupportedOperationException("psdkUiResourceUploadResult not implemented");
}
@ServiceActivator(inputChannel = ChannelName.INBOUND_EVENTS_PSDK_FLOATING_WINDOW_TEXT, outputChannel = ChannelName.OUTBOUND_EVENTS)
public TopicEventsResponse<MqttReply> psdkFloatingWindowText(TopicEventsRequest<PsdkFloatingWindowText> request, MessageHeaders headers) {
throw new UnsupportedOperationException("psdkFloatingWindowText not implemented");
}
@CloudSDKVersion(since = CloudSDKVersionEnum.V1_0_2, include = {GatewayTypeEnum.DOCK, GatewayTypeEnum.DOCK2})
public TopicServicesResponse<ServicesReplyData> speakerAudioPlayStart(GatewayManager gateway, SpeakerAudioPlayStartRequest request) {
return servicesPublish.publish(
gateway.getGatewaySn(),
ControlMethodEnum.SPEAKER_AUDIO_PLAY_START.getMethod(),
request);
}
@ServiceActivator(inputChannel = ChannelName.INBOUND_EVENTS_SPEAKER_AUDIO_PLAY_START_PROGRESS, outputChannel = ChannelName.OUTBOUND_EVENTS)
public TopicEventsResponse<MqttReply> speakerAudioPlayStartProgress(TopicEventsRequest<EventsDataRequest<SpeakerPlayStartProgress>> request, MessageHeaders headers) {
throw new UnsupportedOperationException("speakerAudioPlayStartProgress not implemented");
}
@CloudSDKVersion(since = CloudSDKVersionEnum.V1_0_2, include = {GatewayTypeEnum.DOCK, GatewayTypeEnum.DOCK2})
public TopicServicesResponse<ServicesReplyData> speakerTtsPlayStart(GatewayManager gateway, SpeakerTTSPlayStartRequest request) {
return servicesPublish.publish(
gateway.getGatewaySn(),
ControlMethodEnum.SPEAKER_TTS_PLAY_START.getMethod(),
request);
}
@ServiceActivator(inputChannel = ChannelName.INBOUND_EVENTS_SPEAKER_TTS_PLAY_START_PROGRESS, outputChannel = ChannelName.OUTBOUND_EVENTS)
public TopicEventsResponse<MqttReply> speakerTTSPlayStartProgress(TopicEventsRequest<EventsDataRequest<SpeakerPlayStartProgress>> request, MessageHeaders headers) {
throw new UnsupportedOperationException("speakerTTSPlayStartProgress not implemented");
}
@CloudSDKVersion(since = CloudSDKVersionEnum.V1_0_2, include = {GatewayTypeEnum.DOCK, GatewayTypeEnum.DOCK2})
public TopicServicesResponse<ServicesReplyData> speakerReplay(GatewayManager gateway, PsdkRequest request) {
return servicesPublish.publish(
gateway.getGatewaySn(),
ControlMethodEnum.SPEAKER_REPLAY.getMethod(),
request);
}
@CloudSDKVersion(since = CloudSDKVersionEnum.V1_0_2, include = {GatewayTypeEnum.DOCK, GatewayTypeEnum.DOCK2})
public TopicServicesResponse<ServicesReplyData> speakerPlayStop(GatewayManager gateway, PsdkRequest request) {
return servicesPublish.publish(
gateway.getGatewaySn(),
ControlMethodEnum.SPEAKER_PLAY_STOP.getMethod(),
request);
}
@CloudSDKVersion(since = CloudSDKVersionEnum.V1_0_2, include = {GatewayTypeEnum.DOCK, GatewayTypeEnum.DOCK2})
public TopicServicesResponse<ServicesReplyData> speakerPlayModeSet(GatewayManager gateway, SpeakerPlayModeSetRequest request) {
return servicesPublish.publish(
gateway.getGatewaySn(),
ControlMethodEnum.SPEAKER_PLAY_MODE_SET.getMethod(),
request);
}
@CloudSDKVersion(since = CloudSDKVersionEnum.V1_0_2, include = {GatewayTypeEnum.DOCK, GatewayTypeEnum.DOCK2})
public TopicServicesResponse<ServicesReplyData> speakerPlayVolumeSet(GatewayManager gateway, SpeakerPlayVolumeSetRequest request) {
return servicesPublish.publish(
gateway.getGatewaySn(),
ControlMethodEnum.SPEAKER_PLAY_VOLUME_SET.getMethod(),
request);
}
/////////////////////////////////////////////////////////////////////
/** /**
* Payload control * Payload control
* @param gateway * @param gateway

2
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/debug/AirConditionerModeSwitchRequest.java

@ -2,7 +2,7 @@ package com.dji.sdk.cloudapi.debug;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
/** /**
* @author sean * @author sean

2
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/debug/AlarmStateSwitchRequest.java

@ -3,7 +3,7 @@ package com.dji.sdk.cloudapi.debug;
import com.dji.sdk.cloudapi.device.SwitchActionEnum; import com.dji.sdk.cloudapi.device.SwitchActionEnum;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
/** /**
* @author sean * @author sean

2
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/debug/BatteryMaintenanceSwitchRequest.java

@ -3,7 +3,7 @@ package com.dji.sdk.cloudapi.debug;
import com.dji.sdk.cloudapi.device.SwitchActionEnum; import com.dji.sdk.cloudapi.device.SwitchActionEnum;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
/** /**
* @author sean * @author sean

2
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/debug/BatteryStoreModeSwitchRequest.java

@ -3,7 +3,7 @@ package com.dji.sdk.cloudapi.debug;
import com.dji.sdk.cloudapi.device.BatteryStoreModeEnum; import com.dji.sdk.cloudapi.device.BatteryStoreModeEnum;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
/** /**
* @author sean * @author sean

2
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/debug/EsimActivateRequest.java

@ -2,7 +2,7 @@ package com.dji.sdk.cloudapi.debug;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
/** /**
* @author sean * @author sean

2
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/debug/EsimOperatorSwitchRequest.java

@ -3,7 +3,7 @@ package com.dji.sdk.cloudapi.debug;
import com.dji.sdk.cloudapi.device.TelecomOperatorEnum; import com.dji.sdk.cloudapi.device.TelecomOperatorEnum;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
/** /**
* @author sean * @author sean

7
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/debug/RemoteDebugStepKeyEnum.java

@ -59,7 +59,9 @@ public enum RemoteDebugStepKeyEnum {
FREE_PUTTER("free_putter", "Free Putter"), FREE_PUTTER("free_putter", "Free Putter"),
STOP_CHARGE("stop_charge", "Stop charging"); STOP_CHARGE("stop_charge", "Stop charging"),
UNKNOWN("unknown","Unknown");
private final String stepKey; private final String stepKey;
@ -79,10 +81,11 @@ public enum RemoteDebugStepKeyEnum {
return message; return message;
} }
//fix: 提供unknown取代异常 witcom@2023.10.30
@JsonCreator @JsonCreator
public static RemoteDebugStepKeyEnum find(String stepKey) { public static RemoteDebugStepKeyEnum find(String stepKey) {
return Arrays.stream(values()).filter(stepKeyEnum -> stepKeyEnum.stepKey.equals(stepKey)).findAny() return Arrays.stream(values()).filter(stepKeyEnum -> stepKeyEnum.stepKey.equals(stepKey)).findAny()
.orElseThrow(() -> new CloudSDKException(RemoteDebugStepKeyEnum.class,stepKey)); .orElse(UNKNOWN);
} }
} }

2
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/debug/SdrWorkmodeSwitchRequest.java

@ -3,7 +3,7 @@ package com.dji.sdk.cloudapi.debug;
import com.dji.sdk.cloudapi.device.LinkWorkModeEnum; import com.dji.sdk.cloudapi.device.LinkWorkModeEnum;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
/** /**
* @author sean * @author sean

2
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/debug/SimSlotSwitchRequest.java

@ -3,7 +3,7 @@ package com.dji.sdk.cloudapi.debug;
import com.dji.sdk.cloudapi.device.SimSlotEnum; import com.dji.sdk.cloudapi.device.SimSlotEnum;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
/** /**
* @author sean * @author sean

2
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/debug/api/AbstractDebugService.java

@ -22,7 +22,7 @@ import org.springframework.integration.annotation.ServiceActivator;
import org.springframework.messaging.Message; import org.springframework.messaging.Message;
import org.springframework.messaging.MessageHeaders; import org.springframework.messaging.MessageHeaders;
import javax.annotation.Resource; import jakarta.annotation.Resource;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.ArrayList; import java.util.ArrayList;

2
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/device/CameraModeEnum.java

@ -13,6 +13,8 @@ import java.util.Arrays;
*/ */
public enum CameraModeEnum { public enum CameraModeEnum {
//fix: Cannot construct instance of `com.dji.sdk.cloudapi.device.CameraModeEnum`, problem: com.dji.sdk.cloudapi.device.CameraModeEnum has unknown data: [-1] vincent @ 2023.12.07
UNKNOWN(-1),
PHOTO(0), PHOTO(0),
VIDEO(1), VIDEO(1),

2
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/device/DeviceOsdHost.java

@ -3,7 +3,7 @@ package com.dji.sdk.cloudapi.device;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
/** /**
* @author sean * @author sean

4
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/device/DeviceOsdWsResponse.java

@ -3,8 +3,8 @@ package com.dji.sdk.cloudapi.device;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import javax.validation.Valid; import jakarta.validation.Valid;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
/** /**
* @author sean * @author sean

2
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/device/DockDroneCurrentRthMode.java

@ -3,7 +3,7 @@ package com.dji.sdk.cloudapi.device;
import com.dji.sdk.cloudapi.wayline.RthModeEnum; import com.dji.sdk.cloudapi.wayline.RthModeEnum;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
/** /**
* @author sean * @author sean

3
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/device/DockLiveErrorStatus.java

@ -37,11 +37,14 @@ public class DockLiveErrorStatus {
} }
public String getMessage() { public String getMessage() {
if(success){ return "success";}
return errorCode.getMessage(); return errorCode.getMessage();
} }
@JsonValue @JsonValue
public Integer getCode() { public Integer getCode() {
//witcom: errorCode.getCode() will cause npe 2023.10.30
if(success){ return 0; }
return source.getSource() * MOD + errorCode.getCode(); return source.getSource() * MOD + errorCode.getCode();
} }

2
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/device/DockSilentMode.java

@ -4,7 +4,7 @@ import com.dji.sdk.cloudapi.property.SilentModeEnum;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
/** /**
* @author sean * @author sean

3
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/device/GearEnum.java

@ -32,7 +32,8 @@ public enum GearEnum {
G(8), G(8),
T(9), T(9),
; //problem: com.dji.sdk.cloudapi.device.GearEnum has unknown data: [65535]
UNKNOWN(65535);
private final int gear; private final int gear;

2
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/device/PayloadIndex.java

@ -5,7 +5,7 @@ import com.dji.sdk.exception.CloudSDKException;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.annotation.JsonValue;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import java.util.Arrays; import java.util.Arrays;
import java.util.Objects; import java.util.Objects;

2
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/device/VideoId.java

@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.annotation.JsonValue;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import java.util.Arrays; import java.util.Arrays;
import java.util.Objects; import java.util.Objects;

4
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/firmware/OtaCreateDevice.java

@ -1,7 +1,7 @@
package com.dji.sdk.cloudapi.firmware; package com.dji.sdk.cloudapi.firmware;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import javax.validation.constraints.Pattern; import jakarta.validation.constraints.Pattern;
/** /**
* @author sean * @author sean

6
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/firmware/OtaCreateRequest.java

@ -2,9 +2,9 @@ package com.dji.sdk.cloudapi.firmware;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import javax.validation.Valid; import jakarta.validation.Valid;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import javax.validation.constraints.Size; import jakarta.validation.constraints.Size;
import java.util.List; import java.util.List;
/** /**

2
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/firmware/api/AbstractFirmwareService.java

@ -18,7 +18,7 @@ import org.springframework.integration.annotation.ServiceActivator;
import org.springframework.messaging.Message; import org.springframework.messaging.Message;
import org.springframework.messaging.MessageHeaders; import org.springframework.messaging.MessageHeaders;
import javax.annotation.Resource; import jakarta.annotation.Resource;
/** /**
* @author sean * @author sean

2
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/flightarea/FeatureProperty.java

@ -2,7 +2,7 @@ package com.dji.sdk.cloudapi.flightarea;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import javax.validation.constraints.Min; import jakarta.validation.constraints.Min;
/** /**
* @author sean * @author sean

8
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/flightarea/FlightAreaFeature.java

@ -1,8 +1,8 @@
package com.dji.sdk.cloudapi.flightarea; package com.dji.sdk.cloudapi.flightarea;
import javax.validation.Valid; import jakarta.validation.Valid;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import javax.validation.constraints.Pattern; import jakarta.validation.constraints.Pattern;
/** /**
* @author sean * @author sean
@ -11,7 +11,7 @@ import javax.validation.constraints.Pattern;
*/ */
public class FlightAreaFeature { public class FlightAreaFeature {
@Pattern(regexp = "^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$") //@Pattern(regexp = "^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$")
@NotNull @NotNull
private String id; private String id;

4
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/flightarea/FlightAreaGetFile.java

@ -1,7 +1,7 @@
package com.dji.sdk.cloudapi.flightarea; package com.dji.sdk.cloudapi.flightarea;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import javax.validation.constraints.Pattern; import jakarta.validation.constraints.Pattern;
/** /**
* @author sean * @author sean

2
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/flightarea/FlightAreaJson.java

@ -1,6 +1,6 @@
package com.dji.sdk.cloudapi.flightarea; package com.dji.sdk.cloudapi.flightarea;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import java.util.List; import java.util.List;
/** /**

4
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/flightarea/FlightAreasGetResponse.java

@ -2,8 +2,8 @@ package com.dji.sdk.cloudapi.flightarea;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import javax.validation.Valid; import jakarta.validation.Valid;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import java.util.List; import java.util.List;
/** /**

2
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/flightarea/api/AbstractFlightAreaService.java

@ -18,7 +18,7 @@ import org.springframework.integration.annotation.ServiceActivator;
import org.springframework.messaging.Message; import org.springframework.messaging.Message;
import org.springframework.messaging.MessageHeaders; import org.springframework.messaging.MessageHeaders;
import javax.annotation.Resource; import jakarta.annotation.Resource;
/** /**
* @author sean * @author sean

2
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/interconnection/CustomDataTransmissionToEsdkRequest.java

@ -1,9 +1,9 @@
package com.dji.sdk.cloudapi.interconnection; package com.dji.sdk.cloudapi.interconnection;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import jakarta.validation.constraints.NotNull;
import org.hibernate.validator.constraints.Length; import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotNull;
/** /**
* @author sean * @author sean

2
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/interconnection/CustomDataTransmissionToPsdkRequest.java

@ -3,7 +3,7 @@ package com.dji.sdk.cloudapi.interconnection;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import org.hibernate.validator.constraints.Length; import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
/** /**
* @author sean * @author sean

9
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/interconnection/api/AbstractInterconnectionService.java

@ -1,10 +1,7 @@
package com.dji.sdk.cloudapi.interconnection.api; package com.dji.sdk.cloudapi.interconnection.api;
import com.dji.sdk.annotations.CloudSDKVersion; import com.dji.sdk.annotations.CloudSDKVersion;
import com.dji.sdk.cloudapi.interconnection.CustomDataTransmissionFromEsdk; import com.dji.sdk.cloudapi.interconnection.*;
import com.dji.sdk.cloudapi.interconnection.CustomDataTransmissionToEsdkRequest;
import com.dji.sdk.cloudapi.interconnection.CustomDataTransmissionToPsdkRequest;
import com.dji.sdk.cloudapi.interconnection.InterconnectionMethodEnum;
import com.dji.sdk.config.version.CloudSDKVersionEnum; import com.dji.sdk.config.version.CloudSDKVersionEnum;
import com.dji.sdk.config.version.GatewayManager; import com.dji.sdk.config.version.GatewayManager;
import com.dji.sdk.config.version.GatewayTypeEnum; import com.dji.sdk.config.version.GatewayTypeEnum;
@ -19,7 +16,7 @@ import org.springframework.integration.annotation.ServiceActivator;
import org.springframework.messaging.Message; import org.springframework.messaging.Message;
import org.springframework.messaging.MessageHeaders; import org.springframework.messaging.MessageHeaders;
import javax.annotation.Resource; import jakarta.annotation.Resource;
/** /**
* @author sean * @author sean
@ -64,7 +61,7 @@ public abstract class AbstractInterconnectionService {
*/ */
@ServiceActivator(inputChannel = ChannelName.INBOUND_EVENTS_CUSTOM_DATA_TRANSMISSION_FROM_PSDK, outputChannel = ChannelName.OUTBOUND_EVENTS) @ServiceActivator(inputChannel = ChannelName.INBOUND_EVENTS_CUSTOM_DATA_TRANSMISSION_FROM_PSDK, outputChannel = ChannelName.OUTBOUND_EVENTS)
@CloudSDKVersion(since = CloudSDKVersionEnum.V1_0_0) @CloudSDKVersion(since = CloudSDKVersionEnum.V1_0_0)
public TopicEventsResponse<MqttReply> customDataTransmissionFromPsdk(TopicEventsRequest<CustomDataTransmissionFromEsdk> request, MessageHeaders headers) { public TopicEventsResponse<MqttReply> customDataTransmissionFromPsdk(TopicEventsRequest<CustomDataTransmissionFromPsdk> request, MessageHeaders headers) {
throw new UnsupportedOperationException("customDataTransmissionFromPsdk not implemented"); throw new UnsupportedOperationException("customDataTransmissionFromPsdk not implemented");
} }

2
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/livestream/LiveLensChangeRequest.java

@ -3,7 +3,7 @@ package com.dji.sdk.cloudapi.livestream;
import com.dji.sdk.cloudapi.device.VideoId; import com.dji.sdk.cloudapi.device.VideoId;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
/** /**
* @author sean * @author sean

2
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/livestream/LiveSetQualityRequest.java

@ -3,7 +3,7 @@ package com.dji.sdk.cloudapi.livestream;
import com.dji.sdk.cloudapi.device.VideoId; import com.dji.sdk.cloudapi.device.VideoId;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
/** /**
* @author sean * @author sean

5
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/livestream/LiveStartPushRequest.java

@ -3,8 +3,9 @@ package com.dji.sdk.cloudapi.livestream;
import com.dji.sdk.cloudapi.device.VideoId; import com.dji.sdk.cloudapi.device.VideoId;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import javax.validation.Valid; import jakarta.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import jakarta.validation.Valid;
/** /**
* @author sean * @author sean

2
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/livestream/LiveStopPushRequest.java

@ -3,7 +3,7 @@ package com.dji.sdk.cloudapi.livestream;
import com.dji.sdk.cloudapi.device.VideoId; import com.dji.sdk.cloudapi.device.VideoId;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
/** /**
* @author sean * @author sean

2
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/livestream/LivestreamAgoraUrl.java

@ -2,7 +2,7 @@ package com.dji.sdk.cloudapi.livestream;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.nio.charset.Charset; import java.nio.charset.Charset;

2
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/livestream/LivestreamGb28181Url.java

@ -2,7 +2,7 @@ package com.dji.sdk.cloudapi.livestream;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
/** /**
* @author sean * @author sean

2
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/livestream/LivestreamRtmpUrl.java

@ -2,7 +2,7 @@ package com.dji.sdk.cloudapi.livestream;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
/** /**
* @author sean * @author sean

2
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/livestream/LivestreamRtspUrl.java

@ -2,7 +2,7 @@ package com.dji.sdk.cloudapi.livestream;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
/** /**
* @author sean * @author sean

2
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/livestream/LivestreamWhipUrl.java

@ -2,7 +2,7 @@ package com.dji.sdk.cloudapi.livestream;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
/** /**
* @author sean * @author sean

2
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/livestream/api/AbstractLivestreamService.java

@ -12,7 +12,7 @@ import org.springframework.integration.annotation.ServiceActivator;
import org.springframework.messaging.Message; import org.springframework.messaging.Message;
import org.springframework.messaging.MessageHeaders; import org.springframework.messaging.MessageHeaders;
import javax.annotation.Resource; import jakarta.annotation.Resource;
/** /**
* @author sean * @author sean

6
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/log/FileUploadListRequest.java

@ -2,9 +2,9 @@ package com.dji.sdk.cloudapi.log;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import javax.validation.Valid; import jakarta.validation.Valid;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import javax.validation.constraints.Size; import jakarta.validation.constraints.Size;
import java.util.List; import java.util.List;
/** /**

4
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/log/FileUploadStartFile.java

@ -1,7 +1,7 @@
package com.dji.sdk.cloudapi.log; package com.dji.sdk.cloudapi.log;
import javax.validation.Valid; import jakarta.validation.Valid;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import java.util.List; import java.util.List;
/** /**

6
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/log/FileUploadStartParam.java

@ -1,8 +1,8 @@
package com.dji.sdk.cloudapi.log; package com.dji.sdk.cloudapi.log;
import javax.validation.Valid; import jakarta.validation.Valid;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import javax.validation.constraints.Size; import jakarta.validation.constraints.Size;
import java.util.List; import java.util.List;
/** /**

4
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/log/FileUploadStartRequest.java

@ -5,8 +5,8 @@ import com.dji.sdk.cloudapi.storage.OssTypeEnum;
import com.dji.sdk.cloudapi.storage.StsCredentialsResponse; import com.dji.sdk.cloudapi.storage.StsCredentialsResponse;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import javax.validation.Valid; import jakarta.validation.Valid;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
/** /**
* @author sean * @author sean

6
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/log/FileUploadUpdateRequest.java

@ -2,9 +2,9 @@ package com.dji.sdk.cloudapi.log;
import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.BaseModel;
import javax.validation.Valid; import jakarta.validation.Valid;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import javax.validation.constraints.Size; import jakarta.validation.constraints.Size;
import java.util.List; import java.util.List;
/** /**

2
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/log/LogFileIndex.java

@ -1,6 +1,6 @@
package com.dji.sdk.cloudapi.log; package com.dji.sdk.cloudapi.log;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
/** /**
* @author sean * @author sean

2
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/log/api/AbstractLogService.java

@ -15,7 +15,7 @@ import org.springframework.integration.annotation.ServiceActivator;
import org.springframework.messaging.Message; import org.springframework.messaging.Message;
import org.springframework.messaging.MessageHeaders; import org.springframework.messaging.MessageHeaders;
import javax.annotation.Resource; import jakarta.annotation.Resource;
/** /**
* @author sean * @author sean

6
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/map/CreateMapElementRequest.java

@ -2,9 +2,9 @@ package com.dji.sdk.cloudapi.map;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import javax.validation.Valid; import jakarta.validation.Valid;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import javax.validation.constraints.Pattern; import jakarta.validation.constraints.Pattern;
/** /**
* @author sean * @author sean

4
cloud-sdk/src/main/java/com/dji/sdk/cloudapi/map/CreateMapElementResponse.java

@ -2,8 +2,8 @@ package com.dji.sdk.cloudapi.map;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import javax.validation.constraints.Pattern; import jakarta.validation.constraints.Pattern;
/** /**
* @author sean * @author sean

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save