From 056723857135646a2584bf929e65dfc103e5fa05 Mon Sep 17 00:00:00 2001 From: liujing Date: Fri, 18 Sep 2020 16:53:08 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E5=87=BA=E7=8E=B0=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=8D=95=E5=85=83=E6=A0=BCUI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/item_v2x_fault_help.xml | 2 +- .../src/main/res/layout/item_v2x_scennario_history.xml | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml index d060983917..94c233e74a 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml @@ -52,7 +52,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_10" android:textColor="@color/v2x_FFF_333" - android:textSize="@dimen/dp_28" + android:textSize="@dimen/dp_32" android:textStyle="bold" app:layout_constraintStart_toEndOf="@id/ivFaultHelpHead" app:layout_constraintTop_toTopOf="@+id/ivFaultHelpHead" diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml index 6ab4e26509..e47f51edc5 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml @@ -11,7 +11,7 @@ android:id="@+id/tagEventType" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="@dimen/module_v2x_surrounding_item_bottom_image_height" + android:layout_marginStart="@dimen/dp_36" android:layout_marginTop="@dimen/dp_24" android:background="@drawable/bg_v2x_event_type_read" android:gravity="center" @@ -47,7 +47,6 @@ android:id="@+id/ivIconP" android:layout_width="@dimen/module_v2x_history_event_icon_size" android:layout_height="@dimen/module_v2x_history_event_icon_size" - android:layout_marginStart="@dimen/dp_24" android:layout_marginEnd="@dimen/dp_16" android:src="@drawable/icon_illegal_parking" app:layout_constraintLeft_toLeftOf="@+id/tagEventType" @@ -58,13 +57,13 @@ android:id="@+id/tvAddress" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginStart="@dimen/dp_24" + android:layout_marginStart="@dimen/dp_12" android:layout_marginTop="@dimen/dp_24" android:layout_marginRight="@dimen/dp_30" android:ellipsize="end" android:maxLines="1" android:textColor="@color/v2x_FFF_333" - android:textSize="@dimen/dp_34" + android:textSize="@dimen/dp_32" android:textStyle="bold" app:layout_constraintEnd_toStartOf="@+id/llIllegalParkingLike" app:layout_constraintStart_toEndOf="@+id/ivIconP" From 403d0daa9ae9a7b62b6712b2fa487b582af96322 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Fri, 18 Sep 2020 17:55:32 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E4=BE=A7=E8=BE=B9=E6=A0=8Fitem=E9=97=B4=E8=B7=9D=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/mogo-module-apps/src/main/res/values/dimens.xml | 2 +- modules/mogo-module-media/src/main/res/values/dimens.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/mogo-module-apps/src/main/res/values/dimens.xml b/modules/mogo-module-apps/src/main/res/values/dimens.xml index 8864e74f0f..e73af0f665 100644 --- a/modules/mogo-module-apps/src/main/res/values/dimens.xml +++ b/modules/mogo-module-apps/src/main/res/values/dimens.xml @@ -23,7 +23,7 @@ 94px 94px - 17px + 9px 55px 55px \ No newline at end of file diff --git a/modules/mogo-module-media/src/main/res/values/dimens.xml b/modules/mogo-module-media/src/main/res/values/dimens.xml index 7a4f9479f7..a6fd4099f3 100644 --- a/modules/mogo-module-media/src/main/res/values/dimens.xml +++ b/modules/mogo-module-media/src/main/res/values/dimens.xml @@ -1,7 +1,7 @@ 468px - 573px + 581px 352px From d6a4ade3f21fab9cd74ef847b4bf9ed493d97258 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Fri, 18 Sep 2020 18:02:36 +0800 Subject: [PATCH 03/12] opt m4 --- modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml | 2 +- modules/mogo-module-tanlu/src/main/res/values/dimens.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml index 7716b8ccc7..da58b74233 100644 --- a/modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml @@ -80,7 +80,7 @@ 186px 176px 250px - 172px + 156px 45px 13px diff --git a/modules/mogo-module-tanlu/src/main/res/values/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values/dimens.xml index 7716b8ccc7..da58b74233 100644 --- a/modules/mogo-module-tanlu/src/main/res/values/dimens.xml +++ b/modules/mogo-module-tanlu/src/main/res/values/dimens.xml @@ -80,7 +80,7 @@ 186px 176px 250px - 172px + 156px 45px 13px From 60f3ff8f768b235171de29dd754369cbcf7caec8 Mon Sep 17 00:00:00 2001 From: liujing Date: Fri, 18 Sep 2020 18:32:14 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=9B=B4=E5=A4=9A?= =?UTF-8?q?=E8=89=B2=E5=80=BC+=E5=B0=8F=E9=B9=8FUI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml | 4 ++-- modules/mogo-module-tanlu/src/main/res/values/dimens.xml | 4 ++-- .../src/main/res/layout/footer_nomore_view.xml | 4 ++-- .../mogo-skin-light/src/main/module-v2x-res/values/colors.xml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml index da58b74233..cd3fd1f9a1 100644 --- a/modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml @@ -80,12 +80,12 @@ 186px 176px 250px - 156px + 162px 45px 13px 8px - 7px + 13px 17px 3px 18px diff --git a/modules/mogo-module-tanlu/src/main/res/values/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values/dimens.xml index da58b74233..cd3fd1f9a1 100644 --- a/modules/mogo-module-tanlu/src/main/res/values/dimens.xml +++ b/modules/mogo-module-tanlu/src/main/res/values/dimens.xml @@ -80,12 +80,12 @@ 186px 176px 250px - 156px + 162px 45px 13px 8px - 7px + 13px 17px 3px 18px diff --git a/modules/mogo-module-v2x/src/main/res/layout/footer_nomore_view.xml b/modules/mogo-module-v2x/src/main/res/layout/footer_nomore_view.xml index b516dedff0..b524ced9c9 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/footer_nomore_view.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/footer_nomore_view.xml @@ -12,7 +12,7 @@ android:id="@+id/viewLinStart" android:layout_width="wrap_content" android:layout_height="1px" - android:background="#979797" + android:background="@color/share_event_no_more_color" app:layout_constraintBottom_toBottomOf="@+id/tvNoMoreDataTrip" app:layout_constraintEnd_toStartOf="@+id/tvNoMoreDataTrip" app:layout_constraintStart_toStartOf="parent" @@ -35,7 +35,7 @@ android:id="@+id/viewLinEnd" android:layout_width="wrap_content" android:layout_height="1px" - android:background="#979797" + android:background="@color/share_event_no_more_color" app:layout_constraintBottom_toBottomOf="@+id/tvNoMoreDataTrip" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/tvNoMoreDataTrip" diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml b/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml index 4eb258787e..21bd14ebf9 100644 --- a/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml +++ b/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml @@ -8,7 +8,7 @@ #333333 #FFFFFF #FFFFFF - #CB333333 + #80333333 #999999 #B2333333 #666666 From 374e977550f2bf4657c4471758c1b09d39d17892 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Fri, 18 Sep 2020 18:36:54 +0800 Subject: [PATCH 05/12] opt head image --- .../drawable-ldpi/tanlu_head_image_light.png | Bin 0 -> 1177 bytes .../drawable-mdpi/tanlu_head_image_light.png | Bin 0 -> 1177 bytes .../tanlu_head_image_light.png | Bin 0 -> 2466 bytes .../drawable-xhdpi/tanlu_head_image_light.png | Bin 0 -> 2466 bytes 4 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 skin/mogo-skin-light/src/main/module-tanlu-res/drawable-ldpi/tanlu_head_image_light.png create mode 100644 skin/mogo-skin-light/src/main/module-tanlu-res/drawable-mdpi/tanlu_head_image_light.png create mode 100644 skin/mogo-skin-light/src/main/module-tanlu-res/drawable-xhdpi-1920x1000/tanlu_head_image_light.png create mode 100644 skin/mogo-skin-light/src/main/module-tanlu-res/drawable-xhdpi/tanlu_head_image_light.png diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-ldpi/tanlu_head_image_light.png b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-ldpi/tanlu_head_image_light.png new file mode 100644 index 0000000000000000000000000000000000000000..d6aeb4ec4fd05ef68ae32d6716a0b4669f0a8e04 GIT binary patch literal 1177 zcmV;K1ZMk*P)Px(Q%OWYR7ef2R$EJBR}@~+#4*83)GFRU3^+3mg>eeOR;-yK^`X#Gs6v^)(bv*J znAiS|BG^Ko20<*17gQ{*4=Uq>riz!S69uiPiJE@j&RLstPBitQ3(i@4ulrhit$mJ& z1ABXWzi}DlYj<}yzq-0=aDbeAKL1%+S()74-jXjeGc%K)ot@1Wc6dW&otq$a*Vfhw zy4-|9A<5-(65QI_dI4r%gcac>@kVQ$H#_OUte#q(Og+s$!~9O z8v6x6osqi=4K*c zEgX1anGFpM5)1}SvdRr+vsq!J=jZ1V2n2-5x3siKV`Jlp35b=XG?@-$`uqDousaeF z+&s|7jzAGAFE5WFwiFqfrbmGX2P5VH>7E61gO*?v#2=KwShdO;9*?1_s!Bx+W{aFb z*h6LFZt!~~57i0|pf~<>3#QX)nV6W8>gpW4^@ilpFu!_j5 z^XBHpgzFY?truY66Wtrd{r&v}XGV$lVdR}_ZEZD&YFg8;l*wcyl}a&ej}3$#a=J@6 z1Mk4K#n{=|k<-&ttHA1ZcYBY6ox>5ZN|Z*PMO|X8I14x%wX>tl+S*!s$>^CX&xOA& zQmm<|5gdn=aZRYDA^esiMG96{RtiSQbdlSL)fD-oNRi>aeLErh=|hP|Yvrpizc5Bz zN^J1&0;uBf#l^)qD|vKuWb?~rbMoj>VGe058jT9`4~N4Ni^U4}!PL~$dsu8xt6G%1 z8XewZi9{l0TW)S{?mZg8D$|Hxkr!@XUtiMj)C(~tV;E>$Jt_|d)-f4Rbx&+Px{10* z4-X@XH`sfcMEQ5%bwu?&?kPKdewiYN&Y=7PK~K7V#Ru#&aQ+RPo06!!b?A)o(*NK{ zZ7a^82jiY=+$r6-O8D{B)s<{)Y>5A|Hu#v|7EN~iZ?em zZT~9GkDHpBgyUEW@MZld=v<$rsU zF%z2qv!PrJy_}q!$icyZTwY$94FBHRG3OW#S4uVhBO;N))yt--tE($j+I4(tp4wVW zPEO7v<)U9AmQkBS194;JX<7a94t-&0XvlnutwS1_o}NwsO(L_bUVeeBzeWI`;>KtL rZiPXz*x|ca&jA10)6?@8iKXCQ?GFQhXUA4l00000NkvXXu0mjfoY*#g literal 0 HcmV?d00001 diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-mdpi/tanlu_head_image_light.png b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-mdpi/tanlu_head_image_light.png new file mode 100644 index 0000000000000000000000000000000000000000..d6aeb4ec4fd05ef68ae32d6716a0b4669f0a8e04 GIT binary patch literal 1177 zcmV;K1ZMk*P)Px(Q%OWYR7ef2R$EJBR}@~+#4*83)GFRU3^+3mg>eeOR;-yK^`X#Gs6v^)(bv*J znAiS|BG^Ko20<*17gQ{*4=Uq>riz!S69uiPiJE@j&RLstPBitQ3(i@4ulrhit$mJ& z1ABXWzi}DlYj<}yzq-0=aDbeAKL1%+S()74-jXjeGc%K)ot@1Wc6dW&otq$a*Vfhw zy4-|9A<5-(65QI_dI4r%gcac>@kVQ$H#_OUte#q(Og+s$!~9O z8v6x6osqi=4K*c zEgX1anGFpM5)1}SvdRr+vsq!J=jZ1V2n2-5x3siKV`Jlp35b=XG?@-$`uqDousaeF z+&s|7jzAGAFE5WFwiFqfrbmGX2P5VH>7E61gO*?v#2=KwShdO;9*?1_s!Bx+W{aFb z*h6LFZt!~~57i0|pf~<>3#QX)nV6W8>gpW4^@ilpFu!_j5 z^XBHpgzFY?truY66Wtrd{r&v}XGV$lVdR}_ZEZD&YFg8;l*wcyl}a&ej}3$#a=J@6 z1Mk4K#n{=|k<-&ttHA1ZcYBY6ox>5ZN|Z*PMO|X8I14x%wX>tl+S*!s$>^CX&xOA& zQmm<|5gdn=aZRYDA^esiMG96{RtiSQbdlSL)fD-oNRi>aeLErh=|hP|Yvrpizc5Bz zN^J1&0;uBf#l^)qD|vKuWb?~rbMoj>VGe058jT9`4~N4Ni^U4}!PL~$dsu8xt6G%1 z8XewZi9{l0TW)S{?mZg8D$|Hxkr!@XUtiMj)C(~tV;E>$Jt_|d)-f4Rbx&+Px{10* z4-X@XH`sfcMEQ5%bwu?&?kPKdewiYN&Y=7PK~K7V#Ru#&aQ+RPo06!!b?A)o(*NK{ zZ7a^82jiY=+$r6-O8D{B)s<{)Y>5A|Hu#v|7EN~iZ?em zZT~9GkDHpBgyUEW@MZld=v<$rsU zF%z2qv!PrJy_}q!$icyZTwY$94FBHRG3OW#S4uVhBO;N))yt--tE($j+I4(tp4wVW zPEO7v<)U9AmQkBS194;JX<7a94t-&0XvlnutwS1_o}NwsO(L_bUVeeBzeWI`;>KtL rZiPXz*x|ca&jA10)6?@8iKXCQ?GFQhXUA4l00000NkvXXu0mjfoY*#g literal 0 HcmV?d00001 diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-xhdpi-1920x1000/tanlu_head_image_light.png b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-xhdpi-1920x1000/tanlu_head_image_light.png new file mode 100644 index 0000000000000000000000000000000000000000..8968f0595cb8b1b4526dbe98f2f1fe516c7879b1 GIT binary patch literal 2466 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 Date: Fri, 18 Sep 2020 19:19:30 +0800 Subject: [PATCH 06/12] opt image --- .../res/drawable-mdpi/tanlu_icon_logo.png | Bin 3670 -> 5165 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/tanlu_icon_logo.png b/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/tanlu_icon_logo.png index 957c298fd60c5480e2e1f40811fb826187752056..5480b6d16545fece7e071ce256c5c19a76a588a2 100644 GIT binary patch literal 5165 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 From 941668a1867718e22bac89291267c5466eafa11f Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Mon, 21 Sep 2020 10:57:45 +0800 Subject: [PATCH 07/12] opt --- .../main/res/drawable/tanlu_alert_window_bg.xml | 16 ++++++++-------- .../src/main/res/values-mdpi/dimens.xml | 5 +++-- .../main/res/values-xhdpi-1920x1000/dimens.xml | 1 + .../src/main/res/values-xhdpi/dimens.xml | 1 + .../src/main/res/values/dimens.xml | 5 +++-- .../drawable/tanlu_alert_window_bg_light.xml | 16 ++++++++-------- .../main/module-tanlu-res/values-mdpi/dimens.xml | 8 ++++++++ .../values-xhdpi-1920x1000/dimens.xml | 1 + .../module-tanlu-res/values-xhdpi/dimens.xml | 1 + .../src/main/module-tanlu-res/values/dimens.xml | 1 + 10 files changed, 35 insertions(+), 20 deletions(-) create mode 100644 skin/mogo-skin-light/src/main/module-tanlu-res/values-mdpi/dimens.xml diff --git a/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_alert_window_bg.xml b/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_alert_window_bg.xml index 7ae04a2bed..1520ad601e 100644 --- a/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_alert_window_bg.xml +++ b/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_alert_window_bg.xml @@ -4,10 +4,10 @@ + android:bottom="@dimen/tanlu_module_shade_size" + android:left="@dimen/tanlu_module_shade_size" + android:right="@dimen/tanlu_module_shade_size" + android:top="@dimen/tanlu_module_shade_size" /> @@ -15,10 +15,10 @@ + android:bottom="@dimen/tanlu_module_shade_size" + android:left="@dimen/tanlu_module_shade_size" + android:right="@dimen/tanlu_module_shade_size" + android:top="@dimen/tanlu_module_shade_size" /> diff --git a/modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml index cd3fd1f9a1..2a32aa9897 100644 --- a/modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml @@ -80,16 +80,17 @@ 186px 176px 250px - 162px + 158px 45px 13px - 8px + 6px 13px 17px 3px 18px 26px + 4px 28px 56px diff --git a/modules/mogo-module-tanlu/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values-xhdpi-1920x1000/dimens.xml index 4062891c80..969d398b55 100644 --- a/modules/mogo-module-tanlu/src/main/res/values-xhdpi-1920x1000/dimens.xml +++ b/modules/mogo-module-tanlu/src/main/res/values-xhdpi-1920x1000/dimens.xml @@ -90,6 +90,7 @@ 9px 27px 46px + 4px 50px 90px diff --git a/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml index 88af7354b4..1676116d31 100644 --- a/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml @@ -90,6 +90,7 @@ 9px 27px 46px + 4px 50px 98px diff --git a/modules/mogo-module-tanlu/src/main/res/values/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values/dimens.xml index cd3fd1f9a1..2a32aa9897 100644 --- a/modules/mogo-module-tanlu/src/main/res/values/dimens.xml +++ b/modules/mogo-module-tanlu/src/main/res/values/dimens.xml @@ -80,16 +80,17 @@ 186px 176px 250px - 162px + 158px 45px 13px - 8px + 6px 13px 17px 3px 18px 26px + 4px 28px 56px diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/drawable/tanlu_alert_window_bg_light.xml b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable/tanlu_alert_window_bg_light.xml index afd05b86dd..94999dc002 100644 --- a/skin/mogo-skin-light/src/main/module-tanlu-res/drawable/tanlu_alert_window_bg_light.xml +++ b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable/tanlu_alert_window_bg_light.xml @@ -4,10 +4,10 @@ + android:bottom="@dimen/tanlu_module_shade_size_l" + android:left="@dimen/tanlu_module_shade_size_l" + android:right="@dimen/tanlu_module_shade_size_l" + android:top="@dimen/tanlu_module_shade_size_l" /> @@ -15,10 +15,10 @@ + android:bottom="@dimen/tanlu_module_shade_size_l" + android:left="@dimen/tanlu_module_shade_size_l" + android:right="@dimen/tanlu_module_shade_size_l" + android:top="@dimen/tanlu_module_shade_size_l" /> diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/values-mdpi/dimens.xml b/skin/mogo-skin-light/src/main/module-tanlu-res/values-mdpi/dimens.xml new file mode 100644 index 0000000000..3a2df8bb23 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-tanlu-res/values-mdpi/dimens.xml @@ -0,0 +1,8 @@ + + + 16px + 10px + 8px + 4px + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/values-xhdpi-1920x1000/dimens.xml b/skin/mogo-skin-light/src/main/module-tanlu-res/values-xhdpi-1920x1000/dimens.xml index 9514cc43b3..b51d728283 100644 --- a/skin/mogo-skin-light/src/main/module-tanlu-res/values-xhdpi-1920x1000/dimens.xml +++ b/skin/mogo-skin-light/src/main/module-tanlu-res/values-xhdpi-1920x1000/dimens.xml @@ -3,6 +3,7 @@ 30px 20px 16px + 4px diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/values-xhdpi/dimens.xml b/skin/mogo-skin-light/src/main/module-tanlu-res/values-xhdpi/dimens.xml index b22064a243..9def827f0f 100644 --- a/skin/mogo-skin-light/src/main/module-tanlu-res/values-xhdpi/dimens.xml +++ b/skin/mogo-skin-light/src/main/module-tanlu-res/values-xhdpi/dimens.xml @@ -4,6 +4,7 @@ 30px 20px 16px + 4px diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/values/dimens.xml b/skin/mogo-skin-light/src/main/module-tanlu-res/values/dimens.xml index 6a87855ba7..3a2df8bb23 100644 --- a/skin/mogo-skin-light/src/main/module-tanlu-res/values/dimens.xml +++ b/skin/mogo-skin-light/src/main/module-tanlu-res/values/dimens.xml @@ -3,5 +3,6 @@ 16px 10px 8px + 4px \ No newline at end of file From aee1b67220135661e766cb8ba9ac7279b46714f5 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Mon, 21 Sep 2020 11:05:07 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E7=BC=A9=E7=95=A5=E9=9D=A2=E6=9D=BF=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E3=80=81=E5=8F=96=E6=B6=88=E6=B1=82=E5=8A=A9=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E8=83=8C=E6=99=AF=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/layout/include_navi_info_panle.xml | 3 +++ .../res/drawable/bg_v2x_event_live_show.xml | 23 +++++++++++-------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/modules/mogo-module-extensions/src/main/res/layout/include_navi_info_panle.xml b/modules/mogo-module-extensions/src/main/res/layout/include_navi_info_panle.xml index 97dc87283c..289e64c9d9 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/include_navi_info_panle.xml +++ b/modules/mogo-module-extensions/src/main/res/layout/include_navi_info_panle.xml @@ -10,6 +10,9 @@ android:background="@drawable/module_ext_dw_navi_info_panel_bkg" android:focusable="true" android:clickable="true" + android:layout_marginLeft="@dimen/module_common_shadow_width_pos" + android:layout_marginRight="@dimen/module_common_shadow_width_pos" + android:layout_marginTop="@dimen/module_common_shadow_width_pos" app:layout_constraintHorizontal_bias="0.501" app:layout_constraintLeft_toLeftOf="@id/module_entrance_id_top_container" app:layout_constraintRight_toRightOf="@id/module_entrance_id_top_container" diff --git a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_live_show.xml b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_live_show.xml index b0b87a8207..00d8af5a9a 100644 --- a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_live_show.xml +++ b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_live_show.xml @@ -1,10 +1,15 @@ - - - - - - \ No newline at end of file + + + + + + + + + + + + + + \ No newline at end of file From d734382497abd9e5f05a16dbed97389e1da7b769 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Mon, 21 Sep 2020 11:25:11 +0800 Subject: [PATCH 09/12] opt ui --- .../com/mogo/module/extensions/utils/TopViewAnimHelper.java | 5 +++-- .../src/main/res/values-mdpi/dimens.xml | 1 + .../src/main/res/values-xhdpi/dimens.xml | 2 ++ .../mogo-module-extensions/src/main/res/values/dimens.xml | 2 ++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java index 465e2dbf3c..e71a78f3cd 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java @@ -479,7 +479,8 @@ public class TopViewAnimHelper { tvNextDistance.getId(), ConstraintSet.LEFT, 0); constraintSet.connect(naviBg.getId(), ConstraintSet.TOP, - R.id.module_entrance_id_top_motion_layout, ConstraintSet.TOP, 0); + R.id.module_entrance_id_top_motion_layout, ConstraintSet.TOP, + (int) getDimen(R.dimen.module_common_shadow_width_pos)); constraintSet.connect(ivTurnIcon.getId(), ConstraintSet.TOP, naviBg.getId(), ConstraintSet.TOP, 0); constraintSet.connect(ivTurnIcon.getId(), ConstraintSet.BOTTOM, @@ -541,7 +542,7 @@ public class TopViewAnimHelper { // .module_ext_navi_info_panel_height); constraintSet.connect(naviBg.getId(), ConstraintSet.TOP, R.id.module_entrance_id_top_motion_layout, ConstraintSet.TOP, - 0); + (int) getDimen(R.dimen.module_common_shadow_width_pos)); constraintSet.connect(ivTurnIcon.getId(), ConstraintSet.TOP, naviBg.getId(), ConstraintSet.TOP, 0); constraintSet.connect(ivTurnIcon.getId(), ConstraintSet.BOTTOM, diff --git a/modules/mogo-module-extensions/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-mdpi/dimens.xml index bfb7a65b60..1b660ec7fc 100644 --- a/modules/mogo-module-extensions/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values-mdpi/dimens.xml @@ -5,4 +5,5 @@ 10px 2px 2px + 8px \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml index c06db31dd1..ba03ec1b90 100644 --- a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml @@ -152,4 +152,6 @@ 30px 20px 20px + + 10px \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values/dimens.xml b/modules/mogo-module-extensions/src/main/res/values/dimens.xml index 37328f34fd..696e7cb80e 100644 --- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml @@ -157,4 +157,6 @@ 10px 2px 2px + + 8px \ No newline at end of file From 5da7d3b0ee98b3a4e5ced7f5741d18907bfbe6f3 Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Mon, 21 Sep 2020 11:47:38 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E4=BC=98=E5=8C=96m4=E9=9F=B3=E4=B9=90?= =?UTF-8?q?=E6=A1=86=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module_media_window_alert_bg.9.png | Bin 2497 -> 2301 bytes .../module_media_window_alert_bg.9.png | Bin 2497 -> 2301 bytes .../src/main/res/values/dimens.xml | 6 +++--- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_window_alert_bg.9.png b/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_window_alert_bg.9.png index 24567d76fca7b0144b548487c5b9832bf9e5d6e2..8e6032a5f1daa97b1f867d94a1dfa22435f63d27 100644 GIT binary patch literal 2301 zcmV)C1vJhnkXl0AN*iCGaGVItrBBSuECcgOp{IfDb{o8L(bK(?Ke)5x_{NyJ;`N>ay@{^yW)9s%AUMh_% z#nR}!Sc)!7rRbX6ccfzS-{R6vBx=lRrz~s2@5&@DSN7Sz>0Q~Sbs$RoT|J0*t8Z9U zYk$VOHGa#g)!(YS)_51!MbW<-&G&cp#`|k>UpAXZ=dISXLjRu~KWH9*YPExxg;IDy zpxqXVA%j;aj@T_>76C{Il;0E}F9}ta2C6}-s%fwiq=G4`4xkc{tm@)!G!JRrdfwqh zw|o5ZmjkU8%vqh1c*wd z6ruvFK*miE*3sH)PtTUi<%?eel&X@zx_Vt0#vEp-U={$#VuH;}$m$ZLfVvByRyQcK zih(k9){~*u1<;079AtySY#mXcti0Cj>Je)FF`&ibbJQ#UDQfC{^a`Ldal}o2e07 zJ+f@BLFxc1SD-r0p1IFJQh3VZ4CEVRaTBHls%*}zZh|~SKqsY;mQ|GD!3?9+7m<)T%7+-k<0YsO*_Yl^YUWl?Q^T zrGa9YQ*QY-RVV`*xBcU@Cjlx#Xsuuhh!QAP=GaPet;!936DU(d1U)mMZzh4P!_mk) zRO*zfgjVMuMc>5AWH+%r0Xknl!1~(*Efm6w*C2q9G6hTybc{m?q&Xbe)qRgLnJTOH z;9hIIRU=W7GV4f{@6mYV!2oJ)P$q*ZfRgfq`Gr%U^fkeU_JlbTjz(oTv`-XF+%s|b zYy;D@cw)~qY~F-0>76d?JiG*cy&$zb|(Qpa)7TU49@rEhcHH}P1c z`exa*_!tlD=2Nn&`=(5D)8Z1|#(^EZez3*Wz@9V~sh&AA)Tu$zo5SSg`-}5!fyUog zXmpu0v`b~~7*kG~dTIuVJghITM0K&q-wSLu_?pa5vK&SzUn?P?KN=i#X^k zE?ok>M#~Q4ISFlEw%+Ep%{Prjrp2MXO_24Zu?T`h%G5T;AYnm};tn)W(nqhI0VN>O z3eJ8~PEeX#RyRP}m_1j!P)B!X@rTZlZ*@itc&^A|gCorD?Xj=A}$}Lb*Ru3?=us|B0U-{l-11uGS%7beRK;n z&HGIC0urwv2$CyvsRnonGXO9mkV|CeiprhA{M(%ev{pOEIv;y{_s6`F;8X423umDzz-2R82jbvjjO zHujlw`}NaZZUhOH*>epv3;RrHbsq(hR;WyKWOV_v=T@QF*k@v88hsP=Om1_oOjwSA zrhlI)L83Q$Hz9z8D!UNq;FCL`S=nb=?{gJAA2i6GR;C2nComlY&Bi{{vN?rms1t(h z36K)?i8AleWs~OW_4k6Y55+oc^{~=@7nTN*k_t) zPLtdO32ok!Fi8zuT0SfLOsP-=)PyOm&Q$qXDby*@tn4%KoGFw1qa8p3U?=a8t=xk9tB&rBMRSorimp;RA8 zn-4iiTEpBaLIaBB8D=T+EGqTUz2y&o7 zYK!X%DNvV|&&oa%E;{;PL^9JnNuA;7n>(Oc*=K5Xel~ihR_73ekOWD~spYe>&xG&t zzVWQIRH=Z9iX1AGsP8Td`%JTUN`P`aVh}~o429K)0_JFZ@}E0}dhD|jso!Txt0SNr z5?!iNRy1C@`_V$9@$NDU`%IMR5TXeZ1d#$7t+xJI&36y|;7JztnFCXmL(ne;R2e|b z<^m?MI{|uf?hGjXdQ2AfnSE>4gdlalgvz8aX^qGKxcg}${o!cCJGxE#KC_=R8ij_% zbqEoK@*@57_Vm=@k7w!eyy->S_n8ADeB=u#G?YmpVs)9}X2fAeNs7`>s(6_nBt!puQ;}a+|Mc-8{hRkNXf-5X@e+ z8Ps&`GtqNW^-SC99OmlhdlDZ9a;i&4D`iS64rv%*O+jJ(Ygfs2$AL zY1n5b4(>{oCuay@{^xToH(!TUP1o@ Xcha;YK!ns~00000NkvXXu0mjf88=oO literal 2497 zcmV;y2|o6TP)dR#?RW2f?OMEnDps+IRjgtat60S;t@4 zhuL|!sMKVQRHc89vN}{1)#?7HDtWFpjvlJ@@olX!{!wd=ud0o4U;dAtAEqx~Q8aun z0KOJL-*1=p7h9q<;HoqM3h=Bn5eoQ^2zUd&uBdOo*T7pM24+{lS5p!y>O8cd8}JXa z8j-&(_z^s-I#MMFSqL)jtIgxbklocgu(q<}-j9Rp8EAi$?LK<$nAoJNa4L8Chlu69sKD35lz9+BTs(x_gH(oUD)c9H7 zj+uGmCTzS|^%8WmXXi#T?fWA@W;Ni_3-N2(v@*b?zHiWYVZ7Ay@who*8!uneMMK^IvHP^3jmh)z>-Ojg zs^@J-H(#iH4ZJ4dsRS&ZU_qOh=jSM%f(~A}tp86_&xh)7$^FzL0UMm>SILY|J-;5? zku%S7Oyf1`KUIHwBVg0>e3Nm4KX|~XEwCWpX_k9C4KF_B_Sk>Ff2aK6u*S3R+ z@JK)~c|LsM0_Eq<`e5SGpsPww*VO|yKhI|;9)|=7yj6W2lHm0Qgp}uJ%4dOxR+E9R zfY&!5(csU-dFG#haPoX!^-%o~c!Js`9^Ur#zycj9Sb_0v+|D*`;;fDrS1 z_o0OwE>eA__yz#KnXG|;pz{2f88NBy6IcEE1~ij1{}vQfp3l5)A^2$G0l=r~Kl9v# zL(KEF^+4Nk=6wKsc2?Cs^LqnA%<~(0wgWxCWyemfdbz7=`y?RHJfDu2)OH%g^9=#s zZ$O}Ve!VqiXZ&X7^?KUTy9Pcb;j?E83NX({<0i2ksC-lcc)7=32?#XLN24aP8`yX= z>uFOG)<8gLd4An_=`ORJRP_>ky?Z4f#5~`=Y)>)ppy4)v?P&FTCm_^3KW((O@mk>V zxJiMJ+vn@*0b%9&@O4W^P7C~*X}XvM-!~w@Jl}XeH|;>xn{%pswRg^a-heRkd`I=P z;cEW}%2(&kxgx>y4G1sKN1oqa=J}vH=W8G!&^*8CDF3swYtXF)o%^?-Q1g7}fdxSa zfH#5fw>p2B-KzzKnCCmMTk7>->}&z+i8B(s-hdGEd{{BH9iVy&yi~v68xUxopQrv5 zaP0ZYdJGAIfbNAq0z%F6^|%>x6HmwWe5n4|=M4xo&u=oXTVy$HY(EfuuQwpnJU`B2 zW&Fx@Z-4R z<9>*FKJmwon=&AK6^)GgNbAO+$lpi6jHID8>%k!NXe|K5qo!j&N{C+n3*WZU* zvqpR!TAt67z*~+aK&oHvoxQo=PZ!H2KS(VIcnm4er!U(UP`qroZDc#?4G`czc8A~m zf4o~wL-FzVkn;S5^ZPFLeQiDZ26Xl>*Yo*$x#W)%)SBa)Q1W~3Kf)!ll5c%Aeo0d*6P|kNBXQ z5TD#^a-N@OImq*c?L0&IFDF3v1o@jO0@TM%%=2-$W*=E<+!WJ}Y`CxXLvHjo2(Yi^ zFGp-ro}Z4IbL{(j^ZU-;-`6ity?+AWi&_41M7?!#CBL6vPo}p5*oU{8=XZ9$J|uhd zTN$hgwO`42;fXKY*CC)-#VS^@idC#)6{}dqD%M7=MN!YHpRWG_Ve1~A6ne)Q00000 LNkvXXu0mjfufqh9 diff --git a/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_window_alert_bg.9.png b/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_window_alert_bg.9.png index 24567d76fca7b0144b548487c5b9832bf9e5d6e2..8e6032a5f1daa97b1f867d94a1dfa22435f63d27 100644 GIT binary patch literal 2301 zcmV)C1vJhnkXl0AN*iCGaGVItrBBSuECcgOp{IfDb{o8L(bK(?Ke)5x_{NyJ;`N>ay@{^yW)9s%AUMh_% z#nR}!Sc)!7rRbX6ccfzS-{R6vBx=lRrz~s2@5&@DSN7Sz>0Q~Sbs$RoT|J0*t8Z9U zYk$VOHGa#g)!(YS)_51!MbW<-&G&cp#`|k>UpAXZ=dISXLjRu~KWH9*YPExxg;IDy zpxqXVA%j;aj@T_>76C{Il;0E}F9}ta2C6}-s%fwiq=G4`4xkc{tm@)!G!JRrdfwqh zw|o5ZmjkU8%vqh1c*wd z6ruvFK*miE*3sH)PtTUi<%?eel&X@zx_Vt0#vEp-U={$#VuH;}$m$ZLfVvByRyQcK zih(k9){~*u1<;079AtySY#mXcti0Cj>Je)FF`&ibbJQ#UDQfC{^a`Ldal}o2e07 zJ+f@BLFxc1SD-r0p1IFJQh3VZ4CEVRaTBHls%*}zZh|~SKqsY;mQ|GD!3?9+7m<)T%7+-k<0YsO*_Yl^YUWl?Q^T zrGa9YQ*QY-RVV`*xBcU@Cjlx#Xsuuhh!QAP=GaPet;!936DU(d1U)mMZzh4P!_mk) zRO*zfgjVMuMc>5AWH+%r0Xknl!1~(*Efm6w*C2q9G6hTybc{m?q&Xbe)qRgLnJTOH z;9hIIRU=W7GV4f{@6mYV!2oJ)P$q*ZfRgfq`Gr%U^fkeU_JlbTjz(oTv`-XF+%s|b zYy;D@cw)~qY~F-0>76d?JiG*cy&$zb|(Qpa)7TU49@rEhcHH}P1c z`exa*_!tlD=2Nn&`=(5D)8Z1|#(^EZez3*Wz@9V~sh&AA)Tu$zo5SSg`-}5!fyUog zXmpu0v`b~~7*kG~dTIuVJghITM0K&q-wSLu_?pa5vK&SzUn?P?KN=i#X^k zE?ok>M#~Q4ISFlEw%+Ep%{Prjrp2MXO_24Zu?T`h%G5T;AYnm};tn)W(nqhI0VN>O z3eJ8~PEeX#RyRP}m_1j!P)B!X@rTZlZ*@itc&^A|gCorD?Xj=A}$}Lb*Ru3?=us|B0U-{l-11uGS%7beRK;n z&HGIC0urwv2$CyvsRnonGXO9mkV|CeiprhA{M(%ev{pOEIv;y{_s6`F;8X423umDzz-2R82jbvjjO zHujlw`}NaZZUhOH*>epv3;RrHbsq(hR;WyKWOV_v=T@QF*k@v88hsP=Om1_oOjwSA zrhlI)L83Q$Hz9z8D!UNq;FCL`S=nb=?{gJAA2i6GR;C2nComlY&Bi{{vN?rms1t(h z36K)?i8AleWs~OW_4k6Y55+oc^{~=@7nTN*k_t) zPLtdO32ok!Fi8zuT0SfLOsP-=)PyOm&Q$qXDby*@tn4%KoGFw1qa8p3U?=a8t=xk9tB&rBMRSorimp;RA8 zn-4iiTEpBaLIaBB8D=T+EGqTUz2y&o7 zYK!X%DNvV|&&oa%E;{;PL^9JnNuA;7n>(Oc*=K5Xel~ihR_73ekOWD~spYe>&xG&t zzVWQIRH=Z9iX1AGsP8Td`%JTUN`P`aVh}~o429K)0_JFZ@}E0}dhD|jso!Txt0SNr z5?!iNRy1C@`_V$9@$NDU`%IMR5TXeZ1d#$7t+xJI&36y|;7JztnFCXmL(ne;R2e|b z<^m?MI{|uf?hGjXdQ2AfnSE>4gdlalgvz8aX^qGKxcg}${o!cCJGxE#KC_=R8ij_% zbqEoK@*@57_Vm=@k7w!eyy->S_n8ADeB=u#G?YmpVs)9}X2fAeNs7`>s(6_nBt!puQ;}a+|Mc-8{hRkNXf-5X@e+ z8Ps&`GtqNW^-SC99OmlhdlDZ9a;i&4D`iS64rv%*O+jJ(Ygfs2$AL zY1n5b4(>{oCuay@{^xToH(!TUP1o@ Xcha;YK!ns~00000NkvXXu0mjf88=oO literal 2497 zcmV;y2|o6TP)dR#?RW2f?OMEnDps+IRjgtat60S;t@4 zhuL|!sMKVQRHc89vN}{1)#?7HDtWFpjvlJ@@olX!{!wd=ud0o4U;dAtAEqx~Q8aun z0KOJL-*1=p7h9q<;HoqM3h=Bn5eoQ^2zUd&uBdOo*T7pM24+{lS5p!y>O8cd8}JXa z8j-&(_z^s-I#MMFSqL)jtIgxbklocgu(q<}-j9Rp8EAi$?LK<$nAoJNa4L8Chlu69sKD35lz9+BTs(x_gH(oUD)c9H7 zj+uGmCTzS|^%8WmXXi#T?fWA@W;Ni_3-N2(v@*b?zHiWYVZ7Ay@who*8!uneMMK^IvHP^3jmh)z>-Ojg zs^@J-H(#iH4ZJ4dsRS&ZU_qOh=jSM%f(~A}tp86_&xh)7$^FzL0UMm>SILY|J-;5? zku%S7Oyf1`KUIHwBVg0>e3Nm4KX|~XEwCWpX_k9C4KF_B_Sk>Ff2aK6u*S3R+ z@JK)~c|LsM0_Eq<`e5SGpsPww*VO|yKhI|;9)|=7yj6W2lHm0Qgp}uJ%4dOxR+E9R zfY&!5(csU-dFG#haPoX!^-%o~c!Js`9^Ur#zycj9Sb_0v+|D*`;;fDrS1 z_o0OwE>eA__yz#KnXG|;pz{2f88NBy6IcEE1~ij1{}vQfp3l5)A^2$G0l=r~Kl9v# zL(KEF^+4Nk=6wKsc2?Cs^LqnA%<~(0wgWxCWyemfdbz7=`y?RHJfDu2)OH%g^9=#s zZ$O}Ve!VqiXZ&X7^?KUTy9Pcb;j?E83NX({<0i2ksC-lcc)7=32?#XLN24aP8`yX= z>uFOG)<8gLd4An_=`ORJRP_>ky?Z4f#5~`=Y)>)ppy4)v?P&FTCm_^3KW((O@mk>V zxJiMJ+vn@*0b%9&@O4W^P7C~*X}XvM-!~w@Jl}XeH|;>xn{%pswRg^a-heRkd`I=P z;cEW}%2(&kxgx>y4G1sKN1oqa=J}vH=W8G!&^*8CDF3swYtXF)o%^?-Q1g7}fdxSa zfH#5fw>p2B-KzzKnCCmMTk7>->}&z+i8B(s-hdGEd{{BH9iVy&yi~v68xUxopQrv5 zaP0ZYdJGAIfbNAq0z%F6^|%>x6HmwWe5n4|=M4xo&u=oXTVy$HY(EfuuQwpnJU`B2 zW&Fx@Z-4R z<9>*FKJmwon=&AK6^)GgNbAO+$lpi6jHID8>%k!NXe|K5qo!j&N{C+n3*WZU* zvqpR!TAt67z*~+aK&oHvoxQo=PZ!H2KS(VIcnm4er!U(UP`qroZDc#?4G`czc8A~m zf4o~wL-FzVkn;S5^ZPFLeQiDZ26Xl>*Yo*$x#W)%)SBa)Q1W~3Kf)!ll5c%Aeo0d*6P|kNBXQ z5TD#^a-N@OImq*c?L0&IFDF3v1o@jO0@TM%%=2-$W*=E<+!WJ}Y`CxXLvHjo2(Yi^ zFGp-ro}Z4IbL{(j^ZU-;-`6ity?+AWi&_41M7?!#CBL6vPo}p5*oU{8=XZ9$J|uhd zTN$hgwO`42;fXKY*CC)-#VS^@idC#)6{}dqD%M7=MN!YHpRWG_Ve1~A6ne)Q00000 LNkvXXu0mjfufqh9 diff --git a/modules/mogo-module-media/src/main/res/values/dimens.xml b/modules/mogo-module-media/src/main/res/values/dimens.xml index a6fd4099f3..de1d893a59 100644 --- a/modules/mogo-module-media/src/main/res/values/dimens.xml +++ b/modules/mogo-module-media/src/main/res/values/dimens.xml @@ -1,7 +1,7 @@ - 468px - 581px + 467px + 573px 352px @@ -61,7 +61,7 @@ 2px 3.2px - 332px + 338px 82px 60px 18px From 8f0d7d35a00205d559bc716c32bcf8423d268b4b Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Mon, 21 Sep 2020 12:19:25 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E4=BC=98=E5=8C=96m4=E9=9F=B3=E4=B9=90?= =?UTF-8?q?=E6=A1=86=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 2 +- .../java/com/mogo/module/media/window/MediaWindow2.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index cd77a1f062..21e99e2dc0 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java index ccb2cb0cc8..b8edafa4bd 100644 --- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java +++ b/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java @@ -93,10 +93,10 @@ public class MediaWindow2 implements IMusicView { return; } - if(!ServiceMediaHandler.getIMogoStatusManager().isMainPageOnResume()){ - Log.d(TAG, "not in front"); - return; - } +// if(!ServiceMediaHandler.getIMogoStatusManager().isMainPageOnResume()){ +// Log.d(TAG, "not in front"); +// return; +// } if (!mHasAddWindow) { mHasAddWindow = true; From acfe6fb72c89a931a7760f02bedf5e8b968d8cce Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Mon, 21 Sep 2020 14:35:06 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E6=A1=86=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/module/extensions/utils/TopViewAnimHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java index e71a78f3cd..70177fc753 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java @@ -635,7 +635,7 @@ public class TopViewAnimHelper { } private int computeNaviMarginTop(int height) { - int result = (int) (height - (getDimen(R.dimen.module_ext_top_over_navi_height))); + int result = (int) (height - (getDimen(R.dimen.module_ext_top_over_navi_height))-getDimen(R.dimen.module_common_shadow_width_pos)); Logger.d(TAG, "computeNaviMarginTop: " + height + " result: " + result); return result; }