【类 型】:feat
【主 题】:在输出的json 最外层包一个questAss字段 【描 述】: [原因]:控制飞机 改成cmd/+的主题方式 要用questAss 来标记 [过程]: [影响]: 【结 束】 # 类型 包含: # feat:新功能(feature) # fix:修补bug # docs:文档(documentation) # style: 格式(不影响代码运行的变动) # refactor:重构(即不是新增功能,也不是修改bug的代码变动) # test:增加测试 # chore:构建过程或辅助工具的变动
This commit is contained in:
parent
74d971ea4b
commit
8a87d4ed0b
@ -18,6 +18,7 @@ using System.Windows.Media.Imaging;
|
||||
using System.Windows.Navigation;
|
||||
using System.Windows.Shapes;
|
||||
using static MPTxtToJson.JsonModel;
|
||||
using static MPTxtToJson.JsonModel.QuestAss;
|
||||
|
||||
namespace MPTxtToJson
|
||||
{
|
||||
@ -69,11 +70,12 @@ namespace MPTxtToJson
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
private JsonModel MakeJsonModel()
|
||||
{
|
||||
{
|
||||
JsonModel jsonModel = new JsonModel();
|
||||
jsonModel.ID = "FliCube";
|
||||
jsonModel.ver = "1.0";
|
||||
jsonModel.taskcount = this.strArr.Length-1;
|
||||
QuestAss questAss = new QuestAss();
|
||||
questAss.ID = "FliCube";
|
||||
questAss.ver = "1.0";
|
||||
questAss.taskcount = this.strArr.Length-1;
|
||||
List<Tasks> tasks = new List<Tasks>();
|
||||
int i = 0;
|
||||
foreach (var item in strArr)
|
||||
@ -99,7 +101,8 @@ namespace MPTxtToJson
|
||||
}
|
||||
i++;
|
||||
}
|
||||
jsonModel.tasks = tasks;
|
||||
questAss.tasks = tasks;
|
||||
jsonModel.questAss = questAss;
|
||||
return jsonModel;
|
||||
}
|
||||
/// <summary>
|
||||
@ -180,24 +183,28 @@ namespace MPTxtToJson
|
||||
/// </summary>
|
||||
public class JsonModel
|
||||
{
|
||||
public string ID { get; set; }
|
||||
public string ver { get; set; }
|
||||
public int taskcount { get; set; }
|
||||
public List<Tasks> tasks { get; set; }
|
||||
public class Tasks
|
||||
public QuestAss questAss { get; set; }
|
||||
public class QuestAss
|
||||
{
|
||||
public int seq { get; set; }//航点序号
|
||||
public int frame { get; set; }
|
||||
public int command { get; set; }
|
||||
public int current { get; set; }
|
||||
public int autocontinue { get; set; }
|
||||
public double param1 { get; set; }
|
||||
public double param2 { get; set; }
|
||||
public double param3 { get; set; }
|
||||
public double param4 { get; set; }
|
||||
public double x { get; set; }
|
||||
public double y { get; set; }
|
||||
public double z { get; set; }
|
||||
public string ID { get; set; }
|
||||
public string ver { get; set; }
|
||||
public int taskcount { get; set; }
|
||||
public List<Tasks> tasks { get; set; }
|
||||
public class Tasks
|
||||
{
|
||||
public int seq { get; set; }//航点序号
|
||||
public int frame { get; set; }
|
||||
public int command { get; set; }
|
||||
public int current { get; set; }
|
||||
public int autocontinue { get; set; }
|
||||
public double param1 { get; set; }
|
||||
public double param2 { get; set; }
|
||||
public double param3 { get; set; }
|
||||
public double param4 { get; set; }
|
||||
public double x { get; set; }
|
||||
public double y { get; set; }
|
||||
public double z { get; set; }
|
||||
}
|
||||
}
|
||||
}
|
||||
public static class JsonBase
|
||||
|
Loading…
Reference in New Issue
Block a user