From e88cfb9011a224f05839243c1931d3bd4103f380 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Thu, 5 Nov 2020 15:18:15 +0800
Subject: [PATCH] =?UTF-8?q?[rm]m4=20UI=E5=BE=AE=E8=B0=83+=E8=A7=86?=
 =?UTF-8?q?=E9=A2=91=E6=9A=82=E5=81=9C=E5=90=8E=E7=82=B9=E5=87=BB=E6=92=AD?=
 =?UTF-8?q?=E6=94=BE=E6=8C=89=E9=92=AE=E7=BB=A7=E7=BB=AD=E6=92=AD=E6=94=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/res/drawable-ldpi/icon_heart_choose.png  | Bin 753 -> 0 bytes
 .../main/res/drawable-ldpi/icon_heart_second.png  | Bin 750 -> 0 bytes
 .../res/drawable-ldpi/icon_heart_unchoose.png     | Bin 514 -> 0 bytes
 .../main/res/drawable-mdpi/icon_heart_choose.png  | Bin 753 -> 0 bytes
 .../main/res/drawable-mdpi/icon_heart_second.png  | Bin 750 -> 0 bytes
 .../res/drawable-mdpi/icon_heart_unchoose.png     | Bin 514 -> 0 bytes
 .../icon_heart_choose.png                         | Bin
 .../icon_heart_second.png                         | Bin
 .../icon_heart_unchoose.png                       | Bin
 .../module/v2x/view/SimpleCoverVideoPlayer.kt     |   1 +
 .../src/main/res/drawable/v2x_alert_window_bg.xml |   2 +-
 .../src/main/res/values-ldpi/dimens.xml           |   4 ++--
 .../src/main/res/values-mdpi/dimens.xml           |   4 ++--
 13 files changed, 6 insertions(+), 5 deletions(-)
 delete mode 100644 modules/mogo-module-common/src/main/res/drawable-ldpi/icon_heart_choose.png
 delete mode 100644 modules/mogo-module-common/src/main/res/drawable-ldpi/icon_heart_second.png
 delete mode 100644 modules/mogo-module-common/src/main/res/drawable-ldpi/icon_heart_unchoose.png
 delete mode 100644 modules/mogo-module-common/src/main/res/drawable-mdpi/icon_heart_choose.png
 delete mode 100644 modules/mogo-module-common/src/main/res/drawable-mdpi/icon_heart_second.png
 delete mode 100644 modules/mogo-module-common/src/main/res/drawable-mdpi/icon_heart_unchoose.png
 rename modules/mogo-module-common/src/main/res/{drawable-xhdpi => drawable}/icon_heart_choose.png (100%)
 rename modules/mogo-module-common/src/main/res/{drawable-xhdpi => drawable}/icon_heart_second.png (100%)
 rename modules/mogo-module-common/src/main/res/{drawable-xhdpi => drawable}/icon_heart_unchoose.png (100%)

diff --git a/modules/mogo-module-common/src/main/res/drawable-ldpi/icon_heart_choose.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/icon_heart_choose.png
deleted file mode 100644
index 7fc320c21f6fa2ab539fc0f64726decae0b50370..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 753
zcmV<N0uKF&P)<h;3K|Lk000e1NJLTq000&M000mO1^@s7W$M4M00001b5ch_0Itp)
z=>Px%t4TybR5%f(Q{PLJK@`2S6v0MH^b$cqkZ<W*`GZw+moV|Q|Dc!NvLvHkQjkJ1
ztiPk6N1uw&RkKIYBB`D#1dY;4clY~dZs*+b+oUB38g}N+%suzanKR!yLHp6)H}SPv
zD<0rttCoyxr>RJCsd#t0R654Z+*Xo~Zlt@LTsRKjFJ91U2vTA9Ue3%e+CFpgp|?w4
z7dq4y*|6K+x6S!_vHP743><P5Z0x4~NF}I5Dj&IlP;yq0sE8lQ7-X%xQ<n=J6Wp-V
zs4)pTnnDF6ix=HVz2;L5;&FU}{g$~!XEy`gDFPE!BvmlaTanGNMyxa248y0sf-=DZ
zoD>UHrrYLU-pDWw@eS_2TId-6Ghv!}_nNPiQ|FHQylZcI`s~X_sduvG)2l(;gOe}H
zV=OdqrN5}u%*#+lDq$xLnvZgVpkTCRc3~{X3Ij6Y_U6DIFzUDbFmdLF&kDd?XXgpH
zq!oxhCfJx&+$}3GU!x0@0KXwYrM0|tg<#Xn$$GJ8IthNrG!sbuxX0P~r8>r#2|oUO
z_Igk^Ns!<3ct4PshPKwzHNH}4M@eI=A3?7Zt-T5w+CU7g=#XRG$!A>WGRwV$Cph^8
z6_C;Ln5nwu(}$bRyP26PapoK+HLa9=kT!y81b${jB$pG23;PeN<A66I5cKxvw=$OJ
z(0>zqug&}$K(VQ{LR3Todd*yX0q$mpFi&ENL2Kr~RyR43gM&!o-@!M=2g0uk1ooi-
z7-ROde62W-FKF0QoDLc*hPubu#%8JKA&Rb<5)hj$NbXq@BlelM946{=k6O!%Lm3BS
z196u8SS(Dzo?)86t41QOGEYICld0CZrJGsJ{`gno4D`OY^B%r}+w?S&gV4!+5Z=i!
j{}ore+s9VW|CQty-_{pA`Tkal00000NkvXXu0mjfN2P2S

diff --git a/modules/mogo-module-common/src/main/res/drawable-ldpi/icon_heart_second.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/icon_heart_second.png
deleted file mode 100644
index 71f17bcc7e00b3bcf8b650e8df5a08476417206f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 750
zcmV<K0ulX*P)<h;3K|Lk000e1NJLTq000&M000mO1^@s7W$M4M00001b5ch_0Itp)
z=>Px%s7XXYR5%f(RNqUKK@^>tZ)I1)>OJ~FQVQW~D(+^Mln`OQ6w!+>z4TDflRfEE
zP!tIDNAw4{g%6eKY7{|{iMdoDRu-X>+v@uLn$EeqvuUglbm8osxpU@xckZ28rC>qN
z$(z>NUc<>^sdNL*s=}!gLx|QhXug+9gYbQvh%I(y>~eP}2=+2?(Z$8jX4<%LZcA|e
zbk`~aShxgu=1W(4wGf02KOuv70_Zh+p5}HIqe%S<Ba(~28xF+snRe<nbE5h4qx;y9
zv1-uMS|tci7m|;j3}DH3&{{vBwkk&9K4Y~aSrF-lq*7~G+Hhp@M41EH9FCIEMmFpp
z%biDv%6X{Ha=oU#OSdx5roR_O+4lFR*1pc?kixEHqW-APW>-M&0QoTR8p?8F$$4qv
z)4GR@Jfl?{tSy6h1*8~Y8b>e>uwh18w-Lw6w*Wl=V_^e;WcmYuR9XeGRk5}xn}KIo
z2qd`;3k-^KVC?{)HsVOWfViu#Y(NTctK>uDQ@4Ux-Qxy7k~EwubIp=S6J-vXCZ?_i
zRt<9l%qfm=vaL<0+wS1>XKN9v9kl(&Q!AhCOMI%upzQ{w)F=wlP)3^tlkocLMn)GQ
z(gUObUOOVJ_$ByJ@Z~yIQ~ov|PXuw?B4@0W+ei9{0nuLH_g`TnUqBt;D(c$6`3|5H
z5R+ze6xe7tbJS=LdJbTWvXs4*dq^7KGOgt)CH6<y(`Qs@aZ_-gD}qjxWeFMFD$EkF
zeVfbif+SkC6pfE_`Nn6Hb)mKQePmrm<rY?MBlyx)_{}9?>;r215a3G}t2WOCoPVEg
zAI6QoR&HLoBnQVPFJRqeO8*h-HJ|3T!tMhz>9)K0z;%|TdHgy5?09s(^*P7+FF)PU
gdK-6^&-|b4H_L!ox&pQ#ga7~l07*qoM6N<$g5Mowpa1{>

diff --git a/modules/mogo-module-common/src/main/res/drawable-ldpi/icon_heart_unchoose.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/icon_heart_unchoose.png
deleted file mode 100644
index c7ee647c8163099a25cf94a5a58f1d9c360d460f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 514
zcmV+d0{#7oP)<h;3K|Lk000e1NJLTq000&M000mO1^@s7W$M4M00001b5ch_0Itp)
z=>Px$yh%hsR5%f(le;cNQ51$}8xm0|#0!YaAS4PQF**;x6eJWxp+)C?BpL~gM4?hB
z-Gva1o<=dmjN|*avyN@gB@!$7XWjmF*?XUHIV4GvX;f#69HbZI6)l2xMU)u<b8?)1
z$ZVqCQk0!@JBoWDxd=+;TX0<li3N~%{A}P?!B3l%v4$?EiBrYAP%#e%<=7TQ>`72b
zp;k%YSF~9x0Z9jV2Oq!+Ok3=`GXyV;Tg8Y;_jJ8ZDYc5C5-7wO+ga-@fi|#Br!wRT
z>^^Xbe~!)$xP@)IX$@VA#8$e{D)w|CQ3OpiqI3`NuPLpY50kRP*po=s`8Y_1B-vF~
zI1||)PzDFmqYMCb&DMgrkMAWT%cEcn)el5g$31jop<o!y)?;LyA?U7`K^ORp@QQx`
zBr`zYddzttcE~n5=dbgv;CBNRC>a-;-z@h`<0EQw_JNvhPoXcl*#I>cCmv$2mOY;u
z?*f0hskR}~G1SnwvXz&A0=#5*Yys|i3VR5IN3XY?<)t6Ff-CDGUDMc-3>e4Ozbb4H
zAN_%bH&zqshK-HHfKhCHwBdj|8r~Y`Uz!00paFl9FP=vUHoa@KC;$Ke07*qoM6N<$
Eg8Dqym;e9(

diff --git a/modules/mogo-module-common/src/main/res/drawable-mdpi/icon_heart_choose.png b/modules/mogo-module-common/src/main/res/drawable-mdpi/icon_heart_choose.png
deleted file mode 100644
index 7fc320c21f6fa2ab539fc0f64726decae0b50370..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 753
zcmV<N0uKF&P)<h;3K|Lk000e1NJLTq000&M000mO1^@s7W$M4M00001b5ch_0Itp)
z=>Px%t4TybR5%f(Q{PLJK@`2S6v0MH^b$cqkZ<W*`GZw+moV|Q|Dc!NvLvHkQjkJ1
ztiPk6N1uw&RkKIYBB`D#1dY;4clY~dZs*+b+oUB38g}N+%suzanKR!yLHp6)H}SPv
zD<0rttCoyxr>RJCsd#t0R654Z+*Xo~Zlt@LTsRKjFJ91U2vTA9Ue3%e+CFpgp|?w4
z7dq4y*|6K+x6S!_vHP743><P5Z0x4~NF}I5Dj&IlP;yq0sE8lQ7-X%xQ<n=J6Wp-V
zs4)pTnnDF6ix=HVz2;L5;&FU}{g$~!XEy`gDFPE!BvmlaTanGNMyxa248y0sf-=DZ
zoD>UHrrYLU-pDWw@eS_2TId-6Ghv!}_nNPiQ|FHQylZcI`s~X_sduvG)2l(;gOe}H
zV=OdqrN5}u%*#+lDq$xLnvZgVpkTCRc3~{X3Ij6Y_U6DIFzUDbFmdLF&kDd?XXgpH
zq!oxhCfJx&+$}3GU!x0@0KXwYrM0|tg<#Xn$$GJ8IthNrG!sbuxX0P~r8>r#2|oUO
z_Igk^Ns!<3ct4PshPKwzHNH}4M@eI=A3?7Zt-T5w+CU7g=#XRG$!A>WGRwV$Cph^8
z6_C;Ln5nwu(}$bRyP26PapoK+HLa9=kT!y81b${jB$pG23;PeN<A66I5cKxvw=$OJ
z(0>zqug&}$K(VQ{LR3Todd*yX0q$mpFi&ENL2Kr~RyR43gM&!o-@!M=2g0uk1ooi-
z7-ROde62W-FKF0QoDLc*hPubu#%8JKA&Rb<5)hj$NbXq@BlelM946{=k6O!%Lm3BS
z196u8SS(Dzo?)86t41QOGEYICld0CZrJGsJ{`gno4D`OY^B%r}+w?S&gV4!+5Z=i!
j{}ore+s9VW|CQty-_{pA`Tkal00000NkvXXu0mjfN2P2S

diff --git a/modules/mogo-module-common/src/main/res/drawable-mdpi/icon_heart_second.png b/modules/mogo-module-common/src/main/res/drawable-mdpi/icon_heart_second.png
deleted file mode 100644
index 71f17bcc7e00b3bcf8b650e8df5a08476417206f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 750
zcmV<K0ulX*P)<h;3K|Lk000e1NJLTq000&M000mO1^@s7W$M4M00001b5ch_0Itp)
z=>Px%s7XXYR5%f(RNqUKK@^>tZ)I1)>OJ~FQVQW~D(+^Mln`OQ6w!+>z4TDflRfEE
zP!tIDNAw4{g%6eKY7{|{iMdoDRu-X>+v@uLn$EeqvuUglbm8osxpU@xckZ28rC>qN
z$(z>NUc<>^sdNL*s=}!gLx|QhXug+9gYbQvh%I(y>~eP}2=+2?(Z$8jX4<%LZcA|e
zbk`~aShxgu=1W(4wGf02KOuv70_Zh+p5}HIqe%S<Ba(~28xF+snRe<nbE5h4qx;y9
zv1-uMS|tci7m|;j3}DH3&{{vBwkk&9K4Y~aSrF-lq*7~G+Hhp@M41EH9FCIEMmFpp
z%biDv%6X{Ha=oU#OSdx5roR_O+4lFR*1pc?kixEHqW-APW>-M&0QoTR8p?8F$$4qv
z)4GR@Jfl?{tSy6h1*8~Y8b>e>uwh18w-Lw6w*Wl=V_^e;WcmYuR9XeGRk5}xn}KIo
z2qd`;3k-^KVC?{)HsVOWfViu#Y(NTctK>uDQ@4Ux-Qxy7k~EwubIp=S6J-vXCZ?_i
zRt<9l%qfm=vaL<0+wS1>XKN9v9kl(&Q!AhCOMI%upzQ{w)F=wlP)3^tlkocLMn)GQ
z(gUObUOOVJ_$ByJ@Z~yIQ~ov|PXuw?B4@0W+ei9{0nuLH_g`TnUqBt;D(c$6`3|5H
z5R+ze6xe7tbJS=LdJbTWvXs4*dq^7KGOgt)CH6<y(`Qs@aZ_-gD}qjxWeFMFD$EkF
zeVfbif+SkC6pfE_`Nn6Hb)mKQePmrm<rY?MBlyx)_{}9?>;r215a3G}t2WOCoPVEg
zAI6QoR&HLoBnQVPFJRqeO8*h-HJ|3T!tMhz>9)K0z;%|TdHgy5?09s(^*P7+FF)PU
gdK-6^&-|b4H_L!ox&pQ#ga7~l07*qoM6N<$g5Mowpa1{>

diff --git a/modules/mogo-module-common/src/main/res/drawable-mdpi/icon_heart_unchoose.png b/modules/mogo-module-common/src/main/res/drawable-mdpi/icon_heart_unchoose.png
deleted file mode 100644
index c7ee647c8163099a25cf94a5a58f1d9c360d460f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 514
zcmV+d0{#7oP)<h;3K|Lk000e1NJLTq000&M000mO1^@s7W$M4M00001b5ch_0Itp)
z=>Px$yh%hsR5%f(le;cNQ51$}8xm0|#0!YaAS4PQF**;x6eJWxp+)C?BpL~gM4?hB
z-Gva1o<=dmjN|*avyN@gB@!$7XWjmF*?XUHIV4GvX;f#69HbZI6)l2xMU)u<b8?)1
z$ZVqCQk0!@JBoWDxd=+;TX0<li3N~%{A}P?!B3l%v4$?EiBrYAP%#e%<=7TQ>`72b
zp;k%YSF~9x0Z9jV2Oq!+Ok3=`GXyV;Tg8Y;_jJ8ZDYc5C5-7wO+ga-@fi|#Br!wRT
z>^^Xbe~!)$xP@)IX$@VA#8$e{D)w|CQ3OpiqI3`NuPLpY50kRP*po=s`8Y_1B-vF~
zI1||)PzDFmqYMCb&DMgrkMAWT%cEcn)el5g$31jop<o!y)?;LyA?U7`K^ORp@QQx`
zBr`zYddzttcE~n5=dbgv;CBNRC>a-;-z@h`<0EQw_JNvhPoXcl*#I>cCmv$2mOY;u
z?*f0hskR}~G1SnwvXz&A0=#5*Yys|i3VR5IN3XY?<)t6Ff-CDGUDMc-3>e4Ozbb4H
zAN_%bH&zqshK-HHfKhCHwBdj|8r~Y`Uz!00paFl9FP=vUHoa@KC;$Ke07*qoM6N<$
Eg8Dqym;e9(

diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_choose.png b/modules/mogo-module-common/src/main/res/drawable/icon_heart_choose.png
similarity index 100%
rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_choose.png
rename to modules/mogo-module-common/src/main/res/drawable/icon_heart_choose.png
diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_second.png b/modules/mogo-module-common/src/main/res/drawable/icon_heart_second.png
similarity index 100%
rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_second.png
rename to modules/mogo-module-common/src/main/res/drawable/icon_heart_second.png
diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_unchoose.png b/modules/mogo-module-common/src/main/res/drawable/icon_heart_unchoose.png
similarity index 100%
rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_unchoose.png
rename to modules/mogo-module-common/src/main/res/drawable/icon_heart_unchoose.png
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/SimpleCoverVideoPlayer.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/SimpleCoverVideoPlayer.kt
index d0282bea5e..be83a6236d 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/SimpleCoverVideoPlayer.kt
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/SimpleCoverVideoPlayer.kt
@@ -167,6 +167,7 @@ class SimpleCoverVideoPlayer : StandardGSYVideoPlayer {
         v?.let {
             when (v) {
                 start -> {
+                    onVideoResume()
                 }
                 else -> {
                 }
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_alert_window_bg.xml b/modules/mogo-module-v2x/src/main/res/drawable/v2x_alert_window_bg.xml
index c771e691e5..5f9bc8d7d2 100644
--- a/modules/mogo-module-v2x/src/main/res/drawable/v2x_alert_window_bg.xml
+++ b/modules/mogo-module-v2x/src/main/res/drawable/v2x_alert_window_bg.xml
@@ -7,7 +7,7 @@
                 android:bottom="2dp"
                 android:left="2dp"
                 android:right="2dp"
-                android:top="2dp" />
+                android:top="3dp" />
             <solid android:color="#00000000" />
             <corners android:radius="@dimen/dp_26" />
         </shape>
diff --git a/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml
index a2aa8d0bb0..9ab0be6694 100644
--- a/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml
@@ -105,7 +105,7 @@
 
     <!---->
     <dimen name="v2x_right_context_margin">460px</dimen>
-    <dimen name="v2x_video_window_height_content">464px</dimen>
-    <dimen name="v2x_video_window_height">474px</dimen>
+    <dimen name="v2x_video_window_height_content">370px</dimen>
+    <dimen name="v2x_video_window_height">380px</dimen>
 
 </resources>
diff --git a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
index 33f9e7b3ae..bcf51cad8a 100644
--- a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
@@ -106,7 +106,7 @@
 
     <!---->
     <dimen name="v2x_right_context_margin">460px</dimen>
-    <dimen name="v2x_video_window_height_content">464px</dimen>
-    <dimen name="v2x_video_window_height">474px</dimen>
+    <dimen name="v2x_video_window_height_content">370px</dimen>
+    <dimen name="v2x_video_window_height">380px</dimen>
 
 </resources>