Commit Graph

Select branches

Hide Pull Requests

dev/cbwu

dev/zpx

master

#1

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#5

#6

#7

#8

#9

Mono Color

• 2c865edd53 Merge pull request 'dev/cbwu' (#46) from dev/cbwu into master master WuChengbo 2024-09-20 10:18:33 +0800
• c28e6ec8b7 feat: 新增地图版本号接口 #7 #6 #5 #46 #10 #1 dev/cbwu cbwu 2024-09-20 09:22:16 +0800
• 1ab86cb785 fix: 修复自主着陆点0号飞机连线无效问题 cbwu 2024-09-02 08:31:11 +0800
• 43b2ed009b fix: 修复自主着陆点0号飞机连线无效问题 #45 cbwu 2024-09-02 08:31:11 +0800
• 96e309a06b Merge pull request 'fix: 多机自主着陆点右键菜单勾选，连线问题' (#44) from dev/cbwu into master WuChengbo 2024-08-24 23:40:17 +0800
• 81a4f36aff fix: 多机自主着陆点右键菜单勾选，连线问题 #44 cbwu 2024-08-24 23:39:30 +0800
• 990b04e610 Merge pull request 'fix: 修复自主着陆点对外两接口调用问题' (#43) from dev/cbwu into master WuChengbo 2024-08-24 15:29:17 +0800
• 238fe556c4 fix: 修复自主着陆点对外两接口调用问题 #43 cbwu 2024-08-24 15:27:36 +0800
• 1009d483ab Merge pull request 'fix: 修复多机自主着陆点显示问题，对外新增自主着陆点与飞机连线接口' (#42) from dev/cbwu into master WuChengbo 2024-08-23 15:38:33 +0800
• cdd403e5e0 fix: 修复多机自主着陆点显示问题，对外新增自主着陆点与飞机连线接口 #42 cbwu 2024-08-23 15:36:25 +0800
• ff9a53eccf Merge pull request 'fix: 修复自主着陆点右键菜单不勾选问题' (#41) from dev/cbwu into master WuChengbo 2024-08-20 19:07:28 +0800
• a9d976abb9 fix: 修复自主着陆点右键菜单不勾选问题 #41 cbwu 2024-08-20 19:05:39 +0800
• a1d808cf22 Merge pull request 'fix: 多机自主着陆点，子航线号存储位置改为航线文件第一个航点号的速度' (#40) from dev/cbwu into master WuChengbo 2024-08-20 18:21:07 +0800
• 2293814063 fix: 多机自主着陆点，子航线号存储位置改为航线文件第一个航点号的速度 #40 cbwu 2024-08-20 18:17:36 +0800
• d38943e3d0 Merge branch 'dev/cbwu' cbwu 2024-08-13 09:53:35 +0800
• 6b2094fa94 fix: 多机图标数量拓展为255 cbwu 2024-08-13 09:22:57 +0800
• f8b597200f fix: 多机图标数据修改为255 #39 cbwu 2024-08-13 09:13:26 +0800
• 92456b55dd fix: 修复多机图标 #38 cbwu 2024-08-12 08:38:40 +0800
• fb91015025 feat: 批量航线新增单点偏移 #37 cbwu 2024-08-09 08:32:40 +0800
• ae26173efe feat: 多机批量航线优化 #36 cbwu 2024-08-07 20:03:08 +0800
• 7ec357ab6d fix: UAV图标数量拓展到1000 #35 cbwu 2024-08-02 14:46:08 +0800
• 5b8f7c9b44 Merge pull request 'fix: 修复标记点测试接口暴露问题' (#34) from dev/cbwu into master WuChengbo 2024-07-10 11:22:40 +0800
• d23a613889 fix: 修复标记点测试接口暴露问题 #34 cbwu 2024-07-10 11:22:01 +0800
• 04b9fc1c1f Merge pull request 'feat: 新增目标点测试接口' (#33) from dev/cbwu into master WuChengbo 2024-07-10 08:55:49 +0800
• 4163402d1a feat: 新增目标点测试接口 #33 cbwu 2024-07-10 08:54:56 +0800
• c414ab9df7 Merge pull request 'feat: 测绘航线生成算法优化，航测区域禁止绘制凹多边形。' (#32) from dev/cbwu into master WuChengbo 2024-07-08 10:59:12 +0800
• 86e2541bb1 feat: 测绘航线生成算法优化，航测区域禁止绘制凹多边形。 #32 cbwu 2024-07-08 10:57:15 +0800
• 4cecf53ebf Merge pull request 'feat: 测绘航线新增航程航时计算，测绘航线格式改为.txt,测绘区域格式改为.route,航线文件保存经纬度精确到小数点后7位' (#31) from dev/cbwu into master WuChengbo 2024-06-20 16:52:44 +0800
• c2be9a49ed feat: 测绘航线新增航程航时计算，测绘航线格式改为.txt,测绘区域格式改为.route,航线文件保存经纬度精确到小数点后7位 #31 cbwu 2024-06-20 16:52:03 +0800
• a4a3ab9852 Merge pull request 'feat: 测绘航线完善' (#30) from dev/cbwu into master WuChengbo 2024-06-19 15:59:02 +0800
• 42ad71e2ff feat: 测绘航线完善 #30 cbwu 2024-06-19 15:58:09 +0800
• 00961ec5c7 Merge pull request 'dev/cbwu' (#29) from dev/cbwu into master WuChengbo 2024-06-17 16:18:26 +0800
• 3756297e0b feat: 新增多机航线一键生成. #29 cbwu 2024-06-17 16:17:21 +0800
• 33052d8140 feat: 新增航测航线，待完善 cbwu 2024-06-15 09:19:58 +0800
• 535b69122c Merge pull request 'dev/cbwu' (#28) from dev/cbwu into master WuChengbo 2024-06-06 11:10:16 +0800
• f3696d4f5b fix: 修复限飞区bug #28 cbwu 2024-06-05 17:43:19 +0800
• 996e5ba836 fix: 标记点bug修复 cbwu 2024-06-01 09:45:17 +0800
• e6eb03b9f8 Merge pull request 'fix: 修复盘旋导引的bug' (#27) from dev/cbwu into master WuChengbo 2024-05-20 09:55:01 +0800
• 4e03bfd5fa fix: 修复盘旋导引的bug #27 cbwu 2024-05-20 09:53:55 +0800
• e378f8b263 Merge pull request 'feat: 修改盘旋引领方式' (#26) from dev/cbwu into master WuChengbo 2024-05-17 14:28:12 +0800
• 8596f7f928 feat: 修改盘旋引领方式 #26 cbwu 2024-05-17 14:26:43 +0800
• b22f50f1d8 Merge pull request 'fix: 修复限制区设计的bug。' (#25) from dev/cbwu into master WuChengbo 2024-04-11 17:31:07 +0800
• 3868efc58f fix: 修复限制区设计的bug。 #25 cbwu 2024-04-11 17:09:47 +0800
• 8841c394d2 Merge pull request 'fix: 修复限制区文件保存类型错误的问题。' (#24) from dev/cbwu into master WuChengbo 2024-04-11 16:25:21 +0800
• 94b889132d fix: 修复限制区文件保存类型错误的问题。 #24 cbwu 2024-04-11 16:23:13 +0800
• 52e2b9e6b4 Merge pull request 'feat: 新增限制区装订。' (#23) from dev/cbwu into master WuChengbo 2024-04-09 14:20:43 +0800
• 280e1bc845 feat: 新增限制区装订。 #23 cbwu 2024-04-09 14:20:06 +0800
• 1c0f3c9418 Merge pull request 'feat: 新增限制区设计、导入与显示。' (#22) from dev/cbwu into master WuChengbo 2024-04-09 09:52:31 +0800
• 938465b6ff feat: 新增限制区设计、导入与显示。 #22 cbwu 2024-04-09 09:50:52 +0800
• 73226ac648 Merge pull request 'fix: 修复地图右键菜单修改自主着陆点显示/装订文本内容后事件不触发问题' (#21) from dev/cbwu into master WuChengbo 2024-03-13 09:24:24 +0800
• e032b82a18 fix: 修复地图右键菜单修改自主着陆点显示/装订文本内容后事件不触发问题 #21 cbwu 2024-03-13 09:23:04 +0800
• 664b958e70 Merge pull request 'feat: 缩放条最大提高至20级' (#20) from dev/cbwu into master WuChengbo 2024-03-08 09:39:46 +0800
• 5850eca6f6 feat: 缩放条最大提高至20级 #20 cbwu 2024-03-08 09:38:31 +0800
• 7d0dd0f641 Merge pull request 'type(feat):在线地图服务更换企业key，日访问300w次/天。' (#19) from dev/cbwu into master WuChengbo 2024-02-06 09:16:24 +0800
• 5ba3774841 type(feat):在线地图服务更换企业key，日访问300w次/天。 #19 cbwu 2024-02-06 09:15:01 +0800
• fc5123698e Merge pull request 'type(fix):修复添加tiff文件下航线设计的一些bug。' (#18) from dev/cbwu into master WuChengbo 2024-02-01 09:04:37 +0800
• f00f8abdb1 type(fix):修复添加tiff文件下航线设计的一些bug。 #18 cbwu 2024-01-31 10:40:05 +0800
• 5a52fe4cab Merge pull request 'dev/cbwu' (#17) from dev/cbwu into master WuChengbo 2024-01-15 10:06:10 +0800
• 95deac9d18 type(fix):修复移除全部图层的bug #17 cbwu 2024-01-15 10:04:21 +0800
• 2ab48dc3ca type(fix):修复航线编辑时不同型号的航线对应关系。 cbwu 2023-12-21 16:47:16 +0800
• ffa25e4e3d Merge pull request 'type(fix):优化航线选择' (#16) from dev/cbwu into master WuChengbo 2023-12-18 15:31:53 +0800
• 7aeb42efe9 type(fix):优化航线选择 #16 cbwu 2023-12-18 15:30:54 +0800
• 91a2acf54a Merge pull request 'type(fix):修改981A右键二级子菜单的回收航线为自主着陆点。' (#15) from dev/cbwu into master WuChengbo 2023-12-11 09:23:57 +0800
• 782e53bedd type(fix):修改981A右键二级子菜单的回收航线为自主着陆点。 #15 cbwu 2023-12-11 09:22:13 +0800
• 65769c12ad Merge pull request 'type(feat):新增航线设计时限制至少三个航点。' (#14) from dev/cbwu into master WuChengbo 2023-12-09 16:51:25 +0800
• 7ddb5f7d90 type(feat):新增航线设计时限制至少三个航点。 #14 cbwu 2023-12-09 16:49:45 +0800
• 602b841e7a Merge pull request 'dev/cbwu' (#13) from dev/cbwu into master WuChengbo 2023-12-04 17:02:23 +0800
• 910a299595 Merge pull request '保存航线文件时增加高度输入校验' (#12) from dev/zpx into master WuChengbo 2023-12-04 17:01:25 +0800
• 406e5e24bf 保存航线文件时增加高度输入校验 #12 dev/zpx zhaipx 2023-12-04 16:02:37 +0800
• 76cf403bcd type(feat):981A右键菜单隐藏高程分析、标绘、显示空投航线子项。type(fix):修改981C全局变量的名称。 #13 cbwu 2023-12-04 11:26:56 +0800
• 1517e5a5e0 type(feat):新增限制添加最多127个航点. cbwu 2023-12-04 09:34:20 +0800
• d58663293f type(fix):移除修改航点时经纬度错误的提示弹框。 cbwu 2023-12-04 09:17:30 +0800
• 4b9c4fea41 Merge pull request 'type(fix):修改航线设计时不清除已显示航线。新增航线选择按钮再次点击时可取消。修复航线设计时航线选择可以触发的问题。' (#11) from dev/cbwu into master WuChengbo 2023-12-02 16:32:05 +0800
• 0ee5e7adcd type(fix):修改航线设计时不清除已显示航线。新增航线选择按钮再次点击时可取消。修复航线设计时航线选择可以触发的问题。 #11 cbwu 2023-12-02 16:20:12 +0800
• 219c7d6d81 Merge pull request 'dev/zpx' (#9) from dev/zpx into master WuChengbo 2023-11-09 18:45:44 +0800
• 82b3161226 解决高程分析崩溃bug，并优化距离航向标注样式 #9 zhaipx 2023-11-09 17:34:45 +0800
• 204c6699bb 处理merge冲突 zhaipx 2023-11-09 14:20:17 +0800
• c1e02ae88a 高程分析bug修复 zhaipx 2023-11-09 14:14:07 +0800
• b8803d2954 Merge pull request 'dev/cbwu' (#8) from dev/cbwu into master WuChengbo 2023-11-09 14:12:25 +0800
• 40a11a8dc2 解决合并冲突 #8 cbwu 2023-11-09 14:10:48 +0800
• 13caafbbb1 暂时屏蔽高程分析的标注 cbwu 2023-11-09 13:56:45 +0800
• 950c81f53a Merge pull request 'dev/zpx' (#4) from dev/zpx into master ZhaiPeixiu 2023-11-09 13:36:50 +0800
• 4236fe86ba 1.修复地图定位无法手动输入经纬度的bug；2.增加地图定位度分秒形式 #4 zhaipx 2023-11-09 08:57:28 +0800
• ffc06126f1 修复自动漫游ID号不对应的问题 cbwu 2023-11-07 10:39:42 +0800
• aaa5ae647c 修复图层管理bug；修复A/C回收航线等显示与装订不匹配问题；暴露地图定位的接口。 cbwu 2023-11-07 09:46:36 +0800
• 6cdc5482bc fix: 分支合并问题 zhaipx 2023-11-06 16:15:22 +0800
• b72b6ac9b2 Merge branch 'master' into dev/zpx zhaipx 2023-11-06 15:36:55 +0800
• 282d39e8ab 解决合并冲突 zhaipx 2023-11-06 15:33:39 +0800
• 3a1fd1e399 Merge pull request '修复特定场景下触发编辑崩溃的问题' (#3) from dev/cbwu into master WuChengbo 2023-11-06 08:48:33 +0800
• 8a4a529fc4 修复特定场景下触发编辑崩溃的问题 #3 cbwu 2023-11-06 08:41:47 +0800
• 3a542fe03a Merge pull request '修改航点编辑的bug；编辑保存修改为txt文件；多点测距适配平板模式；' (#2) from dev/cbwu into master ZhaiPeixiu 2023-11-02 16:01:06 +0800
• a3e3723041 修改航点编辑的bug；编辑保存修改为txt文件；多点测距适配平板模式； #2 cbwu 2023-11-02 14:20:34 +0800
• f9ab368f4a 增加注释 zhaipx 2023-11-02 13:40:56 +0800
• 0e94680cc6 '多点测距适配平板（增加双击结束测距）' zhaipx 2023-11-02 09:19:40 +0800
• ba13fd34f4 ignore zhaipx 2023-11-01 18:52:48 +0800
• 485dcae7bc 修改gitignore文件，过滤掉不需要提交到git仓库的文件 zhaipx 2023-11-01 17:38:24 +0800
• fd285f933e add gitignore zhaipx 2023-11-01 17:30:38 +0800
• 2407bbfac5 init zhaipx 2023-11-01 16:51:34 +0800