From be10caa4173df1a02b13cd00c396967ddf700e47 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Tue, 15 Mar 2022 19:11:06 +0800 Subject: [PATCH] fix bug of class name of interface --- .../och/bus/presenter/OchBusOrderModel.java | 3 +- ...axiPassengerAutopilotPlanningCallback.java | 3 +- .../passenger/model/TaxiPassengerModel.java | 39 ++++++----- .../TaxiPassengerServingOrderPresenter.java | 10 +-- .../taxi/passenger/ui/OCHNaviFragment.java | 0 .../ui/TaxiPassengerServingOrderFragment.java | 70 ++++++++++--------- .../core/utilcode/mogo/logger/CallerLogger.kt | 8 +-- .../core/utilcode/mogo/logger/Logger.java | 54 +++++++++----- 8 files changed, 104 insertions(+), 83 deletions(-) delete mode 100644 OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/OCHNaviFragment.java diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusOrderModel.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusOrderModel.java index eeebb658bd..d3d7836fa3 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusOrderModel.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusOrderModel.java @@ -57,6 +57,7 @@ import io.reactivex.exceptions.UndeliverableException; import io.reactivex.functions.Consumer; import io.reactivex.plugins.RxJavaPlugins; import io.reactivex.schedulers.Schedulers; +import mogo.telematics.pad.MessagePad; /** * @author congtaowang @@ -788,7 +789,7 @@ public class OchBusOrderModel { * 到站 * @param data */ - public void onArriveAt( AutopilotStationInfo data){ + public void onArriveAt( MessagePad.ArrivalNotification data){ if ( currentStationIndex > stationList.size() - 1 ) { Logger.e( TAG, "到站异常，取消后续操作结束" ); return; diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/callback/IOCHTaxiPassengerAutopilotPlanningCallback.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/callback/IOCHTaxiPassengerAutopilotPlanningCallback.java index e790784ebb..e6b6ca23ae 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/callback/IOCHTaxiPassengerAutopilotPlanningCallback.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/callback/IOCHTaxiPassengerAutopilotPlanningCallback.java @@ -4,11 +4,10 @@ package com.mogo.och.taxi.passenger.callback; import java.util.List; import mogo.telematics.pad.MessagePad; - /** * @author: wangmingjun * @date: 2021/11/1 */ -interface IOCHTaxiAutopilotPlanningCallback { +public interface IOCHTaxiPassengerAutopilotPlanningCallback { void routeResult(List models); } \ No newline at end of file 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 3d4a2da445..0b66e8f22c 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 @@ -57,6 +57,9 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import mogo.telematics.pad.MessagePad; +import mogo_msg.MogoReportMsg; + /** * Created by pangfan on 2021/8/19 * @@ -472,6 +475,11 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback private IMoGoAutopilotStatusListener mGoAutopilotStatusListener = new IMoGoAutopilotStatusListener(){ + @Override + public void onAutopilotGuardian(@Nullable MogoReportMsg.MogoReportMessage guardianInfo) { + + } + private boolean arriveAtEnd = false; //乘客app专用字段 @Override @@ -525,18 +533,13 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback } @Override - public void onAutopilotGuardian(@Nullable AutopilotGuardianStatusInfo autopilotGuardianStatusInfo) { - - } - - @Override - public void onAutopilotArriveAtStation(@Nullable AutopilotStationInfo data) { + public void onAutopilotArriveAtStation(@Nullable MessagePad.ArrivalNotification arrivalNotification) { if (FunctionBuildConfig.isDemoMode && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) { arriveAtEnd = true; } - if (data == null || !checkCurrentOCHOrder() + if (arrivalNotification == null || !checkCurrentOCHOrder() || (getCurOrderStatus() == TaxiPassengerOrderStatusEnum.ArriveAtEndStation)) { return; } @@ -544,28 +547,29 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback // TipToast.shortTip("到达目的地"); } } + }; - private IMoGoAutopilotPlanningListener moGoAutopilotPlanningListener = new IMoGoAutopilotPlanningListener(){ + private final IMoGoAutopilotPlanningListener moGoAutopilotPlanningListener = new IMoGoAutopilotPlanningListener(){ + + @Override + public void onAutopilotRotting(@Nullable MessagePad.GlobalPathResp routeList) { + if (null != routeList && routeList.getWayPointsList().size() > 0){ + mAutopilotPlanningCallback.routeResult(routeList.getWayPointsList()); + } + } @Override public void onAutopilotTrajectory(ArrayList trajectoryInfos) { } - @Override - public void onAutopilotRotting(AutopilotRouteInfo routeList) { - if (null != routeList && routeList.getModels() != null){ - mAutopilotPlanningCallback.routeResult(routeList.getModels()); - - } - } }; /** * 限速监听 */ - private LimitingVelocityListener limitingVelocityListener = new LimitingVelocityListener(){ + private final LimitingVelocityListener limitingVelocityListener = new LimitingVelocityListener(){ @Override public void onLimitingVelocityChange(int limitingVelocity) { @@ -597,7 +601,4 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback } - /** - * END - */ } diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/TaxiPassengerServingOrderPresenter.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/TaxiPassengerServingOrderPresenter.java index ac42091c69..70cbfff0d6 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/TaxiPassengerServingOrderPresenter.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/TaxiPassengerServingOrderPresenter.java @@ -8,7 +8,6 @@ import androidx.annotation.RequiresApi; import androidx.lifecycle.LifecycleOwner; import com.mogo.commons.mvp.Presenter; -import com.mogo.eagle.core.data.autopilot.AutopilotRouteInfo; import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrderQueryRespBean; import com.mogo.och.taxi.passenger.callback.IOCHTaxiPassengerAutopilotPlanningCallback; @@ -21,6 +20,8 @@ import com.mogo.och.taxi.passenger.ui.TaxiPassengerServingOrderFragment; import java.util.ArrayList; import java.util.List; +import mogo.telematics.pad.MessagePad; + /** * @author: wangmingjun * @date: 2022/3/14 @@ -59,11 +60,11 @@ public class TaxiPassengerServingOrderPresenter extends Presenter models) { + public void routeResult(List models) { if (models == null) return; List latLngList = new ArrayList<>(); - for (AutopilotRouteInfo.RouteModels routeModel : models) { - latLngList.add(new MogoLatLng(routeModel.getLat(), routeModel.getLon())); + for (MessagePad.Location routeModel : models) { + latLngList.add(new MogoLatLng(routeModel.getLatitude(), routeModel.getLongitude())); } mView.routeResult(latLngList); } @@ -106,4 +107,5 @@ public class TaxiPassengerServingOrderPresenter extends Presenter list = new ArrayList<>(); - for (int i = 0; i < 200 ; i++){ + List list = new ArrayList<>(); + for (int i = 0; i < 200; i++) { + MessagePad.Location.Builder builder = MessagePad.Location.newBuilder(); AutopilotRouteInfo.RouteModels routeModels = new AutopilotRouteInfo.RouteModels(); - if (i <= 100){ - routeModels.setLat(40.199248903658166); - routeModels.setLon(116.73435586102245 + i * 0.0001); - }else { - routeModels.setLat(40.199248903658166 + i * 0.0001); - routeModels.setLon(116.73435586102245 + 100 * 0.0001); + if (i <= 100) { + builder.setLatitude(40.199248903658166); + builder.setLongitude(116.73435586102245 + i * 0.0001); + } else { + builder.setLatitude(40.199248903658166 + i * 0.0001); + builder.setLongitude(116.73435586102245 + 100 * 0.0001); } - list.add(routeModels); + list.add(builder.build()); } mPresenter.routeResult(list); return true; @@ -142,10 +140,10 @@ public class TaxiPassengerServingOrderFragment extends /** * 设置进度条最大值为 起点终点首次规划出的值 */ - private void setSeekBarMax(){ + private void setSeekBarMax() { //计算订单起点和终点距离 int maxInt = TaxiPassengerModel.getInstance().calculateOrderDistanceSum(); - Logger.d(TAG,"maxInt = "+maxInt); + Logger.d(TAG, "maxInt = " + maxInt); mProgressSeekBar.setMax(maxInt); } @@ -153,7 +151,7 @@ public class TaxiPassengerServingOrderFragment extends * 行驶进度值更新 */ @RequiresApi(api = Build.VERSION_CODES.N) - private void updateDriveProcessLoading(int progressLoading){ + private void updateDriveProcessLoading(int progressLoading) { mProgressSeekBar.setProgress( TaxiPassengerModel.getInstance().calculateOrderDistanceSum() - progressLoading , true); @@ -198,6 +196,7 @@ public class TaxiPassengerServingOrderFragment extends /** * 绘制 + * * @param coordinates */ private void drawablePolyline(List coordinates) { @@ -212,7 +211,7 @@ public class TaxiPassengerServingOrderFragment extends } } - private void clearPolyline(){ + private void clearPolyline() { if (mMapDirectionView != null) { UiThreadHandler.post(new Runnable() { @Override @@ -227,13 +226,13 @@ public class TaxiPassengerServingOrderFragment extends mTPOrderStartStation.setText(order.startSiteAddr); mTPOrderEndStation.setText(order.endSiteAddr); - if (TaxiPassengerOrderStatusEnum.ArriveAtStartStation.getCode() == order.orderStatus){ + if (TaxiPassengerOrderStatusEnum.ArriveAtStartStation.getCode() == order.orderStatus) { mTPOrderStatus.setText(getString(R.string.taxi_p_arrive_to_start)); setSeekBarMax(); return; } - if (TaxiPassengerOrderStatusEnum.OnTheWayToEndStation.getCode() == order.orderStatus){ + if (TaxiPassengerOrderStatusEnum.OnTheWayToEndStation.getCode() == order.orderStatus) { mTPOrderStatus.setText(R.string.taxi_p_start_to_end); return; } @@ -246,7 +245,7 @@ public class TaxiPassengerServingOrderFragment extends DecimalFormat fnum = new DecimalFormat("##0.00"); String remainDis = fnum.format((float) meters / 1000); int remainTime = (int) timeInSecond / 60; - updateOrderDisAndTimeView(remainDis,remainTime,arriveTime); + updateOrderDisAndTimeView(remainDis, remainTime, arriveTime); updateDriveProcessLoading(meters); } @@ -266,39 +265,41 @@ public class TaxiPassengerServingOrderFragment extends /** * 更新速度 + * * @param newSpeed */ private void updateSpeedView(float newSpeed) { int speed = (int) (Math.abs(newSpeed) * 3.6F); // 倒车时工控机反馈定位信息中speed为负值 - if (speed < mLimitingVelocity ){ - mTPSpeedTv.setText(getSpeedTextStyle(String.valueOf(speed),true)); - }else { + if (speed < mLimitingVelocity) { + mTPSpeedTv.setText(getSpeedTextStyle(String.valueOf(speed), true)); + } else { mTPSpeedTv.setText(getSpeedTextStyle(String.valueOf(speed), false)); } } /** * 设置速度的颜色 + * * @param content * @param isNormal 正常状态 true, 超速状态 * @return */ - private SpannableStringBuilder getSpeedTextStyle(String content,boolean isNormal){ - if (isNormal){ + private SpannableStringBuilder getSpeedTextStyle(String content, boolean isNormal) { + if (isNormal) { return TaxiPassengerUtils.getGradientFontSpan(content - , 0xFFCEEEFF ,0xFFA1DAFF); - }else {//超速 + , 0xFFCEEEFF, 0xFFA1DAFF); + } else {//超速 return TaxiPassengerUtils.getGradientFontSpan(content - ,0xFFFE2505 ,0xFFFF6F62); + , 0xFFFE2505, 0xFFFF6F62); } } - private void runOnUIThread( Runnable executor ) { - if ( executor == null ) { + private void runOnUIThread(Runnable executor) { + if (executor == null) { return; } - if ( Looper.myLooper() != Looper.getMainLooper() ) { - UiThreadHandler.post( executor ); + if (Looper.myLooper() != Looper.getMainLooper()) { + UiThreadHandler.post(executor); } else { executor.run(); } @@ -311,6 +312,7 @@ public class TaxiPassengerServingOrderFragment extends /** * 设置指南针旋转 + * * @param bearing */ private void startIvCompass(float bearing) { diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/logger/CallerLogger.kt b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/logger/CallerLogger.kt index 7bd90bf05e..a9260d9940 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/logger/CallerLogger.kt +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/logger/CallerLogger.kt @@ -6,25 +6,25 @@ object CallerLogger { fun i(tag: String, message: Any? = null) { if (scene.check(tag)) { - Logger.i(tag, message.toString(), null) + Logger.i(tag, message.toString()) } } fun d(tag: String, message: Any? = null) { if (scene.check(tag)) { - Logger.d(tag, message.toString(), null) + Logger.d(tag, message.toString()) } } fun w(tag: String, message: Any? = null) { if (scene.check(tag)) { - Logger.w(tag, message.toString(), null) + Logger.w(tag, message.toString()) } } fun e(tag: String, message: Any? = null) { if (scene.check(tag)) { - Logger.e(tag, message.toString(), null) + Logger.e(tag, message.toString()) } } diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/logger/Logger.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/logger/Logger.java index dabc026b82..779150aa17 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/logger/Logger.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/logger/Logger.java @@ -15,43 +15,59 @@ public final class Logger { return sPrinter.init(logLevel); } - public static void d( String tag, String message, Object... args) { - if(isLoggable(LogLevel.DEBUG)) sPrinter.d(tag, message, args); + public static void d(String tag, String message) { + d(tag, message, (Object) null); } - public static void e( String tag, String message, Object... args) { - if(isLoggable(LogLevel.ERROR)) sPrinter.e(tag, null, message, args); + public static void d(String tag, String message, Object... args) { + if (isLoggable(LogLevel.DEBUG)) sPrinter.d(tag, message, args); } - public static void e( String tag, Throwable throwable, String message, Object... args) { - if(isLoggable(LogLevel.ERROR)) sPrinter.e(tag, throwable, message, args); + public static void e(String tag, String message){ + e(tag,message, (Object) null); } - public static void i( String tag, String message, Object... args) { - if(isLoggable(LogLevel.INFO)) sPrinter.i(tag, message, args); + public static void e(String tag, String message, Object... args) { + if (isLoggable(LogLevel.ERROR)) sPrinter.e(tag, null, message, args); } - public static void v( String tag, String message, Object... args) { - if(isLoggable(LogLevel.VERBOSE)) sPrinter.v(tag, message, args); + public static void e(String tag, Throwable throwable, String message, Object... args) { + if (isLoggable(LogLevel.ERROR)) sPrinter.e(tag, throwable, message, args); } - public static void w( String tag, String message, Object... args) { - if(isLoggable(LogLevel.WARN)) sPrinter.w(tag, message, args); + public static void i(String tag, String message) { + i(tag, message, (Object) null); } - public static void easyLog( String tag, String message) { - if(isLoggable(LogLevel.DEBUG)) sPrinter.d(tag, message); + public static void i(String tag, String message, Object... args) { + if (isLoggable(LogLevel.INFO)) sPrinter.i(tag, message, args); } - public static void json( String tag, String json) { - if(isLoggable(LogLevel.DEBUG)) sPrinter.json(tag, json); + public static void v(String tag, String message, Object... args) { + if (isLoggable(LogLevel.VERBOSE)) sPrinter.v(tag, message, args); } - public static void xml( String tag, String xml) { - if(isLoggable(LogLevel.DEBUG)) sPrinter.xml(tag, xml); + public static void w(String tag, String message){ + w(tag,message, (Object) null); } - private static boolean isLoggable(LogLevel logLevel){ + public static void w(String tag, String message, Object... args) { + if (isLoggable(LogLevel.WARN)) sPrinter.w(tag, message, args); + } + + public static void easyLog(String tag, String message) { + if (isLoggable(LogLevel.DEBUG)) sPrinter.d(tag, message); + } + + public static void json(String tag, String json) { + if (isLoggable(LogLevel.DEBUG)) sPrinter.json(tag, json); + } + + public static void xml(String tag, String xml) { + if (isLoggable(LogLevel.DEBUG)) sPrinter.xml(tag, xml); + } + + private static boolean isLoggable(LogLevel logLevel) { return sPrinter.getSettings().getLogLevel().level <= logLevel.level; } }