Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bugfix feature tracing 1.10 springboot 3.1.x #75

Open
wants to merge 41 commits into
base: v1.10.0
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
ebd883d
Merge commit 'b390ebe579bd0b003e5d9ff20629b4ad3c341e1d' into flision/…
witcom Sep 20, 2023
b301d70
fix: flightId是应用层提供的,应用层有自己的id构建规则,如果不是设备原因必须指定格式,最好就不要控制flightId的格式了
witcom Sep 22, 2023
95df8f7
Merge branch 'main' into flision/v1.7.0
witcom Sep 22, 2023
c8a40b9
fix: 修复未启动debug时仍然需要构造debug参数的问题
witcom Sep 22, 2023
0850908
fix: OsdRouter在设备未注册的情况下报osd时产生大量日志
witcom Sep 22, 2023
9d392c5
feat: 为publishWithReply提供配置选项.
witcom Sep 22, 2023
163f08a
fix: MqttGatewayPublish#publish() log.debug 未判定isDebugEnable
witcom Sep 22, 2023
a79449a
fix: SdkManager改接口,由客户实现gateway管理策略
witcom Sep 25, 2023
52ec346
feat: 新增全局发送默认设置接口
witcom Sep 25, 2023
6e92736
feat: 使栅栏标识可由用户自定义标识生成
witcom Sep 25, 2023
97c4d3f
fix: 调整publish hook参数使客户看到更多信息
witcom Sep 25, 2023
9627b13
fix: 修复设备未注册前设备推送state导致产生大量日志的问题
witcom Oct 8, 2023
89c3433
fix: 修复flow.transform不能返回null导致产生大量日志的问题
witcom Oct 9, 2023
9d9d0cf
feat: PropertySetPublish 新增CompletableFuture支持方法
witcom Oct 9, 2023
4f38be0
fix: 取消FlyToPoint, TakeoffToPoint flightId规则限制
witcom Oct 9, 2023
3753374
fix: 简化SDKManager所需实现接口
witcom Oct 12, 2023
07b0fd3
fix: 修复一些npe问题
witcom Oct 30, 2023
c5e0961
fix: RemoteDebugSteoKeyEnum添加Unknown值
witcom Oct 31, 2023
6f2fd1e
fix: mark an bug
witcom Nov 9, 2023
1772588
fix: Cannot construct instance of `com.dji.sdk.cloudapi.device.Camera…
witcom Dec 8, 2023
9efb6d8
fix: * bug: Cannot deserialize value of type `com.dji.sdk.clouda…
witcom Dec 8, 2023
5c80307
bug report: some AliOss object need to close manually. otherwise wil…
witcom Dec 8, 2023
7bb8816
Merge branch 'v1.8.0'
DJIsean Dec 11, 2023
d321241
Merge branch 'tr-upstream-1.7' into tr-up-1.8
witcom Dec 11, 2023
16dc6db
upd: update spring boot to 3.x
witcom Dec 11, 2023
d7c3dbc
upd: update pom.xml
witcom Dec 11, 2023
438a163
fix: Cannot construct instance of `com.dji.sdk.cloudapi.device.DockLi…
witcom Dec 22, 2023
79a9706
fix: problem: com.dji.sdk.cloudapi.device.GearEnum has unknown data: …
witcom Jan 23, 2024
9b6bfb8
Merge branch 'v1.9.0'
DJIsean Feb 22, 2024
c196f70
readme修改版本号
DJIsean Feb 22, 2024
d24c863
Merge branch 'main' into tr-1.9-boot3.1.x
witcom Feb 23, 2024
e5954ec
fix: SpelEvaluationException: EL1004E: Method call: Method returnHome…
witcom Mar 1, 2024
8fdc613
fix: SpelEvaluationException: EL1004E: Method call: Method offlineMap…
witcom Mar 1, 2024
a1c9b03
Merge remote-tracking branch 'origin/v1.10.0'
dji-huidong Apr 7, 2024
90b2f9f
feat: 新增SrotageConfigGetModuleEnum 枚举 PSDK_UI(1)
witcom Apr 17, 2024
fd02a2f
Merge branch 'main' into tr-1.10-boot3.1.x
witcom Apr 17, 2024
85fc4d7
feat: 新增camera_frame_zoom方法
witcom Apr 19, 2024
77f925c
fix: customDataTransmissionFromPsdk receive wrong parameter
witcom Apr 19, 2024
771f78d
fix: 修复camera_look_at参数无法序列化的问题
witcom May 20, 2024
ea704db
feat: 新增psdk相关api
witcom Jun 3, 2024
b25556a
fix: 修复新增的psdk接口无法调用问题
witcom Jun 5, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ For more documentation, please visit the [DJI Developer Documentation](https://d

## 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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import com.dji.sdk.common.BaseModel;

import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;

/**
* @author sean
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
import com.dji.sdk.cloudapi.device.PayloadIndex;
import com.dji.sdk.common.BaseModel;

import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.Max;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotNull;

/**
* @author sean
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import com.dji.sdk.cloudapi.device.PayloadIndex;
import com.dji.sdk.common.BaseModel;

import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;

/**
* @author sean
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import com.dji.sdk.cloudapi.device.PayloadIndex;
import com.dji.sdk.common.BaseModel;

import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;

/**
* @author sean
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
import com.dji.sdk.cloudapi.device.PayloadIndex;
import com.dji.sdk.common.BaseModel;

import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.Max;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotNull;

/**
* @author sean
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import com.dji.sdk.cloudapi.device.PayloadIndex;
import com.dji.sdk.common.BaseModel;

import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;

/**
* @author sean
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import com.dji.sdk.cloudapi.device.PayloadIndex;
import com.dji.sdk.common.BaseModel;

import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;

/**
* @author sean
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

import com.dji.sdk.cloudapi.device.PayloadIndex;
import com.dji.sdk.common.BaseModel;

import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.Max;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotNull;

/**
* @author sean
Expand Down Expand Up @@ -95,4 +95,24 @@ public CameraLookAtRequest setHeight(Float height) {
this.height = height;
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;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import com.dji.sdk.cloudapi.device.PayloadIndex;
import com.dji.sdk.common.BaseModel;

import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;

/**
* @author sean
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import com.dji.sdk.cloudapi.device.PayloadIndex;
import com.dji.sdk.common.BaseModel;

import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;

/**
* @author sean
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import com.dji.sdk.cloudapi.device.PayloadIndex;
import com.dji.sdk.common.BaseModel;

import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;

/**
* @author sean
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
import com.dji.sdk.cloudapi.device.PayloadIndex;
import com.dji.sdk.common.BaseModel;

import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.Max;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotNull;

/**
* @author sean
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import com.dji.sdk.cloudapi.device.PayloadIndex;
import com.dji.sdk.common.BaseModel;

import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;

/**
* @author sean
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import com.dji.sdk.cloudapi.device.PayloadIndex;
import com.dji.sdk.common.BaseModel;

import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;

/**
* @author sean
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import com.dji.sdk.cloudapi.device.PayloadIndex;
import com.dji.sdk.common.BaseModel;

import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;

/**
* @author sean
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ public enum ControlMethodEnum {
IR_METERING_AREA_SET("ir_metering_area_set"),

CAMERA_POINT_FOCUS_ACTION("camera_point_focus_action"),
CAMERA_FRAME_ZOOM("camera_frame_zoom"),

DRONE_CONTROL("drone_control"),

Expand All @@ -75,6 +76,16 @@ public enum ControlMethodEnum {

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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

import com.dji.sdk.common.BaseModel;

import javax.validation.Valid;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
import jakarta.validation.Valid;
import jakarta.validation.constraints.Max;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotNull;

/**
* @author sean
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.dji.sdk.cloudapi.control;

import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.Max;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotNull;

/**
* @author sean
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

import com.dji.sdk.common.BaseModel;

import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.Max;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotNull;

/**
* @author sean
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import com.dji.sdk.common.BaseModel;

import javax.validation.Valid;
import javax.validation.constraints.*;
import jakarta.validation.Valid;
import jakarta.validation.constraints.*;
import java.util.List;

/**
Expand All @@ -13,7 +13,7 @@
*/
public class FlyToPointRequest extends BaseModel {

@Pattern(regexp = "^[^<>:\"/|?*._\\\\]+$")
//@Pattern(regexp = "^[^<>:\"/|?*._\\\\]+$")
@NotNull
private String flyToId;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

import com.dji.sdk.common.BaseModel;

import javax.validation.Valid;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import jakarta.validation.Valid;
import jakarta.validation.constraints.Max;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;
import java.util.List;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import com.dji.sdk.cloudapi.device.PayloadIndex;
import com.dji.sdk.common.BaseModel;

import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;

/**
* @author sean
Expand Down
Loading