desc:去掉摄像头时间，气体水印加时间

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"

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)

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);