From 9aaf7b7143788fd58071c2854144b9a5751dd557 Mon Sep 17 00:00:00 2001
From: xiaowusky <chenyangyang3858@dingtalk.com>
Date: Thu, 30 Nov 2023 09:09:45 +0800
Subject: [PATCH] =?UTF-8?q?desc:=E5=8E=BB=E6=8E=89=E6=91=84=E5=83=8F?=
 =?UTF-8?q?=E5=A4=B4=E6=97=B6=E9=97=B4=EF=BC=8C=E6=B0=94=E4=BD=93=E6=B0=B4?=
 =?UTF-8?q?=E5=8D=B0=E5=8A=A0=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/activity_home.xml              |  4 ++--
 .../src/main/java/org/easydarwin/TxtOverlay.kt         | 10 +++++-----
 .../src/main/java/org/easydarwin/util/YUVUtils.java    |  8 +++++++-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index 396e574..3952ac5 100644
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@@ -20,8 +20,8 @@
         android:id="@+id/tip_View"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="220px"
-        android:layout_marginStart="@dimen/_100dp"/>
+        android:layout_marginTop="@dimen/_132dp"
+        android:layout_marginStart="@dimen/_12dp"/>
 
     <LinearLayout
         android:id="@+id/setting_area"
diff --git a/library-push/src/main/java/org/easydarwin/TxtOverlay.kt b/library-push/src/main/java/org/easydarwin/TxtOverlay.kt
index af25c25..7487c3d 100644
--- a/library-push/src/main/java/org/easydarwin/TxtOverlay.kt
+++ b/library-push/src/main/java/org/easydarwin/TxtOverlay.kt
@@ -28,8 +28,8 @@ object TxtOverlay {
     // 上一次展示的时间
     private var lastTipUpdateTime: Long = 0
 
-    private const val bmpWidth: Int = 500
-    private const val bmpHeight: Int = 300
+    private const val bmpWidth: Int = 550
+    private const val bmpHeight: Int = 330
 
     // 文字生成的bitmap
     private var bmp: Bitmap? = Bitmap.createBitmap(bmpWidth, bmpHeight, Bitmap.Config.ARGB_8888);
@@ -37,7 +37,7 @@ object TxtOverlay {
     private var yuv: ByteArray? = null
 
     // 时间格式化字符串
-    private val dateFormat = SimpleDateFormat("yy-MM-dd HH:mm:ss")
+    private val dateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss")
 
     private fun buildOverlayBitmap() {
         if (TextUtils.isEmpty(mToDoShowTip)) {
@@ -52,8 +52,8 @@ object TxtOverlay {
             // 文字转bitmap
             YUVUtils.generateBitmap(
                 bmp,
-                /*dateFormat.format(lastTipUpdateTime) + "@" +*/ mToDoShowTip,
-                45,
+                dateFormat.format(lastTipUpdateTime) + "@" + mToDoShowTip,
+                42,
                 Color.WHITE
             )
             yuv = YUVUtils.getYUVByBitmap(bmp)
diff --git a/library-push/src/main/java/org/easydarwin/util/YUVUtils.java b/library-push/src/main/java/org/easydarwin/util/YUVUtils.java
index 14e62fd..1b6837e 100644
--- a/library-push/src/main/java/org/easydarwin/util/YUVUtils.java
+++ b/library-push/src/main/java/org/easydarwin/util/YUVUtils.java
@@ -112,8 +112,14 @@ public class YUVUtils {
             String[] split = text.split("@");
             Canvas canvas = new Canvas(bmp);
             canvas.drawColor(Color.TRANSPARENT, PorterDuff.Mode.CLEAR);
+            int line = 0;
+            int offsetx = 0;
             for (int i = 0; i < split.length; i++) {
-                canvas.drawText(split[i], 0, Math.abs(fontMetrics.ascent) + lineHeight * i, textPaint);
+                if (i > 0) {
+                    line = i + 1;
+                    offsetx = 100;
+                }
+                canvas.drawText(split[i], offsetx, Math.abs(fontMetrics.ascent) + lineHeight * line, textPaint);
             }
         } else {
             Canvas canvas = new Canvas(bmp);