From 792cbf89a549a958b2ff4b968f803c9ce3c41048 Mon Sep 17 00:00:00 2001
From: bxb <baixiaobing@zhidaoauto.com>
Date: Wed, 11 Jan 2023 17:07:37 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=B8=85=E6=89=AB=E8=BD=A6]=20=E5=B7=A6?=
 =?UTF-8?q?=E4=B8=8A=E8=A7=92=E8=BD=A6=E8=BE=86=E5=9F=BA=E6=9C=AC=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=B8=83=E5=B1=80=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sweeper/view/SweeperTrafficDataView.java  |  22 ++++-
 .../sweeper/view/SweeperTrafficLightView.java |   5 +-
 .../main/res/drawable-xhdpi/icon_battery.png  | Bin 0 -> 544 bytes
 .../icon_water_level_warning.png              | Bin 0 -> 19927 bytes
 .../res/drawable-xhdpi/icon_water_nor.png     | Bin 0 -> 807 bytes
 .../res/drawable-xhdpi/icon_water_select.png  | Bin 0 -> 1000 bytes
 .../drawable-xhdpi/sweeper_light_gay_nor.png  | Bin 0 -> 9800 bytes
 .../res/drawable/sweeper_water_selector.xml   |   5 +
 .../main/res/layout/sweeper_traffic_data.xml  |  87 ++++++++++++++----
 .../res/layout/sweeper_traffic_light_view.xml |  10 +-
 .../main/res/layout/sweeper_turn_signal.xml   |   9 +-
 11 files changed, 102 insertions(+), 36 deletions(-)
 create mode 100644 OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/icon_battery.png
 create mode 100644 OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/icon_water_level_warning.png
 create mode 100644 OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/icon_water_nor.png
 create mode 100644 OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/icon_water_select.png
 create mode 100644 OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_light_gay_nor.png
 create mode 100755 OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_water_selector.xml

diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficDataView.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficDataView.java
index 31a47a3358..a4eac8c011 100644
--- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficDataView.java
+++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficDataView.java
@@ -3,6 +3,7 @@ package com.mogo.och.sweeper.view;
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
+import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -22,7 +23,6 @@ import androidx.annotation.Nullable;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import chassis.Chassis;
 import chassis.ChassisStatesOuterClass;
-import chassis.VehicleStateOuterClass;
 import planning.RoboSweeperTaskIndexOuterClass;
 
 public class SweeperTrafficDataView extends ConstraintLayout {
@@ -32,6 +32,9 @@ public class SweeperTrafficDataView extends ConstraintLayout {
     private TextView speedTextView;//速度值
     private TurnSignalView sweeperTurnSignal;//转向灯
     private SweeperLimitingVelocityView sweeperLimitingVelocity;//限速
+    private TextView tvBattery;//电量百分比展示
+    private ImageView ivBgWaterWarning;//水位预警背景图
+    private ImageView ivWater;//水位图标
 
     public SweeperTrafficDataView(@NonNull Context context) {
         super(context);
@@ -56,6 +59,9 @@ public class SweeperTrafficDataView extends ConstraintLayout {
         speedTextView = findViewById(R.id.sweeperSpeedText);
         sweeperTurnSignal = findViewById(R.id.sweeperTurnSignal);
         sweeperLimitingVelocity = findViewById(R.id.sweeperLimitingVelocity);
+        tvBattery = findViewById(R.id.tvBattery);
+        ivBgWaterWarning = findViewById(R.id.sweeperIvBgWaterWarning);
+        ivWater = findViewById(R.id.sweeperIvWater);
     }
     @Override
     protected void onAttachedToWindow() {
@@ -79,15 +85,21 @@ public class SweeperTrafficDataView extends ConstraintLayout {
 
         @Override
         public void onSweeperFutianCleanSystemState(@NonNull ChassisStatesOuterClass.SweeperFuTianTaskSystemStates cleanSystemState) {
-
+            if (cleanSystemState!=null&&cleanSystemState.hasSecuCleanWaterTankLow()) {//清水箱水位低不能清洗作业报警信号
+                ivBgWaterWarning.setVisibility(View.VISIBLE);
+                ivWater.setSelected(true);
+            }else{
+                ivBgWaterWarning.setVisibility(View.GONE);
+                ivWater.setSelected(false);
+            }
         }
 
         @Override
         public void onBMSSystemStates(@NonNull ChassisStatesOuterClass.BMSSystemStates bmsSystemStates) {
-
+            if (bmsSystemStates!=null){
+                tvBattery.setText(String.format("%s%",65));
+            }
         }
-
-
         /**
          * 车辆转向灯
          * @param lightSwitch
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficLightView.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficLightView.java
index adbc4ad114..f86733914d 100644
--- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficLightView.java
+++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficLightView.java
@@ -139,18 +139,15 @@ public class SweeperTrafficLightView extends IViewTrafficLight {
             switch (lightId) {
                 case 1:
                     mLightIconIV.setBackgroundResource(R.drawable.sweeper_light_red_nor);
-                    SweeperTrafficLightView.this.setVisibility(VISIBLE);
                     break;
                 case 2:
                     mLightIconIV.setBackgroundResource(R.drawable.sweeper_lightyellow_nor);
-                    SweeperTrafficLightView.this.setVisibility(VISIBLE);
                     break;
                 case 3:
                     mLightIconIV.setBackgroundResource(R.drawable.sweeper_light_green_nor);
-                    SweeperTrafficLightView.this.setVisibility(VISIBLE);
                     break;
                 default:
-                    SweeperTrafficLightView.this.setVisibility(GONE);
+                    mLightIconIV.setBackgroundResource(R.drawable.sweeper_light_gay_nor);
                     break;
             }
         });
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/icon_battery.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/icon_battery.png
new file mode 100644
index 0000000000000000000000000000000000000000..5fee53445ef7c34d546965a781f04a167228b35f
GIT binary patch
literal 544
zcmeAS@N?(olHy`uVBq!ia0vp^!ayv^!3HERpB7yOq!^2X+?^QKos)S9<hZ0pc&7RK
zGH3zW91M)@nG7r-B|t0%#0(6~3m6%gfixpXYylHoR(Jt3oGl4bn04QS9jL6!)5S5w
zLU8S5TYZ*5k+$@R&Z#RjG){;qnOqU-beh7|nr6-VQB<_mZ{@{64OOnXMwf@;8ZJ$f
zJb+Ri5yy(3oOv_X`un*zesi8YsoC?s^1W?wdGmq9K#{i(DzCkj;I@i6yJ@f2!3Wwu
z+KRG{)SjKY@Q_}%!e23~wOeJ(R{dOX@Mh||#4D5LwVKF#9Mf6gW0}8BQ@e9}@~5-z
zj~IjB81Nk4E0LkPDU^TD_Zh#}uaDF?_OiGlyrwGdjHq);(?jn+Gi$W`JvPJ`e$W+t
zp?WX-9dDdr-lgLqvFiR6bIjLwF+Iz^bthFS)aFpXfIpwxkK=0Ia|L`RI9jH}Rx5tw
z`yZCy(62p>%g<1P`$s_6O&z@*Gyh~8J&XP<_-xU^d8+YOe;s(SJZQOudi-Ib|HjvD
zUHQWH#_O}shqW^W1ZORoak1@tSd)0y!N|ac;*WMdJNF>wa#CLK{YUfH{76k)xha6B
zkzcJZIC$QosiwAzZ*HsHtZKLI56i8Mev@;$c$qt<n+aMUW%trHVV_^e_}-$@if!E^
QP<%3Yy85}Sb4q9e0F{u`d;kCd

literal 0
HcmV?d00001

diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/icon_water_level_warning.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/icon_water_level_warning.png
new file mode 100644
index 0000000000000000000000000000000000000000..96bf7d213ac048a867c5b698fbbc4939909b2bf0
GIT binary patch
literal 19927
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
a2K@iE#nd3SyinNy0000<MNUMnLSTY!iuykQ

literal 0
HcmV?d00001

diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/icon_water_nor.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/icon_water_nor.png
new file mode 100644
index 0000000000000000000000000000000000000000..75dc6a3497f17f8a6f67b2aa2189508f005b5c95
GIT binary patch
literal 807
zcmeAS@N?(olHy`uVBq!ia0vp^qChOe!3HGzB)-G}DaPU;cPEB*=VV?2IWDOYo@u_m
z3|c@o2Loe!CIbsd2@p#GF#`kh0!9XAAk7F8TfhXD6<xp#XUl*TvT_&HGcYhs^mK6y
z@!;*9YMmhxDAHCgoXjD?(b2)E$|0sHvgLAvhMj<mZjIo@Lv8}fO|4U#Sk`O_SmVOY
zebh-Xa7x2Uo`@9+fi(_I3LZX9Qi3%{+>gDVZ<}spY;A1KzHd(T`Tz4bPo6t-_f)S=
zj-~~|zq}((M@n4d>36soy>4}5w`2OD!malAJx)t)5jo9sgU5Jl<;DBY*F<$&7l%lR
zAK1}b<#~_uAES8Dt*+BNJCd2}C+vQzHh=T1wtSs=6M`}=GR}I{>TS+zO%(0qzwj_B
z@z@TIWe$c6S1Xu*KQ-X((k|33@BJ8-!OwK}<<UsDSIf^V-lBI}_^Lrp=gfW=r>w^1
ztZ_5Gn^yXr3cBsZASrTwf#&55*DrFCx_xO?g8Vz1_o!W-qV;HZp6&b-pM{KAW1m_Z
z-|_2UmHrd^;r1^-l{F&YXDxW1@9LDZ;b8sAs^cd%-`AbpuEz6==iBPq*eM@Nqt{>h
zcH#6Q=6|c4T9ym^wD{A!*_Ao=@OKH3@X*V$?;6u)G%^PGG<~~t>PW5e+R$qk^mIG=
zuV$65+P0==f_?M7bx&eVowfFE`YZIuS8A2E*Kvc^?-w}5FDD(ebKsW$U}&uSB>2{r
zXI=FZzqp;;()~+##%U}4X|oLc@)tbz`M*d`^=My(`0vXGocAAU&S{U!@c;Se<xa_~
zhClC0cXe%ZxXog<q`oOBYDfQ9uMgd~o|neHHTz&8!@0Tnx$?XA><^;fJe0OKp5r{q
zu|=gy(`JIxpGIa*!{p}WvU}XacWpiA7N~zP`oo39!0)F$eV-r6lVI(iT*|z+!P&md
z`Q4T^#h=+?+NwXW+I&%y`~2@tk0*P9ypKa5kJ7qRQd55X?Uc^AFnyn#Swmgemo(o4
h(mPInw(vUF^Pj0oS=;?%Tqr1!db;|#taD0e0syyKPeuR$

literal 0
HcmV?d00001

diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/icon_water_select.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/icon_water_select.png
new file mode 100644
index 0000000000000000000000000000000000000000..026549d193d01d7e41872e2db697a33981734c75
GIT binary patch
literal 1000
zcmV<E0~h>>P)<h;3K|Lk000e1NJLTq000#L000~a1^@s6ju`Y_00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR916`%tE1ONa40RR918~^|S00j$he*gdjQb|NXR7ee-lubxfQ547jca$PO
z6F)(wgixZLXzEac(8`6hFc&r=f@q=%DPdqOBwVQwNGm}_+7>QdC8l8F!rh2M(!vNM
z6k<kGn&<7D_vXB>nI`MOopbL!=l;(BoOkB|7kqSY@2KwY4_+i(T_i~N^t4jkTN;~C
z>aLoZ`IYWmAf1zar0@orS!hiQU5E4YslS~`t5gpTUdGAEM}k%RKo8X1+&kZ%y-cq(
z7Mp@$RFgVQ1NP8*R(E$_w<*5KAECOlvzdU86Ch=l?|}2k_ePJ6r97W<lloXhka-ix
zy=0hSI7)dQk2hj(@0m}exl9Sg@$oc4N|RuYQb{nT!{J+ga1vCvx3>_i-7MF7;}$>^
zyTOKWiIUIy+u(ufp`j}j^x7<yOO)X+U%*z<2JG(kxYc@~*xw%^h1W=__9zv_Vj0SF
zNg9uj>#nY=0=A)4b}0ppn1Na=yPtB<Z3QSv45J9q=x7oYr>6|evSCu9s1oZ2N+Jv1
zuiM&+8Eh)0H<(ATM`lTKm=8Egyyd#VGLOfzady^kLrMBWf@UX5w|Z4l0_5aab2%tU
zBr#i=vk&Ozn~=#fg0-5e6nzTVSzZoIOz;H<1_ppw%nUPqJmVONwLJ10#OCJh0QDh*
zg6^1slKJQe`1#X1Tug1^eQt;N8R}NZYZ*#41*i|Dq=@gQb0``GwFJn|2ZBLw3nWgg
zJE65#!BFQ;iV}7%FN1tQM+Z<==78NQCEmSf80P_mLf=TbVV5RlEiM8F2NrN)0jR2S
zDiK&}`_=qN>!zl4>U79#zO<ZeVIeR*4e(7kJOsA4fk*_{*|97u<cD9HJWAaY=u=WV
zDf=E<PyqDx0kySO5>^+W>peUSY;Ac$2~L?&W<i^q^XS@qq7CyO;f+kJ7+O;UR8|5N
z6+k#__1to^WM+-1wY5nT%KN&pv5WdT&-4F!l!_oXw?-{3o!L+Z=}_nunJ51MwG=A#
z9hsT+YIXH9pY=d_LpL<Mp#Hv0<zs*15g1?k2r@G6tM&CgaoV3g*-#rB<J9mFwc>;4
znt87ee;R+#cuqH?&JAQvl2U=Q)%Eq2q@;zC+#~?~18_{^3$0g>mGxe&tekS3|M?AI
WIdz-A2s8Kq0000<MNUMnLSTYd6SF}8

literal 0
HcmV?d00001

diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_light_gay_nor.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_light_gay_nor.png
new file mode 100644
index 0000000000000000000000000000000000000000..2b677df25f42055097d6816d5bfbdd8f34253de7
GIT binary patch
literal 9800
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%0A0BWmm0SK`qHRS$=EWTA>Lsm
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

literal 0
HcmV?d00001

diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_water_selector.xml b/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_water_selector.xml
new file mode 100755
index 0000000000..9c959df076
--- /dev/null
+++ b/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_water_selector.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/icon_water_select" android:state_selected="true" />
+    <item android:drawable="@drawable/icon_water_nor" android:state_selected="false"/>
+</selector>
\ No newline at end of file
diff --git a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_traffic_data.xml b/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_traffic_data.xml
index 70cf4a311c..1f4864c3c3 100644
--- a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_traffic_data.xml
+++ b/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_traffic_data.xml
@@ -3,17 +3,18 @@
     android:layout_width="@dimen/dp_616"
     android:layout_height="@dimen/dp_320"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:background="@drawable/sweeper_bg_traffic_data"
     android:paddingStart="@dimen/dp_47"
     android:paddingTop="@dimen/dp_22">
     <ImageView
         android:id="@+id/sweeperSpeedImage"
-        android:layout_width="@dimen/dp_154"
-        android:layout_height="@dimen/dp_154"
+        android:layout_width="@dimen/dp_200"
+        android:layout_height="@dimen/dp_200"
         android:background="@drawable/sweeper_bg_traffic_data_speed"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        android:layout_marginTop="@dimen/dp_22"
+        android:layout_marginTop="@dimen/dp_4"
         />
     <TextView
         android:id="@+id/sweeperSpeedText"
@@ -25,7 +26,7 @@
         android:text="0"
         android:gravity="center"
         android:textSize="@dimen/dp_48"
-        android:layout_marginTop="@dimen/dp_38"
+        android:layout_marginTop="@dimen/dp_43"
         android:textColor="@color/white"
         android:textStyle="bold"
         />
@@ -45,12 +46,12 @@
         android:id="@+id/sweeperTrafficPosition"
         android:layout_width="@dimen/dp_200"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_30"
+        android:layout_marginStart="@dimen/dp_20"
         app:defaultColor="@color/acc_default_txt_color"
         app:layout_constraintLeft_toRightOf="@+id/sweeperSpeedImage"
         app:layout_constraintTop_toTopOf="parent"
         app:selectColor="@color/dark_mode_select_txt_color"
-        android:layout_marginTop="@dimen/dp_35"/>
+        android:layout_marginTop="@dimen/dp_30"/>
     <View
         android:id="@+id/line1"
         android:layout_width="@dimen/dp_1"
@@ -58,7 +59,7 @@
         app:layout_constraintStart_toEndOf="@+id/sweeperTrafficPosition"
         app:layout_constraintTop_toTopOf="@+id/sweeperTrafficPosition"
         app:layout_constraintBottom_toBottomOf="@+id/sweeperTrafficPosition"
-        android:layout_marginStart="@dimen/dp_30"
+        android:layout_marginStart="@dimen/dp_3"
         android:background="#414869"/>
     <com.mogo.och.sweeper.view.SweeperLimitingVelocityView
         android:id="@+id/sweeperLimitingVelocity"
@@ -67,7 +68,7 @@
         app:layout_constraintStart_toEndOf="@+id/line1"
         app:layout_constraintTop_toTopOf="@+id/sweeperTrafficPosition"
         app:layout_constraintBottom_toBottomOf="@+id/sweeperTrafficPosition"
-        android:layout_marginStart="@dimen/dp_30"
+        android:layout_marginStart="@dimen/dp_26"
         />
     <com.mogo.och.sweeper.view.TurnSignalView
         android:id="@+id/sweeperTurnSignal"
@@ -75,8 +76,8 @@
         android:layout_height="wrap_content"
         app:layout_constraintTop_toBottomOf="@+id/sweeperTrafficPosition"
         app:layout_constraintLeft_toRightOf="@+id/sweeperSpeedImage"
-        android:layout_marginTop="@dimen/dp_20"
-        android:layout_marginStart="@dimen/dp_30"/>
+        android:layout_marginStart="@dimen/dp_20"
+        android:layout_marginTop="@dimen/dp_10"/>
     <View
         android:id="@+id/line2"
         android:layout_width="@dimen/dp_1"
@@ -84,14 +85,66 @@
         app:layout_constraintStart_toEndOf="@+id/sweeperTurnSignal"
         app:layout_constraintTop_toTopOf="@+id/sweeperTurnSignal"
         app:layout_constraintBottom_toBottomOf="@+id/sweeperTurnSignal"
-        android:layout_marginStart="@dimen/dp_30"
+        android:layout_marginStart="@dimen/dp_3"
         android:background="#414869"/>
     <com.mogo.och.sweeper.view.SweeperTrafficLightView
-        android:layout_width="@dimen/dp_120"
-        android:layout_height="@dimen/dp_120"
-        app:layout_constraintStart_toEndOf="@+id/line2"
-        app:layout_constraintTop_toTopOf="@+id/sweeperTurnSignal"
-        app:layout_constraintBottom_toBottomOf="@+id/sweeperTurnSignal"
+        android:layout_width="@dimen/dp_170"
+        android:layout_height="@dimen/dp_170"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_marginBottom="@dimen/dp_70"
+        android:layout_marginEnd="@dimen/dp_6"
+        />
+    <ImageView
+        android:id="@+id/sweeperIvBattery"
+        android:layout_width="@dimen/dp_30"
+        android:layout_height="@dimen/dp_30"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        android:layout_marginBottom="@dimen/dp_54"
+        android:layout_marginStart="@dimen/dp_120"
+        android:src="@drawable/icon_battery"/>
+    <TextView
+        android:id="@+id/tvBattery"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toEndOf="@+id/sweeperIvBattery"
+        app:layout_constraintTop_toTopOf="@+id/sweeperIvBattery"
+        app:layout_constraintBottom_toBottomOf="@+id/sweeperIvBattery"
+        android:textColor="@color/white"
+        tools:text="65%"
+        android:layout_marginStart="6dp"
+        android:textSize="@dimen/dp_24"/>
+    <View
+        android:id="@+id/line3"
+        android:layout_width="@dimen/dp_1"
+        android:layout_height="@dimen/dp_34"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/sweeperIvBattery"
+        app:layout_constraintBottom_toBottomOf="@+id/sweeperIvBattery"
+        android:layout_marginStart="@dimen/dp_20"
+        android:background="#6D87B0"/>
+    <ImageView
+        android:id="@+id/sweeperIvBgWaterWarning"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:src="@drawable/icon_water_level_warning"
+        android:layout_marginBottom="@dimen/dp_40"
+        android:layout_marginEnd="@dimen/dp_110"
+        tools:visibility="visible"
+        android:visibility="gone"
+        />
+    <ImageView
+        android:id="@+id/sweeperIvWater"
+        android:layout_width="@dimen/dp_30"
+        android:layout_height="@dimen/dp_30"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:layout_marginBottom="@dimen/dp_54"
+        android:layout_marginEnd="@dimen/dp_150"
+        android:src="@drawable/sweeper_water_selector"
         />
-
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_traffic_light_view.xml b/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_traffic_light_view.xml
index f7c111451a..fe9a8bc34f 100644
--- a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_traffic_light_view.xml
+++ b/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_traffic_light_view.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools">
     <ImageView
         android:id="@+id/sweeper_traffic_light_iv"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_gravity="center"
-        android:src="@drawable/sweeper_light_red_nor"/>
+        android:src="@drawable/sweeper_light_gay_nor"/>
     <TextView
         android:id="@+id/sweeper_traffic_light_time_tv"
         android:layout_width="match_parent"
@@ -16,6 +16,6 @@
         android:textSize="@dimen/dp_24"
         android:layout_gravity="center"
         android:gravity="center"
-        android:text="10"
+        tools:text="10"
         android:textColor="@color/white"/>
 </FrameLayout>
\ No newline at end of file
diff --git a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_turn_signal.xml b/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_turn_signal.xml
index 7dd5225a35..2af09a3830 100644
--- a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_turn_signal.xml
+++ b/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_turn_signal.xml
@@ -5,15 +5,14 @@
     android:orientation="horizontal">
     <ImageView
         android:id="@+id/turnLeftView"
-        android:layout_width="@dimen/dp_50"
-        android:layout_height="@dimen/dp_50"
+        android:layout_width="@dimen/dp_80"
+        android:layout_height="@dimen/dp_80"
         android:src="@drawable/turn_signal_left_selector"
         android:layout_weight="1"/>
     <ImageView
         android:id="@+id/turnRightView"
-        android:layout_width="@dimen/dp_50"
-        android:layout_height="@dimen/dp_50"
+        android:layout_width="@dimen/dp_80"
+        android:layout_height="@dimen/dp_80"
         android:src="@drawable/turn_signal_right_selector"
-        android:layout_marginStart="@dimen/dp_20"
         android:layout_weight="1"/>
 </LinearLayout>
\ No newline at end of file