From 07aabdcd2d66c4ff18d665f8760e37d6d5be5bd7 Mon Sep 17 00:00:00 2001 From: EmArrow Date: Thu, 26 Sep 2024 16:03:45 +0800 Subject: [PATCH] [6.7.0] change the progressbar icon --- .../function/main/MainLauncherActivity.java | 3 +++ .../icon_progress_bg_patch.9.png | Bin 0 -> 2478 bytes .../drawable-nodpi/icon_progress_patch.9.png | Bin 1871 -> 1857 bytes .../drawable/progressbar_corner_bg_test.xml | 14 +++++++------- .../main/res/layout/view_bone_container.xml | 6 ++---- .../src/main/res/layout/view_bone_tab.xml | 4 ++-- .../src/main/res/layout/view_car_info_tab.xml | 4 ++-- .../src/main/res/values/dimens.xml | 1 + 8 files changed, 17 insertions(+), 15 deletions(-) create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable-nodpi/icon_progress_bg_patch.9.png diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java index 27f121fae8..a2d67be768 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java @@ -8,6 +8,7 @@ import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_MAI import android.os.Bundle; import android.os.Process; +import android.util.Log; import android.view.KeyEvent; import androidx.annotation.Nullable; @@ -90,10 +91,12 @@ public class MainLauncherActivity extends MainActivity { // 兼容处理之前联想PAD及小巴车多个设备部署不同APP方案 if (!DebugConfig.isMultiDisplay()) { if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) { + Log.i("emArrow","Driver start"); ochProvider = (IMoGoFunctionProvider) ARouter.getInstance() .build("/driver/api") .navigation(getContext()); } else if(AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)){ + Log.i("emArrow","Passenger start"); ochProvider = (IMoGoFunctionProvider) ARouter.getInstance() .build("/passenger/api") .navigation(getContext()); diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-nodpi/icon_progress_bg_patch.9.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-nodpi/icon_progress_bg_patch.9.png new file mode 100644 index 0000000000000000000000000000000000000000..297e80cb1cdff0c821f435f4d755df2ec66828a8 GIT binary patch literal 2478 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 literal 0 HcmV?d00001 diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-nodpi/icon_progress_patch.9.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-nodpi/icon_progress_patch.9.png index 6dd935841426facd7fb7999df341f544fc146dc9..73e6592de80b2a338e5a5da38e15e93f39510e16 100644 GIT binary patch delta 1842 zcmV-22hI4;4#5tPB!37=L_t(|UhSIMb5unX#v?AE1T`3v=_D*7C5Q{C{|Qz6ALxTT zxIlc-LVeM)N+0mW7vVu4w5&p?ngJhbxjBy z#+3l1Cr`r26tA@X-nghhdVK3THGk&*sydlG$lP*=B6s3fEaAU!w=CkDntVIT}b zF1Cm24?*3uW4_bjmKIU9T}qzg@qB$2AVXtd5>^aUDM&?tQgBjWvQQX;Tl8>4owR2` zCmm~OAq_lSMm!$Z@;n~mj`=ZI`Jf6Q6$2`QlLeE7;(uXaksVZjWVzKcI{4@k+TG!F zq#=9V!kG9xkH@u`19N$B4q6sg3{*)-Q9v2@~Y5!x8ZIez` zg@zV&)84L_a88cp>lq#c3t_=o4wQEkTCWVGz(pxQ(mnZbP=w1Ac8mvucbuW{0^Pz7 zcXiP~H-EHLw;W&*O0|=8(V~tlb?F6g!IZsvM+@i}CrN<61STR?rM9s)i{eL z1So7T?;hV;2t^Hta|Z7)-fam+LIH$6s((Lg&p&6+uj!@Q+EDw~;2g$yU<^xwsx8O8 zIG?hRc6Vf3tvWBi%?bg<+AHfG*w_W~;V$F=J0}aLz6y&Aq14veg+342R(Zi`;6*3* zJD=IZRx?m<{K;Cy^>edYCAyUZIm&wrXX zZ;*NG8kzV0CG-9jG9O(cv-K}BpI#ud?HrlU|0MI(DKg*uL8kf}nY|~;)P5mz=qEDY z{YYly7@3nt$($Z0bN&dKONYo@9U?PUCqsi$XDc+gt3vhlr~$RaTqLu|wb{4;#quZK zUha9vWl!Lq{u^7&OLW_893%7EEq^lo*Dau{O+c3|po?Ta`P%|IPv*0;7SI_7Xvgms z(640noM;02nat4<2k3+abjkuc*93IU0vgQ#VvSkHZILeGEJDrsZKiT);()^T;_NXW zURh^0(3k~8=9N)0uim79};UEB#4g#R8gMR`@HmBBc z7U?#dbU<=@M-R)bodLnpX5;8i3y2(`l!Lg%&PQ4dfUJWCkB2QL9dx7tUWKdp6^K(!+2i?hSeli~vZ;A)Sn1gb5F?P^V0Dt-+>!3KGsd!M# z19bOK4Fw2RyZgs#0U*wyyB~Mt0MczXTR$*!KbwHkZ8m#9a%}-hyGTQVT_q&hZZ5cI z?84r4A#L-Lt4)Bp7xK$0#>L-LvA+{B=~qh`{V z7XmPx# delta 1856 zcmV-G2fz5i4$lsdB!3o3L_t(|UhSI8Q(Q$9#xXvE22>)CX&?b(%0zr5>VJ}|{2$SU zS@?*!(Tcj!vPu_mc4~&?K-BtVB=|K=Pza zU|b*^gxTmsNq?P?uQi&is2xt-pCmq)&ZqTUfCP;L%K|D2DF8@L4#Ek6u}}yIf#92M zh2jIK7U2xilxB{f1{eItyQ zv=#av%p#hP=h8YBV$YTktYlCrkjzK|lm^EK<3q79aDS5xP<&{IRwtZ!csukq7@aLi zpSLw6I!^QPTwDX!vfvCfA65udMo4A|K%RS&;h>$lW3V`US2+|5#6W0+fk#lfO&Uo# z7;0*Plg%OFF+P{hCwK(Rg@w*Cpsb^?^|C;6ToePu-IELli!hl&jxOoM|?M6c#IryfN)PDj4kD~Z%IEUsFI9!WhNl;jWb(4jJ zHB%UF!oMNFEAPAuu3Okyi_}DhBb~wE=Bs_+5 za4vx(V7MkZi$LME$xT=jheVm=LXs|GZRP+g|2V1@ z27hhHoeLy)irtOaYr+Njlh7lqnv*?=ZC%j}Wv!LTgB`RMZg+^e@wsDIby zX4D(EK)rbb)Vu$HdhZ&j53hha@+YWIE`d6F5!7dYfco+RsIPwqmH!pg$@8EJKZ6?n z5!AOofSMQwb$$%g)F`Ogv!JdFgStKhYM}@U2DxT(FnA&d#r;?V))I0N&mz-iO9B+i zpKyDb=N*$hj(fUq9ab;EqB^($>VK8npt^5rK-bHFu4+J+L4Ev}1~d!m(-{qD+5qbL zO#}J`RNuKWpr1gEO&CDuG@uI_(8V&K8ye8O2Z*$w9e0?!h_VQ4PHr=iL(2!`wijiO z`rz6=bpRGLAW$#OgL-)m90$FR4$^>*AfQVI(B}wf$^s$>ona0_K-@tH$bWZ`14-x9 zKFT85W-AVe-`=r@`K_G*p{3Qq`QsW87(g)xQH#w6S_}bc2MtcTEyf*mHPu0+)$aVWngWP&=+4I-34mmqZOjkMOb}H7#oKJ7e&osk#a$#JpiF?O0Dn*xNEF=F|MQm!pd?61psMc&R2Go=D+8n$C>It7W}z8yB)-{@ z_*^=l*0Vq)lo*)IaBxHbnO7o^(m)X`7np_i|NIfB4~T|bz*#&5D+G)~ - + - + - + + + @@ -33,10 +33,10 @@ \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_container.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_container.xml index 956a3ac6e7..dff2577d56 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_container.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_container.xml @@ -11,7 +11,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_19" - android:layout_marginTop="@dimen/dp_76" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -20,7 +19,7 @@ android:id="@+id/clBoneBiz" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/dp_385" + android:layout_marginTop="@dimen/dp_309" android:layout_marginStart="@dimen/dp_19" android:elevation="1dp" app:layout_constraintLeft_toLeftOf="parent" @@ -30,10 +29,9 @@ android:id="@+id/clBoneTab" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginTop="@dimen/dp_385" + android:layout_marginTop="@dimen/dp_309" android:elevation="20dp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" /> - \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_tab.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_tab.xml index fefbf2a188..e269c962db 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_tab.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_tab.xml @@ -15,7 +15,7 @@ 1170dp 1176dp 1200dp + 1214dp 1241dp 1250dp 1261dp