From b1852c201681e324b635b1eb3b2285d0bb8f3c81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cdonghongyu-mackbook=E2=80=9D?= Date: Mon, 1 Aug 2022 10:37:50 +0800 Subject: [PATCH 1/7] =?UTF-8?q?[Change]=201=E3=80=81=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=BC=A0=E5=85=A5=E5=9C=B0=E5=9B=BE=E7=9A=84?= =?UTF-8?q?=E7=B2=BE=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: “donghongyu-mackbook” --- .../mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 fb7cb4b3d4..63bc02bfdd 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 @@ -1001,7 +1001,7 @@ public class AMapViewWrapper implements IMogoMapView, bean.setAcceleration(gnssInfo.getAcceleration()); bean.setAlt(gnssInfo.getAltitude()); bean.setSystemTime(Double.valueOf(gnssInfo.getSystemTime()).longValue()); - bean.setSatelliteTime(Double.valueOf(gnssInfo.getSatelliteTime()).longValue()); + bean.setSatelliteTime(Double.valueOf(gnssInfo.getSatelliteTime()*1000).longValue()); bean.setLon(gnssInfo.getLongitude()); bean.setLat(gnssInfo.getLatitude()); bean.setGnss_speed(((float) gnssInfo.getGnssSpeed())); From 57fab01347f6cda6330b3aaf1fd681bc9506ac54 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Mon, 1 Aug 2022 11:12:26 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=85=B3=E9=97=AD=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../function/autopilot/adapter/MoGoHandAdasMsgManager.java | 3 +-- .../appupgrade/network/UpgradeAppNetWorkManager.java | 2 +- .../eagle/core/function/bindingcar/BindingcarProvider.java | 4 ++-- .../bindingcar/network/BindingcarNetWorkManager.java | 6 +++--- .../com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt | 2 -- .../src/main/java/com/mogo/map/AMapViewWrapper.java | 2 +- .../mogo/test/crashreport/apm/ApmCrashReportProvider.java | 2 +- 7 files changed, 9 insertions(+), 12 deletions(-) diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java index 00962377ac..e3346498b9 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java @@ -105,9 +105,8 @@ public class MoGoHandAdasMsgManager implements @Override public void onAutopilotCarConfig(@NotNull MessagePad.CarConfigResp carConfigResp) { - Log.d("liyz", "onAutopilotCarConfig carConfigResp "); if (carConfigResp != null && !TextUtils.isEmpty(carConfigResp.getMacAddress())) { - Log.d("liyz", "carConfigResp.getMacAddress() = " + carConfigResp.getMacAddress()); +// Log.d("liyz", "carConfigResp.getMacAddress() = " + carConfigResp.getMacAddress()); CallerBindingcarManager.getBindingcarProvider().getBindingcarInfo(carConfigResp.getMacAddress(), MoGoAiCloudClientConfig.getInstance().getSn()); } } diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/appupgrade/network/UpgradeAppNetWorkManager.java b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/appupgrade/network/UpgradeAppNetWorkManager.java index 389c7ef1c2..7a53bd9385 100644 --- a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/appupgrade/network/UpgradeAppNetWorkManager.java +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/appupgrade/network/UpgradeAppNetWorkManager.java @@ -80,7 +80,7 @@ public class UpgradeAppNetWorkManager { @Override public void onNext(@NonNull UpgradeAppInfo info) { if (info != null && info.getData() != null && info.getData().size() > 0) { - Log.d("liyz", "UpgradeAppInfo url = " + info.getData().get(0).getApp_url() + "----code = " + info.getData().get(0).getVersion_code()); +// Log.d("liyz", "UpgradeAppInfo url = " + info.getData().get(0).getApp_url() + "----code = " + info.getData().get(0).getVersion_code()); CallerLogger.INSTANCE.d(TAG, "UpgradeAppInfo url = " + info.getData().get(0).getApp_url() + "----code = " + info.getData().get(0).getVersion_code()); // if (info.getData().get(0).getVersion_code() > versionCode) { diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java index 223a897d26..2e3783649d 100644 --- a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java @@ -95,7 +95,7 @@ public class BindingcarProvider implements IMoGoBindingcarProvider { private void driverScreen(String macAddress, String widevineIDWithMd5) { long currentHour = System.currentTimeMillis() / (1000 * 60); long oldHour = SharedPrefsMgr.getInstance(mContext).getLong("typeDriver", 0); - Log.d("liyz", "driverScreen --------> "); +// Log.d("liyz", "driverScreen --------> "); //如果2分钟内频繁调，需要拦截，业务导致的会多次请求工控机信息 if (HmiBuildConfig.isShowSnBindingView) { if (currentHour - oldHour > 1) { @@ -108,7 +108,7 @@ public class BindingcarProvider implements IMoGoBindingcarProvider { private void passengerScreen(String macAddress, String widevineIDWithMd5) { long currentHour = System.currentTimeMillis() / (1000 * 60); long oldHour = SharedPrefsMgr.getInstance(mContext).getLong("typePassenger", 0); - Log.d("liyz", "passengerScreen --------> "); +// Log.d("liyz", "passengerScreen --------> "); //如果2分钟内频繁调，需要拦截，业务导致的会多次请求工控机信息 if (HmiBuildConfig.isShowSnBindingView) { if (currentHour - oldHour > 1) { diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java index d9ea6a223b..e3fc946415 100644 --- a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java @@ -62,7 +62,7 @@ public class BindingcarNetWorkManager { public void getBindingcarInfo(Context context, String macAddress, String widevineIDWithMd5, int screenType) { // String macAddress = "48:b0:2d:3a:bc:78"; // String sn = "X20202203105S688HZ"; - Log.d("liyz", "macAddress = " + macAddress + "----widevineIDWithMd5 = " + widevineIDWithMd5); +// Log.d("liyz", "macAddress = " + macAddress + "----widevineIDWithMd5 = " + widevineIDWithMd5); BindingcarRequest request = new BindingcarRequest(macAddress, widevineIDWithMd5, screenType); RequestBody requestBody = RequestBody.create(MediaType.get("application/json;charset=UTF-8"), GsonUtil.jsonFromObject(request)); mBindingcarApiService.getBindingcarInfo(token, requestBody) @@ -77,7 +77,7 @@ public class BindingcarNetWorkManager { public void onNext(@NonNull BindingcarInfo info) { if (info != null && info.getData() != null) { CallerLogger.INSTANCE.d(TAG, "getBindingcarInfo onNext info.getData() =" + info.getData().toString()); - Log.d("liyz", "getBindingcarInfo onNext info.getData() =" + info.getData().toString()); +// Log.d("liyz", "getBindingcarInfo onNext info.getData() =" + info.getData().toString()); if (info.getData().getCompare().equals("0")) { CallerHmiManager.INSTANCE.showBindingcarDialog(); } else if (info.getData().getCompare().equals("3")) { @@ -104,7 +104,7 @@ public class BindingcarNetWorkManager { @Override public void onError(@NonNull Throwable e) { CallerLogger.INSTANCE.e(TAG, "getBindingcarInfo onError e = " + e.toString() + "---e.getMessage = " + e.getMessage()); - Log.e("liyz", "getBindingcarInfo onError e = " + e.toString() + "---e.getMessage = " + e.getMessage()); +// Log.e("liyz", "getBindingcarInfo onError e = " + e.toString() + "---e.getMessage = " + e.getMessage()); } @Override diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt index 268eaaf089..2697ddad0f 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt @@ -1043,7 +1043,6 @@ import java.util.* */ override fun showTurnLight(light: Int) { if (HmiBuildConfig.isShowTurnLightView) { - Log.e("liyz", "showTurnLight light = $light") ThreadUtils.runOnUiThread { if (light == 1) { if (!isLeftLight) { @@ -1083,7 +1082,6 @@ import java.util.* */ override fun showBrakeLight(light: Int) { if (HmiBuildConfig.isShowBrakeLightView) { - Log.e("liyz", "showBrakeLight isBrake = $isBrake") ThreadUtils.runOnUiThread { if (light == 1) { //刹车灯亮 if (!isBrake) { 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 63bc02bfdd..8659c81a7f 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 @@ -649,7 +649,7 @@ public class AMapViewWrapper implements IMogoMapView, @Override public void setCarLightsType(int type, int time) { if (checkAMapView()) { - Log.d("liyz", "AMapViewWrapper setCarLightsType type = " + type + "---time = " + time); +// Log.d("liyz", "AMapViewWrapper setCarLightsType type = " + type + "---time = " + time); mMapView.getMapAutoViewHelper().setTailLightsType(type, time); } } diff --git a/test/crashreport-apmbyte/src/main/java/com/mogo/test/crashreport/apm/ApmCrashReportProvider.java b/test/crashreport-apmbyte/src/main/java/com/mogo/test/crashreport/apm/ApmCrashReportProvider.java index 6fb8c7974e..bd6da83424 100644 --- a/test/crashreport-apmbyte/src/main/java/com/mogo/test/crashreport/apm/ApmCrashReportProvider.java +++ b/test/crashreport-apmbyte/src/main/java/com/mogo/test/crashreport/apm/ApmCrashReportProvider.java @@ -63,7 +63,7 @@ public class ApmCrashReportProvider implements ITestCrashReportProvider { String cityCode = SharedPrefsMgr.getInstance(context).getString(SharedPrefsConstants.LOCATION_CITY_CODE); String lat = SharedPrefsMgr.getInstance(context).getString(SharedPrefsConstants.LOCATION_LATITUDE); String logt = SharedPrefsMgr.getInstance(context).getString(SharedPrefsConstants.LOCATION_LONGITUDE); - Log.d("liyz", "cityCode = " + cityCode + " --lat = " +lat + " --logt = " + logt); +// Log.d("liyz", "cityCode = " + cityCode + " --lat = " +lat + " --logt = " + logt); //地图版本 String mapSDKVersion = AppUtils.getCustomMapSDKVersion(context); map.put("MAP_SDK_VERSION", mapSDKVersion); From 840a9e842c3d65037955db65131d148d37e937ef Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Mon, 1 Aug 2022 12:04:07 +0800 Subject: [PATCH 3/7] =?UTF-8?q?[290=20bus/taxi]=201=E3=80=81=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E9=93=BE=E8=B7=AF=E6=97=A5=E5=BF=97=E9=87=8C=E5=B7=B2?= =?UTF-8?q?=E6=9C=89=E4=B8=94=E9=A2=91=E7=B9=81=E6=89=93=E5=8D=B0=E7=9A=84?= =?UTF-8?q?log=202=E3=80=81=E4=BF=AE=E6=94=B9bus=E4=B9=98=E5=AE=A2?= =?UTF-8?q?=E5=B1=8F=E5=B0=8F=E5=9C=B0=E5=9B=BE=E4=B8=A4=E8=BE=B9=E8=BE=B9?= =?UTF-8?q?=E8=B7=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../passenger/model/BusPassengerModel.java | 22 +++++++++---------- .../ui/BusPassengerMapDirectionView.java | 2 +- .../mogo/och/bus/presenter/BusPresenter.java | 2 +- .../passenger/model/TaxiPassengerModel.java | 2 +- .../com/mogo/och/taxi/model/TaxiModel.java | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java index c43f715dbe..7d06ba2d26 100644 --- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java +++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java @@ -301,17 +301,17 @@ public class BusPassengerModel { @Override public void onAutopilotStatusResponse(@NotNull AutopilotStatusInfo autopilotStatusInfo) { - if (autopilotStatusInfo == null) return; - int state = autopilotStatusInfo.getState(); - CallerLogger.INSTANCE.d( M_BUS_P + TAG, "state = %s", state ); - if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING) { - //2022.7.20 自动驾驶更换成带档位的 -// if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotRunning(); - } else if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE) { -// if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotEnable(); - } else if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE) { -// if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotDisable(); - } +// if (autopilotStatusInfo == null) return; +// int state = autopilotStatusInfo.getState(); +// CallerLogger.INSTANCE.d( M_BUS_P + TAG, "state = %s", state ); +// if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING) { +// //2022.7.20 自动驾驶更换成带档位的 +//// if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotRunning(); +// } else if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE) { +//// if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotEnable(); +// } else if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE) { +//// if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotDisable(); +// } } @Override diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java index 193ddd3703..b4e780ef1c 100644 --- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java +++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java @@ -202,7 +202,7 @@ public class BusPassengerMapDirectionView } boundsBuilder.include(currentLatLng); //第二个参数为四周留空宽度 - mAMap.moveCamera(CameraUpdateFactory.newLatLngBoundsRect(boundsBuilder.build(),50,50,50,50)); + mAMap.moveCamera(CameraUpdateFactory.newLatLngBoundsRect(boundsBuilder.build(),100,100,100,100)); }else { //设置希望展示的地图缩放级别 diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java index d5cb01601e..fadc4ad8d1 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java @@ -165,7 +165,7 @@ public class BusPresenter extends Presenter public void onAutopilotStatusResponse(@NotNull AutopilotStatusInfo autopilotStatusInfo) { if (autopilotStatusInfo == null) return; int state = autopilotStatusInfo.getState(); - CallerLogger.INSTANCE.d(M_BUS + TAG, "onStateChange: " + state + "currentAutopilotStatus = " + currentAutopilotStatus); +// CallerLogger.INSTANCE.d(M_BUS + TAG, "onStateChange: " + state + "currentAutopilotStatus = " + currentAutopilotStatus); switch (state) { case IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE: if (currentAutopilotStatus != IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE) { diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java index 0a5042f633..43937448f5 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java @@ -505,7 +505,7 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback public void onAutopilotStatusResponse(@NotNull AutopilotStatusInfo autopilotStatusInfo) { if (autopilotStatusInfo == null) return; int state = autopilotStatusInfo.getState(); - CallerLogger.INSTANCE.d( M_TAXI_P + TAG, "state = %s", state ); +// CallerLogger.INSTANCE.d( M_TAXI_P + TAG, "state = %s", state ); if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING) { if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotRunning(); if (mCurrentOCHOrder != null diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java index c9aff5714a..c5c7e2316f 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java @@ -1119,7 +1119,7 @@ public class TaxiModel { public void onAutopilotStatusResponse(@NotNull AutopilotStatusInfo autopilotStatusInfo) { if (autopilotStatusInfo == null) return; int state = autopilotStatusInfo.getState(); - CallerLogger.INSTANCE.d(M_TAXI + TAG, "state = %s", state); +// CallerLogger.INSTANCE.d(M_TAXI + TAG, "state = %s", state); if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING) { if (state != mPrevAPStatus && mADASStatusCallback != null){ mADASStatusCallback.onAutopilotRunning(); From 4afe25ef3da01edf86269af6e9bad2697dd809c8 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Mon, 1 Aug 2022 14:40:24 +0800 Subject: [PATCH 4/7] remove unuse cose --- .../src/main/java/com/mogo/och/taxi/model/TaxiModel.java | 1 - .../main/java/com/mogo/och/taxi/network/TaxiServiceManager.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java index c5c7e2316f..147830d57e 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java @@ -1119,7 +1119,6 @@ public class TaxiModel { public void onAutopilotStatusResponse(@NotNull AutopilotStatusInfo autopilotStatusInfo) { if (autopilotStatusInfo == null) return; int state = autopilotStatusInfo.getState(); -// CallerLogger.INSTANCE.d(M_TAXI + TAG, "state = %s", state); if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING) { if (state != mPrevAPStatus && mADASStatusCallback != null){ mADASStatusCallback.onAutopilotRunning(); diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/TaxiServiceManager.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/TaxiServiceManager.java index ce93f197b6..279623f531 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/TaxiServiceManager.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/TaxiServiceManager.java @@ -442,7 +442,7 @@ public class TaxiServiceManager { @Override public void onSuccess(T o) { super.onSuccess(o); - CallerLogger.INSTANCE.e(M_TAXI + TAG,apiName + ": onSuccess() " + o.msg); + CallerLogger.INSTANCE.d(M_TAXI + TAG,apiName + ": onSuccess() " + o.msg); if (callback != null) { callback.onSuccess(o); } From 72cb08d7439b8658720c0d1155bd01bd6b905518 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Mon, 1 Aug 2022 14:43:47 +0800 Subject: [PATCH 5/7] remove log invoke --- .../eagle/core/function/autopilot/MoGoAutopilotProvider.kt | 1 - .../function/autopilot/adapter/MoGoHandAdasMsgManager.java | 1 - .../function/appupgrade/network/UpgradeAppNetWorkManager.java | 2 -- .../eagle/core/function/bindingcar/BindingcarProvider.java | 2 -- .../function/bindingcar/network/BindingcarNetWorkManager.java | 3 --- .../mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java | 1 - .../src/main/java/com/mogo/map/MogoMapUIController.java | 1 - .../main/java/com/mogo/map/uicontroller/AMapUIController.java | 1 - 8 files changed, 12 deletions(-) diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt index 1b8df636d8..76e82209f0 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt @@ -508,7 +508,6 @@ class MoGoAutopilotProvider : override fun onAutopilotCarConfig(carConfigResp: MessagePad.CarConfigResp) { // 乘客屏才监听 AppConfigInfo.plateNumber = carConfigResp.plateNumber -// Log.d("liyz", "onAutopilotCarConfig 乘客屏Mac地址为 = ${carConfigResp.macAddress}") CallerBindingcarManager.getBindingcarProvider() .getBindingcarInfo(carConfigResp.macAddress, MoGoAiCloudClientConfig.getInstance().sn) invokeNettyConnResult("乘客屏车牌号:${carConfigResp.plateNumber},Mac地址为：${carConfigResp.macAddress}") diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java index e3346498b9..ee651b95c2 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java @@ -106,7 +106,6 @@ public class MoGoHandAdasMsgManager implements @Override public void onAutopilotCarConfig(@NotNull MessagePad.CarConfigResp carConfigResp) { if (carConfigResp != null && !TextUtils.isEmpty(carConfigResp.getMacAddress())) { -// Log.d("liyz", "carConfigResp.getMacAddress() = " + carConfigResp.getMacAddress()); CallerBindingcarManager.getBindingcarProvider().getBindingcarInfo(carConfigResp.getMacAddress(), MoGoAiCloudClientConfig.getInstance().getSn()); } } diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/appupgrade/network/UpgradeAppNetWorkManager.java b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/appupgrade/network/UpgradeAppNetWorkManager.java index 7a53bd9385..cefcdcc149 100644 --- a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/appupgrade/network/UpgradeAppNetWorkManager.java +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/appupgrade/network/UpgradeAppNetWorkManager.java @@ -80,7 +80,6 @@ public class UpgradeAppNetWorkManager { @Override public void onNext(@NonNull UpgradeAppInfo info) { if (info != null && info.getData() != null && info.getData().size() > 0) { -// Log.d("liyz", "UpgradeAppInfo url = " + info.getData().get(0).getApp_url() + "----code = " + info.getData().get(0).getVersion_code()); CallerLogger.INSTANCE.d(TAG, "UpgradeAppInfo url = " + info.getData().get(0).getApp_url() + "----code = " + info.getData().get(0).getVersion_code()); // if (info.getData().get(0).getVersion_code() > versionCode) { @@ -92,7 +91,6 @@ public class UpgradeAppNetWorkManager { @Override public void onError(@NonNull Throwable e) { CallerLogger.INSTANCE.e(TAG, "UpgradeAppInfo onError e = " + e.toString() + "---e.getMessage = " + e.getMessage()); -// Log.e("liyz", "UpgradeAppInfo onError e = " + e.toString() + "---e.getMessage = " + e.getMessage()); } @Override diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java index 2e3783649d..8a5e01ee78 100644 --- a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java @@ -95,7 +95,6 @@ public class BindingcarProvider implements IMoGoBindingcarProvider { private void driverScreen(String macAddress, String widevineIDWithMd5) { long currentHour = System.currentTimeMillis() / (1000 * 60); long oldHour = SharedPrefsMgr.getInstance(mContext).getLong("typeDriver", 0); -// Log.d("liyz", "driverScreen --------> "); //如果2分钟内频繁调，需要拦截，业务导致的会多次请求工控机信息 if (HmiBuildConfig.isShowSnBindingView) { if (currentHour - oldHour > 1) { @@ -108,7 +107,6 @@ public class BindingcarProvider implements IMoGoBindingcarProvider { private void passengerScreen(String macAddress, String widevineIDWithMd5) { long currentHour = System.currentTimeMillis() / (1000 * 60); long oldHour = SharedPrefsMgr.getInstance(mContext).getLong("typePassenger", 0); -// Log.d("liyz", "passengerScreen --------> "); //如果2分钟内频繁调，需要拦截，业务导致的会多次请求工控机信息 if (HmiBuildConfig.isShowSnBindingView) { if (currentHour - oldHour > 1) { diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java index e3fc946415..0a0fa8c38e 100644 --- a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java @@ -62,7 +62,6 @@ public class BindingcarNetWorkManager { public void getBindingcarInfo(Context context, String macAddress, String widevineIDWithMd5, int screenType) { // String macAddress = "48:b0:2d:3a:bc:78"; // String sn = "X20202203105S688HZ"; -// Log.d("liyz", "macAddress = " + macAddress + "----widevineIDWithMd5 = " + widevineIDWithMd5); BindingcarRequest request = new BindingcarRequest(macAddress, widevineIDWithMd5, screenType); RequestBody requestBody = RequestBody.create(MediaType.get("application/json;charset=UTF-8"), GsonUtil.jsonFromObject(request)); mBindingcarApiService.getBindingcarInfo(token, requestBody) @@ -77,7 +76,6 @@ public class BindingcarNetWorkManager { public void onNext(@NonNull BindingcarInfo info) { if (info != null && info.getData() != null) { CallerLogger.INSTANCE.d(TAG, "getBindingcarInfo onNext info.getData() =" + info.getData().toString()); -// Log.d("liyz", "getBindingcarInfo onNext info.getData() =" + info.getData().toString()); if (info.getData().getCompare().equals("0")) { CallerHmiManager.INSTANCE.showBindingcarDialog(); } else if (info.getData().getCompare().equals("3")) { @@ -104,7 +102,6 @@ public class BindingcarNetWorkManager { @Override public void onError(@NonNull Throwable e) { CallerLogger.INSTANCE.e(TAG, "getBindingcarInfo onError e = " + e.toString() + "---e.getMessage = " + e.getMessage()); -// Log.e("liyz", "getBindingcarInfo onError e = " + e.toString() + "---e.getMessage = " + e.getMessage()); } @Override 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 8659c81a7f..340c7ff3fd 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 @@ -649,7 +649,6 @@ public class AMapViewWrapper implements IMogoMapView, @Override public void setCarLightsType(int type, int time) { if (checkAMapView()) { -// Log.d("liyz", "AMapViewWrapper setCarLightsType type = " + type + "---time = " + time); mMapView.getMapAutoViewHelper().setTailLightsType(type, time); } } 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 f25d1a1d89..dfd5bc2d1a 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 @@ -257,7 +257,6 @@ public class MogoMapUIController implements IMogoMapUIController { public void setCarLightsType(int type, int time) { initDelegate(); if (mDelegate != null) { -// Log.d("liyz", "MogoMapUIController type = " + type + "---time = " + time); mDelegate.setCarLightsType(type, time); } } 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 ccc7018538..efba482a0e 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 @@ -223,7 +223,6 @@ public class AMapUIController implements IMogoMapUIController { @Override public void setCarLightsType(int type, int time) { -// Log.d("liyz", "AMapUIController type = " + type + "---time = " + time); if (mClient != null) { mClient.setCarLightsType(type, time); } From a592afc7947b4b1c838ab9d44f65f3a2eca53ae8 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Mon, 1 Aug 2022 14:45:18 +0800 Subject: [PATCH 6/7] remove log --- .../com/mogo/eagle/core/function/map/identify/TrackObj.java | 3 --- .../mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt | 2 -- 2 files changed, 5 deletions(-) diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/identify/TrackObj.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/identify/TrackObj.java index 9aeab730d7..1d91f86a50 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/identify/TrackObj.java +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/identify/TrackObj.java @@ -116,14 +116,11 @@ public class TrackObj { lat = matchedPoint[1]; s2LatLng = S2LatLng.fromDegrees(cacheData.getLatitude(), cacheData.getLongitude()); s2CellId = S2CellId.fromLatLng(s2LatLng).parent(22); -// Log.d("hy uuid : " + cacheData.getUuid(), " 更新定位 lon : " + matchedPoint[0] + " , lat : " + matchedPoint[1]); } else { centerLineInfo = null; -// Log.d("hy uuid : " + cacheData.getUuid(), "计算结果出现问题 : " + matchedPoint[0] + " , " + matchedPoint[1]); } } else { centerLineInfo = null; -// Log.d("hy uuid : " + cacheData.getUuid(), "未获取到道路数据"); } } cacheData = cacheData.toBuilder().setLongitude(lon).setLatitude(lat).build(); diff --git a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt index 1e283712bb..b79d01c83f 100644 --- a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt +++ b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt @@ -395,7 +395,6 @@ class MogoPrivateObuManager private constructor() { // val currentTime = TimeUtils.getNowMills() % 60000 // val delayTime = currentTime - hvTime -// Log.e("liyz", "onCvxIvpThreatIndInfo ---> currentTime = $currentTime ----- hvTime---> $hvTime ---hvMillTime = $hvMillTime ----hvSecondMillTime = $hvSecondMillTime ---delayTime---> $delayTime") // CallerObuListenerManager.invokeDelayTime(delayTime) // CallerLogger.e( // "$M_OBU${MogoObuConst.TAG_MOGO_OBU}", @@ -423,7 +422,6 @@ class MogoPrivateObuManager private constructor() { // val currentTime = TimeUtils.getNowMills() % 60000 // val delayTime = currentTime - hvTime -// Log.e("liyz", "onCvxPtcThreatIndInfo ---> currentTime = $currentTime ----- hvTime---> $hvTime ---hvMillTime = $hvMillTime ----hvSecondMillTime = $hvSecondMillTime ---delayTime---> $delayTime") // CallerObuListenerManager.invokeDelayTime(delayTime) // CallerLogger.d( // "$M_OBU${MogoObuConst.TAG_MOGO_OBU}", From e467d244b4e5b3feb8c5442f883d753a6f3e2069 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cdonghongyu-mackbook=E2=80=9D?= Date: Mon, 1 Aug 2022 15:00:59 +0800 Subject: [PATCH 7/7] =?UTF-8?q?[Change]=20A=E3=80=81=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E9=AB=98=E7=B2=BE=E5=9C=B0=E5=9B=BE=201=E3=80=81=E7=A8=B3?= =?UTF-8?q?=E5=AE=9A=E6=80=A7=EF=BC=9B=202=E3=80=81=E6=80=A7=E8=83=BD?= =?UTF-8?q?=E7=9B=91=E6=8E=A7=EF=BC=9B=203=E3=80=81=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E5=BC=95=E5=AF=BC=E7=BA=BF=E5=85=89=E6=96=91=E6=95=88=E6=9E=9C?= =?UTF-8?q?=EF=BC=9B=204=E3=80=81=E8=A1=A1=E9=98=B3=E8=8C=83=E5=9B=B4?= =?UTF-8?q?=E8=B7=AF=E4=BE=A7=E8=AE=BE=E5=A4=87=E7=BB=98=E5=88=B6=EF=BC=8C?= =?UTF-8?q?=E5=8C=85=E5=90=AB=E7=BA=A2=E7=BB=BF=E7=81=AF=E3=80=81=E6=91=84?= =?UTF-8?q?=E5=83=8F=E5=A4=B4=E3=80=81rsu=E3=80=81mec=E3=80=81=E9=9B=B7?= =?UTF-8?q?=E8=BE=BE=EF=BC=9B=205=E3=80=81=E4=BB=96=E8=BD=A6=E9=94=9A?= =?UTF-8?q?=E7=82=B9=E9=A2=9C=E8=89=B2=E6=B8=90=E5=8F=98=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E6=95=88=E6=9E=9C=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: “donghongyu-mackbook” --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 8e90bc84c3..b5a4928f9d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -82,7 +82,7 @@ MOGO_LOCATION_VERSION=1.4.3.8 MOGO_TELEMATIC_VERSION=1.4.3.8 ######## MogoAiCloudSDK Version ######## # 自研地图 -MAP_SDK_VERSION=2.3.1.1 +MAP_SDK_VERSION=2.4.0.1 MAP_SDK_OPERATION_VERSION=1.0.13 # websocket WEBSOCKET_VERSION=1.1.7