From 3db92a6fff18c1591b298fa0bf8085dfcbdb6747 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Sat, 06 Jul 2024 15:08:11 +0800
Subject: [PATCH] 修改智能航线规划，修改南昌机场和西安机场人工接管时图片绑定图斑问题
---
src/main/java/com/dji/sample/territory/utils/WaterMarkUtil.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/dji/sample/territory/utils/WaterMarkUtil.java b/src/main/java/com/dji/sample/territory/utils/WaterMarkUtil.java
index 6e971b3..3d3222e 100644
--- a/src/main/java/com/dji/sample/territory/utils/WaterMarkUtil.java
+++ b/src/main/java/com/dji/sample/territory/utils/WaterMarkUtil.java
@@ -15,6 +15,7 @@
@Component
public class WaterMarkUtil {
+
/**
* 将图片加上水印并压缩
*
@@ -63,7 +64,6 @@
alphaComposite = AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.7f);
g2d.setComposite(alphaComposite);
String extraInfo = String.format("Lon:%.7f Lat:%.7f\n%s %s", lng, lat, angel, sd);
-
File fontFile = new File("/usr/share/fonts/MiSans-Normal.ttf"); // 替换为你的字体文件路径
Font customFont = Font.createFont(Font.TRUETYPE_FONT, fontFile).deriveFont(36.00F);
// 注册字体
@@ -129,27 +129,39 @@
if (angle > 0 && angle < 45) {
return "北偏东";
}
- if (angle >= 45 && angle < 90) {
+ if (angle > 45 && angle < 90) {
return "东偏北";
}
if (angle > 90 && angle < 135) {
return "东偏南";
}
- if (angle >= 135 && angle < 180) {
+ if (angle > 135 && angle < 180) {
return "南偏东";
}
- if (angle >= 315 && angle < 360) {
+ if (angle > 315 && angle < 360) {
return "北偏西";
}
if (angle > 270 && angle < 315) {
return "西偏北";
}
- if (angle >= 225 && angle < 270) {
+ if (angle > 225 && angle < 270) {
return "西偏南";
}
if (angle > 180 && angle < 225) {
return "南偏西";
}
+ if (angle == 45) {
+ return "东北";
+ }
+ if (angle == 135) {
+ return "东南";
+ }
+ if (angle == 225) {
+ return "西南";
+ }
+ if (angle == 315) {
+ return "西北";
+ }
if (angle == 0 || angle == 360) {
return "正北";
}
--
Gitblit v1.9.3