From d0ce252b4db41d6b7b0349383215e0d743019642 Mon Sep 17 00:00:00 2001 From: donghongyu Date: Tue, 7 Feb 2023 15:44:58 +0800 Subject: [PATCH] =?UTF-8?q?[dev=5Farch=5Fopt=5F3.0]=20[Change]=20[=201?= =?UTF-8?q?=E3=80=81=E5=88=A0=E9=99=A4=E5=BA=9F=E5=BC=83=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E6=96=B9=E6=B3=95=20]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: donghongyu --- .../och/bus/passenger/MogoOCHBusPassenger.java | 8 ++------ .../main/java/com/mogo/och/bus/BusProvider.java | 6 ++---- .../com/mogo/och/sweeper/SweeperProvider.java | 7 ++----- .../och/taxi/passenger/MogoOCHTaxiPassenger.java | 7 ++----- .../java/com/mogo/och/taxi/TaxiProvider.java | 6 ++---- .../location/MoGoLocationDispatcher.kt | 4 ++-- .../function/hmi/ui/setting/DebugSettingView.kt | 2 +- .../api/setting/MoGoUiSettingProvider.kt | 2 +- .../call/setting/CallerMoGoUiSettingManager.kt | 2 +- .../eagle/core/utilcode/util/DeviceUtils.java | 16 ++++++++++++++++ .../map/uicontroller/IMogoMapUIController.java | 12 ------------ .../main/java/com/mogo/map/AMapViewWrapper.java | 7 ------- .../java/com/mogo/map/MogoMapUIController.java | 12 ------------ .../mogo/map/uicontroller/AMapUIController.java | 10 ---------- 14 files changed, 31 insertions(+), 70 deletions(-) diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java index 291a58f01d..5cf0a93b79 100644 --- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java +++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java @@ -1,5 +1,7 @@ package com.mogo.och.bus.passenger; +import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI_P; + import android.content.Context; import androidx.fragment.app.Fragment; @@ -9,7 +11,6 @@ import com.alibaba.android.arouter.facade.annotation.Route; import com.mogo.commons.module.status.IMogoStatusChangedListener; import com.mogo.commons.module.status.MogoStatusManager; import com.mogo.commons.module.status.StatusDescriptor; -import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager; import com.mogo.eagle.core.function.call.setting.CallerMoGoUiSettingManager; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.och.bus.passenger.constant.BusPassengerConst; @@ -18,10 +19,6 @@ import com.mogo.och.bus.passenger.ui.BusPassengerRouteFragment; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI_P; - -import java.util.Objects; - /** * 网约车-Bus-乘客端 * @@ -84,7 +81,6 @@ public class MogoOCHBusPassenger implements IMogoOCH, IMogoStatusChangedListener */ private void stepIntoVrMode() { CallerLogger.INSTANCE.d( M_TAXI_P + TAG, "进入vr模式" ); - Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMapUIController()).stepInVrMode(true); // 白天模式 CallerMoGoUiSettingManager.INSTANCE.stepInDayMode();//白天模式 状态栏字体颜色变黑 } diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/BusProvider.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/BusProvider.java index 5766d48689..5cc6478c96 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/BusProvider.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/BusProvider.java @@ -13,7 +13,7 @@ import com.alibaba.android.arouter.facade.annotation.Route; import com.mogo.commons.module.status.IMogoStatusChangedListener; import com.mogo.commons.module.status.MogoStatusManager; import com.mogo.commons.module.status.StatusDescriptor; -import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager; +import com.mogo.eagle.core.function.call.setting.CallerMoGoUiSettingManager; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.och.bus.constant.BusConst; import com.mogo.och.bus.fragment.BusFragment; @@ -21,8 +21,6 @@ import com.mogo.och.bus.fragment.BusFragment; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.Objects; - /** * 网约车小巴业务实现入口 * @@ -42,7 +40,7 @@ public class BusProvider implements IMogoOCH { */ private void stepIntoVrMode() { CallerLogger.INSTANCE.d(M_BUS + TAG, "进入vr模式"); - Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMapUIController()).stepInVrMode(false); + CallerMoGoUiSettingManager.INSTANCE.stepInNightMode();//夜间模式 状态栏字体颜色变黑 } @Override diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java index aa109b728f..dd27f2a3ba 100644 --- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java @@ -11,7 +11,7 @@ import com.alibaba.android.arouter.facade.annotation.Route; import com.mogo.commons.module.status.IMogoStatusChangedListener; import com.mogo.commons.module.status.MogoStatusManager; import com.mogo.commons.module.status.StatusDescriptor; -import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager; +import com.mogo.eagle.core.function.call.setting.CallerMoGoUiSettingManager; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.och.sweeper.constant.SweeperConst; import com.mogo.och.sweeper.fragment.SweeperFragment; @@ -19,8 +19,6 @@ import com.mogo.och.sweeper.fragment.SweeperFragment; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.Objects; - /** * 清扫车业务实现入口 * @@ -40,8 +38,7 @@ public class SweeperProvider implements IMogoOCH { */ private void stepIntoVrMode(){ CallerLogger.INSTANCE.d( M_BUS + TAG, "进入vr模式" ); - Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMapUIController()) - .stepInVrMode(false); + CallerMoGoUiSettingManager.INSTANCE.stepInNightMode();//夜间模式 状态栏字体颜色变黑 } @Override diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/MogoOCHTaxiPassenger.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/MogoOCHTaxiPassenger.java index 049b7f9129..2cb194ce8f 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/MogoOCHTaxiPassenger.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/MogoOCHTaxiPassenger.java @@ -11,7 +11,7 @@ import com.alibaba.android.arouter.facade.annotation.Route; import com.mogo.commons.module.status.IMogoStatusChangedListener; import com.mogo.commons.module.status.MogoStatusManager; import com.mogo.commons.module.status.StatusDescriptor; -import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager; +import com.mogo.eagle.core.function.call.setting.CallerMoGoUiSettingManager; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.och.taxi.passenger.constant.TaxiPassengerConst; import com.mogo.och.taxi.passenger.ui.TaxiPassengerBaseFragment; @@ -19,8 +19,6 @@ import com.mogo.och.taxi.passenger.ui.TaxiPassengerBaseFragment; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.Objects; - public /** * @author congtaowang @@ -47,8 +45,7 @@ class MogoOCHTaxiPassenger implements IMogoOCH, IMogoStatusChangedListener { */ private void stepIntoVrMode() { CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "进入vr模式"); - Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMapUIController()) - .stepInVrMode(false); + CallerMoGoUiSettingManager.INSTANCE.stepInNightMode();//夜间模式 状态栏字体颜色变黑 } private void showFragment() { diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/TaxiProvider.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/TaxiProvider.java index 66b2cd2977..93fc747115 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/TaxiProvider.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/TaxiProvider.java @@ -11,7 +11,7 @@ import com.alibaba.android.arouter.facade.annotation.Route; import com.mogo.commons.module.status.IMogoStatusChangedListener; import com.mogo.commons.module.status.MogoStatusManager; import com.mogo.commons.module.status.StatusDescriptor; -import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager; +import com.mogo.eagle.core.function.call.setting.CallerMoGoUiSettingManager; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.och.taxi.constant.TaxiConst; import com.mogo.och.taxi.ui.TaxiFragment; @@ -19,8 +19,6 @@ import com.mogo.och.taxi.ui.TaxiFragment; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.Objects; - public /** * @author congtaowang @@ -46,7 +44,7 @@ class TaxiProvider implements IMogoOCH , IMogoStatusChangedListener { */ private void stepIntoVrMode() { CallerLogger.INSTANCE.d( M_TAXI + TAG, "进入vr模式" ); - Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMapUIController()).stepInVrMode(false); + CallerMoGoUiSettingManager.INSTANCE.stepInNightMode();//夜间模式 状态栏字体颜色变黑 } private void showFragment() { diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/location/MoGoLocationDispatcher.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/location/MoGoLocationDispatcher.kt index 4c4a2d2823..b2e9d85e3a 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/location/MoGoLocationDispatcher.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/location/MoGoLocationDispatcher.kt @@ -150,8 +150,8 @@ object MoGoLocationDispatcher : lastGaoDeLocation.errorInfo = it.errorInfo } - // 计算最后一次工控机同步的定位是否超时，如果超时则切换为高德地图定位,暂定超过30秒需要切换 - if (TimeUtils.getNowMills() - lastGnssLocation.lastReceiveTime > 30000) { + // 计算最后一次工控机同步的定位是否超时，如果超时则切换为高德地图定位,暂定超过10秒需要切换 + if (TimeUtils.getNowMills() - lastGnssLocation.lastReceiveTime > 10000) { // WGS84坐标系高精度位置信息 CallerChassisLocationWGS84ListenerManager.invokeChassisLocationWGS84( lastGaoDeLocation, diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt index 3d8abc20a1..4670d44fc8 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt @@ -539,7 +539,7 @@ internal class DebugSettingView @JvmOverloads constructor( if (isChecked) { CallerMoGoUiSettingManager.stepInDayMode() } else { - CallerMoGoUiSettingManager.stepOutDayMode() + CallerMoGoUiSettingManager.stepInNightMode() } } diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/setting/MoGoUiSettingProvider.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/setting/MoGoUiSettingProvider.kt index 7ed85728d2..17159f35d5 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/setting/MoGoUiSettingProvider.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/setting/MoGoUiSettingProvider.kt @@ -25,7 +25,7 @@ interface MoGoUiSettingProvider { /** * 退出 皮肤 白天 模式 */ - fun stepOutDayMode() + fun stepInNightMode() /** * 获取 皮肤 模式 diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/setting/CallerMoGoUiSettingManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/setting/CallerMoGoUiSettingManager.kt index 8430deb5cb..dffb580436 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/setting/CallerMoGoUiSettingManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/setting/CallerMoGoUiSettingManager.kt @@ -26,7 +26,7 @@ object CallerMoGoUiSettingManager : MoGoUiSettingProvider { CallerSkinModeListenerManager.invokeListener(FunctionBuildConfig.skinMode) } - override fun stepOutDayMode() { + override fun stepInNightMode() { FunctionBuildConfig.skinMode = 0 CallerSkinModeListenerManager.invokeListener(FunctionBuildConfig.skinMode) } diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/DeviceUtils.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/DeviceUtils.java index 2f332aae10..fbab2ccd1e 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/DeviceUtils.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/DeviceUtils.java @@ -525,6 +525,7 @@ public final class DeviceUtils { /** * 判断用户是否打开系统定位服务 + * * @return true 已经打开定位服务；false 没有打开定位服务 */ public static boolean isLocationEnabled() { @@ -544,4 +545,19 @@ public final class DeviceUtils { } } + + /** + * 中科创达 EB5获取SN好的方法： + * getprop persist.device.sn + * ZTS46S10009S + * + * @return 当前EB5设备SN + */ + public static String getEB5DevicesSN() { + ShellUtils.CommandResult result = UtilsBridge.execCmd("getprop persist.device.sn", false); + if (result.result == 0) { + LogUtils.d("", result.toString()); + } + return "02:00:00:00:00:00"; + } } diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java index 6f84a09bb4..b4ffdb0d44 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java @@ -2,7 +2,6 @@ package com.mogo.map.uicontroller; import android.graphics.Point; import android.graphics.Rect; -import android.location.Location; import android.view.View; import androidx.annotation.Nullable; @@ -16,8 +15,6 @@ import org.json.JSONObject; import java.util.List; -import mogo.telematics.pad.MessagePad; - /** * @author congtaowang * @since 2019-12-26 @@ -77,15 +74,6 @@ public interface IMogoMapUIController { */ void showMyLocation(View view); - - /** - * 以外部定位的方式改变当前位置 - * - * @param location - */ - void changeMyLocation(Location location); - - /** * 获取比例尺数据 * diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java index 0601c8a4c0..9b3f73fbc4 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java @@ -15,7 +15,6 @@ import static com.mogo.map.uicontroller.VisualAngleMode.MODE_MEDIUM_SIGHT; import android.content.Context; import android.graphics.Point; import android.graphics.Rect; -import android.location.Location; import android.os.Bundle; import android.os.Trace; import android.text.TextUtils; @@ -88,8 +87,6 @@ import org.json.JSONObject; import java.util.ArrayList; import java.util.List; -import mogo.telematics.pad.MessagePad; - public class AMapViewWrapper implements IMogoMapView, IMogoMapUIController, LocationListener, @@ -592,10 +589,6 @@ public class AMapViewWrapper implements IMogoMapView, return MogoMapUtils.calculateLineDistance(ObjectUtils.fromMogo(p1), ObjectUtils.fromMogo(p2)); } - @Override - public void changeMyLocation(Location location) { - } - @Override public synchronized boolean isCarLocked() { return mMapView.getMapAutoViewHelper().getLockMode(); diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java index c98a952f30..8534091edf 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java @@ -2,7 +2,6 @@ package com.mogo.map; import android.graphics.Point; import android.graphics.Rect; -import android.location.Location; import android.view.View; import com.mogo.eagle.core.data.map.CenterLine; @@ -19,8 +18,6 @@ import org.json.JSONObject; import java.util.List; -import mogo.telematics.pad.MessagePad; - /** * @author congtaowang * @since 2019-12-26 @@ -228,15 +225,6 @@ public class MogoMapUIController implements IMogoMapUIController { return 0; } - - @Override - public void changeMyLocation(Location location) { - initDelegate(); - if (mDelegate != null) { - mDelegate.changeMyLocation(location); - } - } - @Override public boolean isCarLocked() { initDelegate(); diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/uicontroller/AMapUIController.java b/libraries/mogo-map/src/main/java/com/mogo/map/uicontroller/AMapUIController.java index 7181ca456e..49cac1f769 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/uicontroller/AMapUIController.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/uicontroller/AMapUIController.java @@ -2,8 +2,6 @@ package com.mogo.map.uicontroller; import android.graphics.Point; import android.graphics.Rect; -import android.location.Location; -import android.util.Log; import android.view.View; import com.mogo.eagle.core.data.map.CenterLine; @@ -15,8 +13,6 @@ import org.json.JSONObject; import java.util.List; -import mogo.telematics.pad.MessagePad; - /** * @author congtaowang * @since 2019-12-26 @@ -200,12 +196,6 @@ public class AMapUIController implements IMogoMapUIController { return 0; } - @Override - public void changeMyLocation(Location location) { - if (mClient != null) { - mClient.changeMyLocation(location); - } - } @Override public boolean isCarLocked() {