From dbf76f50b6629fec1c993ad3722076adb30e3f64 Mon Sep 17 00:00:00 2001 From: liujing Date: Mon, 14 Dec 2020 14:45:48 +0800 Subject: [PATCH] =?UTF-8?q?[add]=20=E8=BF=9D=E7=AB=A0=E5=81=9C=E8=BD=A6=20?= =?UTF-8?q?=E8=B8=A9=E5=8A=A8=E7=94=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v2x/adapter/holder/V2XIllegalParkVH.java | 9 ++++++++- .../scene/test/V2XTestConsoleWindow.java | 2 ++ .../mogo/module/v2x/view/HeartUnLikeView.java | 12 ++++++++++- .../anim/v2x_unlike_heart_scale_ani_vr.xml | 16 +++++++++++++++ .../v2x_icon_unlike_animation_vr.png | Bin 1577 -> 1975 bytes .../layout/item_v2x_illegal_parking_vr.xml | 10 ++++----- .../main/res/layout/view_heart_unlike_vr.xml | 19 ++++++++++++++++-- 7 files changed, 59 insertions(+), 9 deletions(-) create mode 100644 modules/mogo-module-v2x/src/main/res/anim/v2x_unlike_heart_scale_ani_vr.xml diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XIllegalParkVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XIllegalParkVH.java index 5f6854cd3e..0dc3538584 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XIllegalParkVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XIllegalParkVH.java @@ -26,6 +26,9 @@ import com.mogo.module.v2x.voice.V2XVoiceManager; import com.mogo.utils.logger.Logger; import com.mogo.utils.network.utils.GsonUtil; +import java.util.logging.Handler; +import java.util.logging.LogRecord; + import static com.mogo.module.v2x.V2XConst.MODULE_NAME; /** @@ -142,6 +145,10 @@ public class V2XIllegalParkVH extends V2XBaseViewHolder { mExploreWay.getPoiType(), 3); } - delayedCloseWindow(); + if (!V2XServiceManager.getMoGoStatusManager().isVrMode()) { + delayedCloseWindow(); + } else { + mIIllegalParkingUnLike.setClickable(false); + } } } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/test/V2XTestConsoleWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/test/V2XTestConsoleWindow.java index a39d5056bc..7777ae5c59 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/test/V2XTestConsoleWindow.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/test/V2XTestConsoleWindow.java @@ -3,6 +3,7 @@ package com.mogo.module.v2x.scenario.scene.test; import android.content.Context; import android.content.Intent; import android.util.AttributeSet; +import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.widget.Button; @@ -257,6 +258,7 @@ public class V2XTestConsoleWindow extends ConstraintLayout { }); mBtnTriggerParkEvent.setOnClickListener(v -> { + Log.d("触发违章停车事件", "00"); V2XMessageEntity> v2XMessageEntity = TestOnLineCarUtils.getV2XIllegalParkData(); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/HeartUnLikeView.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/HeartUnLikeView.java index b361791431..9d7d45c720 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/HeartUnLikeView.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/HeartUnLikeView.java @@ -5,7 +5,10 @@ import android.animation.AnimatorInflater; import android.animation.AnimatorSet; import android.content.Context; import android.util.AttributeSet; +import android.util.Log; import android.view.View; +import android.view.animation.Animation; +import android.view.animation.AnimationUtils; import android.widget.ImageView; import android.widget.LinearLayout; @@ -26,6 +29,7 @@ public class HeartUnLikeView extends LinearLayout implements Animator.AnimatorLi private AnimatorSet mAnimatorSet; private OnClickCallListener mOnClickCallListener; private boolean isAnimator = false; + private ImageView animationImageView; public HeartUnLikeView(Context context) { this(context, null); @@ -39,7 +43,7 @@ public class HeartUnLikeView extends LinearLayout implements Animator.AnimatorLi super(context, attrs, defStyleAttr); inflate(context, V2XServiceManager.getMoGoStatusManager().isVrMode() ? R.layout.view_heart_unlike_vr : R.layout.view_heart_unlike, this); mIllegalParkingUnLike = findViewById(R.id.ivIllegalParkingUnLike); - + animationImageView = findViewById(R.id.animationImage); setOnClickListener(v -> { if (!isAnimator) { isAnimator = true; @@ -53,6 +57,12 @@ public class HeartUnLikeView extends LinearLayout implements Animator.AnimatorLi } mAnimatorSet.start(); } + if (V2XServiceManager.getMoGoStatusManager().isVrMode()) { + animationImageView.setVisibility(View.VISIBLE); + Animation animation = AnimationUtils.loadAnimation(getContext(), R.anim.v2x_unlike_heart_scale_ani_vr); + animationImageView.startAnimation(animation); + animationImageView.setVisibility(View.GONE); + } }); } diff --git a/modules/mogo-module-v2x/src/main/res/anim/v2x_unlike_heart_scale_ani_vr.xml b/modules/mogo-module-v2x/src/main/res/anim/v2x_unlike_heart_scale_ani_vr.xml new file mode 100644 index 0000000000..383effa7da --- /dev/null +++ b/modules/mogo-module-v2x/src/main/res/anim/v2x_unlike_heart_scale_ani_vr.xml @@ -0,0 +1,16 @@ + + + + + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_unlike_animation_vr.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_unlike_animation_vr.png index e14d0188cbb3304d458319d7c229b3e4e8ba9ee1..41390407d8d837b1a2207d80f1dedeb027704804 100644 GIT binary patch literal 1975 zcmZ`)3p7+~6#j=%%;ff(BBU{i&^!$4n#Q;y4dq!T&+;0Xj2UJIQ@A9Lr4pr-k|e7d z4J(C0Aw{>VP`X_Wic%iqQPkvm)IA5uZFT>%{{7mH>GOA)pH&)Bv0fLckWGK8u|ZYiBre z03@*ha)#p$S$NT*4Qr;Yd=BD!#vHj>_KF<&S*!}nGDOV-kWmVuyYT@)FNHS(oXLWM zasjLzt^!xPZ4^IlFu}*4>&qkvgF|2ypb9Av3}y;^u)<(Ahffij;iecA2*Yk74m(8= z1exJn?HsX|Tpkl^LNF$fa5NMai>31X11Qc`)-!VG$qW}L5QI>O#E6IpLWB{4%iBXV zG&MCPlE_3d84oe={CymOj}Xt{ubxiwEsqtG@5f_>2v}SW7S8MA%MBBl;c#%F*)`p# zfEDn)5{Ex?Ea-qlI6^cekcdB%F@>!Ek-?E^+0?nF%TeKE6bBxQ2{jD2MKh#M75I3if|(pX z+}C>J8O@J@p97GHaOlF-Q_}XQl}jfRR#Q94JnP+(_~<~qhshQd zv6$fgarCI0LSM^#hVo5tx@IstrA15XcJ7l(4s}eC^JYCWDEyu*Ayxl`5c5_8(HC3q zja<^G_p5VjxlFZE+hh@UIND^M;~9>+Gxuoqq4)6~BdyC~Qw=XPUKuY%iz-;+{6mV@ z=J%?!2AS8H+;kfy1TLFYtZZD^S>j}W{daMVzgmtC$|5}b1|!>xfxO|Z^^yJXYRjEk z&r&JVw>3$rXtG)17ZK?%too&Ac+`7mOS%c6O{2g}Gc2Es z=#~W%<1bRwYKT2U@)-2mI>)POE9yy~Tnk9*%r7Ye%H}VwSJe@+AA~DMZo#A4<$=SWo20mgkfN8dL`yqR?4T~L54h%ne^<_paUL*XFKRbk zne{cXQ7+uZ_LfH2NJ*%^N9-GVT=tf1WXC$slie4(=}NuHp?QZ(%_p!?14#W{9gD_f zf28t}H0yNx6N8cay)m|K(hRf}o>ncvP}XQy&|c*(AUgyN1+-!A3(Nf)?(Tc}YBOy< z9Zd-4==mG{PFQXE6FNl)3yGu_a?d{%&rdG4bje%3Q=A7+vG2hJ4P0N*_xiIwnhKd`pSHCumAY z>#wgJb}(I5={>oTj;C*MpLE#ZvBmSIM`N0MM1)c7M1m11(cmGv3|De3Km}y3Ij2)i z2_1Hl$w?mfM@BxR$*ZjD3cY&P3l6>jp5`xo}B B{Q&>~ literal 1577 zcmV+^2G;qBP)Nkl-nPzsK6>H9%nKNh3oO9-};WBg2+55l#d%gBrdxUC3 zRmgHZFdE@T;3A+SKV8^Kj%_Gw=r0?qVpPX&rHj$P1YkID8E^(T3>-xH8u*eFn-S3< z7zxDA>g_1cAq)d-p*zq0?giV9FrTD+9BTs^9fz<0xFTS_$tlTGwj#_WC7=1{mJ?Ss zO)Li{$0Ffu$Q87XHXh+zF|AdO<9Z&aS&49m=cQi}<-|)9SCM2IB0cV-5^;z0I^dR= zq=Tj%Kp0O_ey(_#(RB#7)rjrg*hZ3!bIF&8XLLTo<23?TT2MJb8&}g;GR2pFX__AP z0Id=DevOw~L|H;w<~dQNWkealF1-)s<$^qK%=q^a z6hq!QLV}xUmmeMCS$zk%vq5dU%R5QQ3uRbY{S>&NN%$K`$-P2GFGl#ulR3ihqb-nQ z6#eD5BFGUPKnuV4v|Y`jQNil0Q-%pyy}Mw>+7*&O$zkSm0r!xSkv?rtMVX&}=AZAb zwa;3HFvB$d3c_8rtnLy z8xz}cg3{UGCXdQs7PcGl?|=a{fQL=pObZXuPqL0Ls?fz$;K{tBRE~H=E7u(|;@g4V zF^NY7r@2li;=?W-NRE#X&MrKwSKjwVd>Z5fsM%vVDOp(r-K)Ln%limdHbKw| zp-YFN*pVMJ;s%Sq*xx~tiQY1ltS*dERzz9A;V9fAg_QLPU^zD`_@c9b(nF4kbjU7` zi;P8?69Yd=Q3kP(BxBqnYXZs>O)#NByhd8yC}JJat7zeElwM827p#c;z#(q_*N?SG zp{FcKh%%l3$lpbh$we1Atmn|mdq}=twNdYZ?)Nt0m345pjv&Y4 zLQxdeN`-mWMozGVJ`6#4u?q31ET#F1zlE9BuK7(}DcreN32L09(v^Rs`+#{Qc$6GN zV+3cAqB=>7)%0bfdgsxlV}S=73RWkN{DZQAL|x6wifR{4;Vn~ECjs^sw?_=yXAWqI zaWm#(tR^LEssTp#dKsO9Fs5P62j}r%A6M3w9by5(qlsG=)6I0Wp&PC+#g*Sp3Y%!R zrX%>WGdLYqgSWKSl@C_yWWp{%qk`8j!5@s9Nz#dkxmD>$NLL{3L(x;9twq8-#e z^kyzFFd#1n2U~av@jItjz=d)$E@_)ro5o$_jP@nLT(rS!4dD}`Z}V?OSed{hUM;Ng&;OL{oNGCE{uqokWl+|aUW*U3`~#gvzyorJHG61(7U%4m+O zc&QxK>kuXt+{0WYhq9XfvZX1E3n0xW?r44_%J_nxuO%hlG?R4mUB%0;TW`+)+b(vg b+Vt^1n)N!N(TN-100000NkvXXu0mjfOdI+u diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking_vr.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking_vr.xml index 837cf017c1..d3d819a99e 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking_vr.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking_vr.xml @@ -9,13 +9,13 @@ android:paddingEnd="@dimen/dp_62"> + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="@+id/leftImageView" /> - - + + +