Ryuiso 1 year ago
parent
commit
b03e1cb6e7

+ 21 - 21
Backend/cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/ControlErrorCodeEnum.java

@@ -13,48 +13,48 @@ import java.util.Arrays;
  */
 public enum ControlErrorCodeEnum implements IServicesErrorCode, IEventsErrorCode, IErrorInfo {
 
-    SETTING_RTH_FAILED(327000, "Height of return to home setting failed."),
+    SETTING_RTH_FAILED(327000, "返航高度设置失败,请稍候重试"),
 
-    SETTING_LOST_ACTION_FAILED(327001, "Signal lost action setting failed."),
+    SETTING_LOST_ACTION_FAILED(327001, "失联动作设置失败,请稍候重试"),
 
-    OBTAIN_CONTROL_FAILED(327002, "Failed to obtain control."),
+    OBTAIN_CONTROL_FAILED(327002, "获取控制权失败,请稍后重试"),
 
-    DEVICE_OFFLINE(327003, "Failed to obtain control. Device offline."),
+    DEVICE_OFFLINE(327003, "获取控制权失败,请稍后重试"),
 
-    DRAG_LIVESTREAM_VIEW_FAILED(327004, "Failed to drag livestream view."),
+    DRAG_LIVESTREAM_VIEW_FAILED(327004, "画面拖动失败,请重试"),
 
-    AIM_FAILED(327005, "Failed to double tab to be AIM."),
+    AIM_FAILED(327005, "双击画面归中失败"),
 
-    TAKE_PHOTO_FAILED(327006, "Failed to take photo."),
+    TAKE_PHOTO_FAILED(327006, "拍照失败"),
 
-    START_RECORDING_FAILED(327007, "Failed to start recording."),
+    START_RECORDING_FAILED(327007, "开始录像失败"),
 
-    STOP_RECORDING_FAILED(327008, "Failed to stop recording."),
+    STOP_RECORDING_FAILED(327008, "停止录像失败"),
 
-    SWITCH_CAMERA_MODE_FAILED(327009, "Failed to switch camera modes."),
+    SWITCH_CAMERA_MODE_FAILED(327009, "切换相机模式失败"),
 
-    ZOOM_CAMERA_ZOOM_FAILED(327010, "Failed to zoom in/out with zoom camera."),
+    ZOOM_CAMERA_ZOOM_FAILED(327010, "ZOOM相机变焦失败"),
 
-    IR_CAMERA_ZOOM_FAILED(327011, "Failed to zoom in/out with IR camera."),
+    IR_CAMERA_ZOOM_FAILED(327011, "IR相机变焦失败"),
 
-    DEVICE_LOCK(327012, "Failed to obtain control. Device is locked."),
+    DEVICE_LOCK(327012, "获取控制权失败,请稍后重试"),
 
-    SETTING_WAYLINE_LOST_ACTION_FAILED(327013, "Wayline signal lost action setting failed."),
+    SETTING_WAYLINE_LOST_ACTION_FAILED(327013, "参数设置失败,请稍后重试"),
 
-    GIMBAL_REACH_LIMIT(327014, "Gimbal reached movement limit."),
+    GIMBAL_REACH_LIMIT(327014, "云台已达限位"),
 
-    WRONG_LENS_TYPE(327015, "Invalid camera lens type."),
+    WRONG_LENS_TYPE(327015, "直播启动失败,建议刷新直播或重新打开设备小窗"),
 
 
-    DRC_ABNORMAL(514300, "DRC abnormal."),
+    DRC_ABNORMAL(514300, "DRC 异常"),
 
-    DRC_HEARTBEAT_TIMED_OUT(514301, "DRC heartbeat timed out."),
+    DRC_HEARTBEAT_TIMED_OUT(514301, "DRC 心跳超时"),
 
-    DRC_CERTIFICATE_ABNORMAL(514302, "DRC certificate is abnormal."),
+    DRC_CERTIFICATE_ABNORMAL(514302, "DRC 网络证书异常,连接失败"),
 
-    DRC_LINK_LOST(514303, "DRC link is lost."),
+    DRC_LINK_LOST(514303, "DRC 网络异常,连接断开"),
 
-    DRC_LINK_REFUSED(514304, "DRC link is refused."),
+    DRC_LINK_REFUSED(514304, "DRC 请求被拒,连接失败"),
 
     UNKNOWN(-1, "UNKNOWN"),
 

+ 5 - 5
Backend/cloud-sdk/src/main/java/com/dji/sdk/cloudapi/control/DrcStatusErrorEnum.java

@@ -15,15 +15,15 @@ public enum DrcStatusErrorEnum implements IErrorInfo {
 
     SUCCESS(0, "success"),
 
-    MQTT_ERR(514300, "The mqtt connection error."),
+    MQTT_ERR(514300, "MQTT 链接异常"),
 
-    HEARTBEAT_TIMEOUT(514301, "The heartbeat times out and the dock disconnects."),
+    HEARTBEAT_TIMEOUT(514301, "MQTT 请求超时,连接断开."),
 
-    MQTT_CERTIFICATE_ERR(514302, "The mqtt certificate is abnormal and the connection fails."),
+    MQTT_CERTIFICATE_ERR(514302, "MQTT 网络证书异常,连接失败"),
 
-    MQTT_LOST(514303, "The dock network is abnormal and the mqtt connection is lost."),
+    MQTT_LOST(514303, "机场网络异常,MQTT 连接断开"),
 
-    MQTT_REFUSE(514304, "The dock connection to mqtt server was refused.");
+    MQTT_REFUSE(514304, "机场链接MQTT 请求被拒,连接失败"),;
 
     private final String msg;
 

+ 0 - 2
Backend/cloud-sdk/src/main/java/com/dji/sdk/cloudapi/wayline/WaylineErrorCodeEnum.java

@@ -266,8 +266,6 @@ public enum WaylineErrorCodeEnum implements IServicesErrorCode, IEventsErrorCode
     NOT_HOVERING(321777, "飞行器未悬停,无法开始执行飞行任务"),
 
     B_CONTROL_PROPELLERS(321778, "用户使用 B 控操控飞行器起桨,机场无法执行飞行任务"),
-    // TODO 321784 任务过程中遇到大风紧急返航
-    // TODO 322281 任务失败,机场执行飞行任务过程被手动打断或异常终止
     
     USER_CONTROL(322282, "机场执行飞行任务过程中被中断,飞行器被云端用户或遥控器接管"),
 

+ 17 - 17
Backend/sample/src/main/java/com/dji/sample/wayline/model/enums/WaylineErrorCodeEnum.java

@@ -14,39 +14,39 @@ public enum WaylineErrorCodeEnum implements IErrorInfo {
 
     SUCCESS(0, "success", false),
 
-    EMERGENCY_BUTTON(316026, "The emergency button at the dock was pressed.", true),
+    EMERGENCY_BUTTON(316026, "机场急停按钮被按下,无法执行飞行任务,请释放急停按钮后重试", true),
     
-    NOT_IDLE(319001, "Task Center is not currently idle.", true),
+    NOT_IDLE(319001, "机场作业中或设备异常反馈上传日志中,无法执行飞行任务,请等待当前飞行任务或操作执行完成后重试", true),
     
-    PERFORMING_TASK(319016, "The dock is performing other tasks.", true),
+    PERFORMING_TASK(319016, "机场正在执行其他飞行任务,无法执行本次飞行任务", true),
     
-    EXPORTING_LOGS(319018, "The dock is exporting logs.", true),
+    EXPORTING_LOGS(319018, "机场正在自动导出日志中(设备异常反馈),无法执行飞行任务,请稍后重试", true),
     
-    PULLING_LOGS(319019, "The dock is pulling logs.", true),
+    PULLING_LOGS(319019, "机场正在拉取日志中(设备异常反馈),无法执行飞行任务,请稍后重试", true),
     
-    HEIGHT_LIMIT(321513, "The wayline altitude has exceeded the height limit of the drone.", true),
+    HEIGHT_LIMIT(321513, "航线规划高度已超过飞行器限高,机场无法执行飞行任务", true),
     
-    DISTANCE_LIMIT(321514, "The wayline distance has exceeded the limit of the drone.", true),
+    DISTANCE_LIMIT(321514, "任务失败,起点或终点位于限远区域的缓冲区内或超过了限远距离", true),
 
-    RESTRICTED_FLIGHT_AREA(321515, "The wayline passes through a restricted flight area.", true),
+    RESTRICTED_FLIGHT_AREA(321515, "航线穿过限飞区,机场无法执行飞行任务", true),
     
-    SDR_DISCONNECT(514120, "The sdr link between the dock and the drone is disconnected.", true),
+    SDR_DISCONNECT(514120, "机场与飞行器断连,请重启机场后重试或重新对频", true),
 
-    HEAVY_RAIN(514134, "Heavy rain prevented the flight.", true),
+    HEAVY_RAIN(514134, "雨量过大,机场无法执行飞行任务,请稍后重试", true),
     
-    STRONG_WIND(514135, "Strong wind prevented the flight.", true),
+    STRONG_WIND(514135, "风速过大,机场无法执行飞行任务,请稍后重试", true),
     
-    POWER_DISCONNECT(514136, "The dock's power supply is disconnected.", true),
+    POWER_DISCONNECT(514136, "机场供电断开,机场无法执行飞行任务,请恢复机场供电后重试", true),
 
-    LOW_TEMPERATURE(514137, "The low temperature of the environment prevented flight.", true),
+    LOW_TEMPERATURE(514137, "环境温度过低于-20℃ (-4°F),机场无法执行飞行任务,请稍后重试", true),
 
-    DEBUGGING(514145, "The dock is being debugged.", true),
+    DEBUGGING(514145, "机场处于现场调试中,无法执行当前操作或执行飞行任务,请断开遥控器和机场的数据线连接后重试", true),
 
-    REMOTE_DEBUGGING(514146, "The dock is being debugged remotely.", true),
+    REMOTE_DEBUGGING(514146, "机场处于远程调试中,无法执行飞行任务,请退出远程调试后重试", true),
 
-    DOCK_UPGRADING(514147, "The dock is being upgraded.", true),
+    DOCK_UPGRADING(514147, "设备升级中,无法进行远程调试或执行飞行任务,请等待升级完成后重试", true),
 
-    DOCK_WORKING(514148, "The dock is working and cannot perform new tasks.", true),
+    DOCK_WORKING(514148, "机场已经在作业中,无法进行远程调试或再次执行飞行任务,请等待当前任务执行完成后重试", true),
 
     UNKNOWN(-1, "Unknown wayline error.", false);