HC_YFZX
/
LASAPlatform
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

省任务无人机状态信息查询（补）

feature-flyModify
陈伟 2025-08-27 10:21:43 +08:00
parent b5a593ce5c
commit 198b2981a8
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
OpenAuth.App/ServiceApp/DroneDocking/DroneDockApp.cs
View File

@ -682,8 +682,8 @@ namespace OpenAuth.App.ServiceApp.DroneDocking
.Where((a, b) => b.Sn == deviceid).FirstAsync(); .Where((a, b) => b.Sn == deviceid).FirstAsync();
if (dock == null) if (dock == null)
{ {
data.code = 500; data.code = 501;
data.message = "获取无人机机场状态失败"; data.message = "获取无人机状态失败";
} }
else else
{ {
@ -732,6 +732,7 @@ namespace OpenAuth.App.ServiceApp.DroneDocking
//var gimbalRoll = payload99?["gimbal_roll"]?.Value<double>(); //var gimbalRoll = payload99?["gimbal_roll"]?.Value<double>();
var batteryCapacityPercent = var batteryCapacityPercent =
droneOsdData["data"]?["battery"]?["capacity_percent"]?.Value<int>(); droneOsdData["data"]?["battery"]?["capacity_percent"]?.Value<int>();
var quality = droneOsdData["data"]?["position_state"]?["quality"]?.Value<int>();
dynamic inData = new ExpandoObject(); dynamic inData = new ExpandoObject();
// mode_code 0:在线；1:不在线；2:任务执行中 // mode_code 0:在线；1:不在线；2:任务执行中
@ -744,21 +745,29 @@ namespace OpenAuth.App.ServiceApp.DroneDocking
inData.gimbal_yaw = gimbalYaw; inData.gimbal_yaw = gimbalYaw;
//data.gimbal_roll = gimbalRoll; //data.gimbal_roll = gimbalRoll;
inData.battery_capacity_percent = batteryCapacityPercent; inData.battery_capacity_percent = batteryCapacityPercent;
inData.gps_state = 2;
inData.gps_state = quality switch
{
< 2 => 1,
< 10 => 2,
_ => 3
};
// 1： 低精度；2：高精度；3：rtk定位
data.data = inData; data.data = inData;
data.message = "获取无人机机场状态成功！"; data.message = "获取无人机状态成功！";
data.traceid = Guid.NewGuid().ToString(); data.traceid = Guid.NewGuid().ToString();
} }
else else
{ {
data.code = 500; data.code = 502;
data.message = "获取无人机机场状态失败"; data.message = "获取无人机状态失败";
} }
} }
else else
{ {
data.code = 500; // 舱内
data.message = "获取无人机机场状态失败"; data.code = 200;
data.message = "获取无人机状态失败";
} }
} }
} }
@ -766,14 +775,14 @@ namespace OpenAuth.App.ServiceApp.DroneDocking
var response = new ResData(); var response = new ResData();
if (data.code == 200) if (data.code == 200)
{ {
string x_lc_secret = _helper.getxseret(); string xLcSecret = _helper.getxseret();
// 转换为字节数组 // 转换为字节数组
byte[] bytes = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(data)); byte[] bytes = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(data));
var encryptedResData = _helper.Encrypt(bytes); var encryptedResData = _helper.Encrypt(bytes);
response.Result = encryptedResData; response.Result = encryptedResData;
response.Message = "获取无人机机场状态成功！"; response.Message = "获取无人机状态成功！";
response.Code = 200; response.Code = 200;
response.Secret = x_lc_secret; response.Secret = xLcSecret;
return response; return response;
} }
else else
@ -783,7 +792,7 @@ namespace OpenAuth.App.ServiceApp.DroneDocking
byte[] bytes = Encoding.UTF8.GetBytes(" "); byte[] bytes = Encoding.UTF8.GetBytes(" ");
var encryptedResData = _helper.Encrypt(bytes); var encryptedResData = _helper.Encrypt(bytes);
response.Result = encryptedResData; response.Result = encryptedResData;
response.Message = "获取无人机机场状态失败！"; response.Message = "获取无人机状态失败！";
response.Code = 500; response.Code = 500;
response.Secret = xLcSecret; response.Secret = xLcSecret;
return response; return response;