From 86d1d89b42a62a3f6a8a6fed83f226f1bdb0156b Mon Sep 17 00:00:00 2001
From: zhongchao <zhongchao@zhidaoauto.com>
Date: Tue, 21 Nov 2023 09:46:44 +0800
Subject: [PATCH] [6.2.0] reset @

---
 .../java/com/magic/mogo/och/charter/view/SlidePanelView.kt    | 1 +
 .../com/mogo/eagle/core/function/hmi/ui/widget/BatteryView.kt | 1 -
 .../java/com/mogo/eagle/core/widget/TextureVideoView.java     | 4 ----
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/SlidePanelView.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/SlidePanelView.kt
index 03047a13b5..511b368c2f 100644
--- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/SlidePanelView.kt
+++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/SlidePanelView.kt
@@ -210,6 +210,7 @@ class SlidePanelView @JvmOverloads constructor(
         )
         canvas.restore()
         // 画滑块
+
         canvas.drawBitmap(
             bmBlock!!,
             (BLOCK_START_X + blockOffset).toFloat(),
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/BatteryView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/BatteryView.kt
index 18c0f70988..e7afad2471 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/BatteryView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/BatteryView.kt
@@ -53,7 +53,6 @@ class BatteryView : View , IMoGoSkinModeChangeListener {
     ) : super(context, attrs, defStyleAttr) {
     }
 
-    @SuppressLint("NewApi")
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
         super.onMeasure(widthMeasureSpec, heightMeasureSpec)
         setMeasuredDimension(width.toInt(), height.toInt())
diff --git a/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/TextureVideoView.java b/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/TextureVideoView.java
index 3669e249bb..f32561baf4 100644
--- a/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/TextureVideoView.java
+++ b/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/TextureVideoView.java
@@ -16,7 +16,6 @@ package com.mogo.eagle.core.widget;
  * limitations under the License.
  */
 
-import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.SurfaceTexture;
 import android.media.AudioManager;
@@ -95,14 +94,12 @@ public class TextureVideoView extends TextureView implements MediaPlayerControl
         initVideoView();
     }
 
-    @SuppressLint("NewApi")
     @Override
     public void onInitializeAccessibilityEvent(AccessibilityEvent event) {
         super.onInitializeAccessibilityEvent(event);
         event.setClassName(TextureVideoView.class.getName());
     }
 
-    @SuppressLint("NewApi")
     @Override
     public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) {
         super.onInitializeAccessibilityNodeInfo(info);
@@ -151,7 +148,6 @@ public class TextureVideoView extends TextureView implements MediaPlayerControl
         }
     }
 
-    @SuppressLint("NewApi")
     private void openVideo() {
         if (mUri == null) {
             return;