From a646a4ef05c4f5f532d1aebbb561a3dd37246b99 Mon Sep 17 00:00:00 2001
From: xinfengkun <xinfengkun@zhidaoauto.com>
Date: Thu, 6 Apr 2023 14:31:36 +0800
Subject: [PATCH 1/3] =?UTF-8?q?[sweeper310]=20cheery=20pick=20[hmi]=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B8=85=E6=89=AB=E8=BD=A6=E6=91=84=E5=83=8F?=
 =?UTF-8?q?=E5=A4=B4View=EF=BC=8C=E5=8D=87=E7=BA=A7glide=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config.gradle                                 |  8 +-
 .../hmi/ui/widget/SweeperVideoView.java       | 87 +++++++++++++++++++
 2 files changed, 91 insertions(+), 4 deletions(-)
 create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SweeperVideoView.java

diff --git a/config.gradle b/config.gradle
index c2c71ebf9c..8c86d0bd4f 100644
--- a/config.gradle
+++ b/config.gradle
@@ -40,10 +40,10 @@ ext {
             arouter                      : "com.alibaba:arouter-api:1.0.12-mogo",
             aroutercompiler              : "com.alibaba:arouter-compiler:1.0.12-mogo",
             // glide
-            glide                        : 'com.github.bumptech.glide:glide:4.8.0',
-            glideokhttp3                 : 'com.github.bumptech.glide:okhttp3-integration:4.8.0',
-            glideanno                    : 'com.github.bumptech.glide:annotations:4.8.0',
-            glidecompiler                : 'com.github.bumptech.glide:compiler:4.8.0',
+            glide                        : 'com.github.bumptech.glide:glide:4.11.0',
+            glideokhttp3                 : 'com.github.bumptech.glide:okhttp3-integration:4.11.0',
+            glideanno                    : 'com.github.bumptech.glide:annotations:4.11.0',
+            glidecompiler                : 'com.github.bumptech.glide:compiler:4.11.0',
             androidxannotation           : "androidx.annotation:annotation:1.2.0",
             okhttpinterceptor            : "com.squareup.okhttp3:logging-interceptor:3.12.0",
             // fresco
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SweeperVideoView.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SweeperVideoView.java
new file mode 100644
index 0000000000..ce038d1457
--- /dev/null
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SweeperVideoView.java
@@ -0,0 +1,87 @@
+package com.mogo.eagle.core.function.hmi.ui.widget;
+
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatImageView;
+
+import com.bumptech.glide.Priority;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.bumptech.glide.request.RequestOptions;
+import com.bumptech.glide.request.target.CustomTarget;
+import com.bumptech.glide.request.transition.Transition;
+import com.mogo.eagle.core.function.api.autopilot.IMoGoSweeperFutianBackCameraVideoListener;
+import com.mogo.eagle.core.function.call.autopilot.CallerSweeperFutianBackCameraVideoListenerManager;
+import com.mogo.eagle.core.utilcode.mogo.glide.GlideApp;
+import com.mogo.eagle.core.utilcode.util.ThreadUtils;
+
+/**
+ * 清扫车摄像头展示View
+ */
+public class SweeperVideoView extends AppCompatImageView implements IMoGoSweeperFutianBackCameraVideoListener {
+    private static final String TAG = SweeperVideoView.class.getSimpleName();
+    private final RequestOptions requestOptions = new RequestOptions()
+            .priority(Priority.HIGH)
+            .skipMemoryCache(true)
+            .diskCacheStrategy(DiskCacheStrategy.NONE)
+            .dontAnimate();
+
+    public SweeperVideoView(@NonNull Context context) {
+        super(context);
+    }
+
+    public SweeperVideoView(@NonNull Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public SweeperVideoView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        CallerSweeperFutianBackCameraVideoListenerManager.INSTANCE.addListener(TAG, this);
+    }
+
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        CallerSweeperFutianBackCameraVideoListenerManager.INSTANCE.removeListener(this);
+    }
+
+    private final CustomTarget<Bitmap> target = new CustomTarget<Bitmap>() {
+        @Override
+        public void onResourceReady(@NonNull Bitmap resource, @Nullable Transition<? super Bitmap> transition) {
+            //回调内容
+            if (!resource.isRecycled()) {
+                SweeperVideoView.this.setImageBitmap(resource);
+            }
+        }
+
+        @Override
+        public void onLoadCleared(@Nullable Drawable placeholder) {
+            //这个方法在target被回收时调用，如果在除了imageView以外的地方引用了imageView中的bitmap，在这里清除引用以避免崩溃
+        }
+    };
+
+    @Override
+    public void onSweeperFutianBackCameraVideo(@NonNull byte[] data) {
+        ThreadUtils.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                GlideApp.with(SweeperVideoView.this)
+                        .asBitmap()
+                        .load(data)
+                        .placeholder(SweeperVideoView.this.getDrawable())
+                        .apply(requestOptions)
+                        .into(target);
+            }
+        });
+    }
+}

From 6212445c40dc1d36962d455917368f59374fcb44 Mon Sep 17 00:00:00 2001
From: zhongchao <zhongchao@zhidaoauto.com>
Date: Tue, 11 Apr 2023 10:48:37 +0800
Subject: [PATCH 2/3] [3.0.0] replace 3D res and light invoke

---
 .../hmi/ui/vehicle/BrakeViewStatus.kt         |   4 ++--
 .../eagle/core/function/view/MapBizView.kt    |   4 ++--
 .../src/main/res/raw/chuzuche.nt3d            | Bin 8232846 -> 8232854 bytes
 .../mogo-core-res/src/main/res/raw/hq_h9.nt3d | Bin 5043093 -> 5043101 bytes
 .../src/main/res/raw/huanwei.nt3d             | Bin 3789571 -> 3789579 bytes
 .../src/main/res/raw/xiaobache.nt3d           | Bin 4350762 -> 4350770 bytes
 .../uicontroller/IMogoMapUIController.java    |   3 ++-
 .../main/java/com/mogo/map/AMapWrapper.java   |   3 +++
 8 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/BrakeViewStatus.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/BrakeViewStatus.kt
index 3c9fe2419f..a840814b4a 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/BrakeViewStatus.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/BrakeViewStatus.kt
@@ -48,7 +48,7 @@ class BrakeViewStatus @JvmOverloads constructor(
         if (brakeLight == 1) { //刹车灯亮
             if (!isBrake) {
                 isBrake = true
-                CallerMapUIServiceManager.getMapUIController()?.setCarLightsType(0, 500)
+                CallerMapUIServiceManager.getMapUIController()?.setCarLightsType(4, 500)
                 GlobalScope.launch(Dispatchers.Main) {
                     var appearAnimation = AlphaAnimation(0f, 1f)
                     appearAnimation.duration = 300
@@ -63,7 +63,7 @@ class BrakeViewStatus @JvmOverloads constructor(
         } else { //不踩刹车，就消失
             if (isBrake) {
                 isBrake = false
-                CallerMapUIServiceManager.getMapUIController()?.setCarLightsType(3, 500)
+                CallerMapUIServiceManager.getMapUIController()?.setCarLightsType(0, 500)
                 GlobalScope.launch(Dispatchers.Main) {
 //                    scaleImageAndTv()
                     var disappearAnimation = AlphaAnimation(1f, 0f)
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/MapBizView.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/MapBizView.kt
index 8f0933ac44..7195f230e5 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/MapBizView.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/MapBizView.kt
@@ -112,8 +112,8 @@ class MapBizView(context: Context?, attrs: AttributeSet?) : MogoMapView(context,
     private fun turn(lightNum: Int) {
         if (currentLevel != lightNum) {
             when (lightNum) {
-                0 -> CallerMapUIServiceManager.getMapUIController()?.setCarLightsType(3, 500)
-                1 -> CallerMapUIServiceManager.getMapUIController()?.setCarLightsType(4, 500)
+                0 -> CallerMapUIServiceManager.getMapUIController()?.setCarLightsType(0, 500)
+                1 -> CallerMapUIServiceManager.getMapUIController()?.setCarLightsType(1, 500)
                 2 -> CallerMapUIServiceManager.getMapUIController()?.setCarLightsType(2, 500)
             }
             currentLevel = lightNum
diff --git a/core/mogo-core-res/src/main/res/raw/chuzuche.nt3d b/core/mogo-core-res/src/main/res/raw/chuzuche.nt3d
index 0b1ace476a63f0ea3394a7f53c229ab7bdd73c25..55c7942ec7b412a2022518019fe98c7500ed4cb9 100644
GIT binary patch
delta 12535
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

delta 12234
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

diff --git a/core/mogo-core-res/src/main/res/raw/hq_h9.nt3d b/core/mogo-core-res/src/main/res/raw/hq_h9.nt3d
index 47a6be55afd4ac1a799968067cdaab0ad64778de..3802f3e5ecb1f39252483b9fa6fd573f791056e4 100644
GIT binary patch
delta 341
zcmWN_$u2`-7=YoU#c8SeS5-C7^HlTDQd6<)9ngpcHeb^9S^VGGH8vtSiMR;itlW!@
zSW6^g=UqIT=i%!m@`Ox08gU#a{r#8vE!@ZM9QUSteObP}A|20IQ)5lUny59k*3?;3
z|7zTe!1qdvSi&;0SivgRu#OFEVhh{Y!7g&hV-Nc%-~fj>!ZA)z#3{}~uXJvnAK#O?
zgvzkWh{~wSn98`ygvzAKl*+WqjLNLaoXY&0EO;M&SnWg-T}YuDY4jk2Ui6_K0~id$
g>QM31uLLe)h@%0GNT3PLXhAF5(2kC<5}54IKZd4<O8@`>

delta 347
zcmWN=yH3Jj7=Yp0s(^r?R>k_MRq=dAJQTI4pa@=rgJEJa@dgOPpRO*(qzUOo7}MKv
zG0r9=gsHwy@^pVc^>>;HL)SFT`Wxi>mACkdW;CB)JECMriLS&@GOT1o$>^8Fn!eYH
zT$Xvw8{V?QD(`sD8Xs6^BWy*F#ootL<fc5^I%0vxEb@e>JmWbXmUzKSUWK;h)_=Uf
zS!JGUT;~Qixy5bnaF=`B=Rp`ahn;V)?Z+5rf@4fF#Wcs6VU`n|<P=R#bB43bagG+}
RDO}(pmuPc2Z2K!_@DFbAiF5z}

diff --git a/core/mogo-core-res/src/main/res/raw/huanwei.nt3d b/core/mogo-core-res/src/main/res/raw/huanwei.nt3d
index 9a177e5fdb7da8d521c8c67dcb5042b0543658f1..85be9ec991a76b096ffa76f03412d9c9b87697ef 100644
GIT binary patch
delta 281
zcmWN_IZgsm9KhiRh>rmj9sVHVu!t**8^|)X;TDz>uu#un$jcNobaMl5VCDpdiX%`^
z5lSjz$FKOBZ~U_gP2gCOuu>|&`Oj@%rm-)jKL+n_gU=zUzQst$NZ3fk$exj?k$ofD
zNbFavvFq8hYuw-#Rn$;N19!N`10L~&CR%t#8y$4f3+$P@N%*fio%H%^2L%*SLK)|%
x-~yLHe|<Gycq5&LAcHJUki#kRI15JFSu8!@wGc-FNgUu1DIDQA@Ll_Fz5^(KWN`oh

delta 273
zcmWN=KTg769Dw1{QlU@<0TuCw{3)Ucih>}WO?waG#ALz^2>H^%g^h)TjT@Mrz>y<#
zaAIaMY`jnMd~bHKISZDdYnoQtABz7Ui{zJPe2%9xQ4&+4D>0PBm6%FSlq8fSf5e)*
zfp5O>l|A<P#sP<X=P2||_jkKocwz?=r^$Ohu*FBV+2IqP!-><4{(_Y!Ec2EXR#{`6
q4jbXhyW2*=+O?Qsnl?{)#tgGOXO4Lmc)?3vvB+zdcoVK&*{6?jwp?cb

diff --git a/core/mogo-core-res/src/main/res/raw/xiaobache.nt3d b/core/mogo-core-res/src/main/res/raw/xiaobache.nt3d
index 909f474514c4412721a1fb156a1ecebbf051e24c..f90599915610d227317681ed13e91292abf094d6 100644
GIT binary patch
delta 320
zcmWN_IZwi10D$3-0+!1IDNwP3cmXOPAoW7P^sh)729Jc%$-y*+g^e8t6BiN_@;Nv&
zc9p;3WC)Az@GQ^A^i}zU5%elTh}7>~|FZ^x2ch0|y0@Ksn-tI5i{_bV%A4zq7kLzL
zh$9@Mh!V;;K?PORaEdxioZ%c7xWpA2xJDB#wB>kl^JEVn-|G=)W*OK*8X0UOiyiD@
z5BoSkPR^|Sk95rbD%KFiI%3ceM*>Oc*g#5}{ms#rBV7ev_~6G9R0I%22w_C9ETy~B
G`~C+yf0%gy

delta 312
zcmWN=IZwi10D$4zqMQnHAFbelfFidQ5D!Aa|1b=WCbGeTgK6B@*fC*XBq1MzNjJu>
z{0kB$<L3J$&tm;0&lz+ovLs3I-Cy*#Gj_a5O7G?UL;Y0uma6=18RqPkI`3F#gH7JE
z#Rop}iO<5EwfjGl(ZK65v~89-Uh$fF-mt(TODwa(s?fHz>B{KpDm9)k$rMj{#&cdU
z%}ZuPSI=&QVOla3+PKdH+UcN^F1qRAA&=;#kH_>gz#u~mGr}lij0@9B3}62N@-vOR

diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java
index a691df9e5a..50190778f2 100644
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java
@@ -194,7 +194,8 @@ public interface IMogoMapUIController {
     void setCarCursorOption(@Nullable CarCursorOption option);
 
     /**
-     * @param type :车尾灯类型 time: 闪烁时间 最小500ms 小于500ms 默认为500ms
+     * @param type :车尾灯类型  0=默认 1=左黄 2=右黄 3=双黄 4=双红
+     * @param time: 闪烁时间 最小500ms 小于500ms 默认为500ms
      */
     void setCarLightsType(int type, int time);
 
diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java
index c9cd8b2ffb..ed9fa04b01 100644
--- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java
+++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java
@@ -150,6 +150,9 @@ public class AMapWrapper implements IMogoMap {
                 markerOptionsArrayList.add(markerOptions);
             }
         });
+        if(markerOptionsArrayList.size() == 0){
+            return;
+        }
         long time = markerOptionsArrayList.get(0).getTime();
         // 最后一个参数，是否管理锚点的删除
         MarkerHelper.INSTANCE.updateBatchMarkerPositon(markerOptionsArrayList, false, FunctionBuildConfig.isBeautyMode ? 8.0f : 0f, 1, time, 1);

From 23d20435c06deab58a934bfc9311b16e6365b05b Mon Sep 17 00:00:00 2001
From: bxb <baixiaobing@zhidaoauto.com>
Date: Wed, 12 Apr 2023 11:14:14 +0800
Subject: [PATCH 3/3] =?UTF-8?q?[=E6=B8=85=E6=89=AB=E8=BD=A6]=E5=90=8E?=
 =?UTF-8?q?=E6=91=84=E5=83=8F=E5=A4=B4=E8=A7=86=E9=A2=91=E6=B5=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/res/layout/sweeper_base_fragment.xml | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_base_fragment.xml b/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_base_fragment.xml
index 1039ecdcc6..ba5e92da8e 100644
--- a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_base_fragment.xml
+++ b/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_base_fragment.xml
@@ -97,11 +97,24 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         android:layout_marginEnd="@dimen/dp_36"
-        android:layout_marginTop="@dimen/dp_27">
+        android:layout_marginTop="@dimen/dp_27"
+        app:roundLayoutRadius="@dimen/dp_16"
+        >
+        <com.mogo.eagle.core.function.hmi.ui.widget.SweeperVideoView
+            android:id="@+id/sweeper_video_view"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_401"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:src="#999999"/>
         <com.mogo.och.sweeper.view.WeltSmallMapView
             android:id="@+id/sweeper_task_welt_small_map"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_401"
+            app:layout_constraintTop_toBottomOf="@+id/sweeper_video_view"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"/>
     </com.mogo.och.common.module.wigets.OCHRoundConstraintLayout>
 
     <ImageView