From fc71e352706b46515ec1d90143b4fc62e22f67d4 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Wed, 19 Oct 2022 11:51:55 +0800 Subject: [PATCH 1/8] fix ui problem of vip --- .../function/hmi/ui/widget/VipIdentificationView.kt | 11 ++--------- .../src/main/res/values-xhdpi-2560x1440/dimens.xml | 6 ++---- core/mogo-core-res/src/main/res/values/dimens.xml | 6 ++---- 3 files changed, 6 insertions(+), 17 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/VipIdentificationView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/VipIdentificationView.kt index 3692ba8b97..88e89bcf3b 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/VipIdentificationView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/VipIdentificationView.kt @@ -4,9 +4,7 @@ import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater import androidx.constraintlayout.widget.ConstraintLayout -import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.function.hmi.R -import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler import kotlinx.android.synthetic.main.view_vip_identification.view.* @@ -26,13 +24,8 @@ class VipIdentificationView @JvmOverloads constructor( override fun onAttachedToWindow() { super.onAttachedToWindow() val lp = this.layoutParams as LayoutParams - if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) { - lp.marginStart = resources.getDimension(R.dimen.module_vip_margin_left_bus).toInt() - lp.topMargin = resources.getDimension(R.dimen.module_vip_margin_top_bus).toInt() - } else { - lp.marginStart = resources.getDimension(R.dimen.module_vip_margin_left_taxi).toInt() - lp.topMargin = resources.getDimension(R.dimen.module_vip_margin_top_taxi).toInt() - } + lp.marginStart = resources.getDimension(R.dimen.module_vip_margin_left).toInt() + lp.topMargin = resources.getDimension(R.dimen.module_vip_margin_top).toInt() this.layoutParams = lp invalidate() } diff --git a/core/mogo-core-res/src/main/res/values-xhdpi-2560x1440/dimens.xml b/core/mogo-core-res/src/main/res/values-xhdpi-2560x1440/dimens.xml index 82d3e800dc..349297259a 100644 --- a/core/mogo-core-res/src/main/res/values-xhdpi-2560x1440/dimens.xml +++ b/core/mogo-core-res/src/main/res/values-xhdpi-2560x1440/dimens.xml @@ -6,11 +6,9 @@ 104px 104px - 540px - 40px - 640px - 80px + 640px + 80px 30px 130px diff --git a/core/mogo-core-res/src/main/res/values/dimens.xml b/core/mogo-core-res/src/main/res/values/dimens.xml index d7bbdd0449..c8daa54109 100644 --- a/core/mogo-core-res/src/main/res/values/dimens.xml +++ b/core/mogo-core-res/src/main/res/values/dimens.xml @@ -14,11 +14,9 @@ 104px 104px - 380px - 40px - 380px - 40px + 380px + 40px 20px 110px From 644789bd3b1ed3f2a33e12382e4487ed9e9092a3 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Wed, 19 Oct 2022 14:48:16 +0800 Subject: [PATCH 2/8] fix bug of ui --- .../hmi/ui/widget/VipIdentificationView.kt | 16 ++++++++++++++-- .../eagle/core/function/v2x/vip/VipCarManager.kt | 4 ++-- .../main/res/values-xhdpi-2560x1440/dimens.xml | 3 +++ .../mogo-core-res/src/main/res/values/dimens.xml | 3 +++ 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/VipIdentificationView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/VipIdentificationView.kt index 88e89bcf3b..70c1dbd01c 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/VipIdentificationView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/VipIdentificationView.kt @@ -4,7 +4,9 @@ import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater import androidx.constraintlayout.widget.ConstraintLayout +import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.function.hmi.R +import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler import kotlinx.android.synthetic.main.view_vip_identification.view.* @@ -24,8 +26,18 @@ class VipIdentificationView @JvmOverloads constructor( override fun onAttachedToWindow() { super.onAttachedToWindow() val lp = this.layoutParams as LayoutParams - lp.marginStart = resources.getDimension(R.dimen.module_vip_margin_left).toInt() - lp.topMargin = resources.getDimension(R.dimen.module_vip_margin_top).toInt() + if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode) + && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) { + lp.marginStart = resources.getDimension(R.dimen.module_vip_margin_left_bus_passenger).toInt() + lp.topMargin = resources.getDimension(R.dimen.module_vip_margin_top_passenger).toInt() + } else if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode) + && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) { + lp.marginStart = resources.getDimension(R.dimen.module_vip_margin_left_taxi_passenger).toInt() + lp.topMargin = resources.getDimension(R.dimen.module_vip_margin_top_passenger).toInt() + } else { + lp.marginStart = resources.getDimension(R.dimen.module_vip_margin_left).toInt() + lp.topMargin = resources.getDimension(R.dimen.module_vip_margin_top).toInt() + } this.layoutParams = lp invalidate() } diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt index affbba02b8..91548baa38 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt @@ -58,9 +58,9 @@ class VipCarManager : IMogoOnMessageListener, IMoGoTrafficLightListe mContext = context MogoAiCloudSocketManager.getInstance(context) .registerOnMessageListener(401025, this) - + CallerHmiManager.vipIdentification(true) //首次进入应用查询是否为VIP车辆 - requestVip() +// requestVip() } override fun handleMessage(msg: Message): Boolean { diff --git a/core/mogo-core-res/src/main/res/values-xhdpi-2560x1440/dimens.xml b/core/mogo-core-res/src/main/res/values-xhdpi-2560x1440/dimens.xml index 349297259a..6de53bb489 100644 --- a/core/mogo-core-res/src/main/res/values-xhdpi-2560x1440/dimens.xml +++ b/core/mogo-core-res/src/main/res/values-xhdpi-2560x1440/dimens.xml @@ -9,6 +9,9 @@ 640px 80px + 540px + 640px + 40px 30px 130px diff --git a/core/mogo-core-res/src/main/res/values/dimens.xml b/core/mogo-core-res/src/main/res/values/dimens.xml index c8daa54109..dfc124ac5d 100644 --- a/core/mogo-core-res/src/main/res/values/dimens.xml +++ b/core/mogo-core-res/src/main/res/values/dimens.xml @@ -17,6 +17,9 @@ 380px 40px + 380px + 380px + 40px 20px 110px From 1f1ea72c16190c152eae3e530196f0bbf585ae23 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Wed, 19 Oct 2022 14:48:53 +0800 Subject: [PATCH 3/8] .. --- .../com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt index 91548baa38..affbba02b8 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt @@ -58,9 +58,9 @@ class VipCarManager : IMogoOnMessageListener, IMoGoTrafficLightListe mContext = context MogoAiCloudSocketManager.getInstance(context) .registerOnMessageListener(401025, this) - CallerHmiManager.vipIdentification(true) + //首次进入应用查询是否为VIP车辆 -// requestVip() + requestVip() } override fun handleMessage(msg: Message): Boolean { From 3c834c7d639f3e175db72d42b2f8efe7157e4c1e Mon Sep 17 00:00:00 2001 From: renwj Date: Wed, 19 Oct 2022 15:18:46 +0800 Subject: [PATCH 4/8] =?UTF-8?q?[Route]=E4=BF=AE=E6=AD=A3=E5=BC=95=E5=AF=BC?= =?UTF-8?q?=E7=BA=BF=E9=97=AA=E7=83=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/service/routeoverlay/MogoRouteOverlayManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/MogoRouteOverlayManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/MogoRouteOverlayManager.java index efc8f13177..cbca495eb6 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/MogoRouteOverlayManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/MogoRouteOverlayManager.java @@ -74,7 +74,7 @@ public class MogoRouteOverlayManager implements if (from != 1 || location == null) { return; } - if (isArriveAtStation.get()) { + if (isArriveAtStation.get() && autopilotMode.get() != 1) { Logger.d(TAG, "--- onLocationChanged 1 -- [isDemo1: " + FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData + ",isDemo2:" +FunctionBuildConfig.isDemoMode + ",isGps:" + isGps + ",mode:" + autopilotMode.get() + ",lon:" + location.getLongitude() + ",lat:" + location.getLatitude() + ",angle:" + location.getBearing() + "]"); RouteOverlayDrawer.getInstance().clearMogoRouteOverlay(); return; From b1d026306742a85d6b070a5d11fa6410f1550a1e Mon Sep 17 00:00:00 2001 From: renwj Date: Wed, 19 Oct 2022 15:19:40 +0800 Subject: [PATCH 5/8] =?UTF-8?q?Revert=20"[Route]=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=AE=9A=E4=BD=8D=E5=BC=95=E5=AF=BC=E7=BA=BF?= =?UTF-8?q?=E9=97=AA=E7=83=81=E9=97=AE=E9=A2=98"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 59bef0c1753eca5fdc16f30cb1d7d66a68561cb6. --- .../service/routeoverlay/RouteOverlayDrawer.java | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/RouteOverlayDrawer.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/RouteOverlayDrawer.java index e8e827f4e4..01076f6084 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/RouteOverlayDrawer.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/RouteOverlayDrawer.java @@ -100,7 +100,6 @@ public class RouteOverlayDrawer { pps.clear(); List routes = this.routeList; if (routes == null || (total = routes.size()) < 2) { - Log.d("Route", "--- 2 ---"); isExcept = true; return; } @@ -135,9 +134,6 @@ public class RouteOverlayDrawer { } double lon = CallerAutoPilotStatusListenerManager.INSTANCE.getCurWgs84Lon(); double lat = CallerAutoPilotStatusListenerManager.INSTANCE.getCurWgs84Lat(); - StringBuilder sb = new StringBuilder(); - sb.append(lon).append(",").append(lat).append(","); - int removeCount = 0; if (points.size() > 0) { MogoLatLng top = null; while (points.size() != 0) { @@ -155,13 +151,11 @@ public class RouteOverlayDrawer { RouteStrategy.INSTANCE.remove(first.acc); pools.release(first); points.poll(); - removeCount++; } top = first; } if (points.size() == 0) { isExcept = true; - Log.d("Route", "--- 3 ---"); return; } MogoLatLng self = pools.acquire(); @@ -203,19 +197,12 @@ public class RouteOverlayDrawer { mMoGoPolyline.setVisible(true); } } else { - Log.d("Route", "--- 4 ---"); isExcept = true; } - for (MogoLatLng p : points) { - sb.append(p.lon).append(",").append(p.lat); - } - Log.d("Route", "--- draw: removeCount:" + removeCount + ", data:" + sb); } catch (Throwable t) { - Log.d("Route", "--- draw error ---: error:" + t.getMessage()); t.printStackTrace(); } finally { if (isExcept) { - Log.d("Route", "--- 5 ---"); setVisible(false); } if (points.size() > 0) { From 9588c00e6f3e2aad2ce063f42a098e7e3918fe8b Mon Sep 17 00:00:00 2001 From: renwj Date: Wed, 19 Oct 2022 15:21:05 +0800 Subject: [PATCH 6/8] =?UTF-8?q?[Route]=E7=A7=BB=E9=99=A4=E9=A2=91=E7=B9=81?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E7=9A=84=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/service/routeoverlay/MogoRouteOverlayManager.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/MogoRouteOverlayManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/MogoRouteOverlayManager.java index cbca495eb6..9a1e99a46e 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/MogoRouteOverlayManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/MogoRouteOverlayManager.java @@ -75,13 +75,11 @@ public class MogoRouteOverlayManager implements return; } if (isArriveAtStation.get() && autopilotMode.get() != 1) { - Logger.d(TAG, "--- onLocationChanged 1 -- [isDemo1: " + FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData + ",isDemo2:" +FunctionBuildConfig.isDemoMode + ",isGps:" + isGps + ",mode:" + autopilotMode.get() + ",lon:" + location.getLongitude() + ",lat:" + location.getLatitude() + ",angle:" + location.getBearing() + "]"); RouteOverlayDrawer.getInstance().clearMogoRouteOverlay(); return; } boolean force = FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData; if (!force && autopilotMode.get() != 1) { - Logger.d(TAG, "--- onLocationChanged 2 -- [isDemo1: " + FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData + ",isDemo2:" +FunctionBuildConfig.isDemoMode + ",isGps:" + isGps + ",mode:" + autopilotMode.get() + ",lon:" + location.getLongitude() + ",lat:" + location.getLatitude() + ",angle:" + location.getBearing() + "]"); RouteOverlayDrawer.getInstance().clearMogoRouteOverlay(); return; } @@ -89,7 +87,6 @@ public class MogoRouteOverlayManager implements if (!queue.isEmpty()) { List items = queue.pollLast(); if (items != null && !items.isEmpty()) { - Logger.d(TAG, "--- onLocationChanged -- [isDemo1: " + FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData + ",isDemo2:" +FunctionBuildConfig.isDemoMode + ",isGps:" + isGps + ",mode:" + autopilotMode.get() + ",lon:" + location.getLongitude() + ",lat:" + location.getLatitude() + ",angle:" + location.getBearing() + "]"); RouteOverlayDrawer.getInstance().drawTrajectoryList(items, location.getBearing()); } } From 6eb097a033a397699c9cbf94db31787a343cd7e5 Mon Sep 17 00:00:00 2001 From: renwj Date: Wed, 19 Oct 2022 19:41:35 +0800 Subject: [PATCH 7/8] =?UTF-8?q?[=E7=8A=B6=E6=80=81=E6=A0=8F][GPS]=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=E5=BA=94=E7=94=A8=E9=A6=96=E6=AC=A1=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E6=8E=88=E6=9D=83=E5=90=8E=EF=BC=8CGPS?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9C=AA=E9=AB=98=E4=BA=AE=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../status/flow/gps/GpsImpl.kt | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/gps/GpsImpl.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/gps/GpsImpl.kt index 01b5a2ff9f..43c94c86b5 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/gps/GpsImpl.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/gps/GpsImpl.kt @@ -49,9 +49,19 @@ internal class GpsImpl(ctx: Context): IFlow(ctx) { false } + private val onStateListener = object : IAppStateListener { + + override fun onAppStateChanged(isForeground: Boolean) { + if (isForeground) { + send(isLocationEnabled(), isGrandFineLocation()) + } + } + } + override fun onCreate() { val isGranted = isGrandFineLocation() + AppStateManager.registerAppStateListener(onStateListener) send(isLocationEnabled(), isGranted) if (!isGranted) { PermissionUtils.requestAccessFineLocation(object : SimpleCallback { @@ -88,6 +98,7 @@ internal class GpsImpl(ctx: Context): IFlow(ctx) { } catch (t: Throwable) { t.printStackTrace() } + AppStateManager.unRegisterAppStateListener(onStateListener) } } \ No newline at end of file From bb5c7a07e0921d7fd9f1dd55b106c13fb2ef691c Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Wed, 19 Oct 2022 19:46:47 +0800 Subject: [PATCH 8/8] =?UTF-8?q?[2.11.0=20fix]=20=E6=9A=82=E6=97=B6?= =?UTF-8?q?=E5=85=B3=E9=97=AD=E9=85=8D=E7=BD=AE=E4=B8=AD=E5=BF=83=EF=BC=88?= =?UTF-8?q?zhongchao=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zhjt/mogo_core_function_devatools/DevaToolsProvider.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt index 4229be3ef9..073f2b300c 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt @@ -35,8 +35,8 @@ class DevaToolsProvider : IDevaToolsProvider { } override fun initBiz() { - bizConfigCenter.init(mContext!!) - FuncConfigImpl.init() +// bizConfigCenter.init(mContext!!) +// FuncConfigImpl.init() traceManager.init(mContext!!) MogoLogCatchManager.init(mContext!!) }