From 21bda05fc83928313e6a4113485c6c2edea800c4 Mon Sep 17 00:00:00 2001 From: renwj Date: Thu, 18 May 2023 17:44:33 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[2.15.0=5Fhotfix]=20=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=A0=8FGPS=E5=9B=BE=E6=A0=87=E7=94=B1?= =?UTF-8?q?=E4=BA=8E=E6=9D=83=E9=99=90=E6=8E=88=E4=BA=88=E5=9B=9E=E8=B0=83?= =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E7=A1=AE=E5=AF=BC=E8=87=B4=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/utilcode/util/PermissionUtils.java | 31 ++++++++++++++++--- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/PermissionUtils.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/PermissionUtils.java index 5998a82b72..903e1240bb 100755 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/PermissionUtils.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/PermissionUtils.java @@ -1,5 +1,7 @@ package com.mogo.eagle.core.utilcode.util; +import static android.Manifest.permission.ACCESS_FINE_LOCATION; + import android.Manifest; import android.annotation.TargetApi; import android.app.Activity; @@ -25,6 +27,7 @@ import java.util.Set; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.RequiresApi; +import androidx.core.app.ActivityCompat; import androidx.core.content.ContextCompat; import com.mogo.eagle.core.utilcode.constant.PermissionConstants; @@ -156,7 +159,7 @@ public final class PermissionUtils { public static void requestAccessFineLocation(final SimpleCallback callback) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - if (isGranted(Manifest.permission.ACCESS_FINE_LOCATION)) { + if (isGranted(ACCESS_FINE_LOCATION)) { if (callback != null) { callback.onGranted(); } @@ -499,7 +502,10 @@ public final class PermissionUtils { } else if (type == TYPE_DRAW_OVERLAYS) { currentRequestCode = TYPE_DRAW_OVERLAYS; startOverlayPermissionActivity(activity, TYPE_DRAW_OVERLAYS); - } else { + } else if (type == TYPE_ACCESS_FINE_LOCATION) { + currentRequestCode = TYPE_ACCESS_FINE_LOCATION; + ActivityCompat.requestPermissions(activity, new String[] { ACCESS_FINE_LOCATION }, currentRequestCode); + } else { activity.finish(); Log.e("PermissionUtils", "type is wrong."); } @@ -523,8 +529,23 @@ public final class PermissionUtils { @NonNull String[] permissions, @NonNull int[] grantResults) { activity.finish(); - if (sInstance != null && sInstance.mPermissionsRequest != null) { - sInstance.onRequestPermissionsResult(activity); + if (requestCode == TYPE_ACCESS_FINE_LOCATION) { + for (int result : grantResults) { + if (result == PackageManager.PERMISSION_GRANTED) { + if (sSimpleCallback4AccessFineLocation != null) { + sSimpleCallback4AccessFineLocation.onGranted(); + } + } + if (result == PackageManager.PERMISSION_DENIED) { + if (sSimpleCallback4AccessFineLocation != null) { + sSimpleCallback4AccessFineLocation.onDenied(); + } + } + } + } else { + if (sInstance != null && sInstance.mPermissionsRequest != null) { + sInstance.onRequestPermissionsResult(activity); + } } } @@ -570,7 +591,7 @@ public final class PermissionUtils { if (sSimpleCallback4AccessFineLocation == null) { return; } - if (isGranted(Manifest.permission.ACCESS_FINE_LOCATION)) { + if (isGranted(ACCESS_FINE_LOCATION)) { sSimpleCallback4AccessFineLocation.onGranted(); } else { sSimpleCallback4AccessFineLocation.onDenied(); From dc29c847eb7e32cdf6244a4b00b14e04703324a5 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Thu, 18 May 2023 18:33:36 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[3.2.0]=E8=B0=83=E6=95=B4=E6=BC=AB=E6=B8=B8?= =?UTF-8?q?UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/bus_base_fragment.xml | 12 ++++--- .../main/res/layout/taxi_base_fragment.xml | 13 ++++--- .../core/function/hmi/ui/widget/RomaView.kt | 35 +++++++++++++++++-- .../src/main/res/layout/view_roma_bg.xml | 34 ++++++++---------- .../src/main/res/values/attr.xml | 6 ++++ 5 files changed, 71 insertions(+), 29 deletions(-) diff --git a/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml b/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml index 658b15ffa0..931badb5ae 100644 --- a/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml +++ b/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml @@ -300,10 +300,14 @@ + android:layout_width="@dimen/dp_172" + android:layout_height="@dimen/dp_172" + app:layout_constraintBottom_toBottomOf="@id/module_mogo_och_badcase_rl" + app:layout_constraintLeft_toRightOf="@id/module_mogo_och_badcase_rl" + app:layout_constraintTop_toTopOf="@id/module_mogo_och_badcase_rl" + app:roma_open_bg="@drawable/bus_operation_status_select_bg" + app:roma_close_bg="@drawable/bus_operation_status_bg" + /> + android:layout_width="@dimen/module_mogo_och_operation_status_bg_height" + android:layout_height="@dimen/module_mogo_och_operation_status_bg_height" + app:layout_constraintBottom_toBottomOf="@id/module_och_taxi_badcase_ll" + app:layout_constraintLeft_toRightOf="@id/module_och_taxi_badcase_ll" + app:layout_constraintTop_toTopOf="@id/module_och_taxi_badcase_ll" + app:roma_open_bg="@drawable/taxi_operation_status_select_bg" + app:roma_close_bg="@drawable/taxi_operation_status_bg" + android:layout_marginStart="40dp" + /> diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaView.kt index e1ca186a4f..810deabf03 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaView.kt @@ -3,6 +3,7 @@ package com.mogo.eagle.core.function.hmi.ui.widget import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater +import androidx.appcompat.content.res.AppCompatResources import androidx.constraintlayout.widget.ConstraintLayout import com.mogo.eagle.core.function.api.map.roma.IMoGoRomaListener import com.mogo.eagle.core.function.call.map.CallerMapIdentifyManager.romaTrigger @@ -26,8 +27,30 @@ class RomaView @JvmOverloads constructor( @Volatile private var click = true + private val normalRes: Int + private val openRes: Int + init { LayoutInflater.from(context).inflate(R.layout.view_roma_bg, this, true) + val a = context.obtainStyledAttributes( + attrs, + R.styleable.RomaView, + defStyleAttr, + 0 + ) + normalRes = a.getResourceId( + R.styleable.RomaView_roma_close_bg, + R.drawable.romabg_normal_select + ) + openRes = a.getResourceId( + R.styleable.RomaView_roma_open_bg, + R.drawable.romabg_press_select_bg + ) + a.recycle() + if(normalRes!=0){ + ll_roma_bg.background = AppCompatResources.getDrawable(context, normalRes) + } + setOnClickListener { if(!click){ return@setOnClickListener @@ -44,11 +67,19 @@ class RomaView @JvmOverloads constructor( click = true if (status) { romaMode = true - ll_roma_bg.setBackgroundResource(R.drawable.romabg_press_select_bg) + if(openRes!=0){ + ll_roma_bg.setBackgroundResource(openRes) + }else{ + ll_roma_bg.setBackgroundResource(R.drawable.romabg_press_select_bg) + } ivRomaView.setBackgroundResource(R.drawable.roma_press_select_bg) } else { romaMode = false - ll_roma_bg.setBackgroundResource(R.drawable.roma_bg_selector) + if(normalRes!=0){ + ll_roma_bg.setBackgroundResource(normalRes) + }else{ + ll_roma_bg.setBackgroundResource(R.drawable.roma_bg_selector) + } ivRomaView.setBackgroundResource(R.drawable.romafront_select_bg) } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_roma_bg.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_roma_bg.xml index 30bd940a0f..ec6a9f2a2d 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_roma_bg.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_roma_bg.xml @@ -1,28 +1,24 @@ + android:layout_height="match_parent" + android:background="@drawable/roma_bg_selector" + android:elevation="@dimen/dp_10" + android:gravity="center" + android:orientation="vertical"> - + app:layout_constraintRight_toRightOf="parent" + /> - - \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/attr.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/attr.xml index 9426bad2a8..71ab960a6e 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/attr.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/attr.xml @@ -88,4 +88,10 @@ + + + + + + \ No newline at end of file From 05aa2299f6a8fc3648e11a9dddb28b2e81054f9b Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Thu, 18 May 2023 19:24:57 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[3.2.0]=E6=B7=BB=E5=8A=A0=E5=8A=A0=E9=80=9F?= =?UTF-8?q?=E5=BA=A6=E9=9D=A2=E6=9D=BF=E6=8B=96=E6=8B=BD=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drawable-xhdpi/icon_acceleration_drag.png | Bin 0 -> 1790 bytes .../main/res/layout/view_acceleration_float.xml | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_acceleration_drag.png diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_acceleration_drag.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_acceleration_drag.png new file mode 100644 index 0000000000000000000000000000000000000000..305f2395055d342815f4f33807db99434f7d7219 GIT binary patch literal 1790 zcmZ{lX*its8i)Vy%xh*4F&K#;j3r3TpshWUymph;8k|XLnTBI;P%>N$UQ29=)R8t4 zyMv@jB=#ki=>&t;Hl;#z#2^i&mI;T6^+-RT^Wj;p=lXrTujkHkak7_^P?P`wNYNZ@ z+>R#tu?V=M-hJWg0RV7ZnvJD(U{dnyp-h%f3$W8AHH*7o)0JM0Ilqc z?p|d08mP_ICt+kjugLKFRA9xtxM1!{{C-Mz44wjFo9dgO z%y>^BGz0ZG!mMHf;E5x@S(QmQ$3wrq`%}2ezTqXn(m`!U+jxoQQo>stD~8!PR$zP& zbsE0IR2q2tyQ31^U6;HZTC5@oe4brz0uc#$P0`xy4;E4&HPV={DA)|z-dcY9$zdH3 z{P7F3B7O6$S+%t1!Fod@m?SUCu|Kdn#-7)U0#+%&Al+gZ`=u2=Q>kJuFbha?!c3Bb zk|>e>^@j}@j>1NLT_UZXzuBT;+3gS4kxp8N}S zgdKDd6)^gyJ$s&n%8a-AZ(Tv$0STpaxF=O#hvpSSU>?C`-=mm|$pMOxmWooS?EQb9 z^@y&v10N4|3Or4hyPWLa_eEo`s7MQ##zafr_mc6Ku=*C4f63>e8Tt++zBCdmx;Us` zZ4Za0Maamhh$z*Bvv`A>6q!+TSqhhsad@Lfnsu@uE(bh}RwD0+D&r>nl5KT>rhI)t zh#x9?Hlii}2GowPY`2T}_T{z&a36Db$|Aw>c4tYUdo0A!Vn_A_%?3OubRz(|q|qq$sZDU?W#kU$paG6B|i2i!#`O}&2_|6BCt_z#7+xhB;od#e) zHz~SW`>Jigj}uOtsF~&Ya|cl!D+zW<@;Iagy{!^sZh=w-&DInAuA6qyqhGFu2Y4QO zti=VtqX`73wh~V3ggi=S@Lr?_Y%4g>OJ8Z}{q`c~qL`v;uhhw#8aG?e*`CiV4MrP( z&TgBB)L5sB{N1MXGjNjqIidiSVbHHE9spZrg279y1>g>)@WA~lQ57JX!)lO0sPGFc z*`HtqkzwH%Vq`hkrZ`bQPVKQ~weiWMy5h1nCsAIW^CKGLTV~;^jH{b#P{H_`_1>rk za?jp|Dw#yT!0y?`Aq6Xl@3B)raG6yDED$s!Q?xwEEU!tQ&T^gs!9!ee->Hp;(I~V} z?u9NnShhzi-+{+cL*T;-~64zYnDVjB11OCNj%ffOCTwAm5+WryX zBf*8O9SRkwoj%o(9W zE?TfMH&7foMU0Ryr2;)Q0p&s{@IpA=tSvxFMp8uTpdXt|5^_PV7=|`?3qzKIM|)1< zIfewyY<*eaxB1Q8><@vvp!I^OURCPA>JToYVc)RtrwYHxVmROix+y#|1BL{|kXC$J zVT}v|5m%wvccHKgNQ*~WKPW;+{!k%aXWRYX$RW1vM9?7ZcE{r*uK}8^lg)E0M#_Hy DeIXa{ literal 0 HcmV?d00001 diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_acceleration_float.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_acceleration_float.xml index 8629837b9f..06a839f6fc 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_acceleration_float.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_acceleration_float.xml @@ -8,7 +8,7 @@