From a7e1c4496cab34d1ab377ca7a23da026d2681aa0 Mon Sep 17 00:00:00 2001 From: Matthew Date: Sun, 2 Jun 2024 17:20:22 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E9=87=8D=E5=A4=8D=E7=9A=84?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xypower/mpapp/v2/Camera2VideoActivity.java | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/app/src/main/java/com/xypower/mpapp/v2/Camera2VideoActivity.java b/app/src/main/java/com/xypower/mpapp/v2/Camera2VideoActivity.java index 49c43407..fa96fd09 100644 --- a/app/src/main/java/com/xypower/mpapp/v2/Camera2VideoActivity.java +++ b/app/src/main/java/com/xypower/mpapp/v2/Camera2VideoActivity.java @@ -245,9 +245,6 @@ public class Camera2VideoActivity extends AppCompatActivity { mTimeMask = 0; if (!TextUtils.isEmpty(mOSDLeftTop)) { - mOSDLeftTop = mOSDLeftTop.replace("\r\n", "\n"); - mOSDLeftTop = mOSDLeftTop.replace("\n\r", "\n"); - mOSDLeftTop = mOSDLeftTop.replace("\r", "\n"); if (mOSDLeftTop.indexOf(TIME_MICRO_TS) != 0) { mTimeMask |= TIME_MASK_LT_TS; } @@ -259,9 +256,6 @@ public class Camera2VideoActivity extends AppCompatActivity { } } if (!TextUtils.isEmpty(mOSDRightTop)) { - mOSDRightTop = mOSDRightTop.replace("\r\n", "\n"); - mOSDRightTop = mOSDRightTop.replace("\n\r", "\n"); - mOSDRightTop = mOSDRightTop.replace("\r", "\n"); if (mOSDRightTop.indexOf(TIME_MICRO_TS) != 0) { mTimeMask |= TIME_MASK_RT_TS; } @@ -273,9 +267,6 @@ public class Camera2VideoActivity extends AppCompatActivity { } } if (!TextUtils.isEmpty(mOSDRightBottom)) { - mOSDRightBottom = mOSDRightBottom.replace("\r\n", "\n"); - mOSDRightBottom = mOSDRightBottom.replace("\n\r", "\n"); - mOSDRightBottom = mOSDRightBottom.replace("\r", "\n"); if (mOSDRightBottom.indexOf(TIME_MICRO_TS) != 0) { mTimeMask |= TIME_MASK_RB_TS; } @@ -288,9 +279,6 @@ public class Camera2VideoActivity extends AppCompatActivity { } if (!TextUtils.isEmpty(mOSDLeftBottom)) { - mOSDLeftBottom = mOSDLeftBottom.replace("\r\n", "\n"); - mOSDLeftBottom = mOSDLeftBottom.replace("\n\r", "\n"); - mOSDLeftBottom = mOSDLeftBottom.replace("\r", "\n"); if (mOSDLeftBottom.indexOf(TIME_MICRO_TS) != 0) { mTimeMask |= TIME_MASK_LB_TS; }