diff --git a/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/manager/CharterAnalyticsManager.java b/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/manager/CharterAnalyticsManager.java index 0338c6f393..d8f40dd0c7 100644 --- a/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/manager/CharterAnalyticsManager.java +++ b/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/manager/CharterAnalyticsManager.java @@ -47,7 +47,7 @@ public class CharterAnalyticsManager { private void triggerStartAutopilotFailureEvent(String failCode, String failMsg){ if (mStartAutopilotParams.isEmpty()) return; - CallerLogger.INSTANCE.e( M_BUS + "triggerStartAutopilotFailureEvent", failMsg ); + CallerLogger.e( M_BUS + "triggerStartAutopilotFailureEvent", failMsg ); if (CallerAutoPilotStatusListenerManager.INSTANCE.getState() != IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING){ diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java index 3690ed62c9..5d1778ca79 100644 --- a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java +++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java @@ -75,14 +75,14 @@ public class MogoOCHBusPassenger implements IMogoOCH { * 进入鹰眼模式，设置手势缩放地图失效 */ private void stepIntoVrMode() { - CallerLogger.INSTANCE.d( M_BUS_P + TAG, "进入vr模式" ); + CallerLogger.d( M_BUS_P + TAG, "进入vr模式" ); CallerMoGoUiSettingManager.INSTANCE.stepInDayMode();//白天模式 状态栏字体颜色变黑 } private void showFragment() { FragmentManager supportFragmentManager = mActivity.getSupportFragmentManager(); if(mPassengerFragment == null){ - CallerLogger.INSTANCE.d(M_BUS_P + TAG, "准备add fragment======"); + CallerLogger.d(M_BUS_P + TAG, "准备add fragment======"); Fragment fragmentByTag = supportFragmentManager.findFragmentByTag(BusPassengerRouteFragment.TAG); if (fragmentByTag instanceof BusPassengerRouteFragment){ mPassengerFragment = (BusPassengerRouteFragment)fragmentByTag; @@ -95,7 +95,7 @@ public class MogoOCHBusPassenger implements IMogoOCH { return; } - CallerLogger.INSTANCE.d(M_BUS_P + TAG, "准备show fragment"); + CallerLogger.d(M_BUS_P + TAG, "准备show fragment"); supportFragmentManager.beginTransaction().show(mPassengerFragment).commitAllowingStateLoss(); } diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java index 2c7963cf07..f10f9537c9 100644 --- a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java +++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java @@ -42,7 +42,7 @@ public class BusPassengerModelLoopManager { if (mQueryLineDisposable != null && !mQueryLineDisposable.isDisposed()) { return; } - CallerLogger.INSTANCE.i(M_BUS_P + TAG, "startQueryDriverLineLoop()"); + CallerLogger.i(M_BUS_P + TAG, "startQueryDriverLineLoop()"); mQueryLineDisposable = Observable.interval(LOOP_DELAY, LOOP_LINE_2S, TimeUnit.MILLISECONDS) .map((aLong -> aLong + 1)) @@ -53,7 +53,7 @@ public class BusPassengerModelLoopManager { public void stopQueryDriverLineLoop() { if (mQueryLineDisposable != null) { - CallerLogger.INSTANCE.i(M_BUS_P + TAG, "stopQueryDriverLineLoop()"); + CallerLogger.i(M_BUS_P + TAG, "stopQueryDriverLineLoop()"); mQueryLineDisposable.dispose(); mQueryLineDisposable = null; } diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java index a448c2cd36..491c55a46f 100644 --- a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java +++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java @@ -42,7 +42,7 @@ public class BaseBusPassengerPresenter extends Presenter90度 经过 @@ -431,11 +431,11 @@ public class OrderModel { startLat, (int) location.getHeading()); - CallerLogger.INSTANCE.d(M_BUS + TAG, "judgeArrivedStation() stationAngle = " + stationAngle); + CallerLogger.d(M_BUS + TAG, "judgeArrivedStation() stationAngle = " + stationAngle); //3、刚过站且过站距离在15m内， 提交到站 if (stationAngle > 90 && distance <= BusConst.ARRIVE_AT_END_STATION_DISTANCE){ - CallerLogger.INSTANCE.d(M_BUS + TAG, "judgeArrivedStation() = 刚过站且在15m内"); + CallerLogger.d(M_BUS + TAG, "judgeArrivedStation() = 刚过站且在15m内"); onArriveAt(null); //无自动驾驶到站信息传null } @@ -447,7 +447,7 @@ public class OrderModel { * 查询小巴路线 */ public void queryBusRoutes() { - CallerLogger.INSTANCE.d(M_BUS + TAG, "查询小巴路线"); + CallerLogger.d(M_BUS + TAG, "查询小巴路线"); OrderServiceManager.queryBusRoutes(mContext, new OchCommonServiceCallback() { @Override public void onSuccess(BusRoutesResponse data) { @@ -456,7 +456,7 @@ public class OrderModel { || data.getResult().getSites() == null || data.getResult().getSites().isEmpty()) { //当为空时,显示无绑定路线图 - CallerLogger.INSTANCE.d(M_BUS + TAG, "获取到小巴路线数据:空 "); + CallerLogger.d(M_BUS + TAG, "获取到小巴路线数据:空 "); if (refreshBusStationsCallback != null) { refreshBusStationsCallback.updateEmptyUi(); } @@ -466,7 +466,7 @@ public class OrderModel { removeTipRunnables(); return; } - CallerLogger.INSTANCE.d(M_BUS + TAG, "获取到小巴路线数据: " + data); + CallerLogger.d(M_BUS + TAG, "获取到小巴路线数据: " + data); updateBusStatus(data.getResult()); } @@ -549,12 +549,12 @@ public class OrderModel { * 重置路线站点状态--结束路线，当前路线恢复到始发站 */ public void abortTask() { - CallerLogger.INSTANCE.d(M_BUS + TAG, "结束当前路线abortTask"); + CallerLogger.d(M_BUS + TAG, "结束当前路线abortTask"); OrderServiceManager.abortTask(mContext, currentTaskId , new OchCommonServiceCallback() { @Override public void onSuccess(BaseData o) { - CallerLogger.INSTANCE.d(M_BUS + TAG, "abortTask success: " + o); + CallerLogger.d(M_BUS + TAG, "abortTask success: " + o); if (o.code == 0) { // 重置成功 endOrAbortTaskSuccess(); clearBusStationDatas(); @@ -655,14 +655,14 @@ public class OrderModel { if (FunctionBuildConfig.isPassStartAutopilotCommand && TextUtils.isEmpty(busRoutesResult.csvFileUrl) && TextUtils.isEmpty(busRoutesResult.csvFileUrlDPQP)){ ToastUtils.showLong("无发布轨迹, 请发布后重试"); - CallerLogger.INSTANCE.e(M_BUS + TAG, "isPassStartAutopilotCommand = " + + CallerLogger.e(M_BUS + TAG, "isPassStartAutopilotCommand = " + FunctionBuildConfig.isPassStartAutopilotCommand + "busRoutesResult.csvFileUrl = "+ busRoutesResult.csvFileUrl + "busRoutesResult.csvFileUrlDPQP = "+busRoutesResult.csvFileUrlDPQP); return; } - CallerLogger.INSTANCE.e(M_BUS + TAG, "isPassStartAutopilotCommand = " + + CallerLogger.e(M_BUS + TAG, "isPassStartAutopilotCommand = " + FunctionBuildConfig.isPassStartAutopilotCommand); @@ -682,13 +682,13 @@ public class OrderModel { AutopilotControlParameters parameters = initAutopilotControlParameters(leaveIndex); if (null == parameters) { - CallerLogger.INSTANCE.e(M_BUS + TAG, "行程日志-AutopilotControlParameters is empty."); + CallerLogger.e(M_BUS + TAG, "行程日志-AutopilotControlParameters is empty."); return; } CallerAutoPilotControlManager.INSTANCE.startAutoPilot(parameters); - CallerLogger.INSTANCE.d(M_BUS + TAG, "行程日志-开启自动驾驶====" + GsonUtil.jsonFromObject(parameters) + CallerLogger.d(M_BUS + TAG, "行程日志-开启自动驾驶====" + GsonUtil.jsonFromObject(parameters) + " startLatLon=" + parameters.startName + "，endLatLon=" + parameters.endName + "isRestart = " + isRestart); @@ -702,14 +702,14 @@ public class OrderModel { */ private void arriveSiteStation() { if ( backgroundCurrentStationIndex +1 > stationList.size() - 1 ) { //到站短时间内调用多次 - CallerLogger.INSTANCE.e( M_BUS + TAG, "数组越界" ); + CallerLogger.e( M_BUS + TAG, "数组越界" ); return; } int arrivedStationIndex = backgroundCurrentStationIndex + 1; String arriveStation = stationList.get(arrivedStationIndex).getName(); String arriveStationKr = stationList.get(arrivedStationIndex).getNameKr(); String departureStopName = stationList.get(backgroundCurrentStationIndex).getName(); - CallerLogger.INSTANCE.d(M_BUS + TAG, "arriveSiteStation-currentStationIndex = " + arrivedStationIndex); + CallerLogger.d(M_BUS + TAG, "arriveSiteStation-currentStationIndex = " + arrivedStationIndex); OrderServiceManager.arriveSiteStation(mContext, stationList.get(arrivedStationIndex).getSeq(), @@ -718,7 +718,7 @@ public class OrderModel { new OchCommonServiceCallback() { @Override public void onSuccess(BaseData o) { - CallerLogger.INSTANCE.d(M_BUS + TAG, "行程日志-arriveSiteStation success"); + CallerLogger.d(M_BUS + TAG, "行程日志-arriveSiteStation success"); if (o != null && o.code == 0){ queryBusRoutes(); isArrivedStation = true; @@ -774,7 +774,7 @@ public class OrderModel { * 离站上报 */ public void leaveStation() { - CallerLogger.INSTANCE.d(M_BUS + TAG, "leaveStation-backgroundCurrentStationIndex = " + backgroundCurrentStationIndex); + CallerLogger.d(M_BUS + TAG, "leaveStation-backgroundCurrentStationIndex = " + backgroundCurrentStationIndex); String nextStationName = ""; String nextStationNameKr = ""; MogoLocation nextStationPoint = new MogoLocation(); @@ -800,7 +800,7 @@ public class OrderModel { @Override public void onSuccess(BaseData o) { isArrivedStation = false; - CallerLogger.INSTANCE.d(M_BUS + TAG, "行程日志-离站成功开往下一站===="); + CallerLogger.d(M_BUS + TAG, "行程日志-离站成功开往下一站===="); //需要更改当前站和下一站的状态 然后渲染 //startOrStopQueryPassengerWriteOff(false); queryBusRoutes(); @@ -849,7 +849,7 @@ public class OrderModel { FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = false; //是否强制绘制引导线 CallerAutoPilotControlManager.INSTANCE.setIgnoreConditionDraw(false);// 同步给乘客屏 CallerAutoPilotControlManager.INSTANCE.setIPCDemoMode(false);//是否自动启动自驾 - CallerLogger.INSTANCE.d(M_BUS + TAG, "美化模式-ignore：置为false"); + CallerLogger.d(M_BUS + TAG, "美化模式-ignore：置为false"); } } @@ -884,7 +884,7 @@ public class OrderModel { for (int i = 0; i < stationList.size(); i++) { BusStationBean s = stationList.get(i); - CallerLogger.INSTANCE.d(M_BUS + "updateBusStationsStatus--", + CallerLogger.d(M_BUS + "updateBusStationsStatus--", "Index=" + i + " ,name = " + s.getName() + " ," + s.isLeaving() + "," + s.getDrivingStatus()); // 是否正在开往下一站 @@ -917,7 +917,7 @@ public class OrderModel { BusStationBean currentStation = stationList.get(backgroundCurrentStationIndex); - CallerLogger.INSTANCE.d(M_BUS + TAG, + CallerLogger.d(M_BUS + TAG, "行程日志-STATION_STATUS_STOPPED-backgroundCurrentStationIndex=" + backgroundCurrentStationIndex + " isLeaving()=" + currentStation.isLeaving()); @@ -927,11 +927,11 @@ public class OrderModel { && backgroundCurrentStationIndex <= stationList.size() - 1)) {//行驶过程中设置美化 if (stationList.get(backgroundCurrentStationIndex).isLeaving()) { startBeautificationMode(); - CallerLogger.INSTANCE.d(M_BUS + TAG, "美化模式-ignore：置为true（每次滑动出发）"); + CallerLogger.d(M_BUS + TAG, "美化模式-ignore：置为true（每次滑动出发）"); } else if (backgroundCurrentStationIndex > 0 && backgroundCurrentStationIndex < stationList.size() - 1) { //美化模式下 中间站点到站 引导线要一直绘制，所以此处不出强制绘制不传false CallerAutoPilotControlManager.INSTANCE.setIPCDemoMode(false); - CallerLogger.INSTANCE.d(M_BUS + TAG, "美化模式-ignore：false（到达中间站）"); + CallerLogger.d(M_BUS + TAG, "美化模式-ignore：false（到达中间站）"); clearStartAutopilotTag(); } else { closeBeautificationMode(); @@ -1042,7 +1042,7 @@ public class OrderModel { * 在踩刹车、控制方向盘等操作后，会停止自动驾驶，重启自动驾驶的话相当于重新设置自动驾驶目的地 */ public void restartAutopilot() { - CallerLogger.INSTANCE.d(M_BUS + TAG, "行程日志-重启自动驾驶===" + isGoingToNextStation); + CallerLogger.d(M_BUS + TAG, "行程日志-重启自动驾驶===" + isGoingToNextStation); //只去启动自动驾驶，不再去上报离站 startAutopilot(firstStartAutopilot >= 1, -1); } @@ -1057,10 +1057,10 @@ public class OrderModel { private void travelOver() { if (backgroundCurrentStationIndex >= stationList.size()) { - CallerLogger.INSTANCE.e(M_BUS + TAG, "travel over index out of station list"); + CallerLogger.e(M_BUS + TAG, "travel over index out of station list"); return; } - CallerLogger.INSTANCE.d(M_BUS + TAG, "单程结束===="); + CallerLogger.d(M_BUS + TAG, "单程结束===="); CallerAutoPilotControlManager.INSTANCE.cancelAutoPilot(); setTrajectoryStation(null,null,-1L); endTask(); @@ -1070,12 +1070,12 @@ public class OrderModel { * task正常结束 */ private void endTask() { - CallerLogger.INSTANCE.d(M_BUS + TAG, "任务正常走完endTask()"); + CallerLogger.d(M_BUS + TAG, "任务正常走完endTask()"); OrderServiceManager.endTask(mContext, currentTaskId , new OchCommonServiceCallback() { @Override public void onSuccess(BaseData o) { - CallerLogger.INSTANCE.d(M_BUS + TAG, "endTask success: " + o); + CallerLogger.d(M_BUS + TAG, "endTask success: " + o); if (o.code == 0) { endOrAbortTaskSuccess(); clearBusStationDatas(); @@ -1117,7 +1117,7 @@ public class OrderModel { */ public void onArriveAt(MessagePad.ArrivalNotification data) { if (backgroundCurrentStationIndex + 1 > stationList.size() - 1) { - CallerLogger.INSTANCE.e(M_BUS + TAG, "行程日志-到站异常，取消后续操作结束"); + CallerLogger.e(M_BUS + TAG, "行程日志-到站异常，取消后续操作结束"); return; } @@ -1133,19 +1133,19 @@ public class OrderModel { String arriveLat = NumberFormatUtil.cutOutNumber(arriveStation.getLat(), 5); String arriveLon = NumberFormatUtil.cutOutNumber(arriveStation.getLon(), 5); - CallerLogger.INSTANCE.d(M_BUS + TAG, "行程日志-dataLatitude = "+ latitude+ + CallerLogger.d(M_BUS + TAG, "行程日志-dataLatitude = "+ latitude+ ", dataLongitude = " + longitude + "; arriveLat = " + arriveLat + ", arriveLon = " +arriveLon); if (!latitude.equals(arriveLat) || !longitude.equals(arriveLon)) { - CallerLogger.INSTANCE.e(M_BUS + TAG, "行程日志-到站拦截,到站坐标不一致"); + CallerLogger.e(M_BUS + TAG, "行程日志-到站拦截,到站坐标不一致"); return; } } if (isArrivedStation) return; - CallerLogger.INSTANCE.d(M_BUS + TAG, "行程日志-当前==backgroundCurrentStationIndex=" + CallerLogger.d(M_BUS + TAG, "行程日志-当前==backgroundCurrentStationIndex=" + backgroundCurrentStationIndex); arriveSiteStation(); @@ -1177,7 +1177,7 @@ public class OrderModel { } public void startOrStopOrderLoop(boolean start) { - CallerLogger.INSTANCE.d(M_BUS + TAG, "startOrStopOrderLoop() " + start); + CallerLogger.d(M_BUS + TAG, "startOrStopOrderLoop() " + start); if (start) { BusModelLoopManager.getInstance().startHeartbeatLoop(); } else { @@ -1228,15 +1228,15 @@ public class OrderModel { AutopilotControlParameters parameters = initAutopilotControlParameters(-1); if (null == parameters) { - CallerLogger.INSTANCE.e(M_BUS + TAG, "AutopilotControlParameters is empty."); + CallerLogger.e(M_BUS + TAG, "AutopilotControlParameters is empty."); return; } - CallerLogger.INSTANCE.d(M_BUS + TAG, "AutopilotControlParameters is update."); + CallerLogger.d(M_BUS + TAG, "AutopilotControlParameters is update."); CallerAutoPilotStatusListenerManager.INSTANCE.updateAutopilotControlParameters(parameters); } private void clearAutopilotControlParameters() { - CallerLogger.INSTANCE.d(M_BUS + TAG, "AutopilotControlParameters is clear."); + CallerLogger.d(M_BUS + TAG, "AutopilotControlParameters is clear."); CallerAutoPilotStatusListenerManager.INSTANCE.updateAutopilotControlParameters(null); } @@ -1246,14 +1246,14 @@ public class OrderModel { if (leaveIndex < 0) { if (backgroundCurrentStationIndex + 1 > stationList.size() - 1 || !isGoingToNextStation) { - CallerLogger.INSTANCE.e(M_BUS + TAG, "行程日志-mismatch condition1."); + CallerLogger.e(M_BUS + TAG, "行程日志-mismatch condition1."); return null; } currentStation = stationList.get(backgroundCurrentStationIndex); nextStation = stationList.get(backgroundCurrentStationIndex + 1); } else { if (leaveIndex + 1 > stationList.size() - 1 || !isGoingToNextStation) { - CallerLogger.INSTANCE.e(M_BUS + TAG, "行程日志-mismatch condition2."); + CallerLogger.e(M_BUS + TAG, "行程日志-mismatch condition2."); return null; } currentStation = stationList.get(leaveIndex); 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 e8f3e0f280..3aa7c64360 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 @@ -37,7 +37,7 @@ public class BusProvider implements IMogoOCH { * 进入鹰眼模式，设置手势缩放地图失效 */ private void stepIntoVrMode() { - CallerLogger.INSTANCE.d(M_BUS + TAG, "进入vr模式"); + CallerLogger.d(M_BUS + TAG, "进入vr模式"); CallerMoGoUiSettingManager.INSTANCE.stepInNightMode();//夜间模式 状态栏字体颜色变黑 } @@ -48,7 +48,7 @@ public class BusProvider implements IMogoOCH { private void showFragment() { FragmentManager supportFragmentManager = activity.getSupportFragmentManager(); if (busFragment == null) { - CallerLogger.INSTANCE.d(TAG, "准备add fragment======"); + CallerLogger.d(TAG, "准备add fragment======"); Fragment fragmentByTag = supportFragmentManager.findFragmentByTag(BusFragment.TAG); if (fragmentByTag instanceof BusFragment) { busFragment = (BusFragment) fragmentByTag; @@ -60,13 +60,13 @@ public class BusProvider implements IMogoOCH { } return; } - CallerLogger.INSTANCE.d(TAG, "准备show fragment"); + CallerLogger.d(TAG, "准备show fragment"); supportFragmentManager.beginTransaction().show(busFragment).commitAllowingStateLoss(); } private void hideFragment() { if (busFragment != null) { - CallerLogger.INSTANCE.d(TAG, "准备hide fragment"); + CallerLogger.d(TAG, "准备hide fragment"); activity.getSupportFragmentManager().beginTransaction().hide(busFragment).commitAllowingStateLoss(); } diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java index 4c4b743cfb..48ba4e86b4 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java @@ -1,23 +1,20 @@ package com.mogo.och.bus.fragment; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS; -import static com.mogo.map.MogoMap.DEFAULT; - import android.content.Intent; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.os.Bundle; import android.view.View; import android.widget.TextView; - import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import androidx.constraintlayout.widget.ConstraintLayout; import androidx.constraintlayout.widget.Group; - +import androidx.annotation.Nullable; import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.cloud.passport.MoGoAiCloudClientConfig; import com.mogo.eagle.core.data.config.FunctionBuildConfig; +import com.mogo.eagle.core.data.map.CenterLine; import com.mogo.eagle.core.data.temp.EventLogout; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager; @@ -25,10 +22,10 @@ import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant; import com.mogo.eagle.core.utilcode.util.ToastUtils; -import com.mogo.map.MapDataWrapper; import com.mogo.map.overlay.IMoGoOverlayManager; import com.mogo.map.overlay.core.Level; import com.mogo.map.overlay.point.Point; +import com.mogo.map.uicontroller.IMogoMapUIController; import com.mogo.och.bus.R; import com.mogo.och.bus.bean.BusStationBean; import com.mogo.och.bus.constant.BusConst; @@ -45,10 +42,8 @@ import com.mogo.och.common.module.utils.QRUtilsKt; import com.mogo.och.common.module.wigets.BindQRCodeDialog; import com.mogo.och.common.module.wigets.MarqueeTextView; import com.mogo.och.common.module.wigets.OCHCommitDialog; - import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; - import java.util.List; import me.jessyan.autosize.utils.AutoSizeUtils; @@ -86,11 +81,10 @@ public class BusFragment extends BaseBusTabFragment public void onActivityCreated(@Nullable Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); loginService = (LoginService) ARouter.getInstance().build(OchCommonConst.LOGINSERVICE).navigation(); - if (loginService != null) { - loginService.registerFragment(this, getPresenter(), new LoginBusImpl()); + if(loginService!=null){ + loginService.registerFragment(this, getPresenter(),new LoginBusImpl()); } } - @Override public void onDestroyView() { super.onDestroyView(); @@ -113,38 +107,41 @@ public class BusFragment extends BaseBusTabFragment groupStationsPanel = findViewById(R.id.group_stations_panel); noDataView = findViewById(R.id.no_line_data_view); - CallerLogger.INSTANCE.d(M_BUS + TAG, "initView: " + CallerAutoPilotStatusListenerManager.INSTANCE.getState()); + CallerLogger.d(M_BUS + TAG, "initView: " + CallerAutoPilotStatusListenerManager.INSTANCE.getState()); // 初始化的时候设置 UI 按钮状态 showAutopilotBiz(); mSwitchLine.setOnClickListener(this); - mLineName.setOnLongClickListener(v -> { - showHideTestBar(); - return false; + mLineName.setOnLongClickListener(new View.OnLongClickListener() { + @Override + public boolean onLongClick(View v) { + showHideTestBar(); + return false; + } }); } @Subscribe(threadMode = ThreadMode.MAIN) - public void changeOverview(EventLogout eventLogout) { - if (eventLogout.getMessgae() == EventLogout.LOGOUT_TYPE) { - CallerLogger.INSTANCE.d(M_BUS + TAG, "changeOverview Event消息去登出"); + public void changeOverview(EventLogout eventLogout){ + if (eventLogout.getMessgae() == EventLogout.LOGOUT_TYPE){ + CallerLogger.d(M_BUS + TAG,"changeOverview Event消息去登出"); mPresenter.logout(); - } else if (eventLogout.getMessgae() == EventLogout.SHOW_QR_TYPE) { //显示二维码 - CallerLogger.INSTANCE.d(M_BUS + TAG, "changeOverview Event qrcode"); + }else if (eventLogout.getMessgae() == EventLogout.SHOW_QR_TYPE){ //显示二维码 + CallerLogger.d(M_BUS + TAG,"changeOverview Event qrcode"); String qrUrl = String.format(FunctionBuildConfig.urlJson.getBindDriverQRUrl(), MoGoAiCloudClientConfig.getInstance().getSn()); Bitmap bmQr = QRUtilsKt.createQRCodeWithPicture( BitmapFactory.decodeResource(getResources(), R.drawable.icon_qr_center_logo) - , qrUrl, AutoSizeUtils.dp2px(getContext(), 340f), - AutoSizeUtils.dp2px(getContext(), 340f), true); - if (bmQr != null) { + ,qrUrl, AutoSizeUtils.dp2px(getContext(),340f), + AutoSizeUtils.dp2px(getContext(),340f),true); + if (bmQr != null){ BindQRCodeDialog.Builder builder = new BindQRCodeDialog.Builder(); builder.title(getString(R.string.bind_driver_qr_title)) .cancelStr(getString(R.string.qr_cancel)) .qrBm(bmQr).build(getContext()).show(); - } else { - CallerLogger.INSTANCE.d(M_BUS + TAG, "bmQr = null "); + }else { + CallerLogger.d(M_BUS + TAG,"bmQr = null "); } } } @@ -170,18 +167,18 @@ public class BusFragment extends BaseBusTabFragment super.onResume(); } - public void hideStationsPanel() { + public void hideStationsPanel(){ groupStationsPanel.setVisibility(View.GONE); noDataView.setVisibility(View.VISIBLE); } - public void showStationsPanel() { + public void showStationsPanel(){ groupStationsPanel.setVisibility(View.VISIBLE); noDataView.setVisibility(View.GONE); } - public void updateLineEmptyUI() { - setArrivedClickable(false); + public void updateLineEmptyUI(){ + setArrivedClikable(false); showOrHideSwitchLineBtn(true); hideStationsPanel(); hideSlidePanel(); @@ -197,7 +194,7 @@ public class BusFragment extends BaseBusTabFragment public void updateBusTaskStatus(String lineName, String lineTime, List stationList, int arrivingOrArrivedIndex, - boolean isArrived) { + boolean isArrived){ if (getActivity() == null) { return; @@ -213,9 +210,9 @@ public class BusFragment extends BaseBusTabFragment showOrHideSwitchLineBtn(false); mLineName.setText(lineName); - mTaskTime.setText(getString(R.string.bus_line_time_tag) + lineTime); + mTaskTime.setText(getString(R.string.bus_line_time_tag)+ lineTime); // 渲染小巴路线数据 - updateBusStationStatus(stationList, arrivingOrArrivedIndex, isArrived); + updateBusStationStatus(stationList,arrivingOrArrivedIndex,isArrived); }); } @@ -226,36 +223,36 @@ public class BusFragment extends BaseBusTabFragment startStation = stationList.get(0); endStation = stationList.get(stationList.size() - 1); - if (arrivingOrArrivedIndex == stationList.size() - 1 && isArrived) { + if (arrivingOrArrivedIndex == stationList.size() - 1 && isArrived){ //切换路线和结束路线按钮切换 showSlidePanel("单程结束"); setOrRemoveMapMaker(false, BusConst.BUS_END_MAP_MAKER, endStation.getLat() - , endStation.getLon(), R.raw.end_marker); - } else if (arrivingOrArrivedIndex == 0 && isArrived) { + , endStation.getLon(),R.raw.end_marker); + }else if (arrivingOrArrivedIndex == 0 && isArrived){ showSlidePanel("滑动出发"); setOrRemoveMapMaker(true, BusConst.BUS_START_MAP_MAKER, - startStation.getLat(), startStation.getLon(), R.raw.star_marker); + startStation.getLat(), startStation.getLon(),R.raw.star_marker); setOrRemoveMapMaker(true, BusConst.BUS_END_MAP_MAKER, - endStation.getLat(), endStation.getLon(), R.raw.end_marker); - } else { - if (isArrived) { + endStation.getLat(), endStation.getLon(),R.raw.end_marker); + }else{ + if (isArrived){ // 重置滑动按钮文字 showSlidePanel("滑动出发"); } setOrRemoveMapMaker(false, BusConst.BUS_START_MAP_MAKER, startStation.getLat() - , startStation.getLon(), R.raw.star_marker); + , startStation.getLon(),R.raw.star_marker); setOrRemoveMapMaker(true, BusConst.BUS_END_MAP_MAKER, endStation.getLat() - , endStation.getLon(), R.raw.end_marker); + , endStation.getLon(),R.raw.end_marker); } - if (stationList.size() > 2) { //只有两个站点 - updateMoreThanTwoStationsUI(stationList, arrivingOrArrivedIndex, isArrived); - } else { - updateTwoStationsUI(stationList, arrivingOrArrivedIndex, isArrived); + if (stationList.size() > 2){ //只有两个站点 + updateMoreThanTwoStationsUI(stationList,arrivingOrArrivedIndex,isArrived); + }else { + updateTwoStationsUI(stationList,arrivingOrArrivedIndex,isArrived); } updateBusTestBarInfo(); @@ -263,7 +260,6 @@ public class BusFragment extends BaseBusTabFragment /** * 有两个以上站点的路线 - * * @param stationList * @param arrivingOrArrivedIndex * @param isArrived @@ -277,22 +273,22 @@ public class BusFragment extends BaseBusTabFragment secondStationItem.setVisibility(View.VISIBLE); thirdStationItem.showOrHideStationArrowBg(false); - if (arrivingOrArrivedIndex == 0 || arrivingOrArrivedIndex - 1 == 0 - || (arrivingOrArrivedIndex - 2 == 0 && stationList.size() == 3)) { + if (arrivingOrArrivedIndex == 0 || arrivingOrArrivedIndex -1 == 0 + || (arrivingOrArrivedIndex -2 == 0 && stationList.size() == 3)){ firstStationItem.setStationTag(getResources().getString(R.string.bus_station_txt_tag_start)); - } else { + }else { firstStationItem.setStationTag(""); } if (arrivingOrArrivedIndex + 1 == stationList.size() - 1 || arrivingOrArrivedIndex == stationList.size() - 1 - || (arrivingOrArrivedIndex == 0 && arrivingOrArrivedIndex + 2 == stationList.size() - 1)) { //确认是否显示 "终" + || (arrivingOrArrivedIndex == 0 && arrivingOrArrivedIndex + 2 == stationList.size() - 1)){ //确认是否显示 "终" thirdStationItem.setStationTag(getResources().getString(R.string.bus_station_txt_tag_end)); - } else { + }else { thirdStationItem.setStationTag(""); } //圆点： 0:灰色 过站 1：绿色 到站或者即将到站 2：蓝色：未到站 - if (arrivingOrArrivedIndex == 0 && isArrived) { + if (arrivingOrArrivedIndex == 0 && isArrived){ firstStationItem.setStationNameColor(getResources().getColor(R.color.bus_line_station_color_selected)); secondStationItem.setStationNameColor(getResources().getColor(R.color.bus_arrived_station_name_text_color)); thirdStationItem.setStationNameColor(getResources().getColor(R.color.bus_arrived_station_name_text_color)); @@ -308,13 +304,13 @@ public class BusFragment extends BaseBusTabFragment firstStationItem.setStationArrowBg(2); secondStationItem.setStationArrowBg(2); - } else if (arrivingOrArrivedIndex == stationList.size() - 1) { + }else if (arrivingOrArrivedIndex == stationList.size() - 1){ firstStationItem.setStationNameColor(getResources().getColor(R.color.bus_station_tag_txt_un_color)); secondStationItem.setStationNameColor(getResources().getColor(R.color.bus_station_tag_txt_un_color)); thirdStationItem.setStationNameColor(getResources().getColor(R.color.bus_line_station_color_selected)); - firstStationItem.setStationName(stationList.get(arrivingOrArrivedIndex - 2).getName()); - secondStationItem.setStationName(stationList.get(arrivingOrArrivedIndex - 1).getName()); + firstStationItem.setStationName(stationList.get(arrivingOrArrivedIndex -2).getName()); + secondStationItem.setStationName(stationList.get(arrivingOrArrivedIndex -1).getName()); thirdStationItem.setStationName(stationList.get(arrivingOrArrivedIndex).getName()); firstStationItem.setStationPointBg(0); @@ -322,18 +318,18 @@ public class BusFragment extends BaseBusTabFragment thirdStationItem.setStationPointBg(1); firstStationItem.setStationArrowBg(0); - if (isArrived) { + if (isArrived){ secondStationItem.setStationArrowBg(0); - } else { + }else { secondStationItem.setStationArrowBg(1); } - } else { + }else { firstStationItem.setStationNameColor(getResources().getColor(R.color.bus_station_tag_txt_un_color)); secondStationItem.setStationNameColor(getResources().getColor(R.color.bus_line_station_color_selected)); thirdStationItem.setStationNameColor(getResources().getColor(R.color.bus_arrived_station_name_text_color)); - firstStationItem.setStationName(stationList.get(arrivingOrArrivedIndex - 1).getName()); + firstStationItem.setStationName(stationList.get(arrivingOrArrivedIndex -1).getName()); secondStationItem.setStationName(stationList.get(arrivingOrArrivedIndex).getName()); thirdStationItem.setStationName(stationList.get(arrivingOrArrivedIndex + 1).getName()); @@ -342,9 +338,9 @@ public class BusFragment extends BaseBusTabFragment thirdStationItem.setStationPointBg(2); secondStationItem.setStationArrowBg(2); - if (isArrived) { + if (isArrived){ firstStationItem.setStationArrowBg(0); - } else { + }else { firstStationItem.setStationArrowBg(1); } } @@ -353,7 +349,6 @@ public class BusFragment extends BaseBusTabFragment /** * 只有两个站点的路线 - * * @param stationList * @param arrivingOrArrivedIndex * @param isArrived @@ -373,22 +368,22 @@ public class BusFragment extends BaseBusTabFragment thirdStationItem.setStationName(stationList.get(1).getName()); //圆点： 0:灰色 过站 1：绿色 到站或者即将到站 2：蓝色：未到站 - if (arrivingOrArrivedIndex == 0 && isArrived) {//到站 + if (arrivingOrArrivedIndex == 0 && isArrived){//到站 firstStationItem.setStationNameColor(getResources().getColor(R.color.bus_line_station_color_selected)); thirdStationItem.setStationNameColor(getResources().getColor(R.color.bus_arrived_station_name_text_color)); firstStationItem.setStationPointBg(1); firstStationItem.setStationArrowBg(2); thirdStationItem.setStationPointBg(0); - } else { + }else { firstStationItem.setStationNameColor(getResources().getColor(R.color.bus_station_tag_txt_un_color)); thirdStationItem.setStationNameColor(getResources().getColor(R.color.bus_line_station_color_selected)); - if (isArrived) { //到终点 + if (isArrived){ //到终点 firstStationItem.setStationPointBg(0); firstStationItem.setStationArrowBg(0); thirdStationItem.setStationPointBg(1); - } else { //到终点途中 + }else { //到终点途中 firstStationItem.setStationPointBg(0); firstStationItem.setStationArrowBg(1); thirdStationItem.setStationPointBg(1); @@ -397,10 +392,10 @@ public class BusFragment extends BaseBusTabFragment } private void showOrHideSwitchLineBtn(boolean isShow) { - if (isShow) {//显示切换路线 + if (isShow){//显示切换路线 mSwitchLine.setTag(0); mSwitchLine.setText(getResources().getString(R.string.bus_switch_line_btn)); - } else {//显示结束路线 + }else {//显示结束路线 mSwitchLine.setTag(1); mSwitchLine.setText(getResources().getString(R.string.bus_close_line_btn)); } @@ -430,7 +425,7 @@ public class BusFragment extends BaseBusTabFragment @Override public void moveToEnd() { // 开启自动驾驶到下一站 - if (isAnimateRunning) { + if (isAnimateRunning){ stopAutopilotAnimation(); } mPresenter.autoDriveToNextStation(); @@ -447,19 +442,19 @@ public class BusFragment extends BaseBusTabFragment } } - public void clearBusStationsMarkers() { - CallerLogger.INSTANCE.d(M_BUS + TAG, "clearBusStationsMarkers()"); + public void clearBusStationsMarkers(){ + CallerLogger.d(M_BUS + TAG,"clearBusStationsMarkers()"); if (null != startStation) { setOrRemoveMapMaker(false, BusConst.BUS_START_MAP_MAKER, startStation.getLat() - , startStation.getLon(), R.raw.star_marker); + , startStation.getLon(),R.raw.star_marker); } if (null != endStation) { setOrRemoveMapMaker(false, BusConst.BUS_END_MAP_MAKER, endStation.getLat() - , endStation.getLon(), R.raw.end_marker); + , endStation.getLon(),R.raw.end_marker); } //清除鹰眼右下角小地图轨迹 - CallerLogger.INSTANCE.d(SceneConstant.M_BUS, "clearBusStationsMarkers --------->"); + CallerLogger.d(SceneConstant.M_BUS, "clearBusStationsMarkers --------->"); smallMapView.clearPolyline(); } @@ -480,10 +475,10 @@ public class BusFragment extends BaseBusTabFragment * @param isAdd * @param uuid */ - private void setOrRemoveMapMaker(boolean isAdd, String uuid, double lat, double longi, int resourceId) { + private void setOrRemoveMapMaker(boolean isAdd, String uuid, double lat, double longi,int resourceId) { if (isAdd) { Runnable setMapMarkerRunnable = () -> { - CallerLogger.INSTANCE.d(M_BUS + "setMapMaker= " + Thread.currentThread().getName(), + CallerLogger.d(M_BUS + "setMapMaker= "+Thread.currentThread().getName(), uuid + "=latitude=" + lat + ",longitude=" + longi); Point.Options.Builder builder = new Point.Options.Builder(BusConst.TYPE_MARKER_BUS_ORDER, Level.MAP_MARKER) @@ -495,27 +490,29 @@ public class BusFragment extends BaseBusTabFragment .icon3DRes(resourceId) .latitude(lat) .longitude(longi); - MapDataWrapper.INSTANCE.getCenterLineInfo(longi, lat, -1, centerLine -> { + IMogoMapUIController mapUIController = CallerMapUIServiceManager.INSTANCE.getMapUIController(); + if (mapUIController != null) { + CenterLine centerLine = mapUIController.getCenterLineInfo( + longi,lat,-1); if (null != centerLine) { // 有可能鹰眼map为空没有角度。判空使用后可能造成maker角度跟道路角度不一致 地图未初始化会返回空 Double angle = centerLine.getAngle(); if (angle != null) { builder.rotate(angle.floatValue()); } } - return null; - }); + } IMoGoOverlayManager overlayManager = CallerMapUIServiceManager.INSTANCE.getOverlayManager(); if (overlayManager != null) { - overlayManager.showOrUpdatePoint(builder.build(), DEFAULT); + overlayManager.showOrUpdatePoint(builder.build()); } }; OCHThreadPoolManager.getsInstance().execute(setMapMarkerRunnable); - } else { + }else { Runnable removeMapMarkerRunnable = () -> { - CallerLogger.INSTANCE.d(M_BUS + "RemoveMapMaker=" + Thread.currentThread().getName(), - uuid + "=latitude=" + lat + ",longitude=" + longi); + CallerLogger.d(M_BUS + "RemoveMapMaker="+Thread.currentThread().getName(), + uuid+"=latitude="+lat+",longitude="+longi); IMoGoOverlayManager overlayManager = CallerMapUIServiceManager.INSTANCE.getOverlayManager(); if (overlayManager != null) { overlayManager.removePoint(uuid); @@ -539,10 +536,10 @@ public class BusFragment extends BaseBusTabFragment ToastUtils.showLong(getResources().getString(R.string.bus_switch_line_btn_warning1)); return; } - if ((int) mSwitchLine.getTag() == 0) {//切换路线 + if ((int)mSwitchLine.getTag() == 0){//切换路线 Intent intent = new Intent(getContext(), BusSwitchLineActivity.class); startActivity(intent); - } else {//结束任务 + }else {//结束任务 OCHCommitDialog.Builder builder = new OCHCommitDialog.Builder(); OCHCommitDialog closeLineConfirmDialog = builder .title(getString(R.string.bus_dialog_title)) diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusModelLoopManager.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusModelLoopManager.java index 3c8415d86c..d85b685282 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusModelLoopManager.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusModelLoopManager.java @@ -37,7 +37,7 @@ public class BusModelLoopManager { // if (mQueryPassengerDisposable != null && !mQueryPassengerDisposable.isDisposed()) { // return; // } -// CallerLogger.INSTANCE.i(M_BUS + TAG, "startQueryPassengerWriteOffLoop()"); +// CallerLogger.i(M_BUS + TAG, "startQueryPassengerWriteOffLoop()"); // mQueryPassengerDisposable = Observable.interval(LOOP_DELAY_500, // LOOP_PASSENGER_5S, TimeUnit.MILLISECONDS) // .map((aLong -> aLong + 1)) @@ -48,7 +48,7 @@ public class BusModelLoopManager { // public void stopQueryPassengerWriteOffLoop() { // if (mQueryPassengerDisposable != null) { -// CallerLogger.INSTANCE.i(M_BUS + TAG, "stopQueryPassengerWriteOffLoop()"); +// CallerLogger.i(M_BUS + TAG, "stopQueryPassengerWriteOffLoop()"); // mQueryPassengerDisposable.dispose(); // mQueryPassengerDisposable = null; // } @@ -58,7 +58,7 @@ public class BusModelLoopManager { if (mHeartbeatDisposable != null && !mHeartbeatDisposable.isDisposed()) { return; } - CallerLogger.INSTANCE.i(M_BUS + TAG, "startHeartbeatLoop()"); + CallerLogger.i(M_BUS + TAG, "startHeartbeatLoop()"); mHeartbeatDisposable = Observable.interval(BusConst.LOOP_DELAY, BusConst.LOOP_PERIOD_60S, TimeUnit.MILLISECONDS) .map((aLong -> aLong + 1)) @@ -69,7 +69,7 @@ public class BusModelLoopManager { public void stopHeartbeatLoop() { if (mHeartbeatDisposable != null) { - CallerLogger.INSTANCE.i(M_BUS + TAG, "stopHeartbeatLoop()"); + CallerLogger.i(M_BUS + TAG, "stopHeartbeatLoop()"); mHeartbeatDisposable.dispose(); mHeartbeatDisposable = null; } 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 b61a1ef1ce..c70e9db22e 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 @@ -123,7 +123,7 @@ public class BusPresenter extends Presenter }else { mCurrentStation = arrivingOrArrivedIndex -1; } - CallerLogger.INSTANCE.d(M_BUS + "BusOrderModel =", " mCurrentStation =" + mCurrentStation); + CallerLogger.d(M_BUS + "BusOrderModel =", " mCurrentStation =" + mCurrentStation); if (mView != null) { runOnUIThread(() -> mView.updateBusTaskStatus(lineName,lineTime, stationList, arrivingOrArrivedIndex, isArrived)); @@ -150,7 +150,7 @@ public class BusPresenter extends Presenter @Override public void onAutopilotArriveAtStation(MessagePad.ArrivalNotification arrivalNotification) { - CallerLogger.INSTANCE.e( M_BUS + TAG, "行程日志-onAutopilotArriveAtStation arrive"); + CallerLogger.e( M_BUS + TAG, "行程日志-onAutopilotArriveAtStation arrive"); OrderModel.getInstance().onArriveAt(arrivalNotification); } @@ -171,7 +171,7 @@ public class BusPresenter extends Presenter && OrderModel.getInstance().isGoingToNextStation() ) ) { - CallerLogger.INSTANCE.d(M_BUS + "BusOrderModel=", "有美化功能"); + CallerLogger.d(M_BUS + "BusOrderModel=", "有美化功能"); return; } // 改变UI自动驾驶状态 @@ -256,7 +256,7 @@ public class BusPresenter extends Presenter @Override public void loginSuccess(DriverStatusQueryRespBean data) { - CallerLogger.INSTANCE.d(M_BUS + TAG, " loginStatus =" + LoginStatusManager.isLogin()); + CallerLogger.d(M_BUS + TAG, " loginStatus =" + LoginStatusManager.isLogin()); if(LoginStatusManager.isLogin()){ OrderModel.getInstance().startOrStopOrderLoop(true); OrderModel.getInstance().queryBusRoutes(); diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/receiver/TestBusBroadcastReceiver.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/receiver/TestBusBroadcastReceiver.java index b9ffc6d492..3884897d04 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/receiver/TestBusBroadcastReceiver.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/receiver/TestBusBroadcastReceiver.java @@ -25,7 +25,7 @@ public class TestBusBroadcastReceiver extends BroadcastReceiver { try { this.mContext = context; int sceneType = intent.getIntExtra(BusConst.BROADCAST_TEST_BUS_CONTROL_TYPE_EXTRA_KEY, 0); - CallerLogger.INSTANCE.d(M_BUS + TAG, "sceneType:" + sceneType); + CallerLogger.d(M_BUS + TAG, "sceneType:" + sceneType); // 分发场景 dispatchSceneTest(sceneType); diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java index 51814cbd37..6c9165e94e 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java @@ -54,11 +54,11 @@ public class BusTrajectoryManager { if (LoginStatusManager.isLogin() && routesResult != null && OrderModel.getInstance().getCurrentStationIndex() == 0 && !OrderModel.getInstance().isGoingToNextStation()) { - CallerLogger.INSTANCE.d(M_BUS + TAG, "syncTrajectoryInfo() start."); + CallerLogger.d(M_BUS + TAG, "syncTrajectoryInfo() start."); startTrajReqLoop(); } else { // 无路线信息or当前未在始发站 - CallerLogger.INSTANCE.d(M_BUS + TAG, "syncTrajectoryInfo() stop."); + CallerLogger.d(M_BUS + TAG, "syncTrajectoryInfo() stop."); stopTrajReqLoop(); } } @@ -71,31 +71,31 @@ public class BusTrajectoryManager { if (guardianInfo == null || !guardianInfo.hasCode()) return; if ("ISYS_INIT_TRAJECTORY_START".equals(guardianInfo.getCode())) { // 1. 轨迹管理_轨迹开始下载（本地已有对应轨迹也触发） - CallerLogger.INSTANCE.d(M_BUS + TAG, "onAutopilotGuardian() 轨迹开始下载"); + CallerLogger.d(M_BUS + TAG, "onAutopilotGuardian() 轨迹开始下载"); // ToastUtils.showShort("轨迹开始下载"); stopTrajReqLoop(); } else if ("ISYS_INIT_TRAJECTORY_SUCCESS".equals(guardianInfo.getCode())) { // 2. 轨迹管理_轨迹下载成功（本地已有对应轨迹也触发） - CallerLogger.INSTANCE.d(M_BUS + TAG, "onAutopilotGuardian() 轨迹下载成功"); + CallerLogger.d(M_BUS + TAG, "onAutopilotGuardian() 轨迹下载成功"); // ToastUtils.showShort("轨迹下载成功"); stopTrajReqLoop(); } else if ("ISYS_INIT_TRAJECTORY_FAILURE".equals(guardianInfo.getCode())) { // 3. 轨迹管理_轨迹下载失败，本地无对应轨迹 - CallerLogger.INSTANCE.d(M_BUS + TAG, "onAutopilotGuardian() " + + CallerLogger.d(M_BUS + TAG, "onAutopilotGuardian() " + "轨迹下载失败，本地无对应轨迹"); // ToastUtils.showShort("轨迹下载失败，本地无对应轨迹"); } else if ("ISYS_INIT_TRAJECTORY_WARNING".equals(guardianInfo.getCode())) { // 4. 轨迹管理_轨迹下载失败，本地有对应轨迹，认为成功 - CallerLogger.INSTANCE.d(M_BUS + TAG, "onAutopilotGuardian() " + + CallerLogger.d(M_BUS + TAG, "onAutopilotGuardian() " + "轨迹下载失败，本地有对应轨迹，认为成功"); // ToastUtils.showShort("轨迹下载失败，本地有对应轨迹，认为成功"); } else if ("ISYS_INIT_TRAJECTORY_TIMEOUT".equals(guardianInfo.getCode())) { // 5. 轨迹管理_轨迹下载超时 - CallerLogger.INSTANCE.d(M_BUS + TAG, "onAutopilotGuardian() 轨迹下载超时"); + CallerLogger.d(M_BUS + TAG, "onAutopilotGuardian() 轨迹下载超时"); // ToastUtils.showShort("轨迹下载超时"); } else if ("ISSM_FUNC_AUTO_PILOT_READY".equals(guardianInfo.getCode())) { // 收到ssm的自动驾驶变为ready，再次下发轨迹下载.解决：域控重启，或者102域控启动太早，107节点初始化未完成导致的轨迹未进行下载。 - CallerLogger.INSTANCE.d(M_BUS + TAG, "onAutopilotGuardian() ssm ready，再次发起下载"); + CallerLogger.d(M_BUS + TAG, "onAutopilotGuardian() ssm ready，再次发起下载"); syncTrajectoryInfo(); } } @@ -103,7 +103,7 @@ public class BusTrajectoryManager { private void setupAutoPilotLine() { BusRoutesResult routesResult = OrderModel.getInstance().getBusRoutesResult(); if (routesResult == null) { - CallerLogger.INSTANCE.e(M_BUS + TAG, + CallerLogger.e(M_BUS + TAG, "setupAutoPilotLine(): routesResult is null."); return; } else { @@ -155,7 +155,7 @@ public class BusTrajectoryManager { if (mSendReqDisposable != null && !mSendReqDisposable.isDisposed()) { return; } - CallerLogger.INSTANCE.d(M_BUS + TAG, "startTrajReqLoop()"); + CallerLogger.d(M_BUS + TAG, "startTrajReqLoop()"); setupAutoPilotLine(); mSendReqDisposable = Observable.interval(BusConst.LOOP_DELAY, BusConst.LOOP_PERIOD_10S, TimeUnit.MILLISECONDS) @@ -167,14 +167,14 @@ public class BusTrajectoryManager { stopTrajReqLoop(); return; } - CallerLogger.INSTANCE.d(M_BUS + TAG, "loop sendTrajectoryReq: " + aLong); + CallerLogger.d(M_BUS + TAG, "loop sendTrajectoryReq: " + aLong); sendTrajectoryReq(); }); } public void stopTrajReqLoop() { if (mSendReqDisposable != null) { - CallerLogger.INSTANCE.d(M_BUS + TAG, "stopTrajReqLoop()"); + CallerLogger.d(M_BUS + TAG, "stopTrajReqLoop()"); mSendReqDisposable.dispose(); mSendReqDisposable = null; clearAutoPilotLine(); @@ -183,12 +183,12 @@ public class BusTrajectoryManager { private void sendTrajectoryReq() { if (mAutoPilotLine == null) { - CallerLogger.INSTANCE.e(M_BUS + TAG, "sendTrajectoryReq(): mAutoPilotLine is null!!!"); + CallerLogger.e(M_BUS + TAG, "sendTrajectoryReq(): mAutoPilotLine is null!!!"); return; } CallerAutoPilotControlManager.INSTANCE.sendTrajectoryDownloadReq(mAutoPilotLine); - CallerLogger.INSTANCE.d(M_BUS + TAG, "sendTrajectoryReq(): " + CallerLogger.d(M_BUS + TAG, "sendTrajectoryReq(): " + GsonUtils.toJson(mAutoPilotLine)); } } diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginStatusModel.java b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginStatusModel.java index a2951bfbde..3fa8c57873 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginStatusModel.java +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginStatusModel.java @@ -59,7 +59,7 @@ public abstract class OchCommonLoginStatusModel { public void onSuccess(DriverStatusQueryRespBean data) { if (null != data && 0 == data.code) { LoginStatusManager.setLoginStatus(data.data.driverStatus); - CallerLogger.INSTANCE.d(M_TAXI + TAG, "changeCarStatus:" + LoginStatusManager.getLoginStatus()); + CallerLogger.d(M_TAXI + TAG, "changeCarStatus:" + LoginStatusManager.getLoginStatus()); loginSuccess(data); } } diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/map/AmapNaviToDestinationModel.java b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/map/AmapNaviToDestinationModel.java index 3bb41f5c9b..c730bdd54a 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/map/AmapNaviToDestinationModel.java +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/map/AmapNaviToDestinationModel.java @@ -136,7 +136,7 @@ public class AmapNaviToDestinationModel implements AMapNaviListener { public void onNaviInfoUpdate(NaviInfo naviinfo) { //导航过程中的信息更新，请看NaviInfo的具体说明 if (null != mNaviChangedCallback){ - CallerLogger.INSTANCE.i(M_TAXI + TAG, "距离=" + naviinfo.getPathRetainDistance() + ", 剩余时间 " + naviinfo.getPathRetainTime()); + CallerLogger.i(M_TAXI + TAG, "距离=" + naviinfo.getPathRetainDistance() + ", 剩余时间 " + naviinfo.getPathRetainTime()); mNaviChangedCallback.onCurrentNaviDistAndTimeChanged(naviinfo.getPathRetainDistance(),naviinfo.getPathRetainTime());// 米、秒 } } @@ -171,8 +171,8 @@ public class AmapNaviToDestinationModel implements AMapNaviListener { return; } - CallerLogger.INSTANCE.i(M_TAXI + TAG, "路线计算失败：错误码=" + result.getErrorCode() + ",Error Message= " + result.getErrorDetail()); - CallerLogger.INSTANCE.i(M_TAXI + TAG, "错误码详细链接见：http://lbs.amap.com/api/android-navi-sdk/guide/tools/errorcode/"); + CallerLogger.i(M_TAXI + TAG, "路线计算失败：错误码=" + result.getErrorCode() + ",Error Message= " + result.getErrorDetail()); + CallerLogger.i(M_TAXI + TAG, "错误码详细链接见：http://lbs.amap.com/api/android-navi-sdk/guide/tools/errorcode/"); } @Override public void onStartNavi(int type) { @@ -258,7 +258,7 @@ public class AmapNaviToDestinationModel implements AMapNaviListener { // //当前用户要执行的动作 // int recommend = aMapLaneInfo.frontLane[i]; // -// CallerLogger.INSTANCE.e(M_TAXI + "ggb", "---->>> background is " + background + " ; recommend is " + recommend); +// CallerLogger.e(M_TAXI + "ggb", "---->>> background is " + background + " ; recommend is " + recommend); // //根据文档中每个动作对应的枚举类型，显示对应的图片 // try { // sb.append("，第" + (i + 1) + "车道为" + array[background]); @@ -270,7 +270,7 @@ public class AmapNaviToDestinationModel implements AMapNaviListener { // e.printStackTrace(); // } // } -// CallerLogger.INSTANCE.e(M_TAXI + "showLaneInfo", sb.toString()); +// CallerLogger.e(M_TAXI + "showLaneInfo", sb.toString()); } @Override diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/BusProvider.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/BusProvider.java index e8f3e0f280..3aa7c64360 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/BusProvider.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/BusProvider.java @@ -37,7 +37,7 @@ public class BusProvider implements IMogoOCH { * 进入鹰眼模式，设置手势缩放地图失效 */ private void stepIntoVrMode() { - CallerLogger.INSTANCE.d(M_BUS + TAG, "进入vr模式"); + CallerLogger.d(M_BUS + TAG, "进入vr模式"); CallerMoGoUiSettingManager.INSTANCE.stepInNightMode();//夜间模式 状态栏字体颜色变黑 } @@ -48,7 +48,7 @@ public class BusProvider implements IMogoOCH { private void showFragment() { FragmentManager supportFragmentManager = activity.getSupportFragmentManager(); if (busFragment == null) { - CallerLogger.INSTANCE.d(TAG, "准备add fragment======"); + CallerLogger.d(TAG, "准备add fragment======"); Fragment fragmentByTag = supportFragmentManager.findFragmentByTag(BusFragment.TAG); if (fragmentByTag instanceof BusFragment) { busFragment = (BusFragment) fragmentByTag; @@ -60,13 +60,13 @@ public class BusProvider implements IMogoOCH { } return; } - CallerLogger.INSTANCE.d(TAG, "准备show fragment"); + CallerLogger.d(TAG, "准备show fragment"); supportFragmentManager.beginTransaction().show(busFragment).commitAllowingStateLoss(); } private void hideFragment() { if (busFragment != null) { - CallerLogger.INSTANCE.d(TAG, "准备hide fragment"); + CallerLogger.d(TAG, "准备hide fragment"); activity.getSupportFragmentManager().beginTransaction().hide(busFragment).commitAllowingStateLoss(); } diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/fragment/BusFragment.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/fragment/BusFragment.java index 00252b5f0f..8d3d91bdf4 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/fragment/BusFragment.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/fragment/BusFragment.java @@ -113,7 +113,7 @@ public class BusFragment extends BaseBusTabFragment groupStationsPanel = findViewById(R.id.group_stations_panel); noDataView = findViewById(R.id.no_line_data_view); - CallerLogger.INSTANCE.d(M_BUS + TAG, "initView: " + CallerAutoPilotStatusListenerManager.INSTANCE.getState()); + CallerLogger.d(M_BUS + TAG, "initView: " + CallerAutoPilotStatusListenerManager.INSTANCE.getState()); // 初始化的时候设置 UI 按钮状态 showAutopilotBiz(); @@ -131,10 +131,10 @@ public class BusFragment extends BaseBusTabFragment @Subscribe(threadMode = ThreadMode.MAIN) public void changeOverview(EventLogout eventLogout){ if (eventLogout.getMessgae() == EventLogout.LOGOUT_TYPE){ - CallerLogger.INSTANCE.d(M_BUS + TAG,"changeOverview Event消息去登出"); + CallerLogger.d(M_BUS + TAG,"changeOverview Event消息去登出"); mPresenter.logout(); }else if (eventLogout.getMessgae() == EventLogout.SHOW_QR_TYPE){ //显示二维码 - CallerLogger.INSTANCE.d(M_BUS + TAG,"changeOverview Event qrcode，sn = " + CallerLogger.d(M_BUS + TAG,"changeOverview Event qrcode，sn = " + MoGoAiCloudClientConfig.getInstance().getSn()); String qrUrl = String.format(FunctionBuildConfig.urlJson.getBindDriverQRUrl(), MoGoAiCloudClientConfig.getInstance().getSn()); @@ -148,7 +148,7 @@ public class BusFragment extends BaseBusTabFragment .cancelStr(getString(R.string.qr_cancel)) .qrBm(bmQr).build(getContext()).show(); }else { - CallerLogger.INSTANCE.d(M_BUS + TAG,"bmQr = null "); + CallerLogger.d(M_BUS + TAG,"bmQr = null "); } } } @@ -450,7 +450,7 @@ public class BusFragment extends BaseBusTabFragment } public void clearBusStationsMarkers(){ - CallerLogger.INSTANCE.d(M_BUS + TAG,"clearBusStationsMarkers()"); + CallerLogger.d(M_BUS + TAG,"clearBusStationsMarkers()"); if (null != startStation) { setOrRemoveMapMaker(false, BusConst.BUS_START_MAP_MAKER, startStation.getLat() , startStation.getLon(),R.raw.star_marker); @@ -461,7 +461,7 @@ public class BusFragment extends BaseBusTabFragment } //清除鹰眼右下角小地图轨迹 - CallerLogger.INSTANCE.d(SceneConstant.M_BUS, "clearBusStationsMarkers --------->"); + CallerLogger.d(SceneConstant.M_BUS, "clearBusStationsMarkers --------->"); smallMapView.clearPolyline(); } @@ -485,7 +485,7 @@ public class BusFragment extends BaseBusTabFragment private void setOrRemoveMapMaker(boolean isAdd, String uuid, double lat, double longi,int resourceId) { if (isAdd) { Runnable setMapMarkerRunnable = () -> { - CallerLogger.INSTANCE.d(M_BUS + "setMapMaker= "+Thread.currentThread().getName(), + CallerLogger.d(M_BUS + "setMapMaker= "+Thread.currentThread().getName(), uuid + "=latitude=" + lat + ",longitude=" + longi); Point.Options.Builder builder = new Point.Options.Builder(BusConst.TYPE_MARKER_BUS_ORDER, Level.MAP_MARKER) @@ -516,7 +516,7 @@ public class BusFragment extends BaseBusTabFragment }else { Runnable removeMapMarkerRunnable = () -> { - CallerLogger.INSTANCE.d(M_BUS + "RemoveMapMaker="+Thread.currentThread().getName(), + CallerLogger.d(M_BUS + "RemoveMapMaker="+Thread.currentThread().getName(), uuid+"=latitude="+lat+",longitude="+longi); Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getOverlayManager()).removePoint(uuid); }; diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java index 50ab8f5bb7..58bf85296e 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java @@ -195,31 +195,31 @@ public class OrderModel { public void accept(Throwable e) { if (e instanceof UndeliverableException) { e = e.getCause(); - CallerLogger.INSTANCE.d(M_BUS + TAG, "UndeliverableException"); + CallerLogger.d(M_BUS + TAG, "UndeliverableException"); } if ((e instanceof IOException)) {// // fine, irrelevant network problem or API that throws on cancellation - CallerLogger.INSTANCE.d(M_BUS + TAG, "IOException"); + CallerLogger.d(M_BUS + TAG, "IOException"); return; } if (e instanceof InterruptedException) { // fine, some blocking code was interrupted by a dispose call - CallerLogger.INSTANCE.d(M_BUS + TAG, "InterruptedException"); + CallerLogger.d(M_BUS + TAG, "InterruptedException"); return; } if ((e instanceof NullPointerException) || (e instanceof IllegalArgumentException)) { // that's likely a bug in the application - CallerLogger.INSTANCE.d(M_BUS + TAG, "NullPointerException or IllegalArgumentException"); + CallerLogger.d(M_BUS + TAG, "NullPointerException or IllegalArgumentException"); Thread.currentThread().getUncaughtExceptionHandler().uncaughtException(Thread.currentThread(), e); return; } if (e instanceof IllegalStateException) { // that's a bug in RxJava or in a custom operator - CallerLogger.INSTANCE.d(M_BUS + TAG, "IllegalStateException"); + CallerLogger.d(M_BUS + TAG, "IllegalStateException"); Thread.currentThread().getUncaughtExceptionHandler().uncaughtException(Thread.currentThread(), e); return; } - CallerLogger.INSTANCE.d(M_BUS + TAG, "Undeliverable exception"); + CallerLogger.d(M_BUS + TAG, "Undeliverable exception"); } }); } @@ -234,7 +234,7 @@ public class OrderModel { @Override public void onReceivedMsg(int type, @NonNull byte[] byteArray) { if (OchCommonConst.BUSINESS_STRING == type){ - CallerLogger.INSTANCE.d(M_BUS + BaseDPMsg.TAG,new String(byteArray)); + CallerLogger.d(M_BUS + BaseDPMsg.TAG,new String(byteArray)); BaseDPMsg msg = GsonUtils.fromJson(new String(byteArray),BaseDPMsg.class); if (msg!=null && msg.getType() == DPMsgType.TYPE_TASK_DETAILS.getType()){ sendTaskDetailsToClients(); @@ -253,12 +253,12 @@ public class OrderModel { @Override public void onMsgReceived(SystemMsg obj) { if (obj == null){ - CallerLogger.INSTANCE.d(M_BUS + TAG, "onMsgReceived = null"); + CallerLogger.d(M_BUS + TAG, "onMsgReceived = null"); return; } - CallerLogger.INSTANCE.i(M_BUS + TAG,"onMsgReceived = "+obj.getContext()); + CallerLogger.i(M_BUS + TAG,"onMsgReceived = "+obj.getContext()); List list = obj.getScreenList(); - CallerLogger.INSTANCE.i(M_BUS + TAG,"onMsgReceived = "+GsonUtils.toJson(list)); + CallerLogger.i(M_BUS + TAG,"onMsgReceived = "+GsonUtils.toJson(list)); if (list != null && list.contains(1)){ // 1司机端 OCHSocketMessageManager.INSTANCE.pushAppOperationalMsgBox(DateTimeUtil.getCurrentTimeStamp(), @@ -284,7 +284,7 @@ public class OrderModel { @Override public void onMsgReceived(WriteOffPassenger passenger) { //进行播报 - CallerLogger.INSTANCE.i(M_BUS + TAG,"passenger = "+ GsonUtil.jsonFromObject(passenger)); + CallerLogger.i(M_BUS + TAG,"passenger = "+ GsonUtil.jsonFromObject(passenger)); if (passenger != null && passenger.passengerSize == 0) return; if (mPassengerCallback != null){ mPassengerCallback.playPassenger(passenger); @@ -386,7 +386,7 @@ public class OrderModel { public void onStartAutopilotFailure(@NotNull String startFailedCode, @NonNull String startFailedMessage) { BusAnalyticsManager.getInstance().triggerStartAutopilotFailureEventByAdas(startFailedCode, startFailedMessage); if (mADASStatusCallback != null && !FunctionBuildConfig.isDemoMode){ - CallerLogger.INSTANCE.e( M_BUS + TAG, "mAdasStartFailureListener = "+startFailedMessage ); + CallerLogger.e( M_BUS + TAG, "mAdasStartFailureListener = "+startFailedMessage ); mADASStatusCallback.onStartAdasFailure(); } } @@ -415,7 +415,7 @@ public class OrderModel { private void judgeArrivedStation(MogoLocation location) { if (backgroundCurrentStationIndex + 1 > stationList.size() - 1) { - CallerLogger.INSTANCE.e(M_BUS + TAG, "到站数组越界"); + CallerLogger.e(M_BUS + TAG, "到站数组越界"); return; } BusStationBean upcomingStation = stationList.get(backgroundCurrentStationIndex + 1); @@ -427,7 +427,7 @@ public class OrderModel { location.getLongitude(), location.getLatitude()); if (distance <= BusConst.ARRIVE_AT_END_STATION_DISTANCE) { - CallerLogger.INSTANCE.d(M_BUS + TAG, "行程日志-judgeArrivedStation() distance = " + distance + CallerLogger.d(M_BUS + TAG, "行程日志-judgeArrivedStation() distance = " + distance + " to " + upcomingStation.getName()); onArriveAt(null); //无自动驾驶到站信息传null return; @@ -469,7 +469,7 @@ public class OrderModel { CacheDataManager.Companion.getInstance().clearCacheData(mContext, BusCacheKey.BUS_LINE_CACHE); return; } - CallerLogger.INSTANCE.d(M_BUS + TAG, "获取到小巴路线数据: " + GsonUtils.toJson(data)); + CallerLogger.d(M_BUS + TAG, "获取到小巴路线数据: " + GsonUtils.toJson(data)); updateBusStatus(data); } @@ -477,7 +477,7 @@ public class OrderModel { * 查询小巴路线 */ public void queryBusRoutes() { - CallerLogger.INSTANCE.d(M_BUS + TAG, "查询小巴路线"); + CallerLogger.d(M_BUS + TAG, "查询小巴路线"); OrderServiceManager.queryBusRoutes(mContext, new OchCommonServiceCallback() { @Override public void onSuccess(BusRoutesResponse data) { @@ -486,7 +486,7 @@ public class OrderModel { || data.getResult().getSites() == null || data.getResult().getSites().isEmpty()) { // //当为空时,显示无绑定路线图 - CallerLogger.INSTANCE.d(M_BUS + TAG, "获取到小巴路线数据:空 "); + CallerLogger.d(M_BUS + TAG, "获取到小巴路线数据:空 "); if (refreshBusStationsCallback != null) { refreshBusStationsCallback.updateEmptyUi(); } @@ -499,7 +499,7 @@ public class OrderModel { } if (busRoutesResult == null || busRoutesResult.getWriteVersion() < data.getResult().getWriteVersion()){ - CallerLogger.INSTANCE.d(M_BUS + TAG, "更新小巴路线数据: " + data); + CallerLogger.d(M_BUS + TAG, "更新小巴路线数据: " + data); updateBusStatus(data.getResult()); pushCacheTransferData(data.getResult()); } @@ -584,12 +584,12 @@ public class OrderModel { * 重置路线站点状态--结束路线，当前路线恢复到始发站 */ public void abortTask() { - CallerLogger.INSTANCE.d(M_BUS + TAG, "结束当前路线abortTask"); + CallerLogger.d(M_BUS + TAG, "结束当前路线abortTask"); OrderServiceManager.abortTask(mContext, currentTaskId , new OchCommonServiceCallback() { @Override public void onSuccess(BaseData o) { - CallerLogger.INSTANCE.d(M_BUS + TAG, "abortTask success: " + o); + CallerLogger.d(M_BUS + TAG, "abortTask success: " + o); if (o.code == 0) { // 重置成功 endOrAbortTaskSuccess(); clearBusStationDatas(); @@ -727,13 +727,13 @@ public class OrderModel { AutopilotControlParameters parameters = initAutopilotControlParameters(leaveIndex); if (null == parameters) { - CallerLogger.INSTANCE.e(M_BUS + TAG, "行程日志-AutopilotControlParameters is empty."); + CallerLogger.e(M_BUS + TAG, "行程日志-AutopilotControlParameters is empty."); return; } CallerAutoPilotControlManager.INSTANCE.startAutoPilot(parameters); - CallerLogger.INSTANCE.d(M_BUS + TAG, "行程日志-开启自动驾驶====" + GsonUtil.jsonFromObject(parameters) + CallerLogger.d(M_BUS + TAG, "行程日志-开启自动驾驶====" + GsonUtil.jsonFromObject(parameters) + " startLatLon=" + parameters.startName + "，endLatLon=" + parameters.endName + "isRestart = " + isRestart); @@ -747,14 +747,14 @@ public class OrderModel { */ private void arriveSiteStation() { if ( backgroundCurrentStationIndex +1 > stationList.size() - 1 ) { //到站短时间内调用多次 - CallerLogger.INSTANCE.e( M_BUS + TAG, "数组越界" ); + CallerLogger.e( M_BUS + TAG, "数组越界" ); return; } int arrivedStationIndex = backgroundCurrentStationIndex + 1; String arriveStation = stationList.get(arrivedStationIndex).getName(); String arriveStationKr = stationList.get(arrivedStationIndex).getNameKr(); String departureStopName = stationList.get(backgroundCurrentStationIndex).getName(); - CallerLogger.INSTANCE.d(M_BUS + TAG, "arriveSiteStation-currentStationIndex = " + arrivedStationIndex); + CallerLogger.d(M_BUS + TAG, "arriveSiteStation-currentStationIndex = " + arrivedStationIndex); isArrivedStation = true; isGoingToNextStation = false; @@ -770,7 +770,7 @@ public class OrderModel { new OchCommonServiceCallback() { @Override public void onSuccess(BaseData o) { - CallerLogger.INSTANCE.d(M_BUS + TAG, "行程日志-arriveSiteStation success"); + CallerLogger.d(M_BUS + TAG, "行程日志-arriveSiteStation success"); // if (o != null && o.code == 0){ // queryBusRoutes(); // isArrivedStation = true; @@ -832,14 +832,14 @@ public class OrderModel { BusTransferData data = new BusTransferData(LoginStatusManager.isLogin() ? 1:0,busRoutesResult); TaskDetailsMsg msg = new TaskDetailsMsg(GsonUtils.toJson(data)); - CallerLogger.INSTANCE.d(M_BUS + TAG, "sendTaskDetailsToClients = " + GsonUtils.toJson(msg)); + CallerLogger.d(M_BUS + TAG, "sendTaskDetailsToClients = " + GsonUtils.toJson(msg)); CallerTelematicManager.INSTANCE.sendMsgToAllClients(OchCommonConst.BUSINESS_STRING, GsonUtils.toJson(msg).getBytes()); } private void pushCacheTransferData(BusRoutesResult result) { BusTransferData data = new BusTransferData(LoginStatusManager.isLogin() ? 1:0,result); - CallerLogger.INSTANCE.d(M_BUS + TAG, "pushCacheTransferData = " + GsonUtils.toJson(data)); + CallerLogger.d(M_BUS + TAG, "pushCacheTransferData = " + GsonUtils.toJson(data)); CacheDataManager.Companion.getInstance().putCacheData(mContext, BusCacheKey.BUS_LINE_CACHE, GsonUtils.toJson(data)); @@ -882,7 +882,7 @@ public class OrderModel { * 离站上报 */ public void leaveStation() { - CallerLogger.INSTANCE.d(M_BUS + TAG, "leaveStation-backgroundCurrentStationIndex = " + backgroundCurrentStationIndex); + CallerLogger.d(M_BUS + TAG, "leaveStation-backgroundCurrentStationIndex = " + backgroundCurrentStationIndex); String nextStationName = ""; String nextStationNameKr = ""; if (backgroundCurrentStationIndex < stationList.size() - 1) { @@ -894,7 +894,7 @@ public class OrderModel { String finalNextStationNameKr = nextStationNameKr; isArrivedStation = false; - CallerLogger.INSTANCE.d(M_BUS + TAG, "行程日志-离站成功开往下一站===="); + CallerLogger.d(M_BUS + TAG, "行程日志-离站成功开往下一站===="); long writeVersion = DateTimeUtil.getCurrentTimeStamp(); leaveStationSuccess(backgroundCurrentStationIndex, currentStationName, @@ -908,7 +908,7 @@ public class OrderModel { @Override public void onSuccess(BaseData o) { // isArrivedStation = false; -// CallerLogger.INSTANCE.d(M_BUS + TAG, "行程日志-离站成功开往下一站===="); +// CallerLogger.d(M_BUS + TAG, "行程日志-离站成功开往下一站===="); // //需要更改当前站和下一站的状态 然后渲染 // //startOrStopQueryPassengerWriteOff(false); // queryBusRoutes(); @@ -956,7 +956,7 @@ public class OrderModel { FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = false; //是否强制绘制引导线 CallerAutoPilotControlManager.INSTANCE.setIgnoreConditionDraw(false);// 同步给乘客屏 CallerAutoPilotControlManager.INSTANCE.setIPCDemoMode(false);//是否自动启动自驾 - CallerLogger.INSTANCE.d(M_BUS + TAG, "美化模式-ignore：置为false"); + CallerLogger.d(M_BUS + TAG, "美化模式-ignore：置为false"); } } @@ -991,7 +991,7 @@ public class OrderModel { for (int i = 0; i < stationList.size(); i++) { BusStationBean s = stationList.get(i); - CallerLogger.INSTANCE.d(M_BUS + "updateBusStationsStatus--", + CallerLogger.d(M_BUS + "updateBusStationsStatus--", "Index=" + i + " ,name = " + s.getName() + " ," + s.isLeaving() + "," + s.getDrivingStatus()); // 是否正在开往下一站 @@ -1024,7 +1024,7 @@ public class OrderModel { BusStationBean currentStation = stationList.get(backgroundCurrentStationIndex); - CallerLogger.INSTANCE.d(M_BUS + TAG, + CallerLogger.d(M_BUS + TAG, "行程日志-STATION_STATUS_STOPPED-backgroundCurrentStationIndex=" + backgroundCurrentStationIndex + " isLeaving()=" + currentStation.isLeaving()); @@ -1034,11 +1034,11 @@ public class OrderModel { && backgroundCurrentStationIndex <= stationList.size() - 1)) {//行驶过程中设置美化 if (stationList.get(backgroundCurrentStationIndex).isLeaving()) { startBeautificationMode(); - CallerLogger.INSTANCE.d(M_BUS + TAG, "美化模式-ignore：置为true（每次滑动出发）"); + CallerLogger.d(M_BUS + TAG, "美化模式-ignore：置为true（每次滑动出发）"); } else if (backgroundCurrentStationIndex > 0 && backgroundCurrentStationIndex < stationList.size() - 1) { //美化模式下 中间站点到站 引导线要一直绘制，所以此处不出强制绘制不传false CallerAutoPilotControlManager.INSTANCE.setIPCDemoMode(false); - CallerLogger.INSTANCE.d(M_BUS + TAG, "美化模式-ignore：false（到达中间站）"); + CallerLogger.d(M_BUS + TAG, "美化模式-ignore：false（到达中间站）"); clearStartAutopilotTag(); } else { closeBeautificationMode(); @@ -1151,7 +1151,7 @@ public class OrderModel { * 在踩刹车、控制方向盘等操作后，会停止自动驾驶，重启自动驾驶的话相当于重新设置自动驾驶目的地 */ public void restartAutopilot() { - CallerLogger.INSTANCE.d(M_BUS + TAG, "行程日志-重启自动驾驶===" + isGoingToNextStation); + CallerLogger.d(M_BUS + TAG, "行程日志-重启自动驾驶===" + isGoingToNextStation); //只去启动自动驾驶，不再去上报离站 startAutopilot(firstStartAutopilot >= 1, -1); } @@ -1166,10 +1166,10 @@ public class OrderModel { private void travelOver() { if (backgroundCurrentStationIndex >= stationList.size()) { - CallerLogger.INSTANCE.e(M_BUS + TAG, "travel over index out of station list"); + CallerLogger.e(M_BUS + TAG, "travel over index out of station list"); return; } - CallerLogger.INSTANCE.d(M_BUS + TAG, "单程结束===="); + CallerLogger.d(M_BUS + TAG, "单程结束===="); CallerAutoPilotControlManager.INSTANCE.cancelAutoPilot(); endTask(); @@ -1179,12 +1179,12 @@ public class OrderModel { * task正常结束 */ private void endTask() { - CallerLogger.INSTANCE.d(M_BUS + TAG, "任务正常走完endTask()"); + CallerLogger.d(M_BUS + TAG, "任务正常走完endTask()"); OrderServiceManager.endTask(mContext, currentTaskId , new OchCommonServiceCallback() { @Override public void onSuccess(BaseData o) { - CallerLogger.INSTANCE.d(M_BUS + TAG, "endTask success: " + o); + CallerLogger.d(M_BUS + TAG, "endTask success: " + o); if (o.code == 0) { endOrAbortTaskSuccess(); clearBusStationDatas(); @@ -1223,7 +1223,7 @@ public class OrderModel { */ public void onArriveAt(MessagePad.ArrivalNotification data) { if (backgroundCurrentStationIndex + 1 > stationList.size() - 1) { - CallerLogger.INSTANCE.e(M_BUS + TAG, "行程日志-到站异常，取消后续操作结束"); + CallerLogger.e(M_BUS + TAG, "行程日志-到站异常，取消后续操作结束"); return; } @@ -1240,14 +1240,14 @@ public class OrderModel { String arriveLon = NumberFormatUtil.cutOutNumber(arriveStation.getLon(), 5); if (!latitude.equals(arriveLat) || !longitude.equals(arriveLon)) { - CallerLogger.INSTANCE.e(M_BUS + TAG, "行程日志-到站拦截,到站坐标不一致"); + CallerLogger.e(M_BUS + TAG, "行程日志-到站拦截,到站坐标不一致"); return; } } if (isArrivedStation) return; - CallerLogger.INSTANCE.d(M_BUS + TAG, "行程日志-当前==backgroundCurrentStationIndex=" + CallerLogger.d(M_BUS + TAG, "行程日志-当前==backgroundCurrentStationIndex=" + backgroundCurrentStationIndex); arriveSiteStation(); @@ -1298,15 +1298,15 @@ public class OrderModel { AutopilotControlParameters parameters = initAutopilotControlParameters(-1); if (null == parameters) { - CallerLogger.INSTANCE.e(M_BUS + TAG, "AutopilotControlParameters is empty."); + CallerLogger.e(M_BUS + TAG, "AutopilotControlParameters is empty."); return; } - CallerLogger.INSTANCE.d(M_BUS + TAG, "AutopilotControlParameters is update."); + CallerLogger.d(M_BUS + TAG, "AutopilotControlParameters is update."); CallerAutoPilotStatusListenerManager.INSTANCE.updateAutopilotControlParameters(parameters); } private void clearAutopilotControlParameters() { - CallerLogger.INSTANCE.d(M_BUS + TAG, "AutopilotControlParameters is clear."); + CallerLogger.d(M_BUS + TAG, "AutopilotControlParameters is clear."); CallerAutoPilotStatusListenerManager.INSTANCE.updateAutopilotControlParameters(null); } @@ -1316,14 +1316,14 @@ public class OrderModel { if (leaveIndex < 0) { if (backgroundCurrentStationIndex + 1 > stationList.size() - 1 || !isGoingToNextStation) { - CallerLogger.INSTANCE.e(M_BUS + TAG, "行程日志-mismatch condition1."); + CallerLogger.e(M_BUS + TAG, "行程日志-mismatch condition1."); return null; } currentStation = stationList.get(backgroundCurrentStationIndex); nextStation = stationList.get(backgroundCurrentStationIndex + 1); } else { if (leaveIndex + 1 > stationList.size() - 1 || !isGoingToNextStation) { - CallerLogger.INSTANCE.e(M_BUS + TAG, "行程日志-mismatch condition2."); + CallerLogger.e(M_BUS + TAG, "行程日志-mismatch condition2."); return null; } currentStation = stationList.get(leaveIndex); diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/presenter/BusModelLoopManager.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/presenter/BusModelLoopManager.java index 3c8415d86c..d85b685282 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/presenter/BusModelLoopManager.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/presenter/BusModelLoopManager.java @@ -37,7 +37,7 @@ public class BusModelLoopManager { // if (mQueryPassengerDisposable != null && !mQueryPassengerDisposable.isDisposed()) { // return; // } -// CallerLogger.INSTANCE.i(M_BUS + TAG, "startQueryPassengerWriteOffLoop()"); +// CallerLogger.i(M_BUS + TAG, "startQueryPassengerWriteOffLoop()"); // mQueryPassengerDisposable = Observable.interval(LOOP_DELAY_500, // LOOP_PASSENGER_5S, TimeUnit.MILLISECONDS) // .map((aLong -> aLong + 1)) @@ -48,7 +48,7 @@ public class BusModelLoopManager { // public void stopQueryPassengerWriteOffLoop() { // if (mQueryPassengerDisposable != null) { -// CallerLogger.INSTANCE.i(M_BUS + TAG, "stopQueryPassengerWriteOffLoop()"); +// CallerLogger.i(M_BUS + TAG, "stopQueryPassengerWriteOffLoop()"); // mQueryPassengerDisposable.dispose(); // mQueryPassengerDisposable = null; // } @@ -58,7 +58,7 @@ public class BusModelLoopManager { if (mHeartbeatDisposable != null && !mHeartbeatDisposable.isDisposed()) { return; } - CallerLogger.INSTANCE.i(M_BUS + TAG, "startHeartbeatLoop()"); + CallerLogger.i(M_BUS + TAG, "startHeartbeatLoop()"); mHeartbeatDisposable = Observable.interval(BusConst.LOOP_DELAY, BusConst.LOOP_PERIOD_60S, TimeUnit.MILLISECONDS) .map((aLong -> aLong + 1)) @@ -69,7 +69,7 @@ public class BusModelLoopManager { public void stopHeartbeatLoop() { if (mHeartbeatDisposable != null) { - CallerLogger.INSTANCE.i(M_BUS + TAG, "stopHeartbeatLoop()"); + CallerLogger.i(M_BUS + TAG, "stopHeartbeatLoop()"); mHeartbeatDisposable.dispose(); mHeartbeatDisposable = null; } diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java index de2a58d256..d7e93dd771 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java @@ -130,7 +130,7 @@ public class BusPresenter extends Presenter }else { mCurrentStation = arrivingOrArrivedIndex -1; } - CallerLogger.INSTANCE.d(M_BUS + "BusOrderModel =", " mCurrentStation =" + mCurrentStation); + CallerLogger.d(M_BUS + "BusOrderModel =", " mCurrentStation =" + mCurrentStation); if (mView != null) { runOnUIThread(() -> mView.updateBusTaskStatus(lineName,lineTime, stationList, arrivingOrArrivedIndex, isArrived)); @@ -157,7 +157,7 @@ public class BusPresenter extends Presenter @Override public void onAutopilotArriveAtStation(MessagePad.ArrivalNotification arrivalNotification) { - CallerLogger.INSTANCE.e( M_BUS + TAG, "行程日志-onAutopilotArriveAtStation arrive"); + CallerLogger.e( M_BUS + TAG, "行程日志-onAutopilotArriveAtStation arrive"); OrderModel.getInstance().onArriveAt(arrivalNotification); } @@ -181,7 +181,7 @@ public class BusPresenter extends Presenter && OrderModel.getInstance().isGoingToNextStation() ) ) { - CallerLogger.INSTANCE.d(M_BUS + "BusOrderModel=", "有美化功能"); + CallerLogger.d(M_BUS + "BusOrderModel=", "有美化功能"); return; } // 改变UI自动驾驶状态 @@ -268,7 +268,7 @@ public class BusPresenter extends Presenter @Override public void loginSuccess(DriverStatusQueryRespBean data) { - CallerLogger.INSTANCE.d(M_BUS + TAG, " loginStatus =" + LoginStatusManager.isLogin()); + CallerLogger.d(M_BUS + TAG, " loginStatus =" + LoginStatusManager.isLogin()); if(LoginStatusManager.isLogin()){ OrderModel.getInstance().startOrStopOrderLoop(true); // OrderModel.getInstance().queryBusRoutes(); diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/receiver/TestBusBroadcastReceiver.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/receiver/TestBusBroadcastReceiver.java index b9ffc6d492..3884897d04 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/receiver/TestBusBroadcastReceiver.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/receiver/TestBusBroadcastReceiver.java @@ -25,7 +25,7 @@ public class TestBusBroadcastReceiver extends BroadcastReceiver { try { this.mContext = context; int sceneType = intent.getIntExtra(BusConst.BROADCAST_TEST_BUS_CONTROL_TYPE_EXTRA_KEY, 0); - CallerLogger.INSTANCE.d(M_BUS + TAG, "sceneType:" + sceneType); + CallerLogger.d(M_BUS + TAG, "sceneType:" + sceneType); // 分发场景 dispatchSceneTest(sceneType); diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.java index 947adbfc0c..3bbb0f8154 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.java @@ -48,7 +48,7 @@ public class BusAnalyticsManager { private void triggerStartAutopilotFailureEvent(String failCode, String failMsg){ if (mStartAutopilotParams.isEmpty()) return; - CallerLogger.INSTANCE.e( M_BUS + "triggerStartAutopilotFailureEvent", failMsg ); + CallerLogger.e( M_BUS + "triggerStartAutopilotFailureEvent", failMsg ); if (CallerAutoPilotStatusListenerManager.INSTANCE.getState() != IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING){ diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java index 8e009220fb..13bf62b158 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java @@ -53,11 +53,11 @@ public class BusTrajectoryManager { if (LoginStatusManager.isLogin() && routesResult != null && OrderModel.getInstance().getCurrentStationIndex() == 0 && !OrderModel.getInstance().isGoingToNextStation()) { - CallerLogger.INSTANCE.d(M_BUS + TAG, "syncTrajectoryInfo() start."); + CallerLogger.d(M_BUS + TAG, "syncTrajectoryInfo() start."); startTrajReqLoop(); } else { // 无路线信息or当前未在始发站 - CallerLogger.INSTANCE.d(M_BUS + TAG, "syncTrajectoryInfo() stop."); + CallerLogger.d(M_BUS + TAG, "syncTrajectoryInfo() stop."); stopTrajReqLoop(); } } @@ -70,31 +70,31 @@ public class BusTrajectoryManager { if (guardianInfo == null || !guardianInfo.hasCode()) return; if ("ISYS_INIT_TRAJECTORY_START".equals(guardianInfo.getCode())) { // 1. 轨迹管理_轨迹开始下载（本地已有对应轨迹也触发） - CallerLogger.INSTANCE.d(M_BUS + TAG, "onAutopilotGuardian() 轨迹开始下载"); + CallerLogger.d(M_BUS + TAG, "onAutopilotGuardian() 轨迹开始下载"); // ToastUtils.showShort("轨迹开始下载"); stopTrajReqLoop(); } else if ("ISYS_INIT_TRAJECTORY_SUCCESS".equals(guardianInfo.getCode())) { // 2. 轨迹管理_轨迹下载成功（本地已有对应轨迹也触发） - CallerLogger.INSTANCE.d(M_BUS + TAG, "onAutopilotGuardian() 轨迹下载成功"); + CallerLogger.d(M_BUS + TAG, "onAutopilotGuardian() 轨迹下载成功"); // ToastUtils.showShort("轨迹下载成功"); stopTrajReqLoop(); } else if ("ISYS_INIT_TRAJECTORY_FAILURE".equals(guardianInfo.getCode())) { // 3. 轨迹管理_轨迹下载失败，本地无对应轨迹 - CallerLogger.INSTANCE.d(M_BUS + TAG, "onAutopilotGuardian() " + + CallerLogger.d(M_BUS + TAG, "onAutopilotGuardian() " + "轨迹下载失败，本地无对应轨迹"); // ToastUtils.showShort("轨迹下载失败，本地无对应轨迹"); } else if ("ISYS_INIT_TRAJECTORY_WARNING".equals(guardianInfo.getCode())) { // 4. 轨迹管理_轨迹下载失败，本地有对应轨迹，认为成功 - CallerLogger.INSTANCE.d(M_BUS + TAG, "onAutopilotGuardian() " + + CallerLogger.d(M_BUS + TAG, "onAutopilotGuardian() " + "轨迹下载失败，本地有对应轨迹，认为成功"); // ToastUtils.showShort("轨迹下载失败，本地有对应轨迹，认为成功"); } else if ("ISYS_INIT_TRAJECTORY_TIMEOUT".equals(guardianInfo.getCode())) { // 5. 轨迹管理_轨迹下载超时 - CallerLogger.INSTANCE.d(M_BUS + TAG, "onAutopilotGuardian() 轨迹下载超时"); + CallerLogger.d(M_BUS + TAG, "onAutopilotGuardian() 轨迹下载超时"); // ToastUtils.showShort("轨迹下载超时"); } else if ("ISSM_FUNC_AUTO_PILOT_READY".equals(guardianInfo.getCode())) { // 收到ssm的自动驾驶变为ready，再次下发轨迹下载.解决：域控重启，或者102域控启动太早，107节点初始化未完成导致的轨迹未进行下载。 - CallerLogger.INSTANCE.d(M_BUS + TAG, "onAutopilotGuardian() ssm ready，再次发起下载"); + CallerLogger.d(M_BUS + TAG, "onAutopilotGuardian() ssm ready，再次发起下载"); syncTrajectoryInfo(); } } @@ -102,7 +102,7 @@ public class BusTrajectoryManager { private void setupAutoPilotLine() { BusRoutesResult routesResult = OrderModel.getInstance().getBusRoutesResult(); if (routesResult == null) { - CallerLogger.INSTANCE.e(M_BUS + TAG, + CallerLogger.e(M_BUS + TAG, "setupAutoPilotLine(): routesResult is null."); return; } else { @@ -154,7 +154,7 @@ public class BusTrajectoryManager { if (mSendReqDisposable != null && !mSendReqDisposable.isDisposed()) { return; } - CallerLogger.INSTANCE.d(M_BUS + TAG, "startTrajReqLoop()"); + CallerLogger.d(M_BUS + TAG, "startTrajReqLoop()"); setupAutoPilotLine(); mSendReqDisposable = Observable.interval(BusConst.LOOP_DELAY, BusConst.LOOP_PERIOD_10S, TimeUnit.MILLISECONDS) @@ -166,14 +166,14 @@ public class BusTrajectoryManager { stopTrajReqLoop(); return; } - CallerLogger.INSTANCE.d(M_BUS + TAG, "loop sendTrajectoryReq: " + aLong); + CallerLogger.d(M_BUS + TAG, "loop sendTrajectoryReq: " + aLong); sendTrajectoryReq(); }); } public void stopTrajReqLoop() { if (mSendReqDisposable != null) { - CallerLogger.INSTANCE.d(M_BUS + TAG, "stopTrajReqLoop()"); + CallerLogger.d(M_BUS + TAG, "stopTrajReqLoop()"); mSendReqDisposable.dispose(); mSendReqDisposable = null; clearAutoPilotLine(); @@ -182,12 +182,12 @@ public class BusTrajectoryManager { private void sendTrajectoryReq() { if (mAutoPilotLine == null) { - CallerLogger.INSTANCE.e(M_BUS + TAG, "sendTrajectoryReq(): mAutoPilotLine is null!!!"); + CallerLogger.e(M_BUS + TAG, "sendTrajectoryReq(): mAutoPilotLine is null!!!"); return; } CallerAutoPilotControlManager.INSTANCE.sendTrajectoryDownloadReq(mAutoPilotLine); - CallerLogger.INSTANCE.d(M_BUS + TAG, "sendTrajectoryReq(): " + CallerLogger.d(M_BUS + TAG, "sendTrajectoryReq(): " + GsonUtils.toJson(mAutoPilotLine)); } } diff --git a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java index e846a8cc76..6848df9720 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java +++ b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java @@ -73,14 +73,14 @@ public class MogoOCHBusPassenger implements IMogoOCH { * 进入鹰眼模式，设置手势缩放地图失效 */ private void stepIntoVrMode() { - CallerLogger.INSTANCE.d( M_TAXI_P + TAG, "进入vr模式" ); + CallerLogger.d( M_TAXI_P + TAG, "进入vr模式" ); CallerMoGoUiSettingManager.INSTANCE.stepInDayMode();//白天模式 状态栏字体颜色变黑 } private void showFragment() { FragmentManager supportFragmentManager = mActivity.getSupportFragmentManager(); if(mPassengerFragment == null){ - CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "准备add fragment======"); + CallerLogger.d(M_TAXI_P + TAG, "准备add fragment======"); Fragment fragmentByTag = supportFragmentManager.findFragmentByTag(BusPassengerRouteFragment.TAG); if (fragmentByTag instanceof BusPassengerRouteFragment){ mPassengerFragment = (BusPassengerRouteFragment)fragmentByTag; @@ -94,7 +94,7 @@ public class MogoOCHBusPassenger implements IMogoOCH { return; } - CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "准备show fragment"); + CallerLogger.d(M_TAXI_P + TAG, "准备show fragment"); supportFragmentManager.beginTransaction().show(mPassengerFragment).commitAllowingStateLoss(); } diff --git a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java index f61f7a836b..518254c5a6 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java +++ b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java @@ -183,7 +183,7 @@ public class BusPassengerModel { public void onSuccess(BusPassengerOperationStatusResponse data) { if (data == null || data.data == null) return; if (mDriverStatusCallback != null) { - CallerLogger.INSTANCE.d( M_BUS_P + TAG, "queryDriverOperationStatus = %s", data.data.plateNumber ); + CallerLogger.d( M_BUS_P + TAG, "queryDriverOperationStatus = %s", data.data.plateNumber ); mDriverStatusCallback.changeOperationStatus(data.data.driverStatus == 1); mDriverStatusCallback.updatePlateNumber(data.data.plateNumber); } @@ -212,12 +212,12 @@ public class BusPassengerModel { @Override public void onSuccess(BusPassengerRoutesResponse data) { if ( data == null || data.getResult() == null) { - CallerLogger.INSTANCE.d( M_BUS_P + TAG, "queryDriverSiteByCoordinate = null"); + CallerLogger.d( M_BUS_P + TAG, "queryDriverSiteByCoordinate = null"); clearLocalRouteResult(); return; } if (routesResult != null && data.getResult().equals(routesResult)){ - CallerLogger.INSTANCE.d( M_BUS_P + TAG, "queryDriverSiteByCoordinate = not update"); + CallerLogger.d( M_BUS_P + TAG, "queryDriverSiteByCoordinate = not update"); return; } @@ -235,14 +235,14 @@ public class BusPassengerModel { @Override public void onError() { - CallerLogger.INSTANCE.d( M_BUS_P + TAG, "queryDriverSiteByCoordinate = onError =" + CallerLogger.d( M_BUS_P + TAG, "queryDriverSiteByCoordinate = onError =" + ", sn = " +BusPassengerServiceManager.INSTANCE.getDriverAppSn()); queryDriverByLocalDriver(); } @Override public void onFail(int code, String msg) { - CallerLogger.INSTANCE.d( M_BUS_P + TAG, "queryDriverSiteByCoordinate = %s", msg + CallerLogger.d( M_BUS_P + TAG, "queryDriverSiteByCoordinate = %s", msg + ", sn = " +BusPassengerServiceManager.INSTANCE.getDriverAppSn()); if (code == 1003){ queryDriverOperationDelay(); @@ -278,7 +278,7 @@ public class BusPassengerModel { clearLocalRouteResult(); return; } - CallerLogger.INSTANCE.d( M_BUS_P + TAG, "queryDriverSiteByCoordinate = update"); + CallerLogger.d( M_BUS_P + TAG, "queryDriverSiteByCoordinate = update"); routesResult = result; if (mRouteLineInfoCallback != null){ @@ -421,7 +421,7 @@ public class BusPassengerModel { private final IMogoIntentListener mNetWorkIntentListener = new IMogoIntentListener() { @Override public void onIntentReceived( String intentStr, Intent intent ) { - CallerLogger.INSTANCE.d( M_BUS_P + TAG, "onIntentReceived = %s", intentStr ); + CallerLogger.d( M_BUS_P + TAG, "onIntentReceived = %s", intentStr ); if ( ConnectivityManager.CONNECTIVITY_ACTION.equals( intentStr ) ) { if ( NetworkUtils.isConnected( mContext ) ) { queryDriverOperationStatus(); @@ -546,20 +546,20 @@ public class BusPassengerModel { @Override public synchronized void onAutopilotRotting(@Nullable MessagePad.GlobalPathResp routeList) { - CallerLogger.INSTANCE.d(M_BUS_P + TAG, "onAutopilotRotting = " + CallerLogger.d(M_BUS_P + TAG, "onAutopilotRotting = " + GsonUtil.jsonFromObject(routeList)); List routePoints = routeList.getWayPointsList(); if(globalPathTruncation!=null&&!globalPathTruncation.isDisposed()){ - CallerLogger.INSTANCE.d(M_BUS_P + TAG, "1s内不可以接受轨迹"); + CallerLogger.d(M_BUS_P + TAG, "1s内不可以接受轨迹"); return; } globalPathTruncation = RxUtils.INSTANCE.createSubscribe(1_000, () -> { - CallerLogger.INSTANCE.d(M_BUS_P + TAG, "可以接受轨迹"); + CallerLogger.d(M_BUS_P + TAG, "可以接受轨迹"); return null; }); - CallerLogger.INSTANCE.d(M_BUS_P + TAG, "接受轨迹中"); + CallerLogger.d(M_BUS_P + TAG, "接受轨迹中"); if (null != routePoints && routePoints.size() > 0){ updateRoutePoints(routePoints); startToRouteAndWipe(); @@ -577,7 +577,7 @@ public class BusPassengerModel { private void calculateTwoStationsRoute(){ //找出前往站对应的轨迹点，拿出两站点的集合 - CallerLogger.INSTANCE.d(M_BUS_P + TAG, "mRoutePoints.size() = " + mRoutePoints.size()); + CallerLogger.d(M_BUS_P + TAG, "mRoutePoints.size() = " + mRoutePoints.size()); if (mRoutePoints.size() > 0) { if (mStations.size() > 1){ //两个站点及以上要计算两个站点间的轨迹路线 if (mNextStationIndex <= mStations.size()-1 && mNextStationIndex - 1 >=0){ @@ -592,7 +592,7 @@ public class BusPassengerModel { int nextRouteIndex = CoordinateCalculateRouteUtil.getArrivedPointIndexNew(currentRouteIndex ,mRoutePoints ,stationNext.getGcjLon(),stationNext.getGcjLat()); - CallerLogger.INSTANCE.d(M_BUS_P + TAG, "轨迹排查==currentRouteIndex = " + currentRouteIndex + CallerLogger.d(M_BUS_P + TAG, "轨迹排查==currentRouteIndex = " + currentRouteIndex + "， nextRouteIndex = " + nextRouteIndex); if (currentRouteIndex < nextRouteIndex){ //如果找到的next在起点的轨迹前面，直接舍弃这个轨迹，不显示 mTwoStationsRouts.addAll(mRoutePoints.subList(currentRouteIndex,nextRouteIndex + 1)); @@ -616,7 +616,7 @@ public class BusPassengerModel { public void dynamicCalculateRouteInfo() { //计算当前位置和下一站的剩余点集合 //计算剩余点总里程和时间 - CallerLogger.INSTANCE.d(M_BUS_P + TAG, "轨迹排查==mTwoStationsRouts.size() = " + mTwoStationsRouts.size()); + CallerLogger.d(M_BUS_P + TAG, "轨迹排查==mTwoStationsRouts.size() = " + mTwoStationsRouts.size()); if (mTwoStationsRouts.size() == 0){ calculateTwoStationsRoute(); } @@ -632,7 +632,7 @@ public class BusPassengerModel { } for (List lastPoints: lastPointsMap.values()){ - CallerLogger.INSTANCE.d(M_BUS_P + TAG, "轨迹排查==lastPoints.size() = " + lastPoints.size()); + CallerLogger.d(M_BUS_P + TAG, "轨迹排查==lastPoints.size() = " + lastPoints.size()); float lastSumLength = 0; if (lastPoints.size() == 1){ //只是最后一个点，计算当前位置和最后一个点的距离 if (mNextStationIndex <= mStations.size()-1 && mNextStationIndex >= 0){ @@ -651,7 +651,7 @@ public class BusPassengerModel { } double lastTime = lastSumLength / getAverageSpeed() * 3.6 ; //秒 - CallerLogger.INSTANCE.d(M_BUS_P + TAG, "轨迹排查==lastSumLength = " + lastSumLength); + CallerLogger.d(M_BUS_P + TAG, "轨迹排查==lastSumLength = " + lastSumLength); if (mAutopilotPlanningCallback != null){ mAutopilotPlanningCallback.routePlanningToNextStationChanged((long)lastSumLength,(long) lastTime); } @@ -694,7 +694,7 @@ public class BusPassengerModel { mWipePreIndex = haveArrivedIndex; - CallerLogger.INSTANCE.d(M_BUS_P + TAG, "thread = "+ Thread.currentThread().getName()+" haveArrivedIndex== " + haveArrivedIndex); + CallerLogger.d(M_BUS_P + TAG, "thread = "+ Thread.currentThread().getName()+" haveArrivedIndex== " + haveArrivedIndex); if (mAutopilotPlanningCallback != null){ List routePoints = CoordinateCalculateRouteUtil .coordinateConverterLocationToLatLng(mContext,mRoutePoints); @@ -708,7 +708,7 @@ public class BusPassengerModel { * @param isStart */ public void startOrStopCalculateRouteInfo(boolean isStart) { - CallerLogger.INSTANCE.d(M_BUS_P + TAG, "startOrStopCalculateRouteInfo() " + isStart); + CallerLogger.d(M_BUS_P + TAG, "startOrStopCalculateRouteInfo() " + isStart); if (isStart) { BusPassengerModelLoopManager.getInstance().startCalculateRouteInfoLoop(); } else { @@ -718,7 +718,7 @@ public class BusPassengerModel { } private void startOrStopOrderLoop(boolean start) { - CallerLogger.INSTANCE.d(M_BUS_P + TAG, "startOrStopOrderLoop() " + start); + CallerLogger.d(M_BUS_P + TAG, "startOrStopOrderLoop() " + start); if (start) { BusPassengerModelLoopManager.getInstance().startQueryDriverLineLoop(); } else { diff --git a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java index c0d1db411d..3c3db7fd66 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java +++ b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java @@ -41,7 +41,7 @@ public class BusPassengerModelLoopManager { private CompositeDisposable mCalculateRouteDisposable; //每隔2s计算一次剩余里程和时间 public void startOrStopRouteAndWipe() { - CallerLogger.INSTANCE.i(M_BUS_P + TAG, "startOrStopRouteWipe()"); + CallerLogger.i(M_BUS_P + TAG, "startOrStopRouteWipe()"); if (mRouteWipeDisposable != null) return; if (mRouteWipeDisposable == null){ mRouteWipeDisposable = new CompositeDisposable(); @@ -81,7 +81,7 @@ public class BusPassengerModelLoopManager { if (mQueryLineDisposable != null && !mQueryLineDisposable.isDisposed()) { return; } - CallerLogger.INSTANCE.i(M_BUS_P + TAG, "startQueryDriverLineLoop()"); + CallerLogger.i(M_BUS_P + TAG, "startQueryDriverLineLoop()"); mQueryLineDisposable = Observable.interval(LOOP_DELAY, LOOP_LINE_2S, TimeUnit.MILLISECONDS) .map((aLong -> aLong + 1)) @@ -92,14 +92,14 @@ public class BusPassengerModelLoopManager { public void stopQueryDriverLineLoop() { if (mQueryLineDisposable != null) { - CallerLogger.INSTANCE.i(M_BUS_P + TAG, "stopQueryDriverLineLoop()"); + CallerLogger.i(M_BUS_P + TAG, "stopQueryDriverLineLoop()"); mQueryLineDisposable.dispose(); mQueryLineDisposable = null; } } public void startCalculateRouteInfoLoop() { - CallerLogger.INSTANCE.i(M_BUS_P + TAG, "startCalculateRouteInfoLoop()"); + CallerLogger.i(M_BUS_P + TAG, "startCalculateRouteInfoLoop()"); if (mCalculateRouteDisposable != null) return; if (mCalculateRouteDisposable == null){ mCalculateRouteDisposable = new CompositeDisposable(); @@ -130,7 +130,7 @@ public class BusPassengerModelLoopManager { public void stopCalculateRouteInfLoop() { if (mCalculateRouteDisposable != null) { - CallerLogger.INSTANCE.i(M_BUS_P + TAG, "stopCalculateRouteInfLoop()"); + CallerLogger.i(M_BUS_P + TAG, "stopCalculateRouteInfLoop()"); mCalculateRouteDisposable.dispose(); mCalculateRouteDisposable = null; } diff --git a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java index c32e05fe05..b6510fe011 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java +++ b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java @@ -42,7 +42,7 @@ public class BaseBusPassengerPresenter extends Presenter models, int haveArrivedIndex) { - CallerLogger.INSTANCE.d(M_BUS_P + TAG, "routeResult:" + models.size() + CallerLogger.d(M_BUS_P + TAG, "routeResult:" + models.size() + " haveArrivedIndex = "+haveArrivedIndex); runOnUIThread(() ->mView.routeResult(models,haveArrivedIndex)); } diff --git a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java index e52815db6e..49c38699ba 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java +++ b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java @@ -92,7 +92,7 @@ public class BusPassengerMapDirectionView // } private void initView(Context context) { - CallerLogger.INSTANCE.d(M_BUS_P + TAG, "initView"); + CallerLogger.d(M_BUS_P + TAG, "initView"); mContext = context; @@ -151,7 +151,7 @@ public class BusPassengerMapDirectionView mAMap.setOnMapLoadedListener(new AMap.OnMapLoadedListener() { @Override public void onMapLoaded() { - CallerLogger.INSTANCE.d(M_BUS_P + TAG, "smp---onMapLoaded"); + CallerLogger.d(M_BUS_P + TAG, "smp---onMapLoaded"); // 加载自定义样式 CustomMapStyleOptions customMapStyleOptions = new CustomMapStyleOptions() .setEnable(true) @@ -178,12 +178,12 @@ public class BusPassengerMapDirectionView if (gnssInfo == null) { return; } -// CallerLogger.INSTANCE.d(M_BUS_P + TAG, "onCarLocationChanged2 :" + location.getLatitude() + ":" + location.getLongitude()); +// CallerLogger.d(M_BUS_P + TAG, "onCarLocationChanged2 :" + location.getLatitude() + ":" + location.getLongitude()); LatLng currentLatLng = new LatLng(gnssInfo.getLatitude(), gnssInfo.getLongitude()); //更新车辆位置 if (mCarMarker != null) { -// CallerLogger.INSTANCE.d(M_BUS_P + TAG, "location.getBearing() = " + location.getBearing()); +// CallerLogger.d(M_BUS_P + TAG, "location.getBearing() = " + location.getBearing()); mCarMarker.setRotateAngle((float) (360 - gnssInfo.getHeading())); mCarMarker.setPosition(currentLatLng); mCarMarker.setToTop(); @@ -221,7 +221,7 @@ public class BusPassengerMapDirectionView if (mAMap != null) { addRouteColorList(); - CallerLogger.INSTANCE.d(M_BUS_P + TAG, "mLinePointsLatLng.size() = " +mLineStationLatLng.size() + CallerLogger.d(M_BUS_P + TAG, "mLinePointsLatLng.size() = " +mLineStationLatLng.size() +" mCoordinatesLatLng.size()= " + mCoordinatesLatLng.size()); if (mLineStationLatLng.size() >= 2 && mCoordinatesLatLng.size() >= 2) { //设置线段纹理 @@ -275,7 +275,7 @@ public class BusPassengerMapDirectionView texIndexList.clear(); mCoordinatesLatLng.clear(); mLineStationLatLng.clear(); - CallerLogger.INSTANCE.d(M_BUS_P + TAG, " mCoordinatesLatLng.clear " ); + CallerLogger.d(M_BUS_P + TAG, " mCoordinatesLatLng.clear " ); } public void onCreateView(Bundle savedInstanceState) { diff --git a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java index cbd98e6ba9..91e2192546 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java +++ b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java @@ -291,7 +291,7 @@ public class BusPassengerRouteFragment extends // */ // private void startIvCompass(float bearing) { // bearing = 360 - bearing; -// CallerLogger.INSTANCE.d(M_BUS_P + TAG, "startIvCompass: " + bearing); +// CallerLogger.d(M_BUS_P + TAG, "startIvCompass: " + bearing); // rotateAnimation = new RotateAnimation(lastBearing, bearing, Animation.RELATIVE_TO_SELF // , 0.5f, Animation.RELATIVE_TO_SELF, 0.5f); // rotateAnimation.setFillAfter(true); diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/SweeperProvider.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/SweeperProvider.java index 476d872e83..503ee93ce0 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/SweeperProvider.java +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/SweeperProvider.java @@ -35,7 +35,7 @@ public class SweeperProvider implements IMogoOCH { private void showFragment() { FragmentManager supportFragmentManager = activity.getSupportFragmentManager(); if (sweeperFragment == null) { - CallerLogger.INSTANCE.d(TAG, "准备add fragment======"); + CallerLogger.d(TAG, "准备add fragment======"); Fragment fragmentByTag = supportFragmentManager.findFragmentByTag(sweeperFragment.TAG); if (fragmentByTag instanceof SweeperFragment) { sweeperFragment = (SweeperFragment) fragmentByTag; @@ -47,12 +47,12 @@ public class SweeperProvider implements IMogoOCH { } return; } - CallerLogger.INSTANCE.d(TAG, "准备show fragment"); + CallerLogger.d(TAG, "准备show fragment"); supportFragmentManager.beginTransaction().show(sweeperFragment).commitAllowingStateLoss(); } private void hideFragment() { if (sweeperFragment != null) { - CallerLogger.INSTANCE.d(TAG, "准备hide fragment"); + CallerLogger.d(TAG, "准备hide fragment"); activity.getSupportFragmentManager().beginTransaction().hide(sweeperFragment).commitAllowingStateLoss(); } diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/SweeperAmapNaviFragment.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/SweeperAmapNaviFragment.java index e05d396e95..17213ac1d1 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/SweeperAmapNaviFragment.java +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/SweeperAmapNaviFragment.java @@ -125,8 +125,8 @@ public class SweeperAmapNaviFragment extends BaseSweeperUIFragment implements AM @Override public void onNaviViewLoaded() { - CallerLogger.INSTANCE.d(M_TAXI + "wlx", "导航页面加载成功"); - CallerLogger.INSTANCE.d(M_TAXI + "wlx", "请不要使用AMapNaviView.getMap().setOnMapLoadedListener();会overwrite导航SDK内部画线逻辑"); + CallerLogger.d(M_TAXI + "wlx", "导航页面加载成功"); + CallerLogger.d(M_TAXI + "wlx", "请不要使用AMapNaviView.getMap().setOnMapLoadedListener();会overwrite导航SDK内部画线逻辑"); } @Override diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/model/SweeperTaskModel.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/model/SweeperTaskModel.java index 49e6b7b34e..33d42c9a6d 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/model/SweeperTaskModel.java +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/model/SweeperTaskModel.java @@ -154,31 +154,31 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM public void accept(Throwable e) { if (e instanceof UndeliverableException) { e = e.getCause(); - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "UndeliverableException"); + CallerLogger.d(M_SWEEPER + TAG, "UndeliverableException"); } if ((e instanceof IOException)) {// // fine, irrelevant network problem or API that throws on cancellation - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "IOException"); + CallerLogger.d(M_SWEEPER + TAG, "IOException"); return; } if (e instanceof InterruptedException) { // fine, some blocking code was interrupted by a dispose call - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "InterruptedException"); + CallerLogger.d(M_SWEEPER + TAG, "InterruptedException"); return; } if ((e instanceof NullPointerException) || (e instanceof IllegalArgumentException)) { // that's likely a bug in the application - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "NullPointerException or IllegalArgumentException"); + CallerLogger.d(M_SWEEPER + TAG, "NullPointerException or IllegalArgumentException"); Thread.currentThread().getUncaughtExceptionHandler().uncaughtException(Thread.currentThread(), e); return; } if (e instanceof IllegalStateException) { // that's a bug in RxJava or in a custom operator - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "IllegalStateException"); + CallerLogger.d(M_SWEEPER + TAG, "IllegalStateException"); Thread.currentThread().getUncaughtExceptionHandler().uncaughtException(Thread.currentThread(), e); return; } - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "Undeliverable exception"); + CallerLogger.d(M_SWEEPER + TAG, "Undeliverable exception"); } }); } @@ -197,18 +197,18 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM @Override public void onAutopilotRotting(MessagePad.GlobalPathResp routeList) { if (null != routeList && routeList.getWayPointsList() != null && routeList.getWayPointsList().size() > 0) { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "onAutopilotRotting: " + printMessage(routeList)); + CallerLogger.d(M_SWEEPER + TAG, "onAutopilotRotting: " + printMessage(routeList)); // MAP返回路线信息，在1秒内返回了2次，这里加上数据过滤 long current = System.currentTimeMillis(); if (current - mRouteDataCurrentTimeMillis <= ROUTE_DATA_INTERVAL_MILLIS) { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "onAutopilotRotting: interval <=" + ROUTE_DATA_INTERVAL_MILLIS + " data is abandon"); + CallerLogger.d(M_SWEEPER + TAG, "onAutopilotRotting: interval <=" + ROUTE_DATA_INTERVAL_MILLIS + " data is abandon"); return; } mRouteDataCurrentTimeMillis = current; if (mCurrentLineId != mPreLineId) {//判断是否同一条路线 - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "onAutopilotRotting: mCurrentLineId" + mCurrentLineId + "mPreLineId：" + mPreLineId); + CallerLogger.d(M_SWEEPER + TAG, "onAutopilotRotting: mCurrentLineId" + mCurrentLineId + "mPreLineId：" + mPreLineId); mPreLineId = mCurrentLineId; points.addAll(coordinateConverterWgsToGcjList(mContext, routeList.getWayPointsList())); if (mSweeperTaskCallback != null) { @@ -336,7 +336,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM public void onSweeperFutianCloudTask(@NonNull SweeperCloudTask.MessageType messageType, String reqNo, long sysTime, SweeperTask.TaskInfo taskInfo) { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, + CallerLogger.d(M_SWEEPER + TAG, "messageType: " + messageType.getNumber() + " sysTime：" + sysTime + " reqNo：" + reqNo + " onSweeperFutianCloudTask：" + (taskInfo == null ? "null" : printMessage(taskInfo)) + " mSweeperTaskCallback：" + mSweeperTaskCallback); if (mSweeperTaskCallback != null) { msgTypeAndReqNo.put(messageType.getNumber(), reqNo); @@ -348,7 +348,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM public void onSweeperFutianCloudTaskConfirm(@NonNull SweeperCloudTask.MessageType messageType, String reqNo, long sysTime, SweeperTaskConfirm.TaskConfirm taskConfirm) { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "messageType: " + messageType.getNumber() + " sysTime：" + sysTime + " reqNo：" + reqNo + " " + + CallerLogger.d(M_SWEEPER + TAG, "messageType: " + messageType.getNumber() + " sysTime：" + sysTime + " reqNo：" + reqNo + " " + "onSweeperFutianCloudTaskConfirm：" + printMessage(taskConfirm)); if (mSweeperTaskCallback != null && taskConfirm != null) { msgTypeAndReqNo.put(messageType.getNumber(), reqNo); @@ -359,7 +359,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM @Override public void onSweeperFutianCloudTaskStatus(@NonNull SweeperCloudTask.MessageType messageType, String reqNo, long sysTime, SweeperTaskStatus.TaskStatusPush taskStatusPush) { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "messageType: " + messageType.getNumber() + " sysTime：" + sysTime + " reqNo：" + reqNo + " " + + CallerLogger.d(M_SWEEPER + TAG, "messageType: " + messageType.getNumber() + " sysTime：" + sysTime + " reqNo：" + reqNo + " " + "onSweeperFutianCloudTaskStatus：" + printMessage(taskStatusPush)); if (mSweeperTaskCallback != null && taskStatusPush != null) { msgTypeAndReqNo.put(messageType.getNumber(), reqNo); @@ -370,7 +370,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM @Override public void onSweeperFutianCloudTaskStop(@NonNull SweeperCloudTask.MessageType messageType, String reqNo, long sysTime, SweeperTaskStop.StopTaskReq stopTaskReq) { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "messageType: " + messageType.getNumber() + " sysTime：" + sysTime + " reqNo：" + reqNo + " " + + CallerLogger.d(M_SWEEPER + TAG, "messageType: " + messageType.getNumber() + " sysTime：" + sysTime + " reqNo：" + reqNo + " " + "onSweeperFutianCloudTaskStop：" + printMessage(stopTaskReq)); if (mSweeperTaskCallback != null && stopTaskReq != null) { msgTypeAndReqNo.put(messageType.getNumber(), reqNo); @@ -381,7 +381,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM @Override public void onSweeperFutianCloudTaskSuspendResume(@NonNull SweeperCloudTask.MessageType messageType, String reqNo, long sysTime, SweeperTaskSuspendResume.SuspendResumeTaskResp suspendResumeTaskResp) { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "messageType: " + messageType.getNumber() + " sysTime：" + sysTime + " reqNo：" + reqNo + " " + + CallerLogger.d(M_SWEEPER + TAG, "messageType: " + messageType.getNumber() + " sysTime：" + sysTime + " reqNo：" + reqNo + " " + "onSweeperFutianCloudTaskSuspendResume：" + printMessage(suspendResumeTaskResp)); if (mSweeperTaskCallback != null && suspendResumeTaskResp != null) { msgTypeAndReqNo.put(messageType.getNumber(), reqNo); @@ -393,7 +393,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM @Override public void onSweeperFutianCloudBootable(@NonNull SweeperCloudTask.MessageType messageType, String reqNo, long sysTime, SweeperBootable.IsBootableResp isBootableResp) { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "messageType: " + messageType.getNumber() + " sysTime：" + sysTime + " reqNo：" + reqNo + " " + + CallerLogger.d(M_SWEEPER + TAG, "messageType: " + messageType.getNumber() + " sysTime：" + sysTime + " reqNo：" + reqNo + " " + "onSweeperFutianCloudBootable：" + printMessage(isBootableResp)); if (mSweeperTaskCallback != null && isBootableResp != null) { msgTypeAndReqNo.put(messageType.getNumber(), reqNo); @@ -404,7 +404,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM @Override public void onSweeperFutianCloudBigTaskStatus(@NonNull SweeperCloudTask.MessageType messageType, String reqNo, long sysTime, SweeperBigTaskStatus.BigTaskStatusPush bigTaskStatusPush) { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "messageType: " + messageType.getNumber() + " sysTime：" + sysTime + " reqNo：" + reqNo + " " + + CallerLogger.d(M_SWEEPER + TAG, "messageType: " + messageType.getNumber() + " sysTime：" + sysTime + " reqNo：" + reqNo + " " + "onSweeperFutianCloudBigTaskStatus：" + printMessage(bigTaskStatusPush)); if (mSweeperTaskCallback != null && bigTaskStatusPush != null) { msgTypeAndReqNo.put(messageType.getNumber(), reqNo); @@ -422,7 +422,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM return; } mVehicleStateCurrentTimeMillis = current; - // CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "onSweeperFutianCleanSystemState：" + printMessage(cleanSystemState)); + // CallerLogger.d(M_SWEEPER + TAG, "onSweeperFutianCleanSystemState：" + printMessage(cleanSystemState)); if (mSweeperTaskCallback != null) { mSweeperTaskCallback.onSweeperFutianCleanSystemState(cleanSystemState); } @@ -445,7 +445,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM return; } - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, + CallerLogger.d(M_SWEEPER + TAG, "mSubTaskType：" + mSubTaskType + "+ onSweeperFutianTaskIndexData：" + printMessage(roboSweeperTaskIndex)); handleWeltData(roboSweeperTaskIndex); } @@ -508,7 +508,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM builder.setSn(getDriverSn()); String reqNo = SweeperCloudTaskUtils.getRequestId(); SweeperTask.GetTaskReq getTaskReq = builder.build(); - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, + CallerLogger.d(M_SWEEPER + TAG, "getCurrentTask:" + printMessage(getTaskReq) + " reqNo:" + reqNo + " messageType:" + SweeperCloudTask.MessageType.PadSendGetTaskReq.getNumber()); getAutoPilotControlManager().sendSweeperGetTaskReq(reqNo, getTaskReq); } @@ -524,7 +524,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM SweeperTask.StartTaskResp startTaskResp = builder.build(); String reqNo = msgTypeAndReqNo.get(SweeperCloudTask.MessageType.CloudPushTask.getNumber()); getAutoPilotControlManager().sendSweeperStartTaskResp(reqNo, startTaskResp); - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, + CallerLogger.d(M_SWEEPER + TAG, "sendSweeperStartTaskResp:" + printMessage(startTaskResp) + " reqNo:" + reqNo + " messageType:" + SweeperCloudTask.MessageType.CloudPushTask.getNumber()); } @@ -539,7 +539,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM builder.setCode(code); SweeperTaskConfirm.TaskConfirmResp taskConfirmResp = builder.build(); String reqNo = msgTypeAndReqNo.get(SweeperCloudTask.MessageType.CloudPushTaskConfirm.getNumber()); - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, + CallerLogger.d(M_SWEEPER + TAG, "sendSweeperTaskConfirmResp" + printMessage(taskConfirmResp) + " reqNo:" + reqNo + " messageType:" + SweeperCloudTask.MessageType.CloudPushTaskConfirm.getNumber()); getAutoPilotControlManager().sendSweeperTaskConfirmResp(reqNo, taskConfirmResp); } @@ -557,7 +557,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM builder.setCode(code); SweeperTaskStop.StopTaskResp stopTaskResp = builder.build(); String reqNo = msgTypeAndReqNo.get(SweeperCloudTask.MessageType.CloudPushTaskStop.getNumber()); - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, + CallerLogger.d(M_SWEEPER + TAG, "sendSweeperStopTaskResp" + printMessage(stopTaskResp) + " reqNo:" + reqNo + " messageType:" + SweeperCloudTask.MessageType.CloudPushTaskStop.getNumber()); getAutoPilotControlManager().sendSweeperStopTaskResp(reqNo, stopTaskResp); } @@ -577,7 +577,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM builder.setLineId(lineId); SweeperBootable.IsBootable isBootable = builder.build(); String reqNo = SweeperCloudTaskUtils.getRequestId(); - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, + CallerLogger.d(M_SWEEPER + TAG, "sendSweeperAutopilotBootable" + printMessage(isBootable) + " reqNo:" + reqNo + " messageType:" + SweeperCloudTask.MessageType.PadSendBootable.getNumber()); getAutoPilotControlManager().sendSweeperAutopilotBootable(reqNo, isBootable); // TODO: 2023/5/16 @@ -594,7 +594,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM @Override public void onAutopilotStatusResponse(@NonNull AutopilotStatusInfo autoPilotStatusInfo) { - //CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "onAutopilotStatusResponse state:" + autoPilotStatusInfo.getState()); + //CallerLogger.d(M_SWEEPER + TAG, "onAutopilotStatusResponse state:" + autoPilotStatusInfo.getState()); this.mAutopilotState = autoPilotStatusInfo.getState(); if (mControllerStatusCallback != null) { mControllerStatusCallback.onAutopilotState(autoPilotStatusInfo.getState()); @@ -635,12 +635,12 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM getCurrentTask(); }, 10000); } - //CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "onAutopilotIpcConnectStatusChanged status:" + status + " reason：" + reason); + //CallerLogger.d(M_SWEEPER + TAG, "onAutopilotIpcConnectStatusChanged status:" + status + " reason：" + reason); } @Override public void onAutopilotStatusRespByQuery(@NonNull SystemStatusInfo.StatusInfo status) { - // CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "onAutopilotStatusRespByQuery status:" + status.getSysState().getNumber()); + // CallerLogger.d(M_SWEEPER + TAG, "onAutopilotStatusRespByQuery status:" + status.getSysState().getNumber()); } @Override @@ -661,7 +661,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM @Override public void onSweeperFutianCloudTaskUnknown(@NonNull byte[] bytes) { String string = new String(bytes, StandardCharsets.UTF_8); - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "onSweeperFutianCloudTaskUnknown:" + string); + CallerLogger.d(M_SWEEPER + TAG, "onSweeperFutianCloudTaskUnknown:" + string); } @Override diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/receiver/TestSweeperBroadcastReceiver.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/receiver/TestSweeperBroadcastReceiver.java index 29a82c69ab..c18cc6ada5 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/receiver/TestSweeperBroadcastReceiver.java +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/receiver/TestSweeperBroadcastReceiver.java @@ -25,7 +25,7 @@ public class TestSweeperBroadcastReceiver extends BroadcastReceiver { try { this.mContext = context; int sceneType = intent.getIntExtra(SweeperConst.BROADCAST_TEST_SWEEPER_CONTROL_TYPE_EXTRA_KEY, 0); - CallerLogger.INSTANCE.d(M_BUS + TAG, "sceneType:" + sceneType); + CallerLogger.d(M_BUS + TAG, "sceneType:" + sceneType); // 分发场景 dispatchSceneTest(sceneType); diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/util/SweeperAnalyticsManager.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/util/SweeperAnalyticsManager.java index 91b5820710..dbee10c544 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/util/SweeperAnalyticsManager.java +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/util/SweeperAnalyticsManager.java @@ -49,7 +49,7 @@ public class SweeperAnalyticsManager { private void triggerStartAutopilotFailureEvent(String failCode, String failMsg){ if (mStartAutopilotParams.isEmpty()) return; - CallerLogger.INSTANCE.e( M_SWEEPER + "triggerStartAutopilotFailureEvent", failMsg ); + CallerLogger.e( M_SWEEPER + "triggerStartAutopilotFailureEvent", failMsg ); if (CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getState() != IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING){ diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java index 4691f4f95b..ac2436d4f6 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java +++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java @@ -35,7 +35,7 @@ public class SweeperProvider implements IMogoOCH { private void showFragment() { FragmentManager supportFragmentManager = activity.getSupportFragmentManager(); if (sweeperFragment == null) { - CallerLogger.INSTANCE.d(TAG, "准备add fragment======"); + CallerLogger.d(TAG, "准备add fragment======"); Fragment fragmentByTag = supportFragmentManager.findFragmentByTag(sweeperFragment.TAG); if (fragmentByTag instanceof SweeperFragment) { sweeperFragment = (SweeperFragment) fragmentByTag; @@ -47,12 +47,12 @@ public class SweeperProvider implements IMogoOCH { } return; } - CallerLogger.INSTANCE.d(TAG, "准备show fragment"); + CallerLogger.d(TAG, "准备show fragment"); supportFragmentManager.beginTransaction().show(sweeperFragment).commitAllowingStateLoss(); } private void hideFragment() { if (sweeperFragment != null) { - CallerLogger.INSTANCE.d(TAG, "准备hide fragment"); + CallerLogger.d(TAG, "准备hide fragment"); activity.getSupportFragmentManager().beginTransaction().hide(sweeperFragment).commitAllowingStateLoss(); } diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperAmapNaviFragment.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperAmapNaviFragment.java index a1460e31c7..b6439c35bd 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperAmapNaviFragment.java +++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperAmapNaviFragment.java @@ -125,8 +125,8 @@ public class SweeperAmapNaviFragment extends BaseSweeperUIFragment implements AM @Override public void onNaviViewLoaded() { - CallerLogger.INSTANCE.d(M_TAXI + "wlx", "导航页面加载成功"); - CallerLogger.INSTANCE.d(M_TAXI + "wlx", "请不要使用AMapNaviView.getMap().setOnMapLoadedListener();会overwrite导航SDK内部画线逻辑"); + CallerLogger.d(M_TAXI + "wlx", "导航页面加载成功"); + CallerLogger.d(M_TAXI + "wlx", "请不要使用AMapNaviView.getMap().setOnMapLoadedListener();会overwrite导航SDK内部画线逻辑"); } @Override diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperTaskModel.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperTaskModel.java index b95e988d3c..1811d9923c 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperTaskModel.java +++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperTaskModel.java @@ -146,31 +146,31 @@ public class SweeperTaskModel { public void accept(Throwable e) { if (e instanceof UndeliverableException) { e = e.getCause(); - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "UndeliverableException"); + CallerLogger.d(M_SWEEPER + TAG, "UndeliverableException"); } if ((e instanceof IOException)) {// // fine, irrelevant network problem or API that throws on cancellation - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "IOException"); + CallerLogger.d(M_SWEEPER + TAG, "IOException"); return; } if (e instanceof InterruptedException) { // fine, some blocking code was interrupted by a dispose call - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "InterruptedException"); + CallerLogger.d(M_SWEEPER + TAG, "InterruptedException"); return; } if ((e instanceof NullPointerException) || (e instanceof IllegalArgumentException)) { // that's likely a bug in the application - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "NullPointerException or IllegalArgumentException"); + CallerLogger.d(M_SWEEPER + TAG, "NullPointerException or IllegalArgumentException"); Thread.currentThread().getUncaughtExceptionHandler().uncaughtException(Thread.currentThread(), e); return; } if (e instanceof IllegalStateException) { // that's a bug in RxJava or in a custom operator - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "IllegalStateException"); + CallerLogger.d(M_SWEEPER + TAG, "IllegalStateException"); Thread.currentThread().getUncaughtExceptionHandler().uncaughtException(Thread.currentThread(), e); return; } - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "Undeliverable exception"); + CallerLogger.d(M_SWEEPER + TAG, "Undeliverable exception"); } }); } @@ -265,10 +265,10 @@ public class SweeperTaskModel { @Override public void onMsgReceived(OCHOperationalMessage obj) { if (obj == null) { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "onMsgReceived = null"); + CallerLogger.d(M_SWEEPER + TAG, "onMsgReceived = null"); return; } - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "onMsgReceived = " + obj.getMessage()); + CallerLogger.d(M_SWEEPER + TAG, "onMsgReceived = " + obj.getMessage()); OCHSocketMessageManager.INSTANCE.pushAppOperationalMsgBox(obj.getPushTimeStamp(), obj.getMessage(),OCHSocketMessageManager.OPERATION_SYSTEM); } @@ -291,7 +291,7 @@ public class SweeperTaskModel { public void onStartAutopilotFailure(@NotNull String startFailedCode, @NonNull String startFailedMessage) { SweeperAnalyticsManager.getInstance().triggerStartAutopilotFailureEventByAdas(startFailedCode, startFailedMessage); if (mADASStatusCallback != null && !FunctionBuildConfig.isDemoMode) { - CallerLogger.INSTANCE.e(M_SWEEPER + TAG, "mAdasStartFailureListener = " + startFailedMessage); + CallerLogger.e(M_SWEEPER + TAG, "mAdasStartFailureListener = " + startFailedMessage); mADASStatusCallback.onStartAdasFailure(); } } @@ -302,7 +302,7 @@ public class SweeperTaskModel { @Override public void onChassisLocationGCJ02(@Nullable MogoLocation gnssInfo) { if (null == gnssInfo) return; - CallerLogger.INSTANCE.e(M_SWEEPER + TAG, "高德定位到站：mLongitude = " + gnssInfo.getLongitude() + CallerLogger.e(M_SWEEPER + TAG, "高德定位到站：mLongitude = " + gnssInfo.getLongitude() + ", mLatitude=" + gnssInfo.getLatitude() + ", mSubTaskType=" + mSubTaskType +", mIsSubTaskWorking=" + mIsSubTaskWorking + ", isAutopilotSubTaskArriveEndSite=" + isAutopilotSubTaskArriveEndSite ); @@ -346,7 +346,7 @@ public class SweeperTaskModel { //根据围栏判断，是否到达子任务终点 private void judgeArrivedStation(MogoLocation location) { if (mCurrentSubTaskDetail == null) { - CallerLogger.INSTANCE.d(TAG, "行程日志-judgeArrivedStation() mCurrentSubTaskDetail is null"); + CallerLogger.d(TAG, "行程日志-judgeArrivedStation() mCurrentSubTaskDetail is null"); return; } double endSiteLon = mCurrentSubTaskDetail.getEndSiteLon(); @@ -355,7 +355,7 @@ public class SweeperTaskModel { endSiteLon, endSiteLat, location.getLongitude(), location.getLatitude()); if (distance <= SweeperConst.ARRIVE_AT_END_STATION_DISTANCE) { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "行程日志-judgeArrivedStation() distance = " + distance + CallerLogger.d(M_SWEEPER + TAG, "行程日志-judgeArrivedStation() distance = " + distance + " to " + mCurrentSubTaskDetail.getEndSiteName()); isAutopilotSubTaskArriveEndSite = true; //到达子任务终点 结束子任务 @@ -368,7 +368,7 @@ public class SweeperTaskModel { * 在踩刹车、控制方向盘等操作后，会停止自动驾驶，重启自动驾驶的话相当于重新设置自动驾驶目的地 */ public void startAutopilot() { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "行程日志-重启自动驾驶===" + mIsSubTaskWorking); + CallerLogger.d(M_SWEEPER + TAG, "行程日志-重启自动驾驶===" + mIsSubTaskWorking); //只去启动自动驾驶 startAutopilot(firstStartAutopilot >= 1); } @@ -389,11 +389,11 @@ public class SweeperTaskModel { triggerStartServiceEvent(isRestart, false); AutopilotControlParameters parameters = initAutopilotControlParameters(); if (null == parameters) { - CallerLogger.INSTANCE.e(M_SWEEPER + TAG, "行程日志-AutopilotControlParameters is empty."); + CallerLogger.e(M_SWEEPER + TAG, "行程日志-AutopilotControlParameters is empty."); return; } CallerAutoPilotControlManager.INSTANCE.startAutoPilot(parameters); - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "行程日志-开启自动驾驶====" + GsonUtil.jsonFromObject(parameters) + CallerLogger.d(M_SWEEPER + TAG, "行程日志-开启自动驾驶====" + GsonUtil.jsonFromObject(parameters) + " startLatLon=" + parameters.startName + "，endLatLon=" + parameters.endName + "isRestart = " + isRestart); @@ -420,7 +420,7 @@ public class SweeperTaskModel { if (FunctionBuildConfig.isDemoMode) { FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = false; //是否强制绘制引导线 CallerAutoPilotControlManager.INSTANCE.setIPCDemoMode(false);//是否自动启动自驾 - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "美化模式-ignore：置为false"); + CallerLogger.d(M_SWEEPER + TAG, "美化模式-ignore：置为false"); } } @@ -430,7 +430,7 @@ public class SweeperTaskModel { public void startBeautificationMode() { FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = true;//是否强制绘制引导线 CallerAutoPilotControlManager.INSTANCE.setIPCDemoMode(true);//是否自动启动自驾 - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "美化模式-ignore：置为true"); + CallerLogger.d(M_SWEEPER + TAG, "美化模式-ignore：置为true"); } /** @@ -440,18 +440,18 @@ public class SweeperTaskModel { //MAP 280 每隔100ms左右返回一次到站， 导致在到达中间站后再次滑动出发后会有时间差，收到一次到站，出现问题 //此处比对 自驾告诉的子任务终点坐标和本地应到子任务终点坐标， 一致时才表示子任务完成 if (data != null && data.getEndLocation() != null && mCurrentSubTaskDetail != null) { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "MAP到站通知：" + mCurrentSubTaskDetail.getEndSiteName() + " 经度：" + CallerLogger.d(M_SWEEPER + TAG, "MAP到站通知：" + mCurrentSubTaskDetail.getEndSiteName() + " 经度：" + data.getEndLocation().getLongitude() + " 纬度：" + data.getEndLocation().getLatitude()); String latitude = NumberFormatUtil.cutOutNumber(data.getEndLocation().getLatitude(), 5); //wgs String longitude = NumberFormatUtil.cutOutNumber(data.getEndLocation().getLongitude(), 5); String arriveLat = NumberFormatUtil.cutOutNumber(mCurrentSubTaskDetail.getEndSiteWgs64Lat(), 5); String arriveLon = NumberFormatUtil.cutOutNumber(mCurrentSubTaskDetail.getEndSiteWgs64Lon(), 5); if (!latitude.equals(arriveLat) || !longitude.equals(arriveLon)) { - CallerLogger.INSTANCE.e(M_SWEEPER + TAG, "行程日志-子任务终点拦截,自动子任务终点与本地子任务终点不一致"); + CallerLogger.e(M_SWEEPER + TAG, "行程日志-子任务终点拦截,自动子任务终点与本地子任务终点不一致"); return; } } - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "MAP到站通知：mSubTaskType=" + mSubTaskType + " isAutopilotSubTaskArriveEndSite=" + CallerLogger.d(M_SWEEPER + TAG, "MAP到站通知：mSubTaskType=" + mSubTaskType + " isAutopilotSubTaskArriveEndSite=" + isAutopilotSubTaskArriveEndSite + " mSubTaskId=" + mSubTaskId); if (SubTaskTypeEnum.MANUAL_DRIVING_SUBTYPE.getCode() == mSubTaskType) {//人工驾驶子任务需要手动跳过，不能自动结束 return; @@ -492,16 +492,16 @@ public class SweeperTaskModel { AutopilotControlParameters parameters = initAutopilotControlParameters(); if (null == parameters) { - CallerLogger.INSTANCE.e(M_SWEEPER + TAG, "AutopilotControlParameters is empty."); + CallerLogger.e(M_SWEEPER + TAG, "AutopilotControlParameters is empty."); return; } - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "AutopilotControlParameters" + GsonUtil.jsonFromObject(parameters)); - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "AutopilotControlParameters is update."); + CallerLogger.d(M_SWEEPER + TAG, "AutopilotControlParameters" + GsonUtil.jsonFromObject(parameters)); + CallerLogger.d(M_SWEEPER + TAG, "AutopilotControlParameters is update."); CallerAutoPilotStatusListenerManager.INSTANCE.updateAutopilotControlParameters(parameters); } private void clearAutopilotControlParameters() { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "AutopilotControlParameters is clear."); + CallerLogger.d(M_SWEEPER + TAG, "AutopilotControlParameters is clear."); CallerAutoPilotStatusListenerManager.INSTANCE.updateAutopilotControlParameters(null); } @@ -536,7 +536,7 @@ public class SweeperTaskModel { SweeperServiceManager.getCurrentTask(mContext, new OchCommonServiceCallback>() { @Override public void onSuccess(BaseResponse data) { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "getCurrentTask：" + GsonUtil.jsonFromObject(data)); + CallerLogger.d(M_SWEEPER + TAG, "getCurrentTask：" + GsonUtil.jsonFromObject(data)); if (mSweeperTaskCallback != null && data != null) { SweeperSubTaskBean sweeperSubTaskBean = data.getData(); if (sweeperSubTaskBean != null && sweeperSubTaskBean.getSubList() != null && sweeperSubTaskBean.getSubList().size() > 0) { @@ -576,7 +576,7 @@ public class SweeperTaskModel { SweeperServiceManager.getMainTaskList(mContext, new OchCommonServiceCallback>>() { @Override public void onSuccess(BaseResponse> data) { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "getMainTaskList：" + GsonUtil.jsonFromObject(data)); + CallerLogger.d(M_SWEEPER + TAG, "getMainTaskList：" + GsonUtil.jsonFromObject(data)); if (mSweeperTaskCallback != null && data != null && data.getCode() == 0) { List list = data.getData(); mSweeperTaskCallback.setMainTaskList(list, refresh); @@ -612,7 +612,7 @@ public class SweeperTaskModel { SweeperServiceManager.getSubTaskList(taskId, mContext, new OchCommonServiceCallback>>() { @Override public void onSuccess(BaseResponse> data) { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "getSubTaskList：" + GsonUtil.jsonFromObject(data)); + CallerLogger.d(M_SWEEPER + TAG, "getSubTaskList：" + GsonUtil.jsonFromObject(data)); if (mSweeperTaskCallback != null && data != null && data.getCode() == 0) { List list = data.getData(); if (list != null && list.size() > 0) { @@ -653,12 +653,12 @@ public class SweeperTaskModel { SweeperServiceManager.getSubTaskDetail(subTaskId, mContext, new OchCommonServiceCallback>() { @Override public void onSuccess(BaseResponse data) { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "getSubTaskDetail：" + GsonUtil.jsonFromObject(data)); + CallerLogger.d(M_SWEEPER + TAG, "getSubTaskDetail：" + GsonUtil.jsonFromObject(data)); if (data != null) { mCurrentSubTaskDetail = data.getData(); if (mCurrentSubTaskDetail != null) { mSweeperTaskCallback.setSubTakDetail(mCurrentSubTaskDetail, subTaskType); - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "getSubTaskDetail：subTaskType=" + subTaskType + CallerLogger.d(M_SWEEPER + TAG, "getSubTaskDetail：subTaskType=" + subTaskType + ", isStartSubtask=" + isStartSubtask + ", mAutopilotState=" + mAutopilotState); Log.d(M_SWEEPER + TAG, "getSubTaskDetail：subTaskType=" + subTaskType + ", isStartSubtask=" + isStartSubtask + ", mAutopilotState=" + mAutopilotState); @@ -712,7 +712,7 @@ public class SweeperTaskModel { SweeperServiceManager.subTaskStart(isFirst, isEnd, subTaskId, mContext, new OchCommonServiceCallback>() { @Override public void onSuccess(BaseResponse data) { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "subTaskStart：" + GsonUtil.jsonFromObject(data)); + CallerLogger.d(M_SWEEPER + TAG, "subTaskStart：" + GsonUtil.jsonFromObject(data)); if (mSweeperTaskCallback != null && data != null) { if (data.getData()) { mIsSubTaskWorking = true; @@ -762,7 +762,7 @@ public class SweeperTaskModel { SweeperServiceManager.subTaskEnd(isFirst, isEnd, subTaskId, mContext, new OchCommonServiceCallback>() { @Override public void onSuccess(BaseResponse data) { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "subTaskEnd：" + + CallerLogger.d(M_SWEEPER + TAG, "subTaskEnd：" + String.format("isFirst=%b; isEnd=%b; ", isFirst, isEnd) + GsonUtil.jsonFromObject(data)); if (data != null) { if (data.getData()) { @@ -813,7 +813,7 @@ public class SweeperTaskModel { SweeperServiceManager.subTaskSkip(isFirst, isEnd, subTaskId, mContext, new OchCommonServiceCallback>() { @Override public void onSuccess(BaseResponse data) { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "subTaskSkip：" + + CallerLogger.d(M_SWEEPER + TAG, "subTaskSkip：" + String.format("isFirst=%b; isEnd=%b; ", isFirst, isEnd)+ GsonUtil.jsonFromObject(data)); if (mSweeperTaskCallback != null && data != null) { if (data.getData()) { @@ -854,7 +854,7 @@ public class SweeperTaskModel { SweeperServiceManager.mainTaskReset(taskId, mContext, new OchCommonServiceCallback>() { @Override public void onSuccess(BaseResponse data) { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "mainTaskReset：" + GsonUtil.jsonFromObject(data)); + CallerLogger.d(M_SWEEPER + TAG, "mainTaskReset：" + GsonUtil.jsonFromObject(data)); // 主任务重置 当前子任务也需重置 mIsSubTaskWorking = false; isAutopilotSubTaskArriveEndSite = false; diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperPresenter.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperPresenter.java index 288a79755b..723f8619b6 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperPresenter.java +++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperPresenter.java @@ -302,7 +302,7 @@ public class SweeperPresenter extends Presenter "强力：" + clean_intensity_strong; - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "onSweeperFutianCleanSystemState：" + stringBuilder); + CallerLogger.d(M_SWEEPER + TAG, "onSweeperFutianCleanSystemState：" + stringBuilder); mView.onSweeperFutianCleanSystemState(cleanSystemState); } @@ -325,7 +325,7 @@ public class SweeperPresenter extends Presenter roboSweeperTaskIndex.getLocLon() + "纬度：" + roboSweeperTaskIndex.getLocLat(); - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "onSweeperFutianTaskIndexData：" + stringBuilder); + CallerLogger.d(M_SWEEPER + TAG, "onSweeperFutianTaskIndexData：" + stringBuilder); String tempLongitude=NumberFormatUtil.cutOutNumber(roboSweeperTaskIndex.getLocLon(), 6); String tempLatitude=NumberFormatUtil.cutOutNumber(roboSweeperTaskIndex.getLocLat(), 6); //用于过滤车是否停在原地，经纬度相同的情况 diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/receiver/TestSweeperBroadcastReceiver.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/receiver/TestSweeperBroadcastReceiver.java index b2ef6bcadd..2c990d55ea 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/receiver/TestSweeperBroadcastReceiver.java +++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/receiver/TestSweeperBroadcastReceiver.java @@ -25,7 +25,7 @@ public class TestSweeperBroadcastReceiver extends BroadcastReceiver { try { this.mContext = context; int sceneType = intent.getIntExtra(SweeperConst.BROADCAST_TEST_SWEEPER_CONTROL_TYPE_EXTRA_KEY, 0); - CallerLogger.INSTANCE.d(M_BUS + TAG, "sceneType:" + sceneType); + CallerLogger.d(M_BUS + TAG, "sceneType:" + sceneType); // 分发场景 dispatchSceneTest(sceneType); diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperAnalyticsManager.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperAnalyticsManager.java index 5977e000fb..36d48211ad 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperAnalyticsManager.java +++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperAnalyticsManager.java @@ -49,7 +49,7 @@ public class SweeperAnalyticsManager { private void triggerStartAutopilotFailureEvent(String failCode, String failMsg){ if (mStartAutopilotParams.isEmpty()) return; - CallerLogger.INSTANCE.e( M_SWEEPER + "triggerStartAutopilotFailureEvent", failMsg ); + CallerLogger.e( M_SWEEPER + "triggerStartAutopilotFailureEvent", failMsg ); if (CallerAutoPilotStatusListenerManager.INSTANCE.getState() != IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING){ diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperTrajectoryManager.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperTrajectoryManager.java index 43b81e2828..3c072d77bd 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperTrajectoryManager.java +++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperTrajectoryManager.java @@ -47,11 +47,11 @@ public class SweeperTrajectoryManager { */ public void syncTrajectoryInfo(SweeperSubTaskDetailBean sweeperSubTaskDetailBean) { if (sweeperSubTaskDetailBean != null) { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "syncTrajectoryInfo() start."); + CallerLogger.d(M_SWEEPER + TAG, "syncTrajectoryInfo() start."); startTrajReqLoop(sweeperSubTaskDetailBean); } else { // 无路线信息or当前未在始发站 - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "syncTrajectoryInfo() stop."); + CallerLogger.d(M_SWEEPER + TAG, "syncTrajectoryInfo() stop."); stopTrajReqLoop(); } } @@ -65,38 +65,38 @@ public class SweeperTrajectoryManager { if (guardianInfo == null || !guardianInfo.hasCode()) return; if ("ISYS_INIT_TRAJECTORY_START".equals(guardianInfo.getCode())) { // 1. 轨迹管理_轨迹开始下载（本地已有对应轨迹也触发） - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "onAutopilotGuardian() 轨迹开始下载"); + CallerLogger.d(M_SWEEPER + TAG, "onAutopilotGuardian() 轨迹开始下载"); // ToastUtils.showShort("轨迹开始下载"); stopTrajReqLoop(); } else if ("ISYS_INIT_TRAJECTORY_SUCCESS".equals(guardianInfo.getCode())) { // 2. 轨迹管理_轨迹下载成功（本地已有对应轨迹也触发） - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "onAutopilotGuardian() 轨迹下载成功"); + CallerLogger.d(M_SWEEPER + TAG, "onAutopilotGuardian() 轨迹下载成功"); // ToastUtils.showShort("轨迹下载成功"); stopTrajReqLoop(); } else if ("ISYS_INIT_TRAJECTORY_FAILURE".equals(guardianInfo.getCode())) { // 3. 轨迹管理_轨迹下载失败，本地无对应轨迹 - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "onAutopilotGuardian() " + + CallerLogger.d(M_SWEEPER + TAG, "onAutopilotGuardian() " + "轨迹下载失败，本地无对应轨迹"); // ToastUtils.showShort("轨迹下载失败，本地无对应轨迹"); } else if ("ISYS_INIT_TRAJECTORY_WARNING".equals(guardianInfo.getCode())) { // 4. 轨迹管理_轨迹下载失败，本地有对应轨迹，认为成功 - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "onAutopilotGuardian() " + + CallerLogger.d(M_SWEEPER + TAG, "onAutopilotGuardian() " + "轨迹下载失败，本地有对应轨迹，认为成功"); // ToastUtils.showShort("轨迹下载失败，本地有对应轨迹，认为成功"); } else if ("ISYS_INIT_TRAJECTORY_TIMEOUT".equals(guardianInfo.getCode())) { // 5. 轨迹管理_轨迹下载超时 - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "onAutopilotGuardian() 轨迹下载超时"); + CallerLogger.d(M_SWEEPER + TAG, "onAutopilotGuardian() 轨迹下载超时"); // ToastUtils.showShort("轨迹下载超时"); } else if ("ISSM_FUNC_AUTO_PILOT_READY".equals(guardianInfo.getCode())) { // 收到ssm的自动驾驶变为ready，再次下发轨迹下载.解决：域控重启，或者102域控启动太早，107节点初始化未完成导致的轨迹未进行下载。 - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "onAutopilotGuardian() ssm ready，再次发起下载"); + CallerLogger.d(M_SWEEPER + TAG, "onAutopilotGuardian() ssm ready，再次发起下载"); // TODO: 2023/7/25 } } private void setupAutoPilotLine(SweeperSubTaskDetailBean subTaskDetail) { if (subTaskDetail == null) { - CallerLogger.INSTANCE.e(M_SWEEPER + TAG, "setupAutoPilotLine(): routesResult is null."); + CallerLogger.e(M_SWEEPER + TAG, "setupAutoPilotLine(): routesResult is null."); return; } else { mAutoPilotLine = new AutopilotControlParameters.AutoPilotLine( @@ -131,7 +131,7 @@ public class SweeperTrajectoryManager { if (mSendReqDisposable != null && !mSendReqDisposable.isDisposed()) { return; } - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "startTrajReqLoop()"); + CallerLogger.d(M_SWEEPER + TAG, "startTrajReqLoop()"); setupAutoPilotLine(sweeperSubTaskDetailBean); mSendReqDisposable = Observable.interval(SweeperConst.LOOP_DELAY, SweeperConst.LOOP_PERIOD_10S, TimeUnit.MILLISECONDS) @@ -143,14 +143,14 @@ public class SweeperTrajectoryManager { stopTrajReqLoop(); return; } - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "loop sendTrajectoryReq: " + aLong); + CallerLogger.d(M_SWEEPER + TAG, "loop sendTrajectoryReq: " + aLong); sendTrajectoryReq(); }); } public void stopTrajReqLoop() { if (mSendReqDisposable != null) { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "stopTrajReqLoop()"); + CallerLogger.d(M_SWEEPER + TAG, "stopTrajReqLoop()"); mSendReqDisposable.dispose(); mSendReqDisposable = null; clearAutoPilotLine(); @@ -159,12 +159,12 @@ public class SweeperTrajectoryManager { private void sendTrajectoryReq() { if (mAutoPilotLine == null) { - CallerLogger.INSTANCE.e(M_SWEEPER + TAG, "sendTrajectoryReq(): mAutoPilotLine is null!!!"); + CallerLogger.e(M_SWEEPER + TAG, "sendTrajectoryReq(): mAutoPilotLine is null!!!"); return; } CallerAutoPilotControlManager.INSTANCE.sendTrajectoryDownloadReq(mAutoPilotLine); - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "sendTrajectoryReq(): " + CallerLogger.d(M_SWEEPER + TAG, "sendTrajectoryReq(): " + GsonUtils.toJson(mAutoPilotLine)); } } diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/TaxiProvider.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/TaxiProvider.java index 76a54882a1..793ef8c8e1 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/TaxiProvider.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/TaxiProvider.java @@ -33,21 +33,21 @@ class TaxiProvider implements IMogoOCH { private int mContainerId; @Override public void init( Context context ) { - CallerLogger.INSTANCE.d( M_TAXI + TAG, "init" ); + CallerLogger.d( M_TAXI + TAG, "init" ); } /** * 进入鹰眼模式，设置手势缩放地图失效 */ private void stepIntoVrMode() { - CallerLogger.INSTANCE.d( M_TAXI + TAG, "进入vr模式" ); + CallerLogger.d( M_TAXI + TAG, "进入vr模式" ); CallerMoGoUiSettingManager.INSTANCE.stepInNightMode();//夜间模式 状态栏字体颜色变黑 } private void showFragment() { FragmentManager supportFragmentManager = mActivity.getSupportFragmentManager(); if (ochTaxiFragment == null) { - CallerLogger.INSTANCE.d(M_TAXI + TAG, "准备add fragment======"); + CallerLogger.d(M_TAXI + TAG, "准备add fragment======"); Fragment fragmentByTag = supportFragmentManager.findFragmentByTag(TaxiFragment.TAG); if (fragmentByTag instanceof TaxiFragment){ ochTaxiFragment = (TaxiFragment) fragmentByTag; @@ -61,7 +61,7 @@ class TaxiProvider implements IMogoOCH { } return; } - CallerLogger.INSTANCE.d(M_TAXI + TAG, "准备show fragment"); + CallerLogger.d(M_TAXI + TAG, "准备show fragment"); supportFragmentManager.beginTransaction().show(ochTaxiFragment).commitAllowingStateLoss(); } diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java index 9ff5f901d8..b47e691371 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java @@ -184,31 +184,31 @@ public class TaxiModel { public void accept(Throwable e) { if (e instanceof UndeliverableException) { e = e.getCause(); - CallerLogger.INSTANCE.d(M_TAXI + TAG, "UndeliverableException"); + CallerLogger.d(M_TAXI + TAG, "UndeliverableException"); } if ((e instanceof IOException)) {// // fine, irrelevant network problem or API that throws on cancellation - CallerLogger.INSTANCE.d(M_TAXI + TAG, "IOException"); + CallerLogger.d(M_TAXI + TAG, "IOException"); return; } if (e instanceof InterruptedException) { // fine, some blocking code was interrupted by a dispose call - CallerLogger.INSTANCE.d(M_TAXI + TAG, "InterruptedException"); + CallerLogger.d(M_TAXI + TAG, "InterruptedException"); return; } if ((e instanceof NullPointerException) || (e instanceof IllegalArgumentException)) { // that's likely a bug in the application - CallerLogger.INSTANCE.d(M_TAXI + TAG, "NullPointerException or IllegalArgumentException"); + CallerLogger.d(M_TAXI + TAG, "NullPointerException or IllegalArgumentException"); Thread.currentThread().getUncaughtExceptionHandler().uncaughtException(Thread.currentThread(), e); return; } if (e instanceof IllegalStateException) { // that's a bug in RxJava or in a custom operator - CallerLogger.INSTANCE.d(M_TAXI + TAG, "IllegalStateException"); + CallerLogger.d(M_TAXI + TAG, "IllegalStateException"); Thread.currentThread().getUncaughtExceptionHandler().uncaughtException(Thread.currentThread(), e); return; } - CallerLogger.INSTANCE.d(M_TAXI + TAG, "Undeliverable exception"); + CallerLogger.d(M_TAXI + TAG, "Undeliverable exception"); } }); } @@ -256,10 +256,10 @@ public class TaxiModel { @Override public void onMsgReceived(OCHOperationalMessage obj) { if (obj == null) { - CallerLogger.INSTANCE.d(M_TAXI + TAG, "onMsgReceived = null"); + CallerLogger.d(M_TAXI + TAG, "onMsgReceived = null"); return; } - CallerLogger.INSTANCE.d(M_TAXI + TAG, "onMsgReceived = " + obj.getMessage()); + CallerLogger.d(M_TAXI + TAG, "onMsgReceived = " + obj.getMessage()); OCHSocketMessageManager.INSTANCE.pushAppOperationalMsgBox(obj.getPushTimeStamp(), obj.getMessage(), OCHSocketMessageManager.OPERATION_SYSTEM); } @@ -281,7 +281,7 @@ public class TaxiModel { } public void startOrStopOrderLoop(boolean start) { - CallerLogger.INSTANCE.d(M_TAXI + TAG, "startOrStopOrderLoop() " + start); + CallerLogger.d(M_TAXI + TAG, "startOrStopOrderLoop() " + start); if (start) { TaxiModelLoopManager.getInstance().startInAndWaitOrdersLoop(); TaxiModelLoopManager.getInstance().startNewBookingOrderLoop(); @@ -362,7 +362,7 @@ public class TaxiModel { //1.1.2. 当本地有currentOrder： //orderId不一致时：通过currentOrder.orderId查询订单状态，并通知ui更新 //orderId一致且orderStatus不一致时：则更新currentOrder，并通知ui更新 - CallerLogger.INSTANCE.d(M_TAXI + TAG, "AutopilotControl-mCurrentOCHOrder = " + mCurrentOCHOrder.orderStatus + CallerLogger.d(M_TAXI + TAG, "AutopilotControl-mCurrentOCHOrder = " + mCurrentOCHOrder.orderStatus + ", orderStatus = " + data.data.servicing.get(0).orderStatus); if (!mCurrentOCHOrder.orderNo.equals(data.data.servicing.get(0).orderNo)) { queryCurOrderStatus(); @@ -840,14 +840,14 @@ public class TaxiModel { FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = true; CallerAutoPilotControlManager.INSTANCE.setIgnoreConditionDraw(true); CallerAutoPilotControlManager.INSTANCE.setIPCDemoMode(true); - CallerLogger.INSTANCE.d(M_TAXI + TAG, "美化模式-ignore：置为true（更新本地order信息）"); + CallerLogger.d(M_TAXI + TAG, "美化模式-ignore：置为true（更新本地order信息）"); } updateAutopilotControlParameters(); } if (mCurrentOCHOrder.orderStatus == TaxiOrderStatusEnum.ArriveAtEnd.getCode()) { if (FunctionBuildConfig.isDemoMode) { - CallerLogger.INSTANCE.d(M_TAXI + TAG, "setIPCDemoMode：false"); + CallerLogger.d(M_TAXI + TAG, "setIPCDemoMode：false"); CallerAutoPilotControlManager.INSTANCE.setIPCDemoMode(false); } @@ -862,15 +862,15 @@ public class TaxiModel { AutopilotControlParameters parameters = initAutopilotControlParameters(); if (null == parameters) { - CallerLogger.INSTANCE.e(M_TAXI + TAG, "AutopilotControlParameters is empty."); + CallerLogger.e(M_TAXI + TAG, "AutopilotControlParameters is empty."); return; } - CallerLogger.INSTANCE.d(M_TAXI + TAG, "AutopilotControlParameters is update."); + CallerLogger.d(M_TAXI + TAG, "AutopilotControlParameters is update."); CallerAutoPilotStatusListenerManager.INSTANCE.updateAutopilotControlParameters(parameters); } private void clearAutopilotControlParameters() { - CallerLogger.INSTANCE.d(M_TAXI + TAG, "AutopilotControlParameters is clear."); + CallerLogger.d(M_TAXI + TAG, "AutopilotControlParameters is clear."); CallerAutoPilotStatusListenerManager.INSTANCE.updateAutopilotControlParameters(null); } @@ -887,7 +887,7 @@ public class TaxiModel { FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = false; CallerAutoPilotControlManager.INSTANCE.setIgnoreConditionDraw(false); CallerAutoPilotControlManager.INSTANCE.setIPCDemoMode(false); - CallerLogger.INSTANCE.d(M_TAXI + TAG, "美化模式-ignore：置为false（已完成or清除当前订单）"); + CallerLogger.d(M_TAXI + TAG, "美化模式-ignore：置为false（已完成or清除当前订单）"); } } @@ -913,7 +913,7 @@ public class TaxiModel { public void startAutoPilot() { if (!checkCurrentOCHOrder()) { - CallerLogger.INSTANCE.e(M_TAXI + TAG, "no order or order is empty."); + CallerLogger.e(M_TAXI + TAG, "no order or order is empty."); ToastUtils.showShort("当前订单不存在或异常！"); return; } @@ -922,7 +922,7 @@ public class TaxiModel { if (FunctionBuildConfig.isPassStartAutopilotCommand && TextUtils.isEmpty(mCurrentOCHOrder.csvFileUrl) && TextUtils.isEmpty(mCurrentOCHOrder.csvFileUrlDPQP)) { ToastUtils.showLong("无发布轨迹, 请发布后重试"); - CallerLogger.INSTANCE.e(M_TAXI + TAG, "isPassStartAutopilotCommand = " + + CallerLogger.e(M_TAXI + TAG, "isPassStartAutopilotCommand = " + FunctionBuildConfig.isPassStartAutopilotCommand + "busRoutesResult.csvFileUrl = " + mCurrentOCHOrder.csvFileUrl + "busRoutesResult.csvFileUrlDPQP = " + mCurrentOCHOrder.csvFileUrlDPQP); @@ -935,7 +935,7 @@ public class TaxiModel { return; } - CallerLogger.INSTANCE.e(M_TAXI + TAG, "isPassStartAutopilotCommand = " + + CallerLogger.e(M_TAXI + TAG, "isPassStartAutopilotCommand = " + FunctionBuildConfig.isPassStartAutopilotCommand); if (!FunctionBuildConfig.isDemoMode && !OCHAdasAbilityManager.getInstance().getAutopilotAbilityStatus()) { @@ -958,12 +958,12 @@ public class TaxiModel { AutopilotControlParameters parameters = initAutopilotControlParameters(); if (null == parameters) { - CallerLogger.INSTANCE.e(M_TAXI + TAG, "AutopilotControlParameters is empty."); + CallerLogger.e(M_TAXI + TAG, "AutopilotControlParameters is empty."); return; } CallerAutoPilotControlManager.INSTANCE.startAutoPilot(parameters); - CallerLogger.INSTANCE.d(M_TAXI + TAG, "start autopilot with parameter: %s", + CallerLogger.d(M_TAXI + TAG, "start autopilot with parameter: %s", GsonUtil.jsonFromObject(parameters) + " ,startSiteName=" + mCurrentOCHOrder.startSiteAddr + " ,endSiteName=" + mCurrentOCHOrder.endSiteAddr @@ -983,7 +983,7 @@ public class TaxiModel { private AutopilotControlParameters initAutopilotControlParameters() { if (!checkCurrentOCHOrder()) { - CallerLogger.INSTANCE.e(M_TAXI + TAG, "no order or order is empty."); + CallerLogger.e(M_TAXI + TAG, "no order or order is empty."); return null; } @@ -1016,7 +1016,7 @@ public class TaxiModel { public void cancelAutopilot() { try { CallerAutoPilotControlManager.INSTANCE.cancelAutoPilot(); - CallerLogger.INSTANCE.d(M_TAXI + TAG, "结束自动驾驶"); + CallerLogger.d(M_TAXI + TAG, "结束自动驾驶"); } catch (Exception e) { e.printStackTrace(); } @@ -1034,7 +1034,7 @@ public class TaxiModel { startLon, startLat, location.getLongitude(), location.getLatitude()); - CallerLogger.INSTANCE.i(M_TAXI + TAG, "judgeStartStation() distance = " + distance); + CallerLogger.i(M_TAXI + TAG, "judgeStartStation() distance = " + distance); if (distance <= TaxiConst.ARRIVE_AT_START_STATION_DISTANCE) { arrivedStartPoint(); @@ -1045,7 +1045,7 @@ public class TaxiModel { private final IMogoIntentListener mNetWorkIntentListener = new IMogoIntentListener() { @Override public void onIntentReceived(String intentStr, Intent intent) { - CallerLogger.INSTANCE.d(M_TAXI + TAG, "onIntentReceived = %s", intentStr); + CallerLogger.d(M_TAXI + TAG, "onIntentReceived = %s", intentStr); if (ConnectivityManager.CONNECTIVITY_ACTION.equals(intentStr)) { if (NetworkUtils.isConnected(mContext)) { startOrStopOrderLoop(LoginStatusManager.isLogin() && TaxtServingStatusManager.isOpeningOrderStatus()); @@ -1060,7 +1060,7 @@ public class TaxiModel { public void onStartAutopilotFailure(@NotNull String startFailedCode, @NonNull String startFailedMessage) { TaxiAnalyticsManager.INSTANCE.triggerStartAutopilotFailureEventByAdas(startFailedCode, startFailedMessage); if (mADASStatusCallback != null && !FunctionBuildConfig.isDemoMode) { - CallerLogger.INSTANCE.e(M_TAXI + TAG, "mAdasStartFailureListener = " + startFailedMessage); + CallerLogger.e(M_TAXI + TAG, "mAdasStartFailureListener = " + startFailedMessage); mADASStatusCallback.onStartAdasFailure(); } } @@ -1114,13 +1114,13 @@ public class TaxiModel { endLon, endLat, currentLocation.getLongitude(), currentLocation.getLatitude()); - CallerLogger.INSTANCE.i(M_TAXI + TAG, "judgeEndStation() distance = " + distance); + CallerLogger.i(M_TAXI + TAG, "judgeEndStation() distance = " + distance); if (distance <= TaxiConst.ARRIVE_AT_START_STATION_DISTANCE) { //1、当前位置和站点围栏15m内 if (!checkCurrentOCHOrder() || (getCurOrderStatus() == TaxiOrderStatusEnum.ArriveAtEnd)) { - CallerLogger.INSTANCE.i(M_TAXI + TAG, "order exception or order ArriveAtEnd"); + CallerLogger.i(M_TAXI + TAG, "order exception or order ArriveAtEnd"); return; } @@ -1132,16 +1132,16 @@ public class TaxiModel { endLat, (int) currentLocation.getHeading()); - CallerLogger.INSTANCE.i(M_TAXI + TAG, "judgeEndStation() stationAngle = " + stationAngle); + CallerLogger.i(M_TAXI + TAG, "judgeEndStation() stationAngle = " + stationAngle); //3、刚过站且过站距离在15m内， 提交到站 if (stationAngle > 90 && distance <= TaxiConst.ARRIVE_AT_START_STATION_DISTANCE){ if (!checkCurrentOCHOrder() || (getCurOrderStatus() == TaxiOrderStatusEnum.ArriveAtEnd)) { - CallerLogger.INSTANCE.i(M_TAXI + TAG, "order exception or order ArriveAtEnd"); + CallerLogger.i(M_TAXI + TAG, "order exception or order ArriveAtEnd"); return; } - CallerLogger.INSTANCE.i(M_TAXI + TAG, "judgeEndStation() = 刚过站且在15m内"); + CallerLogger.i(M_TAXI + TAG, "judgeEndStation() = 刚过站且在15m内"); arriveTerminal(); } } @@ -1227,7 +1227,7 @@ public class TaxiModel { FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = true; CallerAutoPilotControlManager.INSTANCE.setIgnoreConditionDraw(true); CallerAutoPilotControlManager.INSTANCE.setIPCDemoMode(true); - CallerLogger.INSTANCE.d(M_TAXI + TAG, "美化模式-ignore：置为true（到达出发点且已开启自动驾驶）"); + CallerLogger.d(M_TAXI + TAG, "美化模式-ignore：置为true（到达出发点且已开启自动驾驶）"); } } } else if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE) { @@ -1277,7 +1277,7 @@ public class TaxiModel { @Override public void onAutopilotArriveAtStation(MessagePad.ArrivalNotification data) { - CallerLogger.INSTANCE.i(M_TAXI + TAG, "onAutopilotArriveAtStation = " + data.toString()); + CallerLogger.i(M_TAXI + TAG, "onAutopilotArriveAtStation = " + data.toString()); if (data == null || !checkCurrentOCHOrder() || (getCurOrderStatus() == TaxiOrderStatusEnum.ArriveAtEnd)) { @@ -1291,7 +1291,7 @@ public class TaxiModel { // FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = false; // CallerAutoPilotManager.INSTANCE.setIgnoreConditionDraw(false); CallerAutoPilotControlManager.INSTANCE.setIPCDemoMode(false); - CallerLogger.INSTANCE.d(M_TAXI + TAG, "美化模式-ignore：置为false（到达目的地）"); + CallerLogger.d(M_TAXI + TAG, "美化模式-ignore：置为false（到达目的地）"); } } @@ -1308,7 +1308,7 @@ public class TaxiModel { @Override public void onAutopilotRotting(MessagePad.GlobalPathResp routeList) { if (null != routeList && routeList.getWayPointsList() != null) { - CallerLogger.INSTANCE.d(M_TAXI + TAG, "getWayPointsList = " + CallerLogger.d(M_TAXI + TAG, "getWayPointsList = " + routeList.getWayPointsList().size()); } if (null != routeList && routeList.getWayPointsList().size() > 0) { @@ -1391,7 +1391,7 @@ public class TaxiModel { public void updateOrderRouteInfo(List models) { if (null == models || models.size() == 0) return; if (mCurrentOCHOrder == null) return; - CallerLogger.INSTANCE.d(M_TAXI + TAG, "--------计算出sumLength开始---------- "); + CallerLogger.d(M_TAXI + TAG, "--------计算出sumLength开始---------- "); //转换成高德坐标系 if (mRoutePoints.size() > 0) { @@ -1403,12 +1403,12 @@ public class TaxiModel { } public void startDynamicCalculateRouteInfo() { - CallerLogger.INSTANCE.d(M_TAXI + TAG, "--------mCurrentOCHOrder---------- " + mCurrentOCHOrder); + CallerLogger.d(M_TAXI + TAG, "--------mCurrentOCHOrder---------- " + mCurrentOCHOrder); if (mCurrentOCHOrder != null && mRoutePoints.size() == 0) {//根据orderNo去查询 queryOrderRouteList(mCurrentOCHOrder.orderNo); } - CallerLogger.INSTANCE.d(M_TAXI + TAG, "--------mRoutePoints.size---------- " + mRoutePoints.size()); + CallerLogger.d(M_TAXI + TAG, "--------mRoutePoints.size---------- " + mRoutePoints.size()); if (mRoutePoints.size() > 0) { reportTotalDisAndTime(); @@ -1461,7 +1461,7 @@ public class TaxiModel { private void updateDistance(float lastSumLength){ double lastTime = lastSumLength / TaxiConst.TAXI_AVERAGE_SPEED * 3.6; //秒 - CallerLogger.INSTANCE.d(M_TAXI + "dynamicCalculateRouteInfo" + CallerLogger.d(M_TAXI + "dynamicCalculateRouteInfo" , "---lastSumLength: " + lastSumLength + "----lastTime : " + lastTime + " thread = " + Thread.currentThread().getName()); @@ -1566,7 +1566,7 @@ public class TaxiModel { * @param isStart */ public void startOrStopCalculateRouteInfo(boolean isStart) { - CallerLogger.INSTANCE.d(M_TAXI + TAG, "startOrStopOrderLoop() " + isStart); + CallerLogger.d(M_TAXI + TAG, "startOrStopOrderLoop() " + isStart); if (isStart) { TaxiModelLoopManager.getInstance().startCalculateRouteInfoLoop(); } else { diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModelLoopManager.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModelLoopManager.java index 6574a6ca89..83bfe4b59f 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModelLoopManager.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModelLoopManager.java @@ -44,7 +44,7 @@ public class TaxiModelLoopManager { if (mInAndWaitServiceDisposable != null && !mInAndWaitServiceDisposable.isDisposed()) { return; } - CallerLogger.INSTANCE.i(M_TAXI + TAG, "startInAndWaitOrdersLoop()"); + CallerLogger.i(M_TAXI + TAG, "startInAndWaitOrdersLoop()"); mInAndWaitServiceDisposable = Observable.interval(TaxiConst.LOOP_DELAY, TaxiConst.LOOP_PERIOD_2S, TimeUnit.MILLISECONDS) .map((aLong -> aLong + 1)) @@ -55,7 +55,7 @@ public class TaxiModelLoopManager { public void stopInAndWaitOrdersLoop() { if (mInAndWaitServiceDisposable != null) { - CallerLogger.INSTANCE.i(M_TAXI + TAG, "stopInAndWaitOrdersLoop()"); + CallerLogger.i(M_TAXI + TAG, "stopInAndWaitOrdersLoop()"); mInAndWaitServiceDisposable.dispose(); mInAndWaitServiceDisposable = null; } @@ -65,7 +65,7 @@ public class TaxiModelLoopManager { if (mNewBookingOrderDisposable != null && !mNewBookingOrderDisposable.isDisposed()) { return; } - CallerLogger.INSTANCE.i(M_TAXI + TAG, "startNewBookingOrderLoop()"); + CallerLogger.i(M_TAXI + TAG, "startNewBookingOrderLoop()"); mNewBookingOrderDisposable = Observable.interval(TaxiConst.LOOP_DELAY, TaxiConst.LOOP_PERIOD_1S, TimeUnit.MILLISECONDS) .map((aLong -> aLong + 1)) @@ -76,7 +76,7 @@ public class TaxiModelLoopManager { public void stopNewBookingOrderLoop() { if (mNewBookingOrderDisposable != null) { - CallerLogger.INSTANCE.i(M_TAXI + TAG, "stopNewBookingOrderLoop()"); + CallerLogger.i(M_TAXI + TAG, "stopNewBookingOrderLoop()"); mNewBookingOrderDisposable.dispose(); mNewBookingOrderDisposable = null; } @@ -86,7 +86,7 @@ public class TaxiModelLoopManager { if (mGrabResultDisposable != null && !mGrabResultDisposable.isDisposed()) { return; } - CallerLogger.INSTANCE.i(M_TAXI + TAG, "startGrabResultLoop()"); + CallerLogger.i(M_TAXI + TAG, "startGrabResultLoop()"); mGrabResultDisposable = Observable.interval(TaxiConst.LOOP_DELAY, TaxiConst.LOOP_PERIOD_1S, TimeUnit.MILLISECONDS) .map((aLong -> aLong + 1)) @@ -97,7 +97,7 @@ public class TaxiModelLoopManager { public void stopGrabResultLoop() { if (mGrabResultDisposable != null) { - CallerLogger.INSTANCE.i(M_TAXI + TAG, "stopGrabResultLoop()"); + CallerLogger.i(M_TAXI + TAG, "stopGrabResultLoop()"); mGrabResultDisposable.dispose(); mGrabResultDisposable = null; } @@ -107,7 +107,7 @@ public class TaxiModelLoopManager { if (mHeartbeatDisposable != null && !mHeartbeatDisposable.isDisposed()) { return; } - CallerLogger.INSTANCE.i(M_TAXI + TAG, "startHeartbeatLoop()"); + CallerLogger.i(M_TAXI + TAG, "startHeartbeatLoop()"); mHeartbeatDisposable = Observable.interval(TaxiConst.LOOP_DELAY, TaxiConst.LOOP_PERIOD_60S, TimeUnit.MILLISECONDS) .map((aLong -> aLong + 1)) @@ -118,7 +118,7 @@ public class TaxiModelLoopManager { public void stopHeartbeatLoop() { if (mHeartbeatDisposable != null) { - CallerLogger.INSTANCE.i(M_TAXI + TAG, "stopHeartbeatLoop()"); + CallerLogger.i(M_TAXI + TAG, "stopHeartbeatLoop()"); mHeartbeatDisposable.dispose(); mHeartbeatDisposable = null; } @@ -126,7 +126,7 @@ public class TaxiModelLoopManager { public void startCalculateRouteInfoLoop() { - CallerLogger.INSTANCE.i(M_TAXI + TAG, "startCalculateRouteInfoLoop()"); + CallerLogger.i(M_TAXI + TAG, "startCalculateRouteInfoLoop()"); if (mCalculateRouteDisposable != null) return; mCalculateRouteDisposable = new CompositeDisposable(); @@ -168,7 +168,7 @@ public class TaxiModelLoopManager { public void stopCalculateRouteInfoLoop() { if (mCalculateRouteDisposable != null) { - CallerLogger.INSTANCE.i(M_TAXI + TAG, "stopCalculateRouteInfoLoop()"); + CallerLogger.i(M_TAXI + TAG, "stopCalculateRouteInfoLoop()"); mCalculateRouteDisposable.dispose(); mCalculateRouteDisposable = null; } diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/presenter/NaviPresenter.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/presenter/NaviPresenter.java index 112ed99f50..3eefaf7863 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/presenter/NaviPresenter.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/presenter/NaviPresenter.java @@ -38,7 +38,7 @@ public class NaviPresenter extends Presenter implements @Override public void onCreate( @NonNull LifecycleOwner owner ) { super.onCreate( owner ); - CallerLogger.INSTANCE.d( M_TAXI + TAG, " onCreate" ); + CallerLogger.d( M_TAXI + TAG, " onCreate" ); } @Override diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java index a989268905..18db1efb9f 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java @@ -62,7 +62,7 @@ public class TaxiPresenter extends Presenter implements ITaxiADASS @Override public void onCreate( @NonNull LifecycleOwner owner ) { super.onCreate( owner ); - CallerLogger.INSTANCE.d( M_TAXI + TAG, "网约车-出租车拿到订单" ); + CallerLogger.d( M_TAXI + TAG, "网约车-出租车拿到订单" ); } @Override @@ -238,7 +238,7 @@ public class TaxiPresenter extends Presenter implements ITaxiADASS @RequiresApi(api = Build.VERSION_CODES.P) @Override public void onCurrentOrderStatusChanged(OrderQueryRespBean.Result order) { - CallerLogger.INSTANCE.d(M_TAXI + TAG,"order = "+order.toString()); + CallerLogger.d(M_TAXI + TAG,"order = "+order.toString()); if (TaxiOrderStatusEnum.UserArriveAtStart.getCode() == order.orderStatus){ TaxiModel.getInstance().queryAutopilotStatus(true); TaxiModel.getInstance().setStation(); diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java index b05a6bc229..300dab7da1 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java @@ -200,7 +200,7 @@ public abstract class BaseTaxiTabFragment 0){ @@ -422,7 +422,7 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment } public void onCurrentOrderRouteInfoGot(OrderQueryRouteInfoRespBean.Result routeInfo) {// 单位 米， 秒 - CallerLogger.INSTANCE.d(M_TAXI + TAG, "durationToEnd = " + routeInfo.durationToEnd); + CallerLogger.d(M_TAXI + TAG, "durationToEnd = " + routeInfo.durationToEnd); String dis = "0"; long distance = routeInfo.distanceToEnd; @@ -492,7 +492,7 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment public void onOrderStatusChanged(OrderQueryRespBean.Result order) { int status = order.orderStatus; - CallerLogger.INSTANCE.d(M_TAXI + TAG, "status==" + status); + CallerLogger.d(M_TAXI + TAG, "status==" + status); mCurrentOrder = order; mActivity.runOnUiThread(() -> { if (status == TaxiOrderStatusEnum.None.getCode() || status == TaxiOrderStatusEnum.Cancel.getCode() || status == TaxiOrderStatusEnum.JourneyCompleted.getCode()) { @@ -588,7 +588,7 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment * @param being */ public void isHaveBeingOrder(boolean being) { - CallerLogger.INSTANCE.d(M_TAXI + TAG, "isHaveBeingOrder = " + being); + CallerLogger.d(M_TAXI + TAG, "isHaveBeingOrder = " + being); try { if (being) { mNoDataView.setVisibility(View.GONE); @@ -610,7 +610,7 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment @Override public void onClick(View v) { if (v.getId() == R.id.module_och_taxi_order_server_status_tv) { - CallerLogger.INSTANCE.d(M_TAXI + TAG, mOrderServerStatus.getText().toString()); + CallerLogger.d(M_TAXI + TAG, mOrderServerStatus.getText().toString()); startOrEndService(); } else if (v.getId() == R.id.module_och_taxi_order_cancel_iv) { new TaxiOrderCancelDialog(mTaxiFragment, mActivity, mOrderNo, saveOrderState).show(); @@ -624,11 +624,11 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment showNaviToEndStationFragment(true); } }else if (v.getId() == R.id.taxi_start_by_auto){//自驾模式 - CallerLogger.INSTANCE.d(M_TAXI + TAG, "自驾模式"); + CallerLogger.d(M_TAXI + TAG, "自驾模式"); mOrderStartModeBtn.setTag(0); startOrEndService(); } else if (v.getId() == R.id.taxi_start_by_manual){//人工模式 - CallerLogger.INSTANCE.d(M_TAXI + TAG, "人工模式"); + CallerLogger.d(M_TAXI + TAG, "人工模式"); mOrderStartModeBtn.setTag(1); mTaxiFragment.confirmAutopilotConditionByDriver(); } @@ -699,7 +699,7 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment @Override public void reInitNaviAmap(boolean isPlay, boolean isRestart) { - CallerLogger.INSTANCE.d(M_TAXI + TAG, "isPlay = " + isPlay + ", isRestart=" + isRestart); + CallerLogger.d(M_TAXI + TAG, "isPlay = " + isPlay + ", isRestart=" + isRestart); if (!isRestart) { mTaxiFragment.showAmapNaviToStationFragment(false); return; @@ -754,7 +754,7 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment if (isAdd){ //开启线程执行起终点marker设置 Runnable setMapMarkerRunnable = () -> { - CallerLogger.INSTANCE.d(M_TAXI + "setMapMaker= " + Thread.currentThread().getName(), + CallerLogger.d(M_TAXI + "setMapMaker= " + Thread.currentThread().getName(), uuid + "=latitude=" + station.get(1) + ",longitude=" + station.get(0)); Point.Options.Builder builder = new Point.Options.Builder(TaxiConst.TYPE_MARKER_TAXI_ORDER, Level.MAP_MARKER) @@ -784,7 +784,7 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment }else { //开启线程移除起终点marker设置 Runnable removeMapMarkerRunnable = () -> { - CallerLogger.INSTANCE.d(M_TAXI + "RemoveMapMaker=" + Thread.currentThread().getName(), + CallerLogger.d(M_TAXI + "RemoveMapMaker=" + Thread.currentThread().getName(), uuid + "=latitude=" + station.get(1) + ",longitude=" + station.get(0)); // Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMarkerManager(AbsMogoApplication.getApp())).removeMarkers(uuid); IMoGoOverlayManager overlayManager = CallerMapUIServiceManager.INSTANCE.getOverlayManager(); diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java index f5eb07f81e..0273c04fbe 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java @@ -90,7 +90,7 @@ public class TaxiFragment extends BaseTaxiTabFragment parent, View view, int position, long id) { - CallerLogger.INSTANCE.d(M_TAXI + TAG,"mCurrentReason ="+ mContentArrays[position]); + CallerLogger.d(M_TAXI + TAG,"mCurrentReason ="+ mContentArrays[position]); mCurrentReason = mContentArrays[position]; // GradientDrawable background = (GradientDrawable) mCancelBt.getBackground();//GradientDrawable是Drawable的子类 // background.setColor(Color.parseColor("#2B6EFF")); diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiPersonalDialogFragment.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiPersonalDialogFragment.java index fe488af13e..e9a8752287 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiPersonalDialogFragment.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiPersonalDialogFragment.java @@ -127,7 +127,7 @@ public class TaxiPersonalDialogFragment extends windowManager.getDefaultDisplay().getSize(point); params.width = (int)(point.x * 0.375); params.height = ViewGroup.LayoutParams.MATCH_PARENT; - CallerLogger.INSTANCE.d(M_TAXI + TAG,"width= "+params.width+"height= "+params.height); + CallerLogger.d(M_TAXI + TAG,"width= "+params.width+"height= "+params.height); window.setAttributes(params); window.getDecorView().setBackgroundColor(Color.parseColor("#00FFFFFF"));//设置背景， 不然显示不全 window.setGravity(Gravity.LEFT|Gravity.BOTTOM); @@ -226,13 +226,13 @@ public class TaxiPersonalDialogFragment extends ImageView imageView = (ImageView) tab.getCustomView().findViewById(R.id.operation_tab_line_iv); if (isSelected){ textView.setTextSize(TypedValue.COMPLEX_UNIT_PX,AutoSizeUtils.dp2px(getContext(),46)); - CallerLogger.INSTANCE.d(M_TAXI + TAG,"SelectTv = "+ textView.getText()); + CallerLogger.d(M_TAXI + TAG,"SelectTv = "+ textView.getText()); textView.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD)); textView.setTextColor(Color.parseColor("#FFFFFF")); imageView.setImageDrawable(getResources().getDrawable(R.drawable.taxi_driver_operation_tab_line)); }else { textView.setTextSize(TypedValue.COMPLEX_UNIT_PX,AutoSizeUtils.dp2px(getContext(),40)); - CallerLogger.INSTANCE.d(M_TAXI + TAG,"unSelectTv = "+ textView.getText()); + CallerLogger.d(M_TAXI + TAG,"unSelectTv = "+ textView.getText()); textView.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL)); textView.setTextColor(Color.parseColor("#A7B6F0")); imageView.setImageDrawable(null); @@ -480,7 +480,7 @@ public class TaxiPersonalDialogFragment extends LinearLayoutManager linearLayoutManager = (LinearLayoutManager) manager; int lastItemPosition = linearLayoutManager.findLastCompletelyVisibleItemPosition(); int itemCount = linearLayoutManager.getItemCount(); - CallerLogger.INSTANCE.d(M_TAXI + TAG,"lastItemPosition=="+lastItemPosition+",itemCount=="+itemCount); + CallerLogger.d(M_TAXI + TAG,"lastItemPosition=="+lastItemPosition+",itemCount=="+itemCount); //向上滑动到最后一个 if ((lastItemPosition == itemCount-1) && isUpwardSliding){ onLoadMore(); diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiServerOrdersFragment.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiServerOrdersFragment.java index 91007e4705..838cf0c69b 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiServerOrdersFragment.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiServerOrdersFragment.java @@ -96,7 +96,7 @@ public class TaxiServerOrdersFragment extends BaseTaxiUIFragment { } } - CallerLogger.INSTANCE.d(M_TAXI + TAG,"activity="+getActivity()); + CallerLogger.d(M_TAXI + TAG,"activity="+getActivity()); mTaxiOrderTab.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() { @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP) @Override @@ -139,13 +139,13 @@ public class TaxiServerOrdersFragment extends BaseTaxiUIFragment { if (isSelected){ textView.setBackground(getActivity().getDrawable(R.drawable.taxi_driver_tab_item_bg)); textView.setTextSize(TypedValue.COMPLEX_UNIT_PX,AutoSizeUtils.dp2px(getContext(),40)); - CallerLogger.INSTANCE.d(M_TAXI + TAG,"SelectTv = "+ textView.getText()); + CallerLogger.d(M_TAXI + TAG,"SelectTv = "+ textView.getText()); textView.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD)); textView.setTextColor(Color.parseColor("#FFFFFF")); }else { textView.setBackground(null); textView.setTextSize(TypedValue.COMPLEX_UNIT_PX,AutoSizeUtils.dp2px(getContext(),36)); - CallerLogger.INSTANCE.d(M_TAXI + TAG,"unSelectTv = "+ textView.getText()); + CallerLogger.d(M_TAXI + TAG,"unSelectTv = "+ textView.getText()); textView.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL)); textView.setTextColor(Color.parseColor("#CCD4F5")); } @@ -163,7 +163,7 @@ public class TaxiServerOrdersFragment extends BaseTaxiUIFragment { @NonNull @Override public Fragment getItem(int position) { - CallerLogger.INSTANCE.d( M_TAXI + TAG, "getItem="+position); + CallerLogger.d( M_TAXI + TAG, "getItem="+position); return fragments.get(position); } @@ -175,7 +175,7 @@ public class TaxiServerOrdersFragment extends BaseTaxiUIFragment { @Nullable @Override public CharSequence getPageTitle(int position) { - CallerLogger.INSTANCE.d( M_TAXI + TAG, "getPageTitle="+position); + CallerLogger.d( M_TAXI + TAG, "getPageTitle="+position); return mTabTitles[position]; } } diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.kt b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.kt index 22e0c765d4..0521b9a774 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.kt +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.kt @@ -81,7 +81,7 @@ object TaxiAnalyticsManager { ) { mStartAutopilotKey = if (restart) TaxiConst.EVENT_KEY_RESTART_AUTOPILOT else TaxiConst.EVENT_KEY_START_SERVICE -// CallerLogger.INSTANCE.d(M_TAXI + "埋点==","restart = "+restart+", send= "+send); +// CallerLogger.d(M_TAXI + "埋点==","restart = "+restart+", send= "+send); if (send) { if (mStartAutopilotParams.isEmpty()) return // 开启成功，上报埋点 diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java index cf0079e809..18ae00b5df 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java @@ -52,14 +52,14 @@ public class TaxiTrajectoryManager { public void syncTrajectoryInfo() { OrderQueryRespBean.Result orderInfo = TaxiModel.getInstance().getCurrentOCHOrder(); if (orderInfo == null || orderInfo.orderStatus >= TaxiOrderStatusEnum.OnTheWayToEnd.getCode()) { - CallerLogger.INSTANCE.d(M_TAXI + TAG, "syncTrajectoryInfo() stop."); + CallerLogger.d(M_TAXI + TAG, "syncTrajectoryInfo() stop."); stopTrajReqLoop(); } else { if (mPrevOrderNo.equals(orderInfo.orderNo)) { - CallerLogger.INSTANCE.d(M_TAXI + TAG, "syncTrajectoryInfo() 重复订单."); + CallerLogger.d(M_TAXI + TAG, "syncTrajectoryInfo() 重复订单."); } else { mPrevOrderNo = orderInfo.orderNo; - CallerLogger.INSTANCE.d(M_TAXI + TAG, "syncTrajectoryInfo() start."); + CallerLogger.d(M_TAXI + TAG, "syncTrajectoryInfo() start."); startTrajReqLoop(); } } @@ -73,31 +73,31 @@ public class TaxiTrajectoryManager { if (guardianInfo == null || !guardianInfo.hasCode()) return; if ("ISYS_INIT_TRAJECTORY_START".equals(guardianInfo.getCode())) { // 1. 轨迹管理_轨迹开始下载（本地已有对应轨迹也触发） - CallerLogger.INSTANCE.d(M_TAXI + TAG, "onAutopilotGuardian() 轨迹开始下载"); + CallerLogger.d(M_TAXI + TAG, "onAutopilotGuardian() 轨迹开始下载"); // ToastUtils.showShort("轨迹开始下载"); stopTrajReqLoop(); } else if ("ISYS_INIT_TRAJECTORY_SUCCESS".equals(guardianInfo.getCode())) { // 2. 轨迹管理_轨迹下载成功（本地已有对应轨迹也触发） - CallerLogger.INSTANCE.d(M_TAXI + TAG, "onAutopilotGuardian() 轨迹下载成功"); + CallerLogger.d(M_TAXI + TAG, "onAutopilotGuardian() 轨迹下载成功"); // ToastUtils.showShort("轨迹下载成功"); stopTrajReqLoop(); } else if ("ISYS_INIT_TRAJECTORY_FAILURE".equals(guardianInfo.getCode())) { // 3. 轨迹管理_轨迹下载失败，本地无对应轨迹 - CallerLogger.INSTANCE.d(M_TAXI + TAG, "onAutopilotGuardian() " + + CallerLogger.d(M_TAXI + TAG, "onAutopilotGuardian() " + "轨迹下载失败，本地无对应轨迹"); // ToastUtils.showShort("轨迹下载失败，本地无对应轨迹"); } else if ("ISYS_INIT_TRAJECTORY_WARNING".equals(guardianInfo.getCode())) { // 4. 轨迹管理_轨迹下载失败，本地有对应轨迹，认为成功 - CallerLogger.INSTANCE.d(M_TAXI + TAG, "onAutopilotGuardian() " + + CallerLogger.d(M_TAXI + TAG, "onAutopilotGuardian() " + "轨迹下载失败，本地有对应轨迹，认为成功"); // ToastUtils.showShort("轨迹下载失败，本地有对应轨迹，认为成功"); } else if ("ISYS_INIT_TRAJECTORY_TIMEOUT".equals(guardianInfo.getCode())) { // 5. 轨迹管理_轨迹下载超时 - CallerLogger.INSTANCE.d(M_TAXI + TAG, "onAutopilotGuardian() 轨迹下载超时"); + CallerLogger.d(M_TAXI + TAG, "onAutopilotGuardian() 轨迹下载超时"); // ToastUtils.showShort("轨迹下载超时"); } else if ("ISSM_FUNC_AUTO_PILOT_READY".equals(guardianInfo.getCode())) { // 收到ssm的自动驾驶变为ready，再次下发轨迹下载.解决：域控重启，或者102域控启动太早，107节点初始化未完成导致的轨迹未进行下载。 - CallerLogger.INSTANCE.d(M_TAXI + TAG, "onAutopilotGuardian() ssm ready，再次发起下载"); + CallerLogger.d(M_TAXI + TAG, "onAutopilotGuardian() ssm ready，再次发起下载"); syncTrajectoryInfo(); } } @@ -105,7 +105,7 @@ public class TaxiTrajectoryManager { private void setupAutoPilotLine() { OrderQueryRespBean.Result order = TaxiModel.getInstance().getCurrentOCHOrder(); if (order == null) { - CallerLogger.INSTANCE.e(M_TAXI + TAG, + CallerLogger.e(M_TAXI + TAG, "setupAutoPilotLine(): orderInfo is null."); return; } else { @@ -154,7 +154,7 @@ public class TaxiTrajectoryManager { if (mSendReqDisposable != null && !mSendReqDisposable.isDisposed()) { return; } - CallerLogger.INSTANCE.d(M_TAXI + TAG, "startTrajReqLoop()"); + CallerLogger.d(M_TAXI + TAG, "startTrajReqLoop()"); setupAutoPilotLine(); mSendReqDisposable = Observable.interval(TaxiConst.LOOP_DELAY, TaxiConst.LOOP_PERIOD_10S, TimeUnit.MILLISECONDS) @@ -167,14 +167,14 @@ public class TaxiTrajectoryManager { stopTrajReqLoop(); return; } - CallerLogger.INSTANCE.d(M_TAXI + TAG, "loop sendTrajectoryReq: " + aLong); + CallerLogger.d(M_TAXI + TAG, "loop sendTrajectoryReq: " + aLong); sendTrajectoryReq(); }); } private void stopTrajReqLoop() { if (mSendReqDisposable != null) { - CallerLogger.INSTANCE.d(M_TAXI + TAG, "stopTrajReqLoop()"); + CallerLogger.d(M_TAXI + TAG, "stopTrajReqLoop()"); mSendReqDisposable.dispose(); mSendReqDisposable = null; clearAutoPilotLine(); @@ -183,12 +183,12 @@ public class TaxiTrajectoryManager { private void sendTrajectoryReq() { if (mAutoPilotLine == null) { - CallerLogger.INSTANCE.e(M_TAXI + TAG, "sendTrajectoryReq(): mAutoPilotLine is null!!!"); + CallerLogger.e(M_TAXI + TAG, "sendTrajectoryReq(): mAutoPilotLine is null!!!"); return; } CallerAutoPilotControlManager.INSTANCE.sendTrajectoryDownloadReq(mAutoPilotLine); - CallerLogger.INSTANCE.d(M_TAXI + TAG, "sendTrajectoryReq(): " + CallerLogger.d(M_TAXI + TAG, "sendTrajectoryReq(): " + GsonUtils.toJson(mAutoPilotLine)); } } diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/MogoOCHTaxiPassenger.java b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/MogoOCHTaxiPassenger.java index c81773973b..a0c0677371 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/MogoOCHTaxiPassenger.java +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/MogoOCHTaxiPassenger.java @@ -37,21 +37,21 @@ class MogoOCHTaxiPassenger implements IMogoOCH { @Override public void init(Context context) { - CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "init"); + CallerLogger.d(M_TAXI_P + TAG, "init"); } /** * 进入鹰眼模式，设置手势缩放地图失效 */ private void stepIntoVrMode() { - CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "进入vr模式"); + CallerLogger.d(M_TAXI_P + TAG, "进入vr模式"); CallerMoGoUiSettingManager.INSTANCE.stepInNightMode();//夜间模式 状态栏字体颜色变黑 } private void showFragment() { FragmentManager supportFragmentManager = mActivity.getSupportFragmentManager(); if (ochTaxiPassengerFragment == null) { - CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "准备add fragment======"); + CallerLogger.d(M_TAXI_P + TAG, "准备add fragment======"); Fragment fragmentByTag = supportFragmentManager.findFragmentByTag(TaxiPassengerBaseFragment.TAG); if (fragmentByTag instanceof TaxiPassengerBaseFragment){ ochTaxiPassengerFragment = (TaxiPassengerBaseFragment) fragmentByTag; @@ -64,7 +64,7 @@ class MogoOCHTaxiPassenger implements IMogoOCH { } return; } - CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "准备show fragment"); + CallerLogger.d(M_TAXI_P + TAG, "准备show fragment"); supportFragmentManager.beginTransaction().show(ochTaxiPassengerFragment).commitAllowingStateLoss(); } diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/navi/auto/RoutingNaviPresenter.java b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/navi/auto/RoutingNaviPresenter.java index 1d2f13eeaa..69160ee3b2 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/navi/auto/RoutingNaviPresenter.java +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/navi/auto/RoutingNaviPresenter.java @@ -37,7 +37,7 @@ public class RoutingNaviPresenter extends Presenter imp @Override public void onCreate( @NonNull LifecycleOwner owner ) { super.onCreate( owner ); - CallerLogger.INSTANCE.d( M_TAXI + TAG, " onCreate" ); + CallerLogger.d( M_TAXI + TAG, " onCreate" ); } @Override diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt index 8105055ed0..0e72b048dc 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt @@ -7,7 +7,6 @@ import android.os.Build import android.os.Bundle import android.view.View import androidx.annotation.RequiresApi -import androidx.core.content.ContextCompat import androidx.core.text.HtmlCompat import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope @@ -16,15 +15,17 @@ import com.mogo.commons.mvp.BaseFragment import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager.getState import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02 -import com.mogo.eagle.core.function.main.MainMoGoApplication import com.mogo.eagle.core.network.utils.GsonUtil import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_TAXI +import com.mogo.eagle.core.utilcode.util.DateTimeUtils import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.common.module.map.AmapNaviToDestinationModel import com.mogo.och.common.module.map.ICommonNaviChangedCallback +import com.mogo.och.common.module.utils.DateTimeUtil +import com.mogo.och.common.module.utils.NumberFormatUtil import com.mogo.och.common.module.wigets.OCHCommitDialog import com.mogo.och.taxi.R import com.mogo.och.taxi.bean.OrderDetail @@ -36,15 +37,16 @@ import com.mogo.och.taxi.constant.TaxiOrderStatusEnum import com.mogo.och.taxi.constant.TaxiUnmannedConst.Companion.TAXI_END_MAP_MAKER import com.mogo.och.taxi.constant.TaxiUnmannedConst.Companion.TAXI_START_MAP_MAKER import com.mogo.och.taxi.constant.TaxiUnmannedConst.Companion.TYPE_MARKER_TAXI_ORDER +import com.mogo.och.taxi.model.TaxiModel +import com.mogo.och.taxi.ui.TaxiOrderCancelDialog import com.mogo.och.taxi.ui.base.TaxiFragment -import com.mogo.och.taxi.ui.unmanned.TaskWithOrderUIState +import com.mogo.och.taxi.ui.unmanned.TaskAndOrderUiState import com.mogo.och.taxi.ui.unmanned.UnmannedIntent import com.mogo.och.taxi.utils.MapMakerManager -import com.mogo.och.taxi.utils.TaskUtils import kotlinx.android.synthetic.main.task_fragment_current.cancelOrder import kotlinx.android.synthetic.main.task_fragment_current.endPoint import kotlinx.android.synthetic.main.task_fragment_current.endStationName -import kotlinx.android.synthetic.main.task_fragment_current.mCurrentTaskLayout +import kotlinx.android.synthetic.main.task_fragment_current.mBeingOrderLayout import kotlinx.android.synthetic.main.task_fragment_current.naviToEnd import kotlinx.android.synthetic.main.task_fragment_current.naviToStart import kotlinx.android.synthetic.main.task_fragment_current.noTaskData @@ -57,6 +59,9 @@ import kotlinx.android.synthetic.main.task_fragment_current.taskStatus import kotlinx.android.synthetic.main.task_fragment_current.taskTypeTv import kotlinx.android.synthetic.main.taxi_no_data_common_view.noOrderDataTv import kotlinx.coroutines.flow.map +import java.util.Calendar +import kotlin.math.ceil +import kotlin.math.roundToInt /** * @author: wangmingjun @@ -89,7 +94,7 @@ class TaxiCurrentTaskFragment : BaseFragment(), } override fun getTagName(): String { - return this.javaClass.simpleName + return "TaxiCurrentTaskFragment" } override fun onCreate(savedInstanceState: Bundle?) { @@ -110,7 +115,7 @@ class TaxiCurrentTaskFragment : BaseFragment(), /** * 是否有正在进行的订单，进行UI显示 * - * @param hasCurrentTask + * @param being */ private fun initContainerView(hasCurrentTask: Boolean) { d( @@ -120,14 +125,14 @@ class TaxiCurrentTaskFragment : BaseFragment(), try { if (hasCurrentTask) { noTaskData.visibility = View.GONE - mCurrentTaskLayout.visibility = View.VISIBLE + mBeingOrderLayout.visibility = View.VISIBLE } else { noTaskData.visibility = View.VISIBLE noOrderDataTv.text = "暂无进行中订单" - mCurrentTaskLayout.visibility = View.GONE + mBeingOrderLayout.visibility = View.GONE } } catch (e: NullPointerException) { //可能会出现订单信息已经轮询回来，但进行中页面控件还未初始化完成的情况 - TaxiTaskModel.clearCurrentOCHOrder() + TaxiModel.clearCurrentOCHOrder() } } @@ -152,37 +157,37 @@ class TaxiCurrentTaskFragment : BaseFragment(), //监听返回的数据状态 lifecycleScope.launchWhenStarted { - mViewModel.uiStateFlow.map { it.taskWithOrderUIState }.collect { taskAndOrderUiState -> + mViewModel.uiStateFlow.map { it.taskAndOrderUiState }.collect { taskAndOrderUiState -> d(TAG, "uiStateFlow-initViewModelObserver: $taskAndOrderUiState") when (taskAndOrderUiState) { - is TaskWithOrderUIState.Init -> { + is TaskAndOrderUiState.INIT -> { } - is TaskWithOrderUIState.TaskDriveToNearestStationTask -> { - mDriveToNearestStationTask = taskAndOrderUiState.driveToNearestStationTask - if (taskAndOrderUiState.driveToNearestStationTask != null) { - updateViewByDriveToNearestStationTask(taskAndOrderUiState.driveToNearestStationTask) - } else { - initContainerView(false) - removeAllMapMarker() - } - } + is TaskAndOrderUiState.TASKANDORDER -> { + mDriveToNearestStationTask = taskAndOrderUiState.untruthTask + mCurrentTaskWithOrder = taskAndOrderUiState.taskAndOrder - is TaskWithOrderUIState.TaskWithOrder -> { - mCurrentTaskWithOrder = taskAndOrderUiState.taskWithOrder - - if (mCurrentTaskWithOrder == null) { + if ((taskAndOrderUiState.untruthTask == null + && mCurrentTaskWithOrder != null + && mCurrentTaskWithOrder!!.endSite == null) + || mCurrentTaskWithOrder == null + ) { initContainerView(false) removeAllMapMarker() return@collect } - updateNextTaskFragment(taskAndOrderUiState.taskWithOrder) - updateViewByCurrentTaskWithOrder(taskAndOrderUiState.taskWithOrder) + + if (taskAndOrderUiState.untruthTask != null) { + updateDriveToNearestStationTaskView(taskAndOrderUiState.untruthTask) + } else { + updateNextTaskFragment(taskAndOrderUiState.taskAndOrder) + updateCurrentTaskAndOrderStatusChanged(taskAndOrderUiState.taskAndOrder) + } } - is TaskWithOrderUIState.UpdateTaskTripInfo -> { + is TaskAndOrderUiState.UPDATEORDERMILEANDDUR -> { taskOtherInfo.text = - TaskUtils.getCurrentTaskTotalAndDurationHtml( + QueryCurrentTaskRespBean.Result.getCurrentTaskTotalAndDurationHtml( taskAndOrderUiState.mileage, taskAndOrderUiState.duration ) @@ -192,10 +197,10 @@ class TaxiCurrentTaskFragment : BaseFragment(), } } - private fun updateViewByDriveToNearestStationTask(driveToNearestStationTask: StartServiceRespBean.Result?) { + private fun updateDriveToNearestStationTaskView(driveToNearestStationTask: StartServiceRespBean.Result?) { if (driveToNearestStationTask == null) return initContainerView(true) - // DriverToNearestStationTask 任务更新 + // DriverToNearestStationTask 更新 taskStatus.visibility = View.VISIBLE taskTypeTv.visibility = View.GONE cancelOrder.visibility = View.GONE @@ -238,8 +243,8 @@ class TaxiCurrentTaskFragment : BaseFragment(), } } - fun onCarTakeOrderStatusChanged() { - mViewModel.sendUiIntent(UnmannedIntent.StartOrPauseTakeOrder) + fun onOperationStatusChanged() { + mViewModel.sendUiIntent(UnmannedIntent.StartOrPauseReceivingOrder) } private fun updateRemainDistanceAndTime(isVoicePlay: Boolean) { @@ -266,10 +271,10 @@ class TaxiCurrentTaskFragment : BaseFragment(), } /** - * 更新当前任务和订单信息 + * 任务和订单信息 */ @SuppressLint("SetTextI18n", "UseCompatLoadingForDrawables") - fun updateViewByCurrentTaskWithOrder(taskAndOrder: QueryCurrentTaskRespBean.Result?) { + fun updateCurrentTaskAndOrderStatusChanged(taskAndOrder: QueryCurrentTaskRespBean.Result?) { if (taskAndOrder == null) return if ((taskAndOrder.endSite == null || taskAndOrder.currentStatus == TaskStatusEnum.CompleteTask.code) && taskAndOrder.order == null @@ -287,39 +292,15 @@ class TaxiCurrentTaskFragment : BaseFragment(), * 当前任务是接驾任务,显示订单状态+运营单 订单显示在进行中, 任务不再显示 */ val taskType = taskAndOrder.taskType // 任务类型 - val order = taskAndOrder.order // 订单信息 - val startSite = taskAndOrder.startSite // 起点 - val endSite = taskAndOrder.endSite // 终点 - val currentStatus = taskAndOrder.currentStatus // 任务的状态 0：空闲 1:获取任务 2:开始任务 3:到达目的地 + val order = taskAndOrder.order // 订单 + val startSite = taskAndOrder.startSite //进行的任务 + val endSite = taskAndOrder.endSite //进行的任务 + val currentStatus = taskAndOrder.currentStatus // 任务的状态 + + updateUIShowStatus(taskType, currentStatus, order) when (taskType) { - TaskTypeEnum.None.code -> { - if (order != null && currentStatus == TaskStatusEnum.CompleteTask.code) { - handleOrderView(order) - } - } - TaskTypeEnum.VirtualTask.code -> { //演练任务 - cancelOrder.visibility = View.GONE - orderPhoneAndNum.visibility = View.GONE - taskClickBtn.visibility = View.GONE - - naviToStart.visibility = View.GONE - taskTypeTv.visibility = View.VISIBLE - naviToEnd.visibility = - if (currentStatus >= TaskStatusEnum.StartTask.code) View.VISIBLE else View.GONE - taskOtherInfo.visibility = - if (currentStatus == TaskStatusEnum.GetTask.code) View.GONE else View.VISIBLE - } - - TaskTypeEnum.ToOrderEndTask.code, TaskTypeEnum.ToOrderStartTask.code -> {// 接驾任务 或 送驾任务 - order.also { - handleOrderView(it) - } - } - } - - when (taskType) { TaskTypeEnum.VirtualTask.code -> {// 演练任务 if (order != null && currentStatus == TaskStatusEnum.CompleteTask.code) { updateOrderUI(order) @@ -349,6 +330,7 @@ class TaxiCurrentTaskFragment : BaseFragment(), } updateMapMarkers() + updateRemainDistanceAndTime(false) } @@ -411,18 +393,14 @@ class TaxiCurrentTaskFragment : BaseFragment(), } else { d( M_TAXI + TAG, - "CurrentTaskWithOrder == " + GsonUtil.jsonFromObject(mCurrentTaskWithOrder) + "CurrentTaskAndOrder == " + GsonUtil.jsonFromObject(mCurrentTaskWithOrder) ) } } private fun updateOrderUI(order: OrderDetail) { taskTypeTv.text = resources.getString(R.string.task_order) - taskTypeTv.background = - ContextCompat.getDrawable( - MainMoGoApplication.getApp().applicationContext, - R.drawable.task_order_type_btn_bg - ) + taskTypeTv.background = resources.getDrawable(R.drawable.task_order_type_btn_bg, null) orderPhoneAndNum.text = HtmlCompat.fromHtml( " " + order.bookingUserPhone + "" + " | " + @@ -435,25 +413,24 @@ class TaxiCurrentTaskFragment : BaseFragment(), when (order.orderStatus) { TaxiOrderStatusEnum.None.code -> { //无 initContainerView(false) - removeAllMapMarker() } TaxiOrderStatusEnum.ArriveAtEnd.code -> { //到达目的地 taskStatus.text = resources.getString(R.string.task_start_end_site) updateStartAndEndStationPointByStatus(true) - updateTaskContainerBottomBtn( + updateOrderBottomBtn( getString(R.string.module_och_taxi_order_server_end), Color.parseColor("#FFFFFF"), Color.parseColor("#FF1D5EF3"), true ) - hideNaviBtns() + hideNavi() } TaxiOrderStatusEnum.OnTheWayToEnd.code -> { //送驾中 taskStatus.text = resources.getString(R.string.task_start_end_site) updateStartAndEndStationPointByStatus(true) - updateTaskContainerBottomBtn( + updateOrderBottomBtn( getString(R.string.module_och_taxi_order_close), Color.parseColor("#FFFFFF"), Color.parseColor("#FF1D5EF3"), @@ -462,10 +439,10 @@ class TaxiCurrentTaskFragment : BaseFragment(), } TaxiOrderStatusEnum.UserArriveAtStart.code, TaxiOrderStatusEnum.ArriveAtStart.code -> { - //乘客到达上车点, 验证成功 ; 到达乘客上车点 - taskStatus.text = resources.getString(R.string.arrived_start_site) + //乘客到达上车点,验证成功 ; 到达乘客上车点 updateStartAndEndStationPointByStatus(false) - updateTaskContainerBottomBtn( + taskStatus.text = resources.getString(R.string.arrived_start_site) + updateOrderBottomBtn( if (order.orderStatus == TaxiOrderStatusEnum.UserArriveAtStart.code) getString(R.string.module_och_taxi_order_server_start) else getString(R.string.module_och_taxi_order_server_start_wait_check), @@ -473,14 +450,14 @@ class TaxiCurrentTaskFragment : BaseFragment(), Color.parseColor("#FF1D5EF3"), true ) - hideNaviBtns() - taskOtherInfo.text = TaskUtils.getWaitTimeHtml() + updateOtherInfo() + hideNavi() } TaxiOrderStatusEnum.OnTheWayToStart.code -> { //前往上车地点 taskStatus.text = resources.getString(R.string.task_start_start_site) updateStartAndEndStationPointByStatus(false) - updateTaskContainerBottomBtn( + updateOrderBottomBtn( getString(R.string.module_och_taxi_order_server_start), Color.parseColor("#4DFFFFFF"), Color.parseColor("#4D1D5EF3"), @@ -490,6 +467,60 @@ class TaxiCurrentTaskFragment : BaseFragment(), } } + private fun updateOtherInfo() { + val currentCale = DateTimeUtils.getCurrentDateTime() + val currentDay = + DateTimeUtil.formatCalendarToString(currentCale, DateTimeUtil.yyyy_MM_dd) + + currentCale.add(Calendar.MINUTE, 10) + val strHtml13: String = if (currentDay == DateTimeUtil.formatCalendarToString( + currentCale, + DateTimeUtil.yyyy_MM_dd + ) + ) { + ("免费等待至 " + + "" + DateTimeUtil.formatCalendarToString( + currentCale, + DateTimeUtil.HH_mm + ) + "") + } else { + ("免费等待至" + + "" + DateTimeUtil.formatCalendarToString( + currentCale, + DateTimeUtil.MM_dd_HH_mm + ) + "") + } + taskOtherInfo.text = HtmlCompat.fromHtml(strHtml13, HtmlCompat.FROM_HTML_MODE_LEGACY) + } + + private fun updateUIShowStatus(taskType: Int, currentStatus: Int, order: OrderDetail?) { + when (taskType) { + TaskTypeEnum.None.code -> { + if (order != null && currentStatus == TaskStatusEnum.CompleteTask.code) { + handleOrderView(order) + } + } + + TaskTypeEnum.VirtualTask.code -> { //演练任务 + cancelOrder.visibility = View.GONE + orderPhoneAndNum.visibility = View.GONE + taskClickBtn.visibility = View.GONE +// currentStatus 0：空闲 1:获取任务 2:开始任务 3:到达目的地 + naviToStart.visibility = View.GONE + taskTypeTv.visibility = View.VISIBLE + naviToEnd.visibility = + if (currentStatus >= TaskStatusEnum.StartTask.code) View.VISIBLE else View.GONE + taskOtherInfo.visibility = + if (currentStatus == TaskStatusEnum.GetTask.code) View.GONE else View.VISIBLE + } + + TaskTypeEnum.ToOrderEndTask.code, TaskTypeEnum.ToOrderStartTask.code -> {// 运营单(接驾任务、送驾任务) + if (order == null) return + handleOrderView(order) + } + } + } + private fun handleOrderView(order: OrderDetail?) { if (order == null) return cancelOrder.visibility = View.VISIBLE @@ -510,12 +541,13 @@ class TaxiCurrentTaskFragment : BaseFragment(), } - private fun hideNaviBtns() { + private fun hideNavi() { naviToStart.visibility = View.GONE naviToEnd.visibility = View.GONE AmapNaviToDestinationModel.getInstance(context).destroyAmaNavi() mTaxiFragment?.showAmapNaviToStationFragment(false) mTaxiFragment?.showRoutingToStationFragment(false) + requireParentFragment() } private fun startNaviToStation(isVoicePlay: Boolean, stationLat: Double, stationLng: Double) { @@ -535,18 +567,40 @@ class TaxiCurrentTaskFragment : BaseFragment(), /** * 剩余里程和剩余时间 - * @param meters 米 + * @param meters m * @param timeInSecond 秒 */ - fun updateCurrentTaskTripInfo(meters: Long, timeInSecond: Long) { + fun updateDistanceAndTime(meters: Long, timeInSecond: Long) { +// CallerLogger.d(M_TAXI + TAG,"meters = "+meters+"timeInSecond ="+timeInSecond); if (mCurrentTaskWithOrder == null) return if (mCurrentTaskWithOrder!!.endSite == null && mDriveToNearestStationTask == null) return - taskOtherInfo.text = TaskUtils.getCurrentTaskTripHtml(meters, timeInSecond) + + var dis = "0" + var disUnit = "公里" + if (meters > 0) { + if (meters / 1000 < 1) { + disUnit = "米" + dis = meters.toFloat().roundToInt().toString() + } else { + disUnit = "公里" + dis = NumberFormatUtil.formatLong(meters.toDouble() / 1000) + } + } + val min = ceil(timeInSecond.toDouble() / 60f).toInt() + val strHtml2 = + ("里程 " + "" + dis + "" + " " + disUnit + "" + + "，剩余 " + "" + min + "" + " 分钟") + + taskOtherInfo.text = HtmlCompat.fromHtml(strHtml2, HtmlCompat.FROM_HTML_MODE_LEGACY) } +// private fun speekVoice200mTipsOnce() { +// showNotice(resources.getString(R.string.module_och_taxi_order_arrive_end_200m_tip)) +// } + override fun onDestroyView() { - AmapNaviToDestinationModel.getInstance(context).destroyAmaNavi() super.onDestroyView() + AmapNaviToDestinationModel.getInstance(context).destroyAmaNavi() } private fun startOrEndService() { @@ -600,8 +654,8 @@ class TaxiCurrentTaskFragment : BaseFragment(), activity?.also { TaxiOrderCancelDialog( it, mCurrentTaskWithOrder!!.order!!.orderStatus - ) {type -> - mViewModel.sendUiIntent(UnmannedIntent.CancelOrder(type)) + ) { + mViewModel.sendUiIntent(UnmannedIntent.CancelOrder(it)) }.show() } } @@ -622,7 +676,7 @@ class TaxiCurrentTaskFragment : BaseFragment(), @RequiresApi(Build.VERSION_CODES.N) override fun onCurrentNaviDistAndTimeChanged(meters: Int, timeInSecond: Long) { - updateCurrentTaskTripInfo(meters.toLong(), timeInSecond) + updateDistanceAndTime(meters.toLong(), timeInSecond) } override fun reInitNaviAmap(isPlay: Boolean, isRestart: Boolean) { @@ -655,7 +709,7 @@ class TaxiCurrentTaskFragment : BaseFragment(), }, 3000) } - fun onNaviToEndStationByAmap(isShow: Boolean) { + fun onNaviToEndAmap(isShow: Boolean) { if (mCurrentTaskWithOrder == null) return mTaxiFragment?.showAmapNaviToStationFragment( @@ -690,7 +744,7 @@ class TaxiCurrentTaskFragment : BaseFragment(), MapMakerManager.removeAllMapMarkerByOwner(TYPE_MARKER_TAXI_ORDER) } - private fun updateTaskContainerBottomBtn( + private fun updateOrderBottomBtn( txt: String?, txtColorId: Int, bgColorId: Int, @@ -705,7 +759,7 @@ class TaxiCurrentTaskFragment : BaseFragment(), } override fun onDestroy() { - mViewModel.startOrStopCurrentTaskWithOrderLoop(false) + mViewModel.startOrStopOrderLoop(false) super.onDestroy() } } \ No newline at end of file diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiOrderCancelDialog.java b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiOrderCancelDialog.java index 0d595b0099..33d111f5b2 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiOrderCancelDialog.java +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiOrderCancelDialog.java @@ -141,7 +141,7 @@ public class TaxiOrderCancelDialog extends AlertDialog implements View.OnClickLi @Override public void onItemClick(AdapterView parent, View view, int position, long id) { - CallerLogger.INSTANCE.d(M_TAXI + TAG,"mCurrentReason ="+ mContentArrays[position]); + CallerLogger.d(M_TAXI + TAG,"mCurrentReason ="+ mContentArrays[position]); mCurrentReason = mContentArrays[position]; mContentAdapter.notifyCurrentReasons(mCurrentReason); } diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.java b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.java index 5a33a5e5ee..a6945fde00 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.java +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.java @@ -55,7 +55,7 @@ public class TaxiAnalyticsManager { private void triggerStartAutopilotFailureEvent(String failCode, String failMsg){ if (mStartAutopilotParams.isEmpty()) return; - CallerLogger.INSTANCE.e(M_TAXI + "triggerStartAutopilotFailureEvent", failMsg); + CallerLogger.e(M_TAXI + "triggerStartAutopilotFailureEvent", failMsg); if (CallerAutoPilotStatusListenerManager.INSTANCE.getState() != IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING){ mStartAutopilotParams.put(TaxiUnmannedConst.EVENT_PARAM_START_FAILURE_CODE, failCode); @@ -104,7 +104,7 @@ public class TaxiAnalyticsManager { mStartAutopilotParams.put(TaxiUnmannedConst.EVENT_PARAM_LINE_ID, lineId); mStartAutopilotParams.put(TaxiUnmannedConst.EVENT_PARAM_ORDER_NUMBER, orderNo); -// CallerLogger.INSTANCE.d(M_TAXI + "埋点==","restart = "+restart+", send= "+send); +// CallerLogger.d(M_TAXI + "埋点==","restart = "+restart+", send= "+send); if (send) { if (mStartAutopilotParams.isEmpty()) return; diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java index 62f7a6a297..11ea80ca52 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java @@ -68,14 +68,14 @@ public class TaxiTrajectoryManager { public void syncTrajectoryInfo() { QueryCurrentTaskRespBean.Result taskAndOrder = TaxiTaskModel.INSTANCE.getCurTaskAndOrder(); if (taskAndOrder == null || taskAndOrder.getCurrentStatus() >= TaskStatusEnum.StartTask.getCode()) { - CallerLogger.INSTANCE.d(M_TAXI + TAG, "syncTrajectoryInfo() stop."); + CallerLogger.d(M_TAXI + TAG, "syncTrajectoryInfo() stop."); stopTrajReqLoop(); } else { if (mPrevTaskLineId.equals(String.valueOf(taskAndOrder.getLineId()))) { - CallerLogger.INSTANCE.d(M_TAXI + TAG, "syncTrajectoryInfo() 重复订单."); + CallerLogger.d(M_TAXI + TAG, "syncTrajectoryInfo() 重复订单."); } else { mPrevTaskLineId = String.valueOf(taskAndOrder.getLineId()); - CallerLogger.INSTANCE.d(M_TAXI + TAG, "syncTrajectoryInfo() start."); + CallerLogger.d(M_TAXI + TAG, "syncTrajectoryInfo() start."); startTrajReqLoop(); } } @@ -89,27 +89,27 @@ public class TaxiTrajectoryManager { if (guardianInfo == null || !guardianInfo.hasCode()) return; if ("ISYS_INIT_TRAJECTORY_START".equals(guardianInfo.getCode())) { // 1. 轨迹管理_轨迹开始下载（本地已有对应轨迹也触发） - CallerLogger.INSTANCE.d(M_TAXI + TAG, "onAutopilotGuardian() 轨迹开始下载"); + CallerLogger.d(M_TAXI + TAG, "onAutopilotGuardian() 轨迹开始下载"); // ToastUtils.showShort("轨迹开始下载"); stopTrajReqLoop(); } else if ("ISYS_INIT_TRAJECTORY_SUCCESS".equals(guardianInfo.getCode())) { // 2. 轨迹管理_轨迹下载成功（本地已有对应轨迹也触发） - CallerLogger.INSTANCE.d(M_TAXI + TAG, "onAutopilotGuardian() 轨迹下载成功"); + CallerLogger.d(M_TAXI + TAG, "onAutopilotGuardian() 轨迹下载成功"); // ToastUtils.showShort("轨迹下载成功"); stopTrajReqLoop(); } else if ("ISYS_INIT_TRAJECTORY_FAILURE".equals(guardianInfo.getCode())) { // 3. 轨迹管理_轨迹下载失败，本地无对应轨迹 - CallerLogger.INSTANCE.d(M_TAXI + TAG, "onAutopilotGuardian() " + + CallerLogger.d(M_TAXI + TAG, "onAutopilotGuardian() " + "轨迹下载失败，本地无对应轨迹"); // ToastUtils.showShort("轨迹下载失败，本地无对应轨迹"); } else if ("ISYS_INIT_TRAJECTORY_WARNING".equals(guardianInfo.getCode())) { // 4. 轨迹管理_轨迹下载失败，本地有对应轨迹，认为成功 - CallerLogger.INSTANCE.d(M_TAXI + TAG, "onAutopilotGuardian() " + + CallerLogger.d(M_TAXI + TAG, "onAutopilotGuardian() " + "轨迹下载失败，本地有对应轨迹，认为成功"); // ToastUtils.showShort("轨迹下载失败，本地有对应轨迹，认为成功"); } else if ("ISYS_INIT_TRAJECTORY_TIMEOUT".equals(guardianInfo.getCode())) { // 5. 轨迹管理_轨迹下载超时 - CallerLogger.INSTANCE.d(M_TAXI + TAG, "onAutopilotGuardian() 轨迹下载超时"); + CallerLogger.d(M_TAXI + TAG, "onAutopilotGuardian() 轨迹下载超时"); // ToastUtils.showShort("轨迹下载超时"); } } @@ -118,7 +118,7 @@ public class TaxiTrajectoryManager { QueryCurrentTaskRespBean.Result taskAndOrder = TaxiTaskModel.INSTANCE.getCurTaskAndOrder(); if (taskAndOrder == null || taskAndOrder.getEndSite() == null) { - CallerLogger.INSTANCE.e(M_TAXI + TAG, + CallerLogger.e(M_TAXI + TAG, "setupAutoPilotLine(): taskAndOrder or taskAndOrder.getEndSite() is null."); } else { /** @@ -238,7 +238,7 @@ public class TaxiTrajectoryManager { if (mSendReqDisposable != null && !mSendReqDisposable.isDisposed()) { return; } - CallerLogger.INSTANCE.d(M_TAXI + TAG, "startTrajReqLoop()"); + CallerLogger.d(M_TAXI + TAG, "startTrajReqLoop()"); setupAutoPilotLine(); mSendReqDisposable = Observable.interval(TaxiUnmannedConst.LOOP_DELAY, TaxiUnmannedConst.LOOP_PERIOD_10S, TimeUnit.MILLISECONDS) @@ -251,14 +251,14 @@ public class TaxiTrajectoryManager { stopTrajReqLoop(); return; } - CallerLogger.INSTANCE.d(M_TAXI + TAG, "loop sendTrajectoryReq: " + aLong); + CallerLogger.d(M_TAXI + TAG, "loop sendTrajectoryReq: " + aLong); sendTrajectoryReq(); }); } private void stopTrajReqLoop() { if (mSendReqDisposable != null) { - CallerLogger.INSTANCE.d(M_TAXI + TAG, "stopTrajReqLoop()"); + CallerLogger.d(M_TAXI + TAG, "stopTrajReqLoop()"); mSendReqDisposable.dispose(); mSendReqDisposable = null; clearAutoPilotLine(); @@ -269,16 +269,16 @@ public class TaxiTrajectoryManager { if (mAutoPilotLine != null) { CallerAutoPilotControlManager.INSTANCE.sendTrajectoryDownloadReq(mAutoPilotLine,COMMON_LOADING); }else { - CallerLogger.INSTANCE.e(M_TAXI + TAG, "sendTrajectoryReq(): mAutoPilotLine is null!!!"); + CallerLogger.e(M_TAXI + TAG, "sendTrajectoryReq(): mAutoPilotLine is null!!!"); } if (mPreAutoPilotLine != null){ CallerAutoPilotControlManager.INSTANCE.sendTrajectoryDownloadReq(mPreAutoPilotLine,PRE_LOADING); }else { - CallerLogger.INSTANCE.e(M_TAXI + TAG, "sendTrajectoryReq(): mPreAutoPilotLine is null!!!"); + CallerLogger.e(M_TAXI + TAG, "sendTrajectoryReq(): mPreAutoPilotLine is null!!!"); } - CallerLogger.INSTANCE.d(M_TAXI + TAG, "sendTrajectoryReq(): common_load = " + CallerLogger.d(M_TAXI + TAG, "sendTrajectoryReq(): common_load = " + GsonUtils.toJson(mAutoPilotLine) + ", pre_load" + GsonUtils.toJson(mPreAutoPilotLine)); } } diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/MogoOCHTaxiPassenger.java b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/MogoOCHTaxiPassenger.java index 92f169a9ec..7d3b5ed99f 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/MogoOCHTaxiPassenger.java +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/MogoOCHTaxiPassenger.java @@ -33,21 +33,21 @@ public class MogoOCHTaxiPassenger implements IMogoOCH { @Override public void init(Context context) { - CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "init"); + CallerLogger.d(M_TAXI_P + TAG, "init"); } /** * 进入鹰眼模式，设置手势缩放地图失效 */ private void stepIntoVrMode() { - CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "进入vr模式"); + CallerLogger.d(M_TAXI_P + TAG, "进入vr模式"); CallerMoGoUiSettingManager.INSTANCE.stepInNightMode();//夜间模式 状态栏字体颜色变黑 } private void showFragment() { FragmentManager supportFragmentManager = mActivity.getSupportFragmentManager(); if (ochTaxiPassengerFragment == null) { - CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "准备add fragment======"); + CallerLogger.d(M_TAXI_P + TAG, "准备add fragment======"); Fragment fragmentByTag = supportFragmentManager.findFragmentByTag(TaxiPassengerBaseFragment.TAG); if (fragmentByTag instanceof TaxiPassengerBaseFragment){ ochTaxiPassengerFragment = (TaxiPassengerBaseFragment) fragmentByTag; @@ -60,7 +60,7 @@ public class MogoOCHTaxiPassenger implements IMogoOCH { } return; } - CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "准备show fragment"); + CallerLogger.d(M_TAXI_P + TAG, "准备show fragment"); supportFragmentManager.beginTransaction().show(ochTaxiPassengerFragment).commitAllowingStateLoss(); } diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/impl/V2XScenarioManager.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/impl/V2XScenarioManager.java index 15f86cbafc..4bf19f80b5 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/impl/V2XScenarioManager.java +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/impl/V2XScenarioManager.java @@ -40,7 +40,7 @@ public class V2XScenarioManager implements IV2XScenarioManager { @Override public void handlerMessage(V2XMessageEntity v2XMessageEntity) { - CallerLogger.INSTANCE.d(M_V2X + TAG, "处理V2X场景：" + (v2XMessageEntity == null ? "null" : v2XMessageEntity.toString())); + CallerLogger.d(M_V2X + TAG, "处理V2X场景：" + (v2XMessageEntity == null ? "null" : v2XMessageEntity.toString())); try { synchronized (V2XScenarioManager.class) { // 展示 @@ -66,7 +66,7 @@ public class V2XScenarioManager implements IV2XScenarioManager { default: mV2XScenario = null; - CallerLogger.INSTANCE.e(M_V2X + TAG, "当前V2X消息类型未定义:" + v2XMessageEntity); + CallerLogger.e(M_V2X + TAG, "当前V2X消息类型未定义:" + v2XMessageEntity); return; } // 展示最新的消息 diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XRoadEventMarker.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XRoadEventMarker.java index 98c86bdc0b..5040ac2840 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XRoadEventMarker.java +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XRoadEventMarker.java @@ -63,7 +63,7 @@ public class V2XRoadEventMarker implements IV2XMarker { String id = entity.getLocation().getLon() + "_" + entity.getLocation().getLat(); MarkerRemoveManager.INSTANCE.addMarker(new MarkerWrapper(id, entity.getLocation().getLon(), entity.getLocation().getLat(), 0, markers, null, null)); } else { - CallerLogger.INSTANCE.d(M_V2X + "RWJ", "V2XRoadEventMarker:" + entity.getPoiType() + "--- return empty marker"); + CallerLogger.d(M_V2X + "RWJ", "V2XRoadEventMarker:" + entity.getPoiType() + "--- return empty marker"); } } } diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/warning/V2XFrontWarningScenario.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/warning/V2XFrontWarningScenario.java index c1fe08de93..df2adcc441 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/warning/V2XFrontWarningScenario.java +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/warning/V2XFrontWarningScenario.java @@ -50,7 +50,7 @@ public class V2XFrontWarningScenario extends AbsV2XScenario implements IMoGoChas @Override public void init(@Nullable V2XMessageEntity v2XMessageEntity) { - CallerLogger.INSTANCE.d(M_V2X + TAG, "----- init -----:\n" + (v2XMessageEntity == null ? "null" : v2XMessageEntity.toString())); + CallerLogger.d(M_V2X + TAG, "----- init -----:\n" + (v2XMessageEntity == null ? "null" : v2XMessageEntity.toString())); try { setV2XMessageEntity(v2XMessageEntity); if (v2XMessageEntity != null && v2XMessageEntity.getContent() instanceof V2XWarningTarget) { @@ -64,9 +64,9 @@ public class V2XFrontWarningScenario extends AbsV2XScenario implements IMoGoChas @Override public void show() { - CallerLogger.INSTANCE.d(M_V2X + TAG, "----- show --- 1 --:\n" + (mMarkerEntity == null ? "null" : mMarkerEntity.toString())); + CallerLogger.d(M_V2X + TAG, "----- show --- 1 --:\n" + (mMarkerEntity == null ? "null" : mMarkerEntity.toString())); if (mMarkerEntity != null) { - CallerLogger.INSTANCE.d(M_V2X + TAG, "----- show --- 2 --:\n" + mMarkerEntity); + CallerLogger.d(M_V2X + TAG, "----- show --- 2 --:\n" + mMarkerEntity); String v2xType = getV2XTypeForFrontWarning(mMarkerEntity); V2XMessageEntity entity = getV2XMessageEntity(); if (!v2xType.equals("0")) { @@ -126,13 +126,13 @@ public class V2XFrontWarningScenario extends AbsV2XScenario implements IMoGoChas IV2XMarker marker = getV2XMarker(); if (marker != null && mMarkerEntity != null) { marker.drawPOI(mMarkerEntity); - CallerLogger.INSTANCE.d(M_V2X + TAG, "drawPOI"); + CallerLogger.d(M_V2X + TAG, "drawPOI"); } } @Override public void clearPOI() { - CallerLogger.INSTANCE.d(M_V2X + TAG, "----- clearPOI -----"); + CallerLogger.d(M_V2X + TAG, "----- clearPOI -----"); } @Override diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/warning/V2XWarningMarker.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/warning/V2XWarningMarker.java index 571ac758f6..c5366f474c 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/warning/V2XWarningMarker.java +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/warning/V2XWarningMarker.java @@ -59,12 +59,12 @@ // @Override // public void drawPOI(Object entity) { // try { -// CallerLogger.INSTANCE.d(M_V2X + TAG, "===drawPOI"); +// CallerLogger.d(M_V2X + TAG, "===drawPOI"); // mCloundWarningInfo = (V2XWarningTarget) entity; // drawLineWithEntity(); // // } catch (Exception e) { -// CallerLogger.INSTANCE.d(M_V2X + TAG, e.toString()); +// CallerLogger.d(M_V2X + TAG, e.toString()); // } // // } @@ -115,14 +115,14 @@ // //衡阳交付-取消划线需求,只渲染识别物红色模型移动过程 // //handleStopLine(); // }, 0); -// CallerLogger.INSTANCE.d(M_V2X + TAG, "显示时间为++" + showTime + "识别物类型:" + +// CallerLogger.d(M_V2X + TAG, "显示时间为++" + showTime + "识别物类型:" + // String.valueOf(mCloundWarningInfo.getType())); // // } else { //无停止线 -// CallerLogger.INSTANCE.d(M_V2X + TAG, "无停止线"); +// CallerLogger.d(M_V2X + TAG, "无停止线"); // WorkThreadHandler.getInstance().postDelayed(() -> { // /* 衡阳交付-取消划线需求,只渲染识别物红色模型移动过程 -// CallerLogger.INSTANCE.d(M_V2X + TAG, "无停止线" + mCloundWarningInfo.toString()); +// CallerLogger.d(M_V2X + TAG, "无停止线" + mCloundWarningInfo.toString()); // //绘制识别物与交汇点连线，并且更新连线数据 // drawOtherObjectLine(mCloundWarningInfo); // //二轮车和行人的渲染和移动 @@ -130,7 +130,7 @@ // if (carLocation.lat != 0 && carLocation.lon != 0) { // drawSelfCarLine(carLocation.lon, carLocation.lat, bearing); // } else { -// CallerLogger.INSTANCE.d(M_V2X + TAG, "数据为空carLocation == null"); +// CallerLogger.d(M_V2X + TAG, "数据为空carLocation == null"); // } // */ // Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMarkerService()).renderWarningMoveMarker(mCloundWarningInfo.getLon() @@ -153,7 +153,7 @@ // MogoLatLng startLatLng = new MogoLatLng(carLocation.lat, carLocation.lon); // MogoLatLng endLatLng = new MogoLatLng(middleLocationInStopLine.lat, middleLocationInStopLine.lon); // double angle = Trigonometric.getAngle(startLatLng.lon, startLatLng.lat, endLatLng.lon, endLatLng.lat); -// CallerLogger.INSTANCE.d(M_V2X + TAG, "angle==" + String.valueOf(angle)); +// CallerLogger.d(M_V2X + TAG, "angle==" + String.valueOf(angle)); // return angle; // } // @@ -166,14 +166,14 @@ // startLatLng, MogoLatLng mogoLatLng) { // if (info != null) { // double angle = Trigonometric.getAngle(startLatLng.lon, startLatLng.lat, mogoLatLng.lon, mogoLatLng.lat); -// CallerLogger.INSTANCE.d(M_V2X + TAG, "angle==drawRedWarningLineFrontOfStopLine:" + String.valueOf(angle)); +// CallerLogger.d(M_V2X + TAG, "angle==drawRedWarningLineFrontOfStopLine:" + String.valueOf(angle)); // IMoGoStopPolylineManager stopPolyLineMnager = BridgeApi.INSTANCE.v2xStopPolyline(); // if (stopPolyLineMnager != null) { // IMogoPolyline polyLine = stopPolyLineMnager.getMogoStopPolyline(); // MogoLatLng endLatlng = new MogoLatLng(mogoLatLng.lat, mogoLatLng.lon); // MogoLatLng addMiddleLoc = Trigonometric.getNewLocation(startLatLng.lon, startLatLng.lat, 25, angle); // if (polyLine != null) { -// CallerLogger.INSTANCE.d(M_V2X + TAG, "drawStopLine polyLine != null"); +// CallerLogger.d(M_V2X + TAG, "drawStopLine polyLine != null"); // polyLine.setPoints(Arrays.asList(startLatLng, addMiddleLoc, endLatlng)); // polyLine.setTransparency(0.5f); // } else { @@ -184,11 +184,11 @@ // locations.add(endLatlng); // lineInfo.setLocations(locations); // lineInfo.setHeading(info.getHeading()); -// CallerLogger.INSTANCE.d(TAG, "drawStopLine width = " + info.getRoadwidth()); +// CallerLogger.d(TAG, "drawStopLine width = " + info.getRoadwidth()); // lineInfo.setWidth(info.getRoadwidth() * 14 + 5); // stopPolyLineMnager.drawStopPolyline(BridgeApi.INSTANCE.context(), lineInfo); // } -// CallerLogger.INSTANCE.d(M_V2X + TAG, "停止线前方50m区域的三个坐标点是:" + startLatLng.lon + "," + startLatLng.lat + +// CallerLogger.d(M_V2X + TAG, "停止线前方50m区域的三个坐标点是:" + startLatLng.lon + "," + startLatLng.lat + // "中间点坐标:" + addMiddleLoc.lon + "," + addMiddleLoc.lat // + "终点" + endLatlng.lon + "," + endLatlng.lat); // } @@ -199,7 +199,7 @@ // // public void clearAllLine() { // UiThreadHandler.postDelayed(() -> { -// CallerLogger.INSTANCE.d(M_V2X + TAG, "清除所有预警线的时间是:" + String.valueOf(showTime)); +// CallerLogger.d(M_V2X + TAG, "清除所有预警线的时间是:" + String.valueOf(showTime)); // //清除识别物到碰撞点预警线 // IMoGoPersonWarnPolylineManager personStopPolyLineManager = BridgeApi.INSTANCE.v2xPersonWarnPolyline(); // if (personStopPolyLineManager != null) { @@ -251,10 +251,10 @@ // } // fillPoints.add(y); // } else { -// CallerLogger.INSTANCE.d(M_V2X + TAG, "停止线数据不存在"); +// CallerLogger.d(M_V2X + TAG, "停止线数据不存在"); // } // } catch (Exception e) { -// CallerLogger.INSTANCE.e(M_V2X + TAG, "exception : " + e); +// CallerLogger.e(M_V2X + TAG, "exception : " + e); // e.printStackTrace(); // } // } @@ -294,7 +294,7 @@ // * */ // private MogoLatLng getMiddleLocationInStopLine() { // if (carLocation.lat == 0 || carLocation.lon == 0) { -// CallerLogger.INSTANCE.d(M_V2X + TAG, "获取不到车的位置"); +// CallerLogger.d(M_V2X + TAG, "获取不到车的位置"); // } // MogoLatLng newLocation = new MogoLatLng(0, 0); // if (mCloundWarningInfo != null && mCloundWarningInfo.getStopLines() != null && mCloundWarningInfo.getStopLines().size() > 1) { @@ -304,7 +304,7 @@ // double angle = Trigonometric.getAngle(x.getLat(), x.getLat(), y.getLon(), y.getLat()); // newLocation = Trigonometric.getNewLocation(x.getLon(), x.getLat(), distance * 0.5, angle); // } else { -// CallerLogger.INSTANCE.d(M_V2X + TAG, "停止线返回坐标点数量不正确" + mCloundWarningInfo.getStopLines().size()); +// CallerLogger.d(M_V2X + TAG, "停止线返回坐标点数量不正确" + mCloundWarningInfo.getStopLines().size()); // } // return newLocation; // } @@ -316,7 +316,7 @@ // * lat 自车纬度 // */ // public void drawSelfCarLine(double lon, double lat, float bearing) { -// CallerLogger.INSTANCE.d(M_V2X + TAG, "drawSelfCarLine"); +// CallerLogger.d(M_V2X + TAG, "drawSelfCarLine"); // if (!isSelfLineClear) { // if (mCloundWarningInfo != null) { // IMoGoWarnPolylineManager warnPolyLineManager = BridgeApi.INSTANCE.v2xWarnPolyline(); @@ -342,7 +342,7 @@ // //扩展点为了渐变色添加 // addMiddleLoc = Trigonometric.getNewLocation(startLatlng.getLon(), startLatlng.getLat(), distance / 2, // Trigonometric.getAngle(startLatlng.lon, startLatlng.lat, endLatlng.lon, endLatlng.lat)); -// CallerLogger.INSTANCE.d(M_V2X + TAG, "angle==扩展点为了渐变色添加:" + +// CallerLogger.d(M_V2X + TAG, "angle==扩展点为了渐变色添加:" + // String.valueOf(Trigonometric.getAngle(startLatlng.lon, startLatlng.lat, endLatlng.lon, endLatlng.lat))); // if (mogoPolyline != null) { // mogoPolyline.setPoints(Arrays.asList(startLatlng, addMiddleLoc, endLatlng)); @@ -360,9 +360,9 @@ // info.setHasStopLines(mCloundWarningInfo.getStopLines().size() > 0); // } // warnPolyLineManager.drawWarnPolyline(BridgeApi.INSTANCE.context(), info); -// CallerLogger.INSTANCE.d(M_V2X + TAG, "自车前方第一条线" + "起点:" + startLatlng + "中间点:" + addMiddleLoc + "终点:" + endLatlng); +// CallerLogger.d(M_V2X + TAG, "自车前方第一条线" + "起点:" + startLatlng + "中间点:" + addMiddleLoc + "终点:" + endLatlng); // } -// CallerLogger.INSTANCE.d(M_V2X + TAG, "自车为起点绘制 自车;" + startLatlng.lon + "," + startLatlng.lat + +// CallerLogger.d(M_V2X + TAG, "自车为起点绘制 自车;" + startLatlng.lon + "," + startLatlng.lat + // "中间扩展点" + addMiddleLoc.lon + "," + addMiddleLoc.lat + "终点:" + endLatlng.lon + "," + endLatlng.lat); // } else { // clearAllLine(); @@ -375,7 +375,7 @@ // */ // private void drawOtherObjectLine(V2XWarningTarget info) { // if (info != null) { -// CallerLogger.INSTANCE.d(M_V2X + TAG, "info != null"); +// CallerLogger.d(M_V2X + TAG, "info != null"); // IMoGoPersonWarnPolylineManager personWarnPolylineManager = BridgeApi.INSTANCE.v2xPersonWarnPolyline(); // if (personWarnPolylineManager == null) { // return; @@ -387,7 +387,7 @@ // MogoLatLng addMiddleLoc = Trigonometric.getNewLocation(startLatlng.getLon(), startLatlng.getLat(), distance / 2, // Trigonometric.getAngle(startLatlng.lon, startLatlng.lat, endLatlng.lon, endLatlng.lat));//补点 // if (polyLine != null) { -// CallerLogger.INSTANCE.d(M_V2X + TAG, "目标物与碰撞点连线 != null"); +// CallerLogger.d(M_V2X + TAG, "目标物与碰撞点连线 != null"); // polyLine.setPoints(Arrays.asList(startLatlng, addMiddleLoc, endLatlng)); // polyLine.setTransparency(0.5f); // } else { @@ -402,10 +402,10 @@ // lineInfo.setHeading(info.getHeading()); // lineInfo.setWidth(info.getRoadwidth() * 14 + 5); // personWarnPolylineManager.drawPersonWarnPolyline(BridgeApi.INSTANCE.context(), lineInfo); -// CallerLogger.INSTANCE.d(M_V2X + TAG, "目标物与预碰撞点画线点为" + "起点:" + startLatlng + "中间点:" + addMiddleLoc + "终点:" + endLatlng); +// CallerLogger.d(M_V2X + TAG, "目标物与预碰撞点画线点为" + "起点:" + startLatlng + "中间点:" + addMiddleLoc + "终点:" + endLatlng); // } // } else { -// CallerLogger.INSTANCE.e(M_V2X + TAG, "info == null"); +// CallerLogger.e(M_V2X + TAG, "info == null"); // clearAllLine(); // } // } @@ -415,14 +415,14 @@ // float distance = CoordinateUtils.calculateLineDistance( // startLatLng.lon, startLatLng.lat, endLatLng.lon, endLatLng.lat); // double rotate = Trigonometric.getAngle(startLatLng.lon, startLatLng.lat, endLatLng.lon, endLatLng.lat); -// CallerLogger.INSTANCE.d(M_V2X + TAG, "添加小箭头--目标物与预碰撞点之间的距离是" + String.valueOf(distance)); +// CallerLogger.d(M_V2X + TAG, "添加小箭头--目标物与预碰撞点之间的距离是" + String.valueOf(distance)); // if (distance > 5) { // int count = (int) (distance / 5); // for (int i = 0; i < count; i++) { // MogoLatLng newLo = Trigonometric.getNewLocation( // startLatLng.getLon(), startLatLng.getLat(), 5 * (i + 1), Trigonometric.getAngle(startLatLng.lon, startLatLng.lat, endLatLng.lon, endLatLng.lat)); // Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMarkerService()).drawerArrowsMarkerWithLocation(newLo, WARNING_ARROWS, 10, new Double(rotate).intValue()); -// CallerLogger.INSTANCE.d(M_V2X + TAG, "小箭头位置" + newLo); +// CallerLogger.d(M_V2X + TAG, "小箭头位置" + newLo); // } // } // @@ -441,6 +441,6 @@ // //衡阳交付-取消划线需求,只渲染识别物红色模型移动过程 // //drawSelfCarLine(latLng.getLongitude(), latLng.getLatitude(), latLng.getBearing()); // } -// CallerLogger.INSTANCE.d(M_V2X + TAG, "车辆行驶轨迹" + latLng.getLongitude() + "," + latLng.getLatitude()); +// CallerLogger.d(M_V2X + TAG, "车辆行驶轨迹" + latLng.getLongitude() + "," + latLng.getLatitude()); // } //} diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseManagerView.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseManagerView.kt index 2e6d9195ce..75100b5784 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseManagerView.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseManagerView.kt @@ -6,7 +6,6 @@ import android.graphics.Color import android.graphics.drawable.ColorDrawable import android.os.Handler import android.util.AttributeSet -import android.util.Log import android.view.LayoutInflater import android.view.View import androidx.constraintlayout.widget.ConstraintLayout @@ -19,6 +18,8 @@ import com.mogo.eagle.core.data.deva.badcase.SubBagEntity import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotRecordListener import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotRecordListenerManager +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_DEVA import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.zhidao.loglib.download.DownloadManager @@ -116,7 +117,7 @@ class BadCaseManagerView @JvmOverloads constructor( if(bagManagerList.size>0){ bagManagerEntity.reqType = 3 bagManagerEntity.keyReq = bagManagerList[0].key - Log.i("sendBagManagerCmd","bagManagerEntity.keyReq="+bagManagerEntity.keyReq) + CallerLogger.i(M_DEVA+"sendBagManagerCmd","bagManagerEntity.keyReq="+bagManagerEntity.keyReq) CallerAutoPilotControlManager.sendBagManagerCmd(bagManagerEntity) bagUploadDialog = BagUploadDialog(context) @@ -237,24 +238,24 @@ class BadCaseManagerView @JvmOverloads constructor( override fun onBagManagerResult(bagManager: BagManagerOuterClass.BagManager) { super.onBagManagerResult(bagManager) UiThreadHandler.post { - Log.i(TAG,"onBagManagerResult Start") - Log.i(TAG,"keyReq="+bagManager.keyReq) - Log.i(TAG,"reqType="+bagManager.reqType) - Log.i(TAG,"uploadCosResp stat="+bagManager.uploadCosResp.stat) - Log.i(TAG,"descReq description="+bagManager.descReq.description + CallerLogger.i(M_DEVA + TAG,"onBagManagerResult Start") + CallerLogger.i(M_DEVA + TAG,"keyReq="+bagManager.keyReq) + CallerLogger.i(M_DEVA + TAG,"reqType="+bagManager.reqType) + CallerLogger.i(M_DEVA + TAG,"uploadCosResp stat="+bagManager.uploadCosResp.stat) + CallerLogger.i(M_DEVA + TAG,"descReq description="+bagManager.descReq.description +" audioUrl="+bagManager.descReq.audioUrl +" reportBI="+bagManager.descReq.reportBI +" hasAudio="+bagManager.descReq.hasAudio) for(logBag in bagManager.bagsInfoRespList){ - Log.i(TAG,"bagPath="+logBag.bagPath) - Log.i(TAG,"timestamp="+logBag.timestamp) - Log.i(TAG,"description="+logBag.description) - Log.i(TAG,"key="+logBag.key) - Log.i(TAG,"mergeStat="+logBag.mergeStat) - Log.i(TAG,"totalSize="+logBag.totalSize) - Log.i(TAG,"uploadStat="+logBag.uploadStat) + CallerLogger.i(M_DEVA + TAG,"bagPath="+logBag.bagPath) + CallerLogger.i(M_DEVA + TAG,"timestamp="+logBag.timestamp) + CallerLogger.i(M_DEVA + TAG,"description="+logBag.description) + CallerLogger.i(M_DEVA + TAG,"key="+logBag.key) + CallerLogger.i(M_DEVA + TAG,"mergeStat="+logBag.mergeStat) + CallerLogger.i(M_DEVA + TAG,"totalSize="+logBag.totalSize) + CallerLogger.i(M_DEVA + TAG,"uploadStat="+logBag.uploadStat) } - Log.i(TAG,"onBagManagerResult End") + CallerLogger.i(M_DEVA + TAG,"onBagManagerResult End") //获取空间使用信息 if(bagManager.reqType == 1){ @@ -367,7 +368,7 @@ class BadCaseManagerView @JvmOverloads constructor( //执行下一个上传Bag命令 bagManagerEntity.reqType = 3 bagManagerEntity.keyReq = bagManagerList[0].key - Log.i("sendBagManagerCmd","bagManagerEntity.keyReq="+bagManagerEntity.keyReq) + CallerLogger.i("sendBagManagerCmd","bagManagerEntity.keyReq="+bagManagerEntity.keyReq) CallerAutoPilotControlManager.sendBagManagerCmd(bagManagerEntity) } } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/record/RecordHelper.java b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/record/RecordHelper.java index bcd74d8efe..d7a33d08ae 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/record/RecordHelper.java +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/record/RecordHelper.java @@ -1,5 +1,7 @@ package com.zhjt.mogo_core_function_devatools.badcase.record; +import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_DEVA; + import android.media.AudioRecord; import android.media.MediaRecorder; import android.os.Environment; @@ -164,8 +166,7 @@ public class RecordHelper { mp3EncodeThread = new Mp3EncodeThread(resultFile, bufferSize, currentConfig); mp3EncodeThread.start(); } catch (Exception e) { -// Log.e(e, TAG, e.getMessage()); - CallerLogger.INSTANCE.d("$M_DEVA$TAG", e.getMessage()); + CallerLogger.d(M_DEVA+TAG, e.getMessage()); } } @@ -176,14 +177,14 @@ public class RecordHelper { AudioRecordThread() { bufferSize = AudioRecord.getMinBufferSize(currentConfig.getSampleRate(), currentConfig.getChannelConfig(), currentConfig.getEncodingConfig()) * RECORD_AUDIO_BUFFER_TIMES; - CallerLogger.INSTANCE.d("$M_DEVA$TAG", "record buffer size = %s", bufferSize); + CallerLogger.d("$M_DEVA$TAG", "record buffer size = %s", bufferSize); audioRecord = new AudioRecord(MediaRecorder.AudioSource.MIC, currentConfig.getSampleRate(), currentConfig.getChannelConfig(), currentConfig.getEncodingConfig(), bufferSize); if (currentConfig.getFormat() == RecordConfig.RecordFormat.MP3) { if (mp3EncodeThread == null) { initMp3EncoderThread(bufferSize); } else { - CallerLogger.INSTANCE.e("$M_DEVA$TAG", "mp3EncodeThread != null, 请检查代码"); + CallerLogger.e("$M_DEVA$TAG", "mp3EncodeThread != null, 请检查代码"); } } } @@ -205,7 +206,7 @@ public class RecordHelper { private void startPcmRecorder() { state = RecordState.RECORDING; notifyState(); - CallerLogger.INSTANCE.d("$M_DEVA$TAG", "开始录制 Pcm"); + CallerLogger.d("$M_DEVA$TAG", "开始录制 Pcm"); FileOutputStream fos = null; try { fos = new FileOutputStream(tmpFile); @@ -223,7 +224,7 @@ public class RecordHelper { if (state == RecordState.STOP) { makeFile(); } else { - CallerLogger.INSTANCE.i("$M_DEVA$TAG", "暂停！"); + CallerLogger.i("$M_DEVA$TAG", "暂停！"); } } catch (Exception e) { notifyError("录音失败"); @@ -239,7 +240,7 @@ public class RecordHelper { if (state != RecordState.PAUSE) { state = RecordState.IDLE; notifyState(); - CallerLogger.INSTANCE.d("$M_DEVA$TAG", "录音结束"); + CallerLogger.d("$M_DEVA$TAG", "录音结束"); } } @@ -267,7 +268,7 @@ public class RecordHelper { notifyState(); stopMp3Encoded(); } else { - CallerLogger.INSTANCE.d("$M_DEVA$TAG", "暂停"); + CallerLogger.d("$M_DEVA$TAG", "暂停"); } } } @@ -282,7 +283,7 @@ public class RecordHelper { } }); } else { - CallerLogger.INSTANCE.e("$M_DEVA$TAG", "mp3EncodeThread is null, 代码业务流程有误，请检查！！ "); + CallerLogger.e("$M_DEVA$TAG", "mp3EncodeThread is null, 代码业务流程有误，请检查！！ "); } } @@ -301,7 +302,7 @@ public class RecordHelper { break; } notifyFinish(); - CallerLogger.INSTANCE.i("$M_DEVA$TAG", "录音完成！ path: %s ； 大小：%s", resultFile.getAbsoluteFile(), resultFile.length()); + CallerLogger.i("$M_DEVA$TAG", "录音完成！ path: %s ； 大小：%s", resultFile.getAbsoluteFile(), resultFile.length()); } /** @@ -353,7 +354,7 @@ public class RecordHelper { inputStream.close(); } } catch (Exception e) { - Log.e(TAG, e.getMessage()); + CallerLogger.e(M_DEVA + TAG, e.getMessage()); return false; } finally { try { @@ -376,7 +377,7 @@ public class RecordHelper { private String getFilePath(String fileName) { if (!FileUtils.createOrExistsDir(ROOT_PATH)) { - CallerLogger.INSTANCE.w("$M_DEVA$TAG", "文件夹创建失败：%s", ROOT_PATH); + CallerLogger.w("$M_DEVA$TAG", "文件夹创建失败：%s", ROOT_PATH); return null; } @@ -387,7 +388,7 @@ public class RecordHelper { private String getTempFilePath() { if (!FileUtils.createOrExistsDir(TEMP_PATH)) { - CallerLogger.INSTANCE.e("$M_DEVA$TAG", "文件夹创建失败：%s", TEMP_PATH); + CallerLogger.e("$M_DEVA$TAG", "文件夹创建失败：%s", TEMP_PATH); } String fileName = String.format(Locale.getDefault(), "tmp_%s", FileUtils.getNowString(new SimpleDateFormat("yyyyMMddHHmmssSSS", Locale.SIMPLIFIED_CHINESE))); return String.format(Locale.getDefault(), "%s%s.pcm", TEMP_PATH, fileName); diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/record/mp3/Mp3Utils.java b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/record/mp3/Mp3Utils.java index 5a8f84e0fd..ff851d67a9 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/record/mp3/Mp3Utils.java +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/record/mp3/Mp3Utils.java @@ -1,9 +1,11 @@ package com.zhjt.mogo_core_function_devatools.badcase.record.mp3; +import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_DEVA; + import android.media.MediaExtractor; import android.media.MediaFormat; -import android.util.Log; +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.FileUtils; import com.zhjt.mogo_core_function_devatools.badcase.record.RecordConfig; @@ -34,7 +36,7 @@ public class Mp3Utils { long duration = mf.getLong(MediaFormat.KEY_DURATION) / 1000L; return duration; } catch (IOException e) { - Log.e(TAG, e.getMessage()); + CallerLogger.e(M_DEVA +TAG, e.getMessage()); } finally { if (mex != null) { mex.release(); diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/dialog/BaseFloatDialog.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/dialog/BaseFloatDialog.java index 7435516b70..3e9a52ceb4 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/dialog/BaseFloatDialog.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/dialog/BaseFloatDialog.java @@ -53,14 +53,14 @@ public class BaseFloatDialog extends Dialog { @Override public void show() { - CallerLogger.INSTANCE.d(TAG, "onShow===="); + CallerLogger.d(TAG, "onShow===="); super.show(); setWindowSize(); } @Override public void dismiss() { - CallerLogger.INSTANCE.d( TAG, "onDismiss===="); + CallerLogger.d( TAG, "onDismiss===="); super.dismiss(); } private void setWindowSize(){ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/roundimage/RoundedDrawable.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/roundimage/RoundedDrawable.java index 5a7c95c0e5..2751aaac37 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/roundimage/RoundedDrawable.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/roundimage/RoundedDrawable.java @@ -142,7 +142,7 @@ public class RoundedDrawable extends Drawable { drawable.draw(canvas); } catch (Exception e) { e.printStackTrace(); - CallerLogger.INSTANCE.w(M_HMI + TAG, "Failed to create bitmap from drawable!"); + CallerLogger.w(M_HMI + TAG, "Failed to create bitmap from drawable!"); bitmap = null; } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/roundimage/RoundedImageView.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/roundimage/RoundedImageView.java index ab4a3f0dd2..2e3e5bb38c 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/roundimage/RoundedImageView.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/roundimage/RoundedImageView.java @@ -273,7 +273,7 @@ public class RoundedImageView extends AppCompatImageView { try { d = rsrc.getDrawable(mResource); } catch (Exception e) { - CallerLogger.INSTANCE.w(M_HMI + TAG, "Unable to find resource : " + mResource + " exception : " + e); + CallerLogger.w(M_HMI + TAG, "Unable to find resource : " + mResource + " exception : " + e); // Don't try again. mResource = 0; } @@ -311,7 +311,7 @@ public class RoundedImageView extends AppCompatImageView { try { d = rsrc.getDrawable(mBackgroundResource); } catch (Exception e) { - CallerLogger.INSTANCE.w(M_HMI + TAG, "Unable to find resource : " + mBackgroundResource + " exception : " + e); + CallerLogger.w(M_HMI + TAG, "Unable to find resource : " + mBackgroundResource + " exception : " + e); // Don't try again. mBackgroundResource = 0; } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java index 3e93aeb725..d051dd3928 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java @@ -53,7 +53,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); EventBus.getDefault().register(this); - CallerLogger.INSTANCE.i(M_HMI + TAG, "onCreate"); + CallerLogger.i(M_HMI + TAG, "onCreate"); } @Override @@ -99,7 +99,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis @Override protected void loadOthersModules() { super.loadOthersModules(); - CallerLogger.INSTANCE.d(M_MAIN + TAG, "loadOthersModules"); + CallerLogger.d(M_MAIN + TAG, "loadOthersModules"); loadOCHModule(); } @@ -156,7 +156,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis paramIndexes = {0} ) private void traceStartUp(String content) { - CallerLogger.INSTANCE.d(M_HMI + TAG, content); + CallerLogger.d(M_HMI + TAG, content); } @Override diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java index 38a4ecf33f..8d24b5c6b2 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java @@ -66,7 +66,7 @@ public abstract class MainMoGoApplication extends AbsMogoApplication { } private void initModules() { - CallerLogger.INSTANCE.d(M_MAIN + TAG, "initModules"); + CallerLogger.d(M_MAIN + TAG, "initModules"); // BIZ MogoModulePaths.addModuleFunctionServer(new MogoModule(MogoServicePaths.PATH_FUNC_BIZ, "IMoGoNoticeProvider")); // 后置 车聊聊，IM @@ -76,7 +76,7 @@ public abstract class MainMoGoApplication extends AbsMogoApplication { // 后置 地图数据收集模块 MogoModulePaths.addModuleFunctionServer(new MogoModule(MogoServicePaths.PATH_MAP_DATA_COLLECT_PROVIDER, "MoGoMapDataCollector")); } - CallerLogger.INSTANCE.i(M_MAIN + TAG, "App launch timer cost " + (System.currentTimeMillis() - start) + "ms"); + CallerLogger.i(M_MAIN + TAG, "App launch timer cost " + (System.currentTimeMillis() - start) + "ms"); } @Override diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/PassengerLauncherActivity.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/PassengerLauncherActivity.java index 8eb7f3d55d..8b2bc3e951 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/PassengerLauncherActivity.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/PassengerLauncherActivity.java @@ -66,7 +66,7 @@ public class PassengerLauncherActivity extends MainActivity implements IMogoInte protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); EventBus.getDefault().register(this); - CallerLogger.INSTANCE.i(M_HMI + TAG, "onCreate"); + CallerLogger.i(M_HMI + TAG, "onCreate"); } @Override @@ -120,7 +120,7 @@ public class PassengerLauncherActivity extends MainActivity implements IMogoInte @Override protected void loadOthersModules() { super.loadOthersModules(); - CallerLogger.INSTANCE.d(M_HMI + TAG, "loadOthersModules"); + CallerLogger.d(M_HMI + TAG, "loadOthersModules"); loadOCHModule(); } @@ -151,7 +151,7 @@ public class PassengerLauncherActivity extends MainActivity implements IMogoInte paramIndexes = {0} ) private void traceStartUp(String content) { - CallerLogger.INSTANCE.d(M_HMI + TAG, content); + CallerLogger.d(M_HMI + TAG, content); } @Override diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/modules/MogoModulesManager.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/modules/MogoModulesManager.java index 73d2bcfae5..0f53108175 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/modules/MogoModulesManager.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/modules/MogoModulesManager.java @@ -83,7 +83,7 @@ public class MogoModulesManager implements MogoModulesHandler { final List modules = MogoModulePaths.getModuleFunctions(); if (modules != null && !modules.isEmpty()) { for (MogoModule module : modules) { - CallerLogger.INSTANCE.d(M_MAIN + TAG, "module.getPath():" + module.getPath() + " name: " + module.getName()); + CallerLogger.d(M_MAIN + TAG, "module.getPath():" + module.getPath() + " name: " + module.getName()); IMoGoFunctionProvider provider = loadFunction(module.getPath()); if (provider != null) { mModuleFunctionProviders.put(module, provider); @@ -98,7 +98,7 @@ public class MogoModulesManager implements MogoModulesHandler { final List modules = MogoModulePaths.getModuleFunctionServers(); if (modules != null && !modules.isEmpty()) { for (MogoModule module : modules) { - CallerLogger.INSTANCE.d(M_MAIN + TAG, "module.getPath():" + module.getPath() + " name: " + module.getName()); + CallerLogger.d(M_MAIN + TAG, "module.getPath():" + module.getPath() + " name: " + module.getName()); IMoGoFunctionServerProvider provider = loadFunctionServer(module.getPath()); if (provider != null) { mModuleFunctionServerProviders.put(module, provider); @@ -115,7 +115,7 @@ public class MogoModulesManager implements MogoModulesHandler { if (baseModule == null) { continue; } - CallerLogger.INSTANCE.d(M_MAIN + TAG, "加载基本模块 : " + baseModule.getPath()); + CallerLogger.d(M_MAIN + TAG, "加载基本模块 : " + baseModule.getPath()); loadBaseProvider(baseModule.getPath()); } } @@ -155,10 +155,10 @@ public class MogoModulesManager implements MogoModulesHandler { if (modules != null) { for (IMoGoFunctionProvider module : modules) { try { - CallerLogger.INSTANCE.d(M_HMI + TAG, "destroy module: " + module.getFunctionName()); + CallerLogger.d(M_HMI + TAG, "destroy module: " + module.getFunctionName()); module.onDestroy(); } catch (Exception e) { - CallerLogger.INSTANCE.e(M_HMI + TAG, e + " onDestroy"); + CallerLogger.e(M_HMI + TAG, e + " onDestroy"); } } } @@ -172,10 +172,10 @@ public class MogoModulesManager implements MogoModulesHandler { if (modules != null) { for (IMoGoFunctionServerProvider module : modules) { try { - CallerLogger.INSTANCE.d(M_HMI + TAG, "destroy module: " + module.getFunctionName()); + CallerLogger.d(M_HMI + TAG, "destroy module: " + module.getFunctionName()); module.onDestroy(); } catch (Exception e) { - CallerLogger.INSTANCE.e(M_HMI + TAG, e + " onDestroy"); + CallerLogger.e(M_HMI + TAG, e + " onDestroy"); } } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/windowview/FloatingViewHandler.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/windowview/FloatingViewHandler.java index a1dad25a40..cfd43c9748 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/windowview/FloatingViewHandler.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/windowview/FloatingViewHandler.java @@ -62,7 +62,7 @@ public class FloatingViewHandler { } if (sFloatingLayout == null) { - CallerLogger.INSTANCE.e(M_HMI + TAG, "no floating frame. "); + CallerLogger.e(M_HMI + TAG, "no floating frame. "); return; } @@ -85,7 +85,7 @@ public class FloatingViewHandler { } if (sFloatingLayout == null) { - CallerLogger.INSTANCE.e(M_HMI + TAG, "no floating frame. "); + CallerLogger.e(M_HMI + TAG, "no floating frame. "); return; } sFloatingLayout.addView(view, params); @@ -106,18 +106,18 @@ public class FloatingViewHandler { } if (sFloatingLayout == null) { - CallerLogger.INSTANCE.e(M_HMI + TAG, "no floating frame. "); + CallerLogger.e(M_HMI + TAG, "no floating frame. "); return; } if (sView == view) { - CallerLogger.INSTANCE.w(M_HMI + TAG, "改布局已添加且没有移除，不操作"); + CallerLogger.w(M_HMI + TAG, "改布局已添加且没有移除，不操作"); return; } if (sView != null) { if (priority < sPriority) { - CallerLogger.INSTANCE.w(M_HMI + TAG, "过滤低优先级布局"); + CallerLogger.w(M_HMI + TAG, "过滤低优先级布局"); return; } sFloatingLayout.removeView(sView); @@ -144,18 +144,18 @@ public class FloatingViewHandler { } if (sFloatingLayout == null) { - CallerLogger.INSTANCE.e(M_HMI + TAG, "no floating frame. "); + CallerLogger.e(M_HMI + TAG, "no floating frame. "); return; } if (sView == view) { - CallerLogger.INSTANCE.w(M_HMI + TAG, "改布局已添加且没有移除，不操作"); + CallerLogger.w(M_HMI + TAG, "改布局已添加且没有移除，不操作"); return; } if (sView != null) { if (priority < sPriority) { - CallerLogger.INSTANCE.w(M_HMI + TAG, "过滤低优先级布局"); + CallerLogger.w(M_HMI + TAG, "过滤低优先级布局"); return; } sFloatingLayout.removeView(sView); diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/MapBizView.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/MapBizView.kt index a86c77fb68..be35a30e56 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/MapBizView.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/MapBizView.kt @@ -11,13 +11,9 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationWGS84Liste import com.mogo.eagle.core.function.api.setting.IMoGoSkinModeChangeListener import com.mogo.eagle.core.function.call.autopilot.CallerChassisLamplightListenerManager import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84ListenerManager +import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager import com.mogo.eagle.core.function.call.setting.CallerSkinModeListenerManager import com.mogo.map.MogoMapView -import com.mogo.map.overlay.line.Polyline -import com.mogo.map.overlay.point.Point -import com.mogo.map.overlay.proxy.line.IMapPolylineOverlay -import com.mogo.map.overlay.proxy.point.IMapPointOverlay -import com.mogo.map.uicontroller.IMogoMapUIController class MapBizView(context: Context?, attrs: AttributeSet?) : MogoMapView(context, attrs), @@ -52,7 +48,7 @@ class MapBizView(context: Context?, attrs: AttributeSet?) : MogoMapView(context, //设置旋转手势是否可用。 it.setRotateGesturesEnabled(false) //设置比例尺控件是否可见 - it.setScaleControlsEnabled(false) + it.setScaleControlsEnabled(true) //设置拖拽手势是否可用。 it.setScrollGesturesEnabled(true) //设置倾斜手势是否可用。 @@ -64,18 +60,6 @@ class MapBizView(context: Context?, attrs: AttributeSet?) : MogoMapView(context, } } - fun getUI(): IMogoMapUIController { - return uiController - } - - fun addLine(options:Polyline.Options): IMapPolylineOverlay? { - return map.addLine(options) - } - - fun addPoint(options: Point.Options): IMapPointOverlay?{ - return map.addPoint(options) - } - override fun onSaveInstanceState(outState: Bundle?) { super.onSaveInstanceState(outState) } @@ -90,9 +74,9 @@ class MapBizView(context: Context?, attrs: AttributeSet?) : MogoMapView(context, override fun onSkinModeChange(skinMode: Int) { if (skinMode == 0) { - getUI().stepInDayMode(false) + CallerMapUIServiceManager.getMapUIController()?.stepInVrMode(false) } else if (skinMode == 1) { - getUI().stepInDayMode(true) + CallerMapUIServiceManager.getMapUIController()?.stepInVrMode(true) } } @@ -123,9 +107,9 @@ class MapBizView(context: Context?, attrs: AttributeSet?) : MogoMapView(context, private fun turn(lightNum: Int) { if (currentLevel != lightNum) { when (lightNum) { - 0 -> getUI().setCarLightsType(0, 500) - 1 -> getUI().setCarLightsType(1, 500) - 2 -> getUI().setCarLightsType(2, 500) + 0 -> CallerMapUIServiceManager.getMapUIController()?.setCarLightsType(0, 500) + 1 -> CallerMapUIServiceManager.getMapUIController()?.setCarLightsType(1, 500) + 2 -> CallerMapUIServiceManager.getMapUIController()?.setCarLightsType(2, 500) } currentLevel = lightNum } diff --git a/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/HttpParamsEx.java b/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/HttpParamsEx.java index 8cc29d18ce..4d9df600ca 100644 --- a/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/HttpParamsEx.java +++ b/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/HttpParamsEx.java @@ -19,7 +19,7 @@ public class HttpParamsEx extends HttpParams { if (!TextUtils.isEmpty(key)) { if (value == null) { - CallerLogger.INSTANCE.e(M_NETWORK + TAG, key + " with illegal value"); + CallerLogger.e(M_NETWORK + TAG, key + " with illegal value"); } } return super.put(key, value); diff --git a/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/SubscribeImpl.java b/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/SubscribeImpl.java index 694ce2bec2..6d1326a942 100644 --- a/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/SubscribeImpl.java +++ b/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/SubscribeImpl.java @@ -35,7 +35,7 @@ public abstract class SubscribeImpl implements Observer { @Override public void onError(Throwable e) { onFinish(); - CallerLogger.INSTANCE.e(M_NETWORK + TAG, "occur when net request , exception : " + e); + CallerLogger.e(M_NETWORK + TAG, "occur when net request , exception : " + e); } @Override @@ -65,7 +65,7 @@ public abstract class SubscribeImpl implements Observer { } public void onError(String message, int code) { - CallerLogger.INSTANCE.e(M_NETWORK + TAG, "onError code : " + code + " , message : " + message); + CallerLogger.e(M_NETWORK + TAG, "onError code : " + code + " , message : " + message); } } diff --git a/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/GestureTopCloseLayout.java b/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/GestureTopCloseLayout.java index a705ab0fc5..987f313a8f 100644 --- a/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/GestureTopCloseLayout.java +++ b/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/GestureTopCloseLayout.java @@ -79,7 +79,7 @@ public class GestureTopCloseLayout extends ConstraintLayout { @Override public void onViewPositionChanged(@NonNull View changedView, int left, int top, int dx, int dy) { super.onViewPositionChanged(changedView, left, top, dx, dy); - CallerLogger.INSTANCE.i(TAG, "onViewPositionChanged==top=" + top + + CallerLogger.i(TAG, "onViewPositionChanged==top=" + top + " changedView.getHeight()==" + changedView.getHeight()); if (top < 0) { mTop = top; @@ -96,7 +96,7 @@ public class GestureTopCloseLayout extends ConstraintLayout { //手指释放的时候回调 @Override public void onViewReleased(View releasedChild, float xvel, float yvel) { - CallerLogger.INSTANCE.i(TAG, "onViewReleased==mTop=" + mTop + " getHeight=" + getHeight()); + CallerLogger.i(TAG, "onViewReleased==mTop=" + mTop + " getHeight=" + getHeight()); if (mTop < 0) { mViewDragHelper.settleCapturedViewAt(0, -getHeight()); invalidate(); diff --git a/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/TextureVideoView.java b/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/TextureVideoView.java index 6146af2b9b..5dd31a933a 100644 --- a/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/TextureVideoView.java +++ b/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/TextureVideoView.java @@ -218,7 +218,7 @@ public class TextureVideoView extends TextureView implements MediaPlayerControl mVideoHeight = mp.getVideoHeight(); int seekToPosition = mSeekWhenPrepared; -// CallerLogger.INSTANCE.i(TAG, "seekToPosition = " + seekToPosition); +// CallerLogger.i(TAG, "seekToPosition = " + seekToPosition); if (seekToPosition != 0) { seekTo(seekToPosition); } @@ -423,7 +423,7 @@ public class TextureVideoView extends TextureView implements MediaPlayerControl mTagetStateBackup = STATE_PLAYING; return; } - //CallerLogger.INSTANCE.i(TAG, "mCurrentState = " + mCurrentState); + //CallerLogger.i(TAG, "mCurrentState = " + mCurrentState); if (isInPlaybackState()) { mMediaPlayer.start(); mCurrentState = STATE_PLAYING; 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 fc76cc6b6b..117d5298ac 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 @@ -4,24 +4,28 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.Scene.Companion.scene object CallerLogger { + @JvmStatic fun i(tag: String, message: Any? = null, vararg args: Any?) { if (scene.check(tag)) { Logger.i(tag, message.toString(), *args) } } + @JvmStatic fun d(tag: String, message: Any? = null, vararg args: Any?) { if (scene.check(tag)) { Logger.d(tag, message.toString(), *args) } } + @JvmStatic fun w(tag: String, message: Any? = null, vararg args: Any?) { if (scene.check(tag)) { Logger.w(tag, message.toString(), *args) } } + @JvmStatic fun e(tag: String, message: Any? = null, vararg args: Any?) { if (scene.check(tag)) { Logger.e(tag, message.toString(), *args) diff --git a/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/locationinfo/MogoLocationInfoServices.java b/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/locationinfo/MogoLocationInfoServices.java index 1a377a0b79..9d2f598560 100644 --- a/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/locationinfo/MogoLocationInfoServices.java +++ b/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/locationinfo/MogoLocationInfoServices.java @@ -45,16 +45,16 @@ public class MogoLocationInfoServices { public void start() { LocationManager.getInstance().start(); - CallerLogger.INSTANCE.d(TAG, "sdk - start"); + CallerLogger.d(TAG, "sdk - start"); } public void stop() { LocationManager.getInstance().stop(); - CallerLogger.INSTANCE.d(TAG, "sdk - stop"); + CallerLogger.d(TAG, "sdk - stop"); } public void init(Context context) { LocationManager.getInstance().init(context); - CallerLogger.INSTANCE.d(TAG, "sdk - init"); + CallerLogger.d(TAG, "sdk - init"); } } diff --git a/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/socket/MogoAiCloudSocketManager.java b/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/socket/MogoAiCloudSocketManager.java index 50ef32ca9f..8951f10428 100644 --- a/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/socket/MogoAiCloudSocketManager.java +++ b/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/socket/MogoAiCloudSocketManager.java @@ -104,7 +104,7 @@ public class MogoAiCloudSocketManager extends ConnectionLifecycleListener implem @Override public void registerOnMessageListener(int msgType, IMogoOnMessageListener listener) { if (mListeners.containsKey(msgType)) { - CallerLogger.INSTANCE.w(TAG, "msgType is exist : " + msgType); + CallerLogger.w(TAG, "msgType is exist : " + msgType); return; } if (!mListeners.containsKey(msgType)) { @@ -154,7 +154,7 @@ public class MogoAiCloudSocketManager extends ConnectionLifecycleListener implem @Override public void sendMsg(MsgBody body, IMogoMsgAckListener listener) { - CallerLogger.INSTANCE.d(TAG, "sendMsg."); + CallerLogger.d(TAG, "sendMsg."); mAckListeners.put(body.getMsgId(), listener); MsgBody msgBody = new MsgBody(); msgBody.msgType(body.getMsgType()); @@ -194,15 +194,15 @@ public class MogoAiCloudSocketManager extends ConnectionLifecycleListener implem @Override public void onMsgReceived(int msgType, Object obj) { if (obj == null) { - CallerLogger.INSTANCE.e(TAG, "Failed to parse the received message!"); + CallerLogger.e(TAG, "Failed to parse the received message!"); return; } - CallerLogger.INSTANCE.d(TAG, "onMsgReceived obj className : " + obj.getClass().getName()); + CallerLogger.d(TAG, "onMsgReceived obj className : " + obj.getClass().getName()); List listeners = mListeners.get(msgType); if (listeners != null && !listeners.isEmpty()) { for (IMogoOnMessageListener listener : listeners) { if (listener != null) { -// CallerLogger.INSTANCE.d(TAG, "received msgId = " + mAckListeners.get(msgType) + " content = " + obj.toString()); +// CallerLogger.d(TAG, "received msgId = " + mAckListeners.get(msgType) + " content = " + obj.toString()); listener.onMsgReceived(obj); } } diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java index 5126c87f36..9d4d5fdb61 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java @@ -55,7 +55,7 @@ public abstract class AbsMogoApplication extends Application { private void initRxJavaErrorHandler() { RxJavaPlugins.setErrorHandler(throwable -> { - CallerLogger.INSTANCE.e("RxJava", "" + throwable); + CallerLogger.e("RxJava", "" + throwable); }); } diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/crash/FinalizeCrashFixer.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/crash/FinalizeCrashFixer.java index 63ea19249f..4363fd8ffe 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/crash/FinalizeCrashFixer.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/crash/FinalizeCrashFixer.java @@ -36,10 +36,10 @@ public class FinalizeCrashFixer { AppStateManager.INSTANCE.registerAppStateListener(isForeground -> { if (isForeground) { //前后台则重新反射关闭一遍，避免线程被再次开启 - CallerLogger.INSTANCE.d("FinalizeCrashFixer", "--- 切换到前台 ---"); + CallerLogger.d("FinalizeCrashFixer", "--- 切换到前台 ---"); } else { //前后台则重新反射关闭一遍，避免线程被再次开启 - CallerLogger.INSTANCE.d("FinalizeCrashFixer", "--- 切换到后台 ---"); + CallerLogger.d("FinalizeCrashFixer", "--- 切换到后台 ---"); } realFix(); }); diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/network/ParamsUtil.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/network/ParamsUtil.java index 6cfd729f0b..302a01be68 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/network/ParamsUtil.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/network/ParamsUtil.java @@ -83,7 +83,7 @@ public class ParamsUtil { public static RequestBody convert(Map map) { String json = GsonUtil.getGson().toJson(map); - CallerLogger.INSTANCE.d(TAG, "request params : " + json); + CallerLogger.d(TAG, "request params : " + json); return RequestBody.create(okhttp3.MediaType.parse("application/json; charset=utf-8"), json); } @@ -109,13 +109,13 @@ public class ParamsUtil { StringBuilder builder = new StringBuilder(); for (String key : keys) { if (TextUtils.isEmpty(key)) { - CallerLogger.INSTANCE.w(TAG, "key is illegal"); + CallerLogger.w(TAG, "key is illegal"); continue; } final Object value = params.get(key); if (value == null) { - CallerLogger.INSTANCE.w(TAG, key + " value is illegal"); + CallerLogger.w(TAG, key + " value is illegal"); continue; } String targetValue = value.toString(); diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/voice/AIAssist.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/voice/AIAssist.java index 5b6a7b122a..4b793c227b 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/voice/AIAssist.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/voice/AIAssist.java @@ -45,7 +45,7 @@ public class AIAssist { try { mTTS.release(); } catch (Exception e) { - CallerLogger.INSTANCE.e(TAG, "release has exception : " + e); + CallerLogger.e(TAG, "release has exception : " + e); } } sInstance = null; 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 e69de29bb2..3ecde6eca0 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 @@ -0,0 +1,1166 @@ +package com.mogo.map; + +import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_CODE_HD_MAP_CALL; +import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_CODE_INIT_ON_MAP_INIT; +import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_CODE_INIT_ON_MAP_LOADED; +import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_CODE_ROMA_MODE_INVOKE; +import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_CODE_ROMA_REQUEST_OK; +import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_SOURCE_INIT; +import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_SOURCE_MAP; +import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_TYPE_HD_MAP; +import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_TYPE_INIT_STATUS; +import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_MAP; +import static com.mogo.map.uicontroller.VisualAngleMode.MAP_STYLE_VR_ANGLE_300; +import static com.mogo.map.uicontroller.VisualAngleMode.MAP_STYLE_VR_ANGLE_CROSS; +import static com.mogo.map.uicontroller.VisualAngleMode.MAP_STYLE_VR_ANGLE_TOP; +import static com.mogo.map.uicontroller.VisualAngleMode.MAP_STYLE_VR_ROMA; +import static com.mogo.map.uicontroller.VisualAngleMode.MODE_CLOSE_SIGHT; +import static com.mogo.map.uicontroller.VisualAngleMode.MODE_LONG_SIGHT; +import static com.mogo.map.uicontroller.VisualAngleMode.MODE_MEDIUM_SIGHT; + +import android.content.Context; +import android.graphics.Point; +import android.graphics.Rect; +import android.os.Bundle; +import android.os.Looper; +import android.text.TextUtils; +import android.view.MotionEvent; +import android.view.View; + +import androidx.annotation.NonNull; + +import com.mogo.eagle.core.data.config.HdMapBuildConfig; +import com.mogo.eagle.core.data.enums.TrafficTypeEnum; +import com.mogo.eagle.core.data.map.CenterLine; +import com.mogo.eagle.core.data.map.MapRoadInfo; +import com.mogo.eagle.core.data.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLocation; +import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84ListenerManager; +import com.mogo.eagle.core.function.call.map.CallerMapDataCollectorManager; +import com.mogo.eagle.core.function.call.map.CallerMapDevaListenerManager; +import com.mogo.eagle.core.function.call.map.CallerMapRoadListenerManager; +import com.mogo.eagle.core.function.call.map.CallerMapRomaListener; +import com.mogo.eagle.core.function.call.map.CallerMapStyleListenerManager; +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; +import com.mogo.eagle.core.utilcode.util.ThreadUtils; +import com.mogo.eagle.core.utilcode.util.UiThreadHandler; +import com.mogo.map.hdcache.IHdCacheListener; +import com.mogo.map.identify.MogoIdentifyManager; +import com.mogo.map.listener.MogoMapListenerHandler; +import com.mogo.map.location.GDLocationClient; +import com.mogo.map.uicontroller.CarCursorOption; +import com.mogo.map.uicontroller.EnumMapUI; +import com.mogo.map.uicontroller.IMogoMapUIController; +import com.mogo.map.uicontroller.MapCameraPosition; +import com.mogo.map.uicontroller.MapControlResult; +import com.mogo.map.uicontroller.VisualAngleMode; +import com.mogo.map.utils.HDMapUtils; +import com.mogo.map.utils.MogoMapUtils; +import com.mogo.map.utils.ObjectUtils; +import com.mogo.map.utils.ResIdCache; +import com.zhidaoauto.map.sdk.open.MapAutoApi; +import com.zhidaoauto.map.sdk.open.abs.MapStatusListener; +import com.zhidaoauto.map.sdk.open.abs.OnCameraChangeListener; +import com.zhidaoauto.map.sdk.open.abs.OnHdDataDownByCityListener; +import com.zhidaoauto.map.sdk.open.abs.OnMapClickListener; +import com.zhidaoauto.map.sdk.open.abs.OnMapLoadedListener; +import com.zhidaoauto.map.sdk.open.abs.OnMapStyleListener; +import com.zhidaoauto.map.sdk.open.abs.OnMapTouchListener; +import com.zhidaoauto.map.sdk.open.abs.OnMapViewVisualAngleChangeListener; +import com.zhidaoauto.map.sdk.open.abs.OnRoadInfoListener; +import com.zhidaoauto.map.sdk.open.abs.OnRoamStatusListener; +import com.zhidaoauto.map.sdk.open.abs.log.ILog; +import com.zhidaoauto.map.sdk.open.business.PointCloudHelper; +import com.zhidaoauto.map.sdk.open.camera.CameraPosition; +import com.zhidaoauto.map.sdk.open.camera.CameraUpdateFactory; +import com.zhidaoauto.map.sdk.open.camera.LatLngBounds; +import com.zhidaoauto.map.sdk.open.data.CityInfo; +import com.zhidaoauto.map.sdk.open.data.MapDataApi; +import com.zhidaoauto.map.sdk.open.location.LocationClient; +import com.zhidaoauto.map.sdk.open.location.MyLocationStyle; +import com.zhidaoauto.map.sdk.open.marker.BitmapDescriptorFactory; +import com.zhidaoauto.map.sdk.open.marker.Marker; +import com.zhidaoauto.map.sdk.open.marker.MarkerHelper; +import com.zhidaoauto.map.sdk.open.marker.OnMarkClickListener; +import com.zhidaoauto.map.sdk.open.query.LonLatPoint; +import com.zhidaoauto.map.sdk.open.road.RoadCross; +import com.zhidaoauto.map.sdk.open.road.StopLine; +import com.zhidaoauto.map.sdk.open.tools.MapTools; +import com.zhidaoauto.map.sdk.open.view.MapAutoView; +import com.zhidaoauto.map.sdk.open.view.MapAutoViewHelper; +import com.zhjt.service.chain.ChainLog; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.util.ArrayList; +import java.util.List; + + +public class AMapViewWrapper implements IMogoMapView, + IMogoMapUIController, + OnMapLoadedListener, + MapStatusListener, + OnCameraChangeListener, + OnMapClickListener, + OnMapTouchListener, + OnMarkClickListener, + OnMapStyleListener, + OnMapViewVisualAngleChangeListener, + OnRoadInfoListener, + ILog, OnRoamStatusListener { + + private static final String TAG = "AMapViewWrapper"; + private final MapAutoView mMapView; + private final IMogoMap mIMap; + private final CarCursorOption DEFAULT_OPTION = new CarCursorOption.Builder() + .carCursorRes(R.drawable.map_api_ic_current_location2) + .naviCursorRes(R.drawable.ic_amap_navi_cursor) + .build(); + private CarCursorOption mCarCursorOption = DEFAULT_OPTION; + private EnumMapUI mCurrentUI = EnumMapUI.MAP_STYLE_NIGHT_VR; + private VisualAngleMode mVisualAngleMode = MODE_MEDIUM_SIGHT; + + private IHdCacheListener hdCacheListener; + + public AMapViewWrapper(MapAutoView mMapView) { + CallerLogger.i(M_MAP + TAG, "autoop--AMapViewWrapper: init"); + this.mMapView = mMapView; + initViews(); + initListeners(); + this.mIMap = new AMapWrapper(this.mMapView.getMapAutoViewHelper(), this.mMapView, this); + } + + private void initViews() { + // 初始化首次地图进入的时候的样式， MapAutoApi.INSTANCE.init(context, mapParams);将影响这里的数据 + int mapStyle = MapAutoApi.INSTANCE.getMapParams().getStyleMode(); + CallerLogger.d(M_MAP + TAG, "默认配置地图模式：mapStyle=" + mapStyle); + switch (mapStyle) { + case MapAutoApi.MAP_STYLE_DAY: + mCurrentUI = EnumMapUI.MAP_STYLE_DAY; + break; + case MapAutoApi.MAP_STYLE_DAY_NAV: + mCurrentUI = EnumMapUI.MAP_STYLE_DAY_NAV; + break; + case MapAutoApi.MAP_STYLE_NIGHT: + mCurrentUI = EnumMapUI.MAP_STYLE_NIGHT; + break; + case MapAutoApi.MAP_STYLE_NIGHT_NAV: + mCurrentUI = EnumMapUI.MAP_STYLE_NIGHT_NAV; + break; + case MapAutoApi.MAP_STYLE_DAY_VR: + mCurrentUI = EnumMapUI.MAP_STYLE_DAY_VR; + break; + case MapAutoApi.MAP_STYLE_NIGHT_VR: + mCurrentUI = EnumMapUI.MAP_STYLE_NIGHT_VR; + break; + default: + CallerLogger.e(M_MAP + TAG, "暂不支持此地图模式，默认使用VR夜间模式"); + } + + } + + private void initMapView() { + if (mMapView == null) { + return; + } + MapAutoViewHelper options = mMapView.getMapAutoViewHelper(); + ThreadUtils.getIoPool().submit(() -> { + if (options != null) { + //设置手势是否可以缩放 isCanZoom true 可缩放 false 不可缩放 + options.setZoomGesturesEnabled(true); + options.setScaleVRMode(true); + options.setWeatherEnable(false); +// options.setAllGesturesEnabled(false); //禁止全部手势 + if (options.getMyLocationStyle() != null) { + options.getMyLocationStyle().setDisplayAnimEnable(true); + } + //修改自车模型，未来需区分车的类型 + options.setMyLocationStyle(options.getMyLocationStyle().myLocationIcon(HdMapBuildConfig.currentCarVrIconRes, true)); + } + }); + } + + private void initListeners() { + mMapView.setOnMarkClickListener(this); + mMapView.setOnMapLoadedListener(this); + mMapView.setOnMapTouchListener(this); + mMapView.setOnMapClickListener(this); + mMapView.registerListener(this, MapAutoApi.LISTENER_TYPE_ZOOM); + mMapView.registerListener(this, MapAutoApi.LISTENER_TYPE_ROTATE); + mMapView.registerListener(this, MapAutoApi.LISTENER_TYPE_3D); + mMapView.setOnCameraChangeListener(this); + mMapView.setOnMapStyleListener(this); + mMapView.setOnRoamStatusListener(this); + mMapView.setOnMapViewVisualAngleChangeListener(this); + mMapView.setOnRoadInfoListener(this, 1); + MapAutoApi.INSTANCE.registerLogListener(this); + CallerLogger.d(M_MAP + TAG, "styleop - initListeners - setOnMapStyleListener - view " + mMapView); + } + + /** + * 修改获取当前车道号 + * + * @param roadId + * @param s1 + */ + @Override + public void onRoadIdInfo(@androidx.annotation.Nullable String roadId, @androidx.annotation.Nullable String s1) { + if (roadId != null && !TextUtils.isEmpty(roadId)) { + // CallerLogger.d(M_MAP + TAG, "onRoadIdInfo::" + roadId); + CallerMapRoadListenerManager.INSTANCE.invokeListenersOnRoadIdGet(roadId); + } else { + //CallerLogger.d(M_MAP + TAG, "onRoadIdInfo::null"); + } + } + + @Override + public void onRoadCrossInfo(@androidx.annotation.Nullable RoadCross roadCross) { + + } + + @Override + public void onStopLineInfo(@androidx.annotation.Nullable StopLine stopLine) { + MogoLocation carLoc = CallerChassisLocationWGS84ListenerManager.INSTANCE.getChassisLocationWGS84(); + if (stopLine != null && stopLine.road_id != null && !stopLine.road_id.isEmpty() && stopLine.points != null && stopLine.points.size() > 0) { + ArrayList points = stopLine.points; + if (carLoc != null) { +// //CallerLogger.d(M_MAP + TAG, "onStopLineInfo:stop_line" + stopLine + ", car_loc:{lon: " + carLoc.getLatitude() + ", lat: " + carLoc.getLongitude() + "}"); + MapRoadInfo.StopLine stopInfo = convert(stopLine); + LonLatPoint p1 = points.get(0); + LonLatPoint p2 = points.get(points.size() - 1); + double distanceOfCarToStopLine = MapDataApi.INSTANCE.getNearstFromPointToSegment(carLoc.getLongitude(), carLoc.getLatitude(), p1.longitude, p1.latitude, p2.longitude, p2.latitude) * 10_0000; + stopInfo.setDistanceOfCarToStopLine(distanceOfCarToStopLine); + //CallerLogger.d(M_MAP + TAG, "onStopLineInfo: --- distance: " + distanceOfCarToStopLine); + CallerMapRoadListenerManager.INSTANCE.invokeListenersOnStopLineGet(stopInfo); + } + } else { + if (carLoc != null) { + //CallerLogger.d(M_MAP + TAG, "onStopLineInfo::null, car_loc:{lon: " + carLoc.getLatitude() + ", lat: " + carLoc.getLongitude() + "}"); + } + } + } + + private MapRoadInfo.StopLine convert(StopLine line) { + MapRoadInfo.StopLine ret = new MapRoadInfo.StopLine(); + ret.setDistance(line.distance); + ret.setLaneId(line.lane_id); + ret.setRoadId(line.road_id); + ret.setTieId(line.tile_id); + ArrayList points = line.points; + if (points != null && points.size() > 0) { + List newPoints = new ArrayList<>(); + for (int i = 0; i < points.size(); i++) { + LonLatPoint lonLatPoint = points.get(i); + MogoLatLng latLng = new MogoLatLng(lonLatPoint.latitude, lonLatPoint.longitude); + latLng.duration = lonLatPoint.duration; + latLng.angle = lonLatPoint.angle; + latLng.speed = lonLatPoint.speed; + latLng.altitude = lonLatPoint.altitude; + latLng.provider = lonLatPoint.provider; + newPoints.add(latLng); + } + ret.setPoints(newPoints); + } + return ret; + } + + + private Context getContext() { + return mMapView.getContext(); + } + + @Override + public View getMapView() { + return mMapView; + } + + @Override + public IMogoMap getMap() { + return mIMap; + } + + @Override + public void onCreate(Bundle bundle) { + if (mMapView != null) { + mMapView.onCreate(bundle); + CallerLogger.d(M_MAP + TAG, "map onCreate"); + } + } + + @Override + public void onResume() { + if (mMapView != null) { + mMapView.onResume(); + CallerLogger.d(M_MAP + TAG, "map onResume"); + } + } + + @Override + public void onPause() { + if (mMapView != null) { + mMapView.onPause(); + CallerLogger.d(M_MAP + TAG, "map onPause"); + } + } + + @Override + public void onDestroy() { + if (mMapView != null) { + mMapView.onDestroy(); + mMapView.setOnMarkClickListener(null); + mMapView.setOnMapLoadedListener(null); + mMapView.setOnMapTouchListener(null); + mMapView.setOnMapClickListener(null); + mMapView.setOnCameraChangeListener(null); + MapAutoApi.INSTANCE.unregisterLogListener(this); + CallerLogger.d(M_MAP + TAG, "map onDestroy"); + } + + } + + @Override + public void onSaveInstanceState(Bundle outState) { + if (mMapView != null) { + mMapView.onSaveInstanceState(outState); + CallerLogger.d(M_MAP + TAG, "map onSaveInstanceState"); + } + } + + @Override + public void onLowMemory() { + + } + + @Override + public MapControlResult changeZoom(float zoom) { + if (isVrMold()) { + return MapControlResult.ERROR; + } + CallerLogger.d(M_MAP + TAG, "changeZoom : " + zoom); + getMap().changeZoom(zoom); + return MapControlResult.SUCCESS; + } + + @Override + public void changeZoom2(float zoom) { +// if (isVrMold()) { +// return; +// } + CallerLogger.d(M_MAP + TAG, "changeZoom2 : " + zoom); + getMap().changeZoom2(zoom); + } + + @Override + public void setDebugMode(Boolean debugMode) { + MapAutoApi.INSTANCE.setDebugMode(debugMode); + } + + @Override + public void changeMapVisualAngle(VisualAngleMode angelMode, MogoLatLng mogoLatLng) { + MapAutoViewHelper mapAutoViewHelper = mMapView.getMapAutoViewHelper(); + if (mapAutoViewHelper != null) { + mVisualAngleMode = angelMode; + if (angelMode == MODE_CLOSE_SIGHT) { + if (mogoLatLng == null) { + CallerLogger.e(M_MAP + TAG, "切换地图近景需要传入要移动的经纬度数据"); + return; + } + // 近景传入经纬度为点击地图上静态marker经纬度数据，为GPS坐标点。 + mapAutoViewHelper.setNearViewAnglePosition(new LonLatPoint(mogoLatLng.lon, mogoLatLng.lat), true); + } else { + mapAutoViewHelper.setMapViewVisualAngle(angelMode.getCode()); + } + } + } + + @ChainLog( + linkChainLog = CHAIN_TYPE_HD_MAP, + linkCode = CHAIN_SOURCE_MAP, + nodeAliasCode = CHAIN_CODE_HD_MAP_CALL, + paramIndexes = {0} + ) + @Override + public void setRoamTrajectory(String trajectory) { + if (checkAMapView()) { + mMapView.getMapAutoViewHelper().setRoamTrajectory(trajectory); + } + } + + @ChainLog( + linkChainLog = CHAIN_TYPE_HD_MAP, + linkCode = CHAIN_SOURCE_MAP, + parentNodeAliasCode = CHAIN_CODE_ROMA_REQUEST_OK, + nodeAliasCode = CHAIN_CODE_ROMA_MODE_INVOKE, + paramIndexes = {0}, + endPoint = false + ) + @Override + public void setRomaMode(int mode) { + if (checkAMapView()) { + mMapView.getMapAutoViewHelper().setRoamStyle(mode, 1800, MapAutoApi.ROAM_SPEED_40); + } + } + + @Override + public VisualAngleMode getCurrentMapVisualAngle() { + return mVisualAngleMode; + } + + @Override + public void moveToCenter(MogoLatLng latLng) { + moveToCenter(latLng, true); + } + + private boolean checkAMapView() { + if (mMapView == null || mMapView.getMapAutoViewHelper() == null) { + CallerLogger.e(M_MAP + TAG, "自研mapView实例为空，请检查"); + return false; + } + return true; + } + + @Override + public void moveToCenter(MogoLatLng latLng, boolean animate) { + CallerLogger.d(M_MAP + TAG, "move to center " + latLng); + if (latLng == null || latLng.lat == 0.0d || latLng.lon == 0.0d) { + CallerLogger.e(M_MAP + TAG, "latLng = null or is illegal"); + return; + } + if (checkAMapView()) { + mMapView.getMapAutoViewHelper().animateCamera(new LonLatPoint(latLng.lon, latLng.lat)); + } + } + + @Override + public void showMyLocation(boolean visible) { + CallerLogger.d(M_MAP + TAG, "showMyLocation1 " + visible); + // 如果是VR模式 + if (isVrMold()) { + return; + } + // 不是VR模式情况强制刷新下 + if (checkAMapView()) { + MyLocationStyle style = mMapView.getMapAutoViewHelper().getMyLocationStyle(); + if (visible) { + // 强制刷新一遍车标 + style.myLocationIcon(mCarCursorOption.getCarCursorRes()); + } + mMapView.getMapAutoViewHelper().setMyLocationStyle(style); + } + } + + /** + * @return true-是，false=不是 + */ + private boolean isVrMold() { + boolean isVrMode = mCurrentUI == EnumMapUI.MAP_STYLE_NIGHT_VR || mCurrentUI == EnumMapUI.MAP_STYLE_DAY_VR; + CallerLogger.d(M_MAP + TAG, "是否是VR模式: " + isVrMode); + return isVrMode; + } + + /** + * 是否是白天模式 + * + * @return true-是，false-不是 + */ + @Override + public boolean isDayMode() { + return mCurrentUI == EnumMapUI.MAP_STYLE_DAY_VR + || mCurrentUI == EnumMapUI.MAP_STYLE_DAY + || mCurrentUI == EnumMapUI.MAP_STYLE_DAY_NAV; + } + + @Override + public void showMyLocation(View view) { + if (checkAMapView()) { + MyLocationStyle style = mMapView.getMapAutoViewHelper().getMyLocationStyle(); + style.myLocationIcon(BitmapDescriptorFactory.INSTANCE.convertViewToBitmap(view)); + mMapView.getMapAutoViewHelper().setMyLocationStyle(style); + } + } + + public void initMyLocation() { + if (checkAMapView()) { + MarkerHelper.INSTANCE.addPreModel(R.raw.guangquan); +// MarkerHelper.addPreModel(R.raw.guangquan_day) + mMapView.getMapAutoViewHelper().setMyLocationEnabled(true); + } + } + + + @Override + public float getScalePerPixel() { + return getMap().getScalePerPixel(); + } + + @Override + public float getZoomLevel() { + return getMap().getZoomLevel(); + } + + @Override + public float getRoadWidth(double lon, double lat, float angle, boolean isGpsLocation, boolean isRTK) { + return getMap().getRoadWidth(lon, lat, angle, isGpsLocation, isRTK); + } + + @Override + public MogoLatLng getCameraNorthEastPosition() { + return ObjectUtils.fromAMap(MapTools.INSTANCE.getVisibleRegion().getRightTopPoint()); + } + + @Override + public MogoLatLng getCameraSouthWestPosition() { + try { + return ObjectUtils.fromAMap(MapTools.INSTANCE.getVisibleRegion().getLeftBottomPoint()); + } catch (Exception e) { + e.printStackTrace(); + } + return null; + } + + @Override + public MogoLatLng getWindowCenterLocation() { + try { + if (checkAMapView()) { + return ObjectUtils.fromAMap(mMapView.getMapAutoViewHelper().getCenter()); + } + } catch (Exception e) { + e.printStackTrace(); + } + return null; + } + + @Override + public void setPointToCenter(double mapCenterX, double mapCenterY) { + if (checkAMapView()) { + if (isVrMold()) { + return; + } + CallerLogger.d(M_MAP + TAG, "setPointToCenter x : " + mapCenterX + " y : " + mapCenterY); + mMapView.getMapAutoViewHelper().setPointToCenter((float) mapCenterX, (float) mapCenterY); + } + } + + @Override + public Point getLocationPointInScreen(MogoLatLng latLng) { + if (checkAMapView()) { + try { + return MapTools.INSTANCE.toScreenLocation(ObjectUtils.fromMogo(latLng)); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + return null; + } + + @Override + public MogoLatLng getLocationMogoLatLngInScreen(Point point) { + if (checkAMapView()) { + try { + return ObjectUtils.fromAMap( + MapTools.INSTANCE.fromScreenLocation(point)); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + return null; + } + + @Override + public void setRenderFps(int fps) { + if (checkAMapView()) { + if (mMapView.getMapAutoViewHelper() != null) { + mMapView.getMapAutoViewHelper().setRenderFps(fps); + CallerLogger.d(M_MAP + TAG, "设置刷新帧率 fps = " + fps); + } + } + } + + @Override + public void showBounds(String tag, MogoLatLng carPosition, List lonLats, Rect bound, boolean lockCarPosition) { + if (!checkAMapView()) { + return; + } + if (isVrMold()) { + CallerLogger.w(M_MAP + TAG, "vr 模式下忽略该设置"); + return; + } + CallerLogger.i(M_MAP + TAG, "showBounds : " + M_MAP + TAG + " , " + carPosition.toString() + " , " + bound.toShortString() + " , " + lockCarPosition); + try { + LatLngBounds latLngBounds = MogoMapUtils.getLatLngBounds(carPosition, lonLats, lockCarPosition); + mMapView.getMapAutoViewHelper().setCenter(ObjectUtils.fromMogo(carPosition)); + mMapView.getMapAutoViewHelper().moveCamera(CameraUpdateFactory.INSTANCE.newLatLngBounds(latLngBounds, bound.left, bound.right, bound.top, bound.bottom)); + } catch (Exception e) { + CallerLogger.e(M_MAP + TAG, "M_MAP+TAG : " + M_MAP + TAG + " error : " + e); + } + } + + @Override + public void forceRender() { + if (checkAMapView()) { + mMapView.getMapAutoViewHelper().runOnDrawFrame(); + } + } + + @Override + public float calculateLineDistance(MogoLatLng p1, MogoLatLng p2) throws Exception { + if (p1 == null || p2 == null) { + throw new Exception("计算距离的点不能为 null"); + } + return MogoMapUtils.calculateLineDistance(ObjectUtils.fromMogo(p1), ObjectUtils.fromMogo(p2)); + } + + @Override + public synchronized boolean isCarLocked() { + return mMapView.getMapAutoViewHelper().getLockMode(); + } + + @Override + public void setCarCursorOption(CarCursorOption option) { + if (isVrMold()) { + return; + } + if (mCarCursorOption != null && mCarCursorOption != DEFAULT_OPTION) { + mCarCursorOption.destroy(); + } + if (option != null) { + try { + mCarCursorOption = option.clone(); + } catch (Exception e) { + mCarCursorOption = DEFAULT_OPTION; + } + } else { + mCarCursorOption = DEFAULT_OPTION; + } + if (!checkAMapView()) { + return; + } + + if (mMapView.getMapAutoViewHelper() == null) { + return; + } + MyLocationStyle style = mMapView.getMapAutoViewHelper().getMyLocationStyle(); + if (mCarCursorOption.getCarCursorBmp() != null && !mCarCursorOption.getCarCursorBmp().isRecycled()) { + style.myLocationIcon(mCarCursorOption.getCarCursorBmp()); + } else { + if (mCarCursorOption.getCarCursorRes() != 0) { + style.myLocationIcon(mCarCursorOption.getCarCursorRes()); + } + } + mMapView.getMapAutoViewHelper().setMyLocationStyle(style); + } + + /** + * 设置转向灯和刹车灯 + * + * @param type :车尾灯类型 + * @param time 闪烁时间 最小500ms 小于500ms 默认为500ms + */ + @Override + public void setCarLightsType(int type, int time) { + if (checkAMapView()) { + mMapView.getMapAutoViewHelper().setTailLightsType(type, time); + } + } + + @Override + public MapCameraPosition getMapCameraPosition() { + if (checkAMapView()) { + CameraPosition cameraPosition = mMapView.getMapAutoViewHelper().getCameraPosition(); + return ObjectUtils.fromAMap(cameraPosition); + } + return null; + } + + @Override + public void changeBearing(float bearing) { + if (checkAMapView()) { + mMapView.getMapAutoViewHelper().setMapViewRotation(bearing); + } + } + + @Override + public void changeMapViewAngle(int type) { + } + + @Override + public void changeCurrentIcon(int iconId) { + if (checkAMapView()) { + mMapView.getMapAutoViewHelper().getMyLocationStyle().myLocationIcon(iconId, true); + } + } + + @Override + public long getTileId(double lon, double lat) { + return getMap().getUIController().getTileId(lon, lat); + } + + @Override + public int getLimitSpeed(double lon, double lat, float angle) { + return MapDataApi.INSTANCE.getLimitSpeed(lon, lat, angle); + } + + @Override + public CenterLine getCenterLineInfo(double lon, double lat, float angle) { + return ObjectUtils.transformCenterLine(MapDataApi.INSTANCE.getCenterLineInfo(lon, lat, angle)); + } + + @Override + public void result(@NonNull String filePath) { + CallerMapDevaListenerManager.INSTANCE.invokeUploadLogFile(filePath); + } + + @Override + public void onMapClick(@Nullable LonLatPoint lonLatPoint) { + MogoMapListenerHandler.Companion.getMogoMapListenerHandler().onMapClick(ObjectUtils.fromAMap(lonLatPoint)); + } + + + @ChainLog( + linkChainLog = CHAIN_TYPE_INIT_STATUS, + linkCode = CHAIN_SOURCE_INIT, + nodeAliasCode = CHAIN_CODE_INIT_ON_MAP_INIT, + paramIndexes = {-1} + ) + @Override + public void onMapInit() { + CallerLogger.i(M_MAP + TAG, "autoop--onMapInit: "); + MogoMapListenerHandler.Companion.getMogoMapListenerHandler().onMapLoaded(); + } + + @ChainLog( + linkChainLog = CHAIN_TYPE_INIT_STATUS, + linkCode = CHAIN_SOURCE_INIT, + nodeAliasCode = CHAIN_CODE_INIT_ON_MAP_LOADED, + paramIndexes = {-1} + ) + @Override + public void onMapLoaded() { + CallerLogger.i(M_MAP + TAG, "autoop--onMapLoaded: "); + if (checkAMapView()) { + CameraPosition cameraPosition = mMapView.getMapAutoViewHelper().getCameraPosition(); + MogoMapListenerHandler.Companion.getMogoMapListenerHandler().onMapChanged(ObjectUtils.fromAMap(cameraPosition.getTarget()), + cameraPosition.getZoom(), + cameraPosition.getTilt(), + cameraPosition.getBearing()); + initMapView(); + initMyLocation(); + loadPreVehicleModel(); + } + } + + @Override + public boolean onTouch(@Nullable MotionEvent motionEvent) { + MogoMapListenerHandler.Companion.getMogoMapListenerHandler().onTouch(motionEvent); + return false; + } + + @Override + public void onMarkClick(@NotNull Marker markerInfo) { +// mMarkerClickHandler.handleMarkerClicked(markerInfo); + } + + @Override + public void onRoadLoaded(@Nullable String s) { + } + + @Override + public void onMapStatusChanged(int type, int value) { + } + + @Override + public void onRoamStatus(int status, @NonNull String msg) { + CallerMapRomaListener.INSTANCE.invokeMapRomaStatus(status, msg); + } + + @Override + public void onMapViewVisualAngleChange(int i) { + CallerLogger.d(M_MAP + TAG, " 地图自动更改视距 currentThread : " + Thread.currentThread().getName()); + mVisualAngleMode = getVisualAngleMode(i); + MogoMapListenerHandler.Companion.getMogoMapListenerHandler().onMapVisualAngleChanged(mVisualAngleMode); + } + + /** + * 获取当前视距类型 + * + * @param mode 当前类型 + * @return 当前类型 + */ + private VisualAngleMode getVisualAngleMode(int mode) { + switch (mode) { + case 0: + return MODE_CLOSE_SIGHT; + case 1: + return MODE_MEDIUM_SIGHT; + case 2: + return MODE_LONG_SIGHT; + case 3: + return MAP_STYLE_VR_ANGLE_300; + case 4: + return MAP_STYLE_VR_ANGLE_TOP; + case 5: + return MAP_STYLE_VR_ANGLE_CROSS; + case 7: + return MAP_STYLE_VR_ROMA; + default: + return MODE_MEDIUM_SIGHT; + } + } + + @Override + public void onCameraChange(int type, int value) { + } + + @Override + public void onCameraChangeFinish(@Nullable CameraPosition cameraPosition) { + if (cameraPosition != null) { + MogoMapListenerHandler.Companion.getMogoMapListenerHandler().onMapChanged(ObjectUtils.fromAMap(cameraPosition.getTarget()), + cameraPosition.getZoom(), + cameraPosition.getTilt(), + cameraPosition.getBearing()); + } + } + + @Override + public void onChangeMapStyle(int styleId) { + CallerLogger.d(M_MAP + TAG, "currentMapStyle = " + styleId); + // 映射地图样式ID到鹰眼样式ID + if (styleId == MapAutoApi.MAP_STYLE_DAY + || styleId == MapAutoApi.MAP_STYLE_DAY_NAV) { + mCurrentUI = EnumMapUI.MAP_STYLE_DAY_NAV; + } else if (styleId == MapAutoApi.MAP_STYLE_NIGHT) { + mCurrentUI = EnumMapUI.MAP_STYLE_NIGHT; + } else if (styleId == MapAutoApi.MAP_STYLE_NIGHT_NAV) { + mCurrentUI = EnumMapUI.MAP_STYLE_NIGHT_NAV; + } else if (styleId == MapAutoApi.MAP_STYLE_NIGHT_VR) { + mCurrentUI = EnumMapUI.MAP_STYLE_NIGHT_VR; + } else if (styleId == MapAutoApi.MAP_STYLE_DAY_VR) { + mCurrentUI = EnumMapUI.MAP_STYLE_DAY_VR; + } + + loadPreVehicleModel(); + + if (mCurrentUI != null) { + UiThreadHandler.post(() -> { + try { + CallerLogger.d(M_MAP + TAG, "currentUI = " + mCurrentUI); + MogoMapListenerHandler.Companion.getMogoMapListenerHandler().onMapModeChanged(mCurrentUI); + CallerMapStyleListenerManager.INSTANCE.invokeMapStyleChange(styleId); + } catch (Exception e) { + e.printStackTrace(); + } + }); + } + } + + // 是否使用RTK数据 + private boolean mRtkEnable = false; + + @Override + public void rtkEnable(boolean enable) { + try { + mRtkEnable = !mRtkEnable; + if (mMapView != null && mMapView.getLocationClient() != null) { + mMapView.getLocationClient().rtkEnable(mRtkEnable); + } + } catch (Exception e) { + CallerLogger.e(M_MAP + TAG, "rtkEnable has exception : " + e); + } + } + + + @Override + public void stepInVrMode(boolean isDayMode) { +// try { +// int mapStyle; +// if (isDayMode) { +// mCurrentUI = EnumMapUI.MAP_STYLE_DAY_VR; +// mapStyle = MapAutoApi.MAP_STYLE_DAY_VR; +// } else { +// mCurrentUI = EnumMapUI.MAP_STYLE_NIGHT_VR; +// mapStyle = MapAutoApi.MAP_STYLE_NIGHT_VR; +// } +// if (mMapView != null && mMapView.getMapAutoViewHelper() != null) { +// mMapView.getMapAutoViewHelper().setMapStyle(mapStyle); +// } +// } catch (Exception e) { +// e.printStackTrace(); +// } + } + + @Override + public String getMarkerInfoResName(String speedVal) { + return ResIdCache.getVal(speedVal); + } + + @Override + public void setMarkerInfoResName(String speedVal, String val) { + ResIdCache.putVal(speedVal, val); + } + + @Override + public void setMapDAngle(float angle) { + if (checkAMapView()) { + mMapView.getMapAutoViewHelper().setMapDAngle(angle); + } + } + + @Override + public float getAngle(double startLon, double startLat, double endLon, double endLat) { + return MapAutoApi.INSTANCE.getAngle(startLon, startLat, endLon, endLat); + } + + @Override + public Double getRoadAngle(Double lon, Double lat, float angle) { + return MapDataApi.INSTANCE.getRoadRectInfo(lon, lat, angle).getAngle(); + } + + /** + * 加载3D模型 + */ + private void loadPreVehicleModel() { + CallerLogger.d(M_MAP + TAG, "添加感知模型到地图中……"); + ThreadUtils.getIoPool().submit(() -> { + addPreVehicleModelWeiZhi(TrafficTypeEnum.TYPE_TRAFFIC_ID_WEI_ZHI, "添加感知模型到地图中……preVehicleStrWeiZhi="); + + addPreVehicleModelWeiZhi(TrafficTypeEnum.TYPE_TRAFFIC_ID_PEOPLE, "添加感知模型到地图中……preVehicleStrPeople="); + + addPreVehicleModelWeiZhi(TrafficTypeEnum.TYPE_TRAFFIC_ID_BICYCLE, "添加感知模型到地图中……preVehicleStrBicycle="); + + addPreVehicleModelWeiZhi(TrafficTypeEnum.TYPE_TRAFFIC_ID_TA_CHE, "添加感知模型到地图中……preVehicleStrTaChe="); + + addPreVehicleModelWeiZhi(TrafficTypeEnum.TYPE_TRAFFIC_ID_MOTO, "添加感知模型到地图中……preVehicleStrMoto="); + + addPreVehicleModelWeiZhi(TrafficTypeEnum.TYPE_TRAFFIC_ID_BUS, "添加感知模型到地图中……preVehicleStrBus="); + + addPreVehicleModelWeiZhi(TrafficTypeEnum.TYPE_TRAFFIC_ID_TRUCK, "添加感知模型到地图中……preVehicleStrTruck="); + }); + } + + /** + * 添加模型到地图中 + * + * @param typeTrafficId 障碍物类型ID + * @param logMsg 日志消息 + */ + private void addPreVehicleModelWeiZhi(TrafficTypeEnum typeTrafficId, String logMsg) { + String preVehicleStrWeiZhi; + // 根据当前的地图皮肤模式动态替换 + if (isDayMode()) { + preVehicleStrWeiZhi = + // 添加模型到地图中 + MogoIdentifyManager.getInstance(getContext()) + .addPreVehicleModel(typeTrafficId.getType(), typeTrafficId.getTraffic3DIconId()); + } else { + preVehicleStrWeiZhi = + // 添加模型到地图中 + MogoIdentifyManager.getInstance(getContext()) + .addPreVehicleModel(typeTrafficId.getType(), typeTrafficId.getTraffic3DNightIconId()); + } + + CallerLogger.d(M_MAP + TAG, logMsg + preVehicleStrWeiZhi); + + if (preVehicleStrWeiZhi == null) { + UiThreadHandler.postDelayed(() -> { + CallerLogger.w(M_MAP + TAG, "添加感知模型到地图中失败，尝试重复添加……"); + addPreVehicleModelWeiZhi(typeTrafficId, logMsg); + }, 1000L); + } + } + + @Override + public void setLockMode(boolean isLock) { + if (checkAMapView()) { + mMapView.getMapAutoViewHelper().setLockMode(isLock); + } + } + + @Override + public void setScrollGesturesEnable(boolean isEnable) { + if (checkAMapView()) { + mMapView.getMapAutoViewHelper().setScrollGesturesEnabled(isEnable); + } + } + + @Override + public void setAllGesturesEnabled(boolean isEnable) { + if (checkAMapView()) { + mMapView.getMapAutoViewHelper().setAllGesturesEnabled(isEnable); + } + } + + + @Override + public void setExtraGPSData(MogoLocation gnssInfo) { + LocationClient locationClient = mMapView.getLocationClient(); + if (locationClient != null) { + locationClient.setIsUseExtraGPSData(true);//设置是否使用外界坐标 + locationClient.rtkEnable(true);//设置是否是高精定位 + + LonLatPoint lonLatPoint = new LonLatPoint(); + lonLatPoint.setAngle(gnssInfo.getHeading()); + lonLatPoint.setAltitude(gnssInfo.getAltitude()); + lonLatPoint.setLongitude(gnssInfo.getLongitude()); + lonLatPoint.setLatitude(gnssInfo.getLatitude()); + lonLatPoint.setSatelliteTime(Double.valueOf(gnssInfo.getSatelliteTime() * 1000).longValue()); + lonLatPoint.setSpeed((float) gnssInfo.getGnssSpeed()); + + locationClient.updateLocation(lonLatPoint);//更新新自动驾驶RTK相关数据 + + CallerMapDataCollectorManager.INSTANCE.setIsInit(); + } + } + + @Override + public void setIsDrawPointCloud(Boolean isDrawPointCloud) { + try { + // 是否绘制点云 + PointCloudHelper.INSTANCE.setIsDrawPointCloud(isDrawPointCloud); + } catch (Exception e) { + e.printStackTrace(); + } + } + + @Override + public void setPointCloudSize(Float pointCloudSize) { + //设置点云大小 + PointCloudHelper.INSTANCE.setPointCloudSize(pointCloudSize); + } + + @Override + public void setPointCloudColor(String color) { + // 设置点云颜色 + PointCloudHelper.INSTANCE.setPointCloudColor(color); + } + + @Override + public void cacheHDDataByCity(IHdCacheListener listener) { + if (mMapView.getMapAutoViewHelper() != null) { + String gdCityCode = GDLocationClient.getInstance(getContext()).getLastCityCode(); + CallerLogger.i(M_MAP + TAG, "gdCityCode is:" + gdCityCode); + Integer id = HDMapUtils.getHDCityCode(gdCityCode); + if (id != null) { + hdCacheListener = listener; + mMapView.getMapAutoViewHelper().cacheHDDataByCity(id, new OnHdDataDownByCityListener() { + @Override + public void onMapHDDataCacheProgressByCity(int cityId, double progress) { + if (Thread.currentThread() == Looper.getMainLooper().getThread()) { + if (hdCacheListener != null) { + hdCacheListener.onMapHdCacheProgress(cityId, progress * 100); + } + } else { + UiThreadHandler.post(() -> { + if (hdCacheListener != null) { + hdCacheListener.onMapHdCacheProgress(cityId, progress * 100); + } + }, UiThreadHandler.MODE.QUEUE); + } + } + + @Override + public void onMapHDDataCacheStateByCity(int i, int state) {// 0失败，1成功 + if (Thread.currentThread() == Looper.getMainLooper().getThread()) { + if (hdCacheListener != null) { + hdCacheListener.onMapHdCacheResult(i, state); + } + } else { + UiThreadHandler.post(() -> { + if (hdCacheListener != null) { + hdCacheListener.onMapHdCacheResult(i, state); + } + }, UiThreadHandler.MODE.QUEUE); + } + } + }); + } + } + } + + @Override + public void cacheHDDataByCity(IHdCacheListener listener, MogoLocation location) { + if (mMapView.getMapAutoViewHelper() != null) { + hdCacheListener = listener; + CallerLogger.i(M_MAP + TAG, "location lon is:" + location.getLongitude() + ",lat is:" + location.getLatitude()); + mMapView.getMapAutoViewHelper().cacheHDDataByCityByLonLat(location.getLongitude(), location.getLatitude(), new OnHdDataDownByCityListener() { + @Override + public void onMapHDDataCacheProgressByCity(int cityId, double progress) { + if (Thread.currentThread() == Looper.getMainLooper().getThread()) { + if (hdCacheListener != null) { + hdCacheListener.onMapHdCacheProgress(cityId, progress * 100); + } + } else { + UiThreadHandler.post(() -> { + if (hdCacheListener != null) { + hdCacheListener.onMapHdCacheProgress(cityId, progress * 100); + } + }, UiThreadHandler.MODE.QUEUE); + } + } + + @Override + public void onMapHDDataCacheStateByCity(int i, int state) {// 0失败，1成功 + if (Thread.currentThread() == Looper.getMainLooper().getThread()) { + if (hdCacheListener != null) { + hdCacheListener.onMapHdCacheResult(i, state); + } + } else { + UiThreadHandler.post(() -> { + if (hdCacheListener != null) { + hdCacheListener.onMapHdCacheResult(i, state); + } + }, UiThreadHandler.MODE.QUEUE); + } + } + }); + } + } + + @Override + public boolean isCityDataCached() { + if (mMapView.getMapAutoViewHelper() != null) { + String gdCityCode = GDLocationClient.getInstance(getContext()).getLastCityCode(); + CallerLogger.i(M_MAP + TAG, "gdCityCode is:" + gdCityCode); + Integer id = HDMapUtils.getHDCityCode(gdCityCode); + if (id != null) { + List cityInfoList = mMapView.getMapAutoViewHelper().getAllCityCode(); + if (cityInfoList != null) { + for (CityInfo cityInfo : cityInfoList) { + if (id == cityInfo.getCityCode()) { + return cityInfo.isCache; + } + } + } + } + } + return false; + } + + @Override + public void cancelDownloadCacheData() { + if (mMapView.getMapAutoViewHelper() != null) { + mMapView.getMapAutoViewHelper().cancelCacheHDData(); + } + } + + @Override + public String getCityCode() { + return GDLocationClient.getInstance(getContext()).getLastCityCode(); + } + + @Override + public void animateTo(double lon, double lat, float rotateAngle, int duration, boolean isGps) { + if (mMapView.getMapAutoViewHelper() != null) { + mMapView.getMapAutoViewHelper().animateTo(lon, lat, rotateAngle, duration, isGps); + } + } + + @Override + public void animateTo(double lon, double lat, float v1, float v2, float v3, float v4, int duration, boolean isGps) { + if (mMapView.getMapAutoViewHelper() != null) { + mMapView.getMapAutoViewHelper().animateTo(lon, lat, v1, v2, v3, v4, duration, isGps); + } + } +} diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java index ae79e21ca4..da45eca7d8 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java @@ -1,26 +1,36 @@ package com.mogo.map; import android.annotation.SuppressLint; - -import androidx.annotation.NonNull; - +import android.graphics.Point; +import android.util.Pair; +import com.mogo.eagle.core.data.config.FunctionBuildConfig; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; +import com.mogo.map.center.CenterLine; import com.mogo.map.overlay.proxy.line.IMapPolylineOverlay; import com.mogo.map.overlay.proxy.point.IMapPointOverlay; import com.mogo.map.overlay.wrapper.point.AMapPointWrapper; +import com.mogo.map.road.RoadNameInfo; +import com.mogo.map.uicontroller.AMapUIController; import com.mogo.map.uicontroller.IMogoMapUIController; import com.mogo.map.utils.ObjectUtils; +import com.zhidaoauto.map.sdk.open.data.MapDataApi; +import com.zhidaoauto.map.sdk.open.data.SinglePointRoadInfo; import com.zhidaoauto.map.sdk.open.marker.BatchMarkerOptions; import com.zhidaoauto.map.sdk.open.marker.Marker; +import com.zhidaoauto.map.sdk.open.marker.MarkerHelper; import com.zhidaoauto.map.sdk.open.marker.MarkerOptions; import com.zhidaoauto.map.sdk.open.marker.MarkerSimpleData; import com.zhidaoauto.map.sdk.open.poyline.Polyline; import com.zhidaoauto.map.sdk.open.poyline.PolylineOptions; +import com.zhidaoauto.map.sdk.open.query.LonLatPoint; +import com.zhidaoauto.map.sdk.open.tools.MapTools; import com.zhidaoauto.map.sdk.open.view.MapAutoView; import com.zhidaoauto.map.sdk.open.view.MapAutoViewHelper; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; +import java.util.List; import mogo.telematics.pad.MessagePad; import mogo.yycp.api.proto.SocketDownData; @@ -35,16 +45,25 @@ public class AMapWrapper implements IMogoMap { private static final String TAG = "AMapWrapper"; + private static MapAutoViewHelper sAMap; private final IMogoMapUIController mMapUIController; private MapAutoViewHelper mAMap; private final MapAutoView mMapView; private IMogoUiSettings mUiSettings; public AMapWrapper(MapAutoViewHelper map, MapAutoView mapView, IMogoMapUIController controller) { - CallerLogger.INSTANCE.i(TAG, "autoop--AMapWrapper: init" + this); + CallerLogger.i(TAG, "autoop--AMapWrapper: init" + this); this.mAMap = map; + sAMap = map; this.mMapView = mapView; mMapUIController = controller; + // 设置实现自定义 info window +// MapAutoApi.INSTANCE.setInfoWindowAdapter(new AMapInfoWindowAdapter()); + AMapUIController.getInstance().initClient(mMapUIController); + } + + public static MapAutoViewHelper getAMap() { + return sAMap; } @Override @@ -59,42 +78,42 @@ public class AMapWrapper implements IMogoMap { } @Override - public IMogoMapUIController getUiController() { + public IMogoMapUIController getUIController() { return mMapUIController; } @Override - public IMapPointOverlay addPoint(@NonNull com.mogo.map.overlay.point.Point.Options options) { + public IMapPointOverlay addPoint(com.mogo.map.overlay.point.Point.Options options) { if (!checkAMap()) { return null; } - MarkerOptions markerOptions = ObjectUtils.fromMogo(options,mMapView); + MarkerOptions markerOptions = ObjectUtils.fromMogo(options); if (markerOptions == null) { - CallerLogger.INSTANCE.e(TAG, "marker参数为空"); + CallerLogger.e(TAG, "marker参数为空"); return null; } Marker delegate = mAMap.addMarker(markerOptions); if (delegate == null) { return null; } - return new AMapPointWrapper(options.getId(), delegate,mMapView); + return new AMapPointWrapper(options.getId(), delegate); } @Override - public IMapPolylineOverlay addLine(@NonNull com.mogo.map.overlay.line.Polyline.Options options) { + public IMapPolylineOverlay addLine(com.mogo.map.overlay.line.Polyline.Options options) { if (!checkAMap()) { return null; } - PolylineOptions polylineOptions = ObjectUtils.fromMogo(options,mMapView); + PolylineOptions polylineOptions = ObjectUtils.fromMogo(options); if (polylineOptions == null) { - CallerLogger.INSTANCE.e(TAG, "polyline参数为空"); + CallerLogger.e(TAG, "polyline参数为空"); return null; } - Polyline delegate = polylineOptions.getLineWidth() > 0 ? mAMap.drawThickLine(polylineOptions) : mAMap.drawLine(polylineOptions); + Polyline delegate = polylineOptions.lineWidth > 0 ? mAMap.drawThickLine(polylineOptions) : mAMap.drawLine(polylineOptions); if (delegate == null) { return null; } - return new com.mogo.map.overlay.wrapper.line.AMapPolylineWrapper(options.getId(), delegate,mMapView); + return new com.mogo.map.overlay.wrapper.line.AMapPolylineWrapper(options.getId(), delegate); } BatchMarkerOptions batchMarkerOptions = new BatchMarkerOptions(); @@ -119,15 +138,13 @@ public class AMapWrapper implements IMogoMap { return; } long time = markerOptionsArrayList.get(0).getTime(); - batchMarkerOptions.setList(markerOptionsArrayList); - batchMarkerOptions.setDelayStrategy(false); - batchMarkerOptions.setRuleAngle(8.0f); - batchMarkerOptions.setControlIcon(1); - batchMarkerOptions.setSatelliteTime(time); - batchMarkerOptions.setDeleteRule(0); - if(mMapView.getMarkerController() != null){ - mMapView.getMarkerController().updateBatchMarkerPositon(batchMarkerOptions); - } + batchMarkerOptions.list = markerOptionsArrayList; + batchMarkerOptions.delayStrategy = false; + batchMarkerOptions.ruleAngle = 8.0f; + batchMarkerOptions.controlIcon = 1; + batchMarkerOptions.satelliteTime = time; + batchMarkerOptions.deleteRule = 0; + MarkerHelper.INSTANCE.updateBatchMarkerPositon(batchMarkerOptions); } BatchMarkerOptions aiBatchMarkerOptions = new BatchMarkerOptions(); @@ -153,23 +170,19 @@ public class AMapWrapper implements IMogoMap { } long time = markerOptionsArrayList.get(0).getTime(); // 最后一个参数，是否管理锚点的删除 - aiBatchMarkerOptions.setList(markerOptionsArrayList); - aiBatchMarkerOptions.setDelayStrategy(false); - aiBatchMarkerOptions.setRuleAngle(8.0f); - aiBatchMarkerOptions.setControlIcon(1); - aiBatchMarkerOptions.setSatelliteTime(time); - aiBatchMarkerOptions.setDeleteRule(0); - if(mMapView.getMarkerController() != null) { - mMapView.getMarkerController().updateBatchMarkerPositon(aiBatchMarkerOptions); - } + aiBatchMarkerOptions.list = markerOptionsArrayList; + aiBatchMarkerOptions.delayStrategy = false; + aiBatchMarkerOptions.ruleAngle = 8.0f; + aiBatchMarkerOptions.controlIcon = 1; + aiBatchMarkerOptions.satelliteTime = time; + aiBatchMarkerOptions.deleteRule = 0; + MarkerHelper.INSTANCE.updateBatchMarkerPositon(aiBatchMarkerOptions); } @Override public String addPreVehicleModel(int type, int modelRes) { try { - if(mMapView.getMarkerController() != null){ - return mMapView.getMarkerController().addPreVehicleModel(type, modelRes); - } + return MarkerHelper.INSTANCE.addPreVehicleModel(type, modelRes); } catch (Exception e) { e.printStackTrace(); } @@ -179,21 +192,120 @@ public class AMapWrapper implements IMogoMap { @Override public void removeMarker(String uuidString) { try { - if(mMapView.getMarkerController() != null){ - mMapView.getMarkerController().removeMarker(uuidString); - } + MarkerHelper.INSTANCE.removeMarker(uuidString); } catch (Exception e) { e.printStackTrace(); } } + @Override + public void clear() { + if (checkAMap()) { + mAMap.clearPanel(); + } + } + + @Override + public void clear(boolean isKeepMyLocationOverlay) { + if (checkAMap()) { + mAMap.clearPanel(); + } + } + + @Override + public void setPointToCenter(int x, int y) { + if (checkAMap()) { + LonLatPoint lonLatPoint = MapTools.INSTANCE.fromScreenLocation(new Point(x, y)); + mAMap.setCenter(lonLatPoint); + } + } + + @Override + public float getScalePerPixel() { + if (checkAMap()) { + return mAMap.getScalePerPixel(); + } + return 0; + } + + @Override + public void changeZoom(float zoom) { + CallerLogger.d(TAG, "changeZoom %s", zoom); + if (checkAMap()) { + mAMap.setZoom((int) zoom); + } + } + + @Override + public void changeZoom2(float zoom) { + CallerLogger.d(TAG, "changeZoom %s", zoom); + if (checkAMap()) { + mAMap.setZoomVal(zoom); + } + } + + @Override + public float getZoomLevel() { + if (checkAMap()) { + try { + return mAMap.getZoom(); + } catch (Exception ignored) { + + } + } + return 0; + } + private boolean checkAMap() { mAMap = mMapView.getMapAutoViewHelper(); + sAMap = mAMap; if (mAMap == null) { - CallerLogger.INSTANCE.e(TAG, "自研map实例为空，请检查"); + CallerLogger.e(TAG, "自研map实例为空，请检查"); return false; } return true; } + @Override + public float getRoadWidth(double lon, double lat, float angle, boolean isGpsLocation, boolean isRTK) { + SinglePointRoadInfo singlePointRoadInfo = MapDataApi.INSTANCE.getSinglePointMatchRoad(lon, lat, angle, isGpsLocation, isRTK); + + return singlePointRoadInfo != null ? singlePointRoadInfo.getLaneWidth() : 0; + } + + @Override + public CenterLine getCenterLineRangeInfo(double lon, double lat, float angle, float distance) { + try { + com.zhidaoauto.map.sdk.open.road.CenterLine info = MapDataApi.INSTANCE.getCenterLineRangeInfo(lon, lat, angle, distance); + CenterLine ret = null; + if (info != null) { + ret = new CenterLine(info.id, info.tile_id, info.road_id, info.lane_id, convert(info.points), info.angle == null ? 0f : info.angle); + } + return ret; + } catch (Throwable t) { + t.printStackTrace(); + return null; + } + } + + @Override + public RoadNameInfo getRoadName(double lon, double lat, float angle) { +// com.zhidaoauto.map.sdk.open.road.RoadNameInfo info = MapDataApi.INSTANCE.getRoadName(lon, lat, angle); +// RoadNameInfo ret = null; +// if (info != null) { +// ret = new RoadNameInfo(info.tile_id, info.road_id, info.road_name); +// } + return null; + } + + private List> convert(List points) { + if (points == null || points.isEmpty()) { + return Collections.emptyList(); + } + List> ret = new ArrayList<>(points.size()); + for (LonLatPoint p : points) { + ret.add(Pair.create(p.longitude, p.latitude)); + } + return ret; + } } 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 new file mode 100644 index 0000000000..7f68078bf7 --- /dev/null +++ b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java @@ -0,0 +1,522 @@ +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; +import com.mogo.eagle.core.data.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLocation; +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; +import com.mogo.map.hdcache.IHdCacheListener; +import com.mogo.map.uicontroller.AMapUIController; +import com.mogo.map.uicontroller.CarCursorOption; +import com.mogo.map.uicontroller.IMogoMapUIController; +import com.mogo.map.uicontroller.MapCameraPosition; +import com.mogo.map.uicontroller.MapControlResult; +import com.mogo.map.uicontroller.VisualAngleMode; + +import java.util.List; + + +/** + * @author congtaowang + * @since 2019-12-26 + *

+ * 地图控制 + */ +public class MogoMapUIController implements IMogoMapUIController { + + private static final String TAG = "MogoMapUIController"; + + private IMogoMapUIController mDelegate; + + private static volatile MogoMapUIController sInstance; + + private MogoMapUIController() { + initDelegate(); + } + + private void initDelegate() { + if (mDelegate == null) { + mDelegate = AMapUIController.getInstance(); + } + } + + public static MogoMapUIController getInstance() { + if (sInstance == null) { + synchronized (MogoMapUIController.class) { + if (sInstance == null) { + sInstance = new MogoMapUIController(); + } + } + } + return sInstance; + } + + public static synchronized void release() { + sInstance = null; + } + + @Override + public MapControlResult changeZoom(float zoom) { + initDelegate(); + if (mDelegate != null) { + return mDelegate.changeZoom(zoom); + } + return MapControlResult.ERROR; + } + + @Override + public void changeZoom2(float zoom) { + initDelegate(); + if (mDelegate != null) { + mDelegate.changeZoom2(zoom); + } + } + + @Override + public void setDebugMode(Boolean debugMode) { + initDelegate(); + if (mDelegate != null) { + mDelegate.setDebugMode(debugMode); + } + } + + @Override + public void changeMapVisualAngle(VisualAngleMode angelMode, MogoLatLng mogoLatLng) { + initDelegate(); + if (mDelegate != null) { + CallerLogger.d(TAG, "set VisualAngle: " + angelMode.name()); + mDelegate.changeMapVisualAngle(angelMode, mogoLatLng); + } + } + + @Override + public void setRoamTrajectory(String trajectory) { + initDelegate(); + if (mDelegate != null) { + mDelegate.setRoamTrajectory(trajectory); + } + } + + @Override + public void setRomaMode(int mode) { + initDelegate(); + if (mDelegate != null) { + CallerLogger.d(TAG, "set setRomaMode: " + mode); + mDelegate.setRomaMode(mode); + } + } + + @Override + public VisualAngleMode getCurrentMapVisualAngle() { + initDelegate(); + if (mDelegate != null) { + return mDelegate.getCurrentMapVisualAngle(); + } + return null; + } + + @Override + public void moveToCenter(MogoLatLng latLng, boolean animate) { + initDelegate(); + if (mDelegate != null) { + mDelegate.moveToCenter(latLng, animate); + } + } + + @Override + public boolean isDayMode() { + initDelegate(); + if (mDelegate != null) { + return mDelegate.isDayMode(); + } + return false; + } + + @Override + public void showMyLocation(boolean visible) { + initDelegate(); + if (mDelegate != null) { + mDelegate.showMyLocation(visible); + } + } + + + @Override + public void showMyLocation(View view) { + initDelegate(); + if (mDelegate != null) { + mDelegate.showMyLocation(view); + } + } + + + @Override + public float getScalePerPixel() { + initDelegate(); + if (mDelegate != null) { + return mDelegate.getScalePerPixel(); + } + return 0; + } + + @Override + public float getZoomLevel() { + initDelegate(); + if (mDelegate != null) { + return mDelegate.getZoomLevel(); + } + return 0; + } + + @Override + public float getRoadWidth(double lon, double lat, float angle, boolean isGpsLocation, boolean isRTK) { + initDelegate(); + if (mDelegate != null) { + return mDelegate.getRoadWidth(lon, lat, angle, isGpsLocation, isRTK); + } + + return 0; + } + + @Override + public MogoLatLng getCameraNorthEastPosition() { + initDelegate(); + if (mDelegate != null) { + return mDelegate.getCameraNorthEastPosition(); + } + return null; + } + + @Override + public MogoLatLng getCameraSouthWestPosition() { + initDelegate(); + if (mDelegate != null) { + return mDelegate.getCameraSouthWestPosition(); + } + return null; + } + + @Override + public MogoLatLng getWindowCenterLocation() { + initDelegate(); + if (mDelegate != null) { + return mDelegate.getWindowCenterLocation(); + } + return null; + } + + @Override + public void setPointToCenter(double mapCenterX, double mapCenterY) { + initDelegate(); + if (mDelegate != null) { + mDelegate.setPointToCenter(mapCenterX, mapCenterY); + } + } + + @Override + public Point getLocationPointInScreen(MogoLatLng latLng) { + initDelegate(); + if (mDelegate != null) { + return mDelegate.getLocationPointInScreen(latLng); + } + return null; + } + + @Override + public MogoLatLng getLocationMogoLatLngInScreen(Point point) { + initDelegate(); + if (mDelegate != null) { + return mDelegate.getLocationMogoLatLngInScreen(point); + } + return null; + } + + @Override + public void setRenderFps(int fps) { + initDelegate(); + if (mDelegate != null) { + mDelegate.setRenderFps(fps); + } + } + + @Override + public void showBounds(String tag, MogoLatLng carPosition, List lonLats, Rect bound, boolean lockCarPosition) { + initDelegate(); + if (mDelegate != null) { + mDelegate.showBounds(tag, carPosition, lonLats, bound, lockCarPosition); + } + } + + @Override + public void forceRender() { + initDelegate(); + if (mDelegate != null) { + mDelegate.forceRender(); + } + } + + @Override + public float calculateLineDistance(MogoLatLng p1, MogoLatLng p2) throws Exception { + initDelegate(); + if (mDelegate != null) { + return mDelegate.calculateLineDistance(p1, p2); + } + return 0; + } + + @Override + public boolean isCarLocked() { + initDelegate(); + if (mDelegate != null) { + return mDelegate.isCarLocked(); + } + return false; + } + + @Override + public void setCarCursorOption(CarCursorOption option) { + initDelegate(); + if (mDelegate != null) { + mDelegate.setCarCursorOption(option); + } + } + + @Override + public void setCarLightsType(int type, int time) { + initDelegate(); + if (mDelegate != null) { + mDelegate.setCarLightsType(type, time); + } + } + + @Override + public MapCameraPosition getMapCameraPosition() { + initDelegate(); + if (mDelegate != null) { + return mDelegate.getMapCameraPosition(); + } + return null; + } + + @Override + public void changeBearing(float bearing) { + initDelegate(); + if (mDelegate != null) { + mDelegate.changeBearing(bearing); + } + } + + @Override + public void changeMapViewAngle(int type) { + initDelegate(); + if (mDelegate != null) { + mDelegate.changeMapViewAngle(type); + } + } + + @Override + public void changeCurrentIcon(int iconId) { + initDelegate(); + if (mDelegate != null) { + mDelegate.changeCurrentIcon(iconId); + } + } + + @Override + public long getTileId(double lon, double lat) { + if (mDelegate != null) { + return mDelegate.getTileId(lon, lat); + } + return 0; + } + + @Override + public int getLimitSpeed(double lon, double lat, float angle) { + if (mDelegate != null) { + return mDelegate.getLimitSpeed(lon, lat, angle); + } + return 0; + } + + @Override + public CenterLine getCenterLineInfo(double lon, double lat, float angle) { + if (mDelegate != null) { + return mDelegate.getCenterLineInfo(lon, lat, angle); + } + return null; + } + + @Override + public void rtkEnable(boolean enable) { + initDelegate(); + if (mDelegate != null) { + mDelegate.rtkEnable(enable); + } + } + + @Override + public void destroy() { + mDelegate = null; + } + + @Override + public void stepInVrMode(boolean isDayMode) { + initDelegate(); + if (mDelegate != null) { + mDelegate.stepInVrMode(isDayMode); + } + } + + @Override + public String getMarkerInfoResName(String speedVal) { + initDelegate(); + if (mDelegate != null) { + return mDelegate.getMarkerInfoResName(speedVal); + } + return null; + } + + @Override + public void setMarkerInfoResName(String speedVal, String val) { + initDelegate(); + if (mDelegate != null) { + mDelegate.setMarkerInfoResName(speedVal, val); + } + } + + @Override + public void setMapDAngle(float angle) { + initDelegate(); + if (mDelegate != null) { + mDelegate.setMapDAngle(angle); + } + } + + @Override + public float getAngle(double startLon, double startLat, double endLon, double endLat) { + initDelegate(); + if (mDelegate != null) { + return mDelegate.getAngle(startLon, startLat, endLon, endLat); + } + return 0.0f; + } + + @Override + public Double getRoadAngle(Double lon, Double lat, float angle) { + if (mDelegate != null) { + return mDelegate.getRoadAngle(lon, lat, angle); + } + return 0.0; + } + + @Override + public void setLockMode(boolean isLock) { + initDelegate(); + if (mDelegate != null) { + mDelegate.setLockMode(isLock); + } + } + + @Override + public void setScrollGesturesEnable(boolean isEnable) { + initDelegate(); + if (mDelegate != null) { + mDelegate.setScrollGesturesEnable(isEnable); + } + } + + @Override + public void setAllGesturesEnabled(boolean isEnable) { + initDelegate(); + if (mDelegate != null) { + mDelegate.setAllGesturesEnabled(isEnable); + } + } + + @Override + public void setExtraGPSData(MogoLocation gnssInfo) { + initDelegate(); + if (mDelegate != null) { + mDelegate.setExtraGPSData(gnssInfo); + } + } + + @Override + public void setIsDrawPointCloud(Boolean isDrawPointCloud) { + initDelegate(); + if (mDelegate != null) { + mDelegate.setIsDrawPointCloud(isDrawPointCloud); + } + } + + @Override + public void setPointCloudSize(Float pointCloudSize) { + initDelegate(); + if (mDelegate != null) { + mDelegate.setPointCloudSize(pointCloudSize); + } + } + + @Override + public void setPointCloudColor(String color) { + initDelegate(); + if (mDelegate != null) { + mDelegate.setPointCloudColor(color); + } + } + + @Override + public void cacheHDDataByCity(IHdCacheListener listener) { + if (mDelegate != null) { + mDelegate.cacheHDDataByCity(listener); + } + } + + @Override + public void cacheHDDataByCity(IHdCacheListener listener, MogoLocation location) { + if (mDelegate != null) { + mDelegate.cacheHDDataByCity(listener, location); + } + } + + @Override + public boolean isCityDataCached() { + if (mDelegate != null) { + return mDelegate.isCityDataCached(); + } + return false; + } + + @Override + public void cancelDownloadCacheData() { + if (mDelegate != null) { + mDelegate.cancelDownloadCacheData(); + } + } + + @Override + public String getCityCode() { + if (mDelegate != null) { + return mDelegate.getCityCode(); + } + return null; + } + + @Override + public void animateTo(double lon, double lat, float rotateAngle, int duration, boolean isGps) { + if (mDelegate != null) { + mDelegate.animateTo(lon, lat, rotateAngle, duration, isGps); + } + } + + @Override + public void animateTo(double lon, double lat, float v1, float v2, float v3, float v4, int duration, boolean isGps) { + if (mDelegate != null) { + mDelegate.animateTo(lon, lat, v1, v2, v3, v4, duration, isGps); + } + } +} diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapView.java b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapView.java index 8411a0a442..5df0fbf998 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapView.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapView.java @@ -55,7 +55,7 @@ public class MogoMapView extends MogoBaseMapView implements ILifeCycle { if (mapView != null) { addView(mapView, new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)); } else { - CallerLogger.INSTANCE.e(TAG, "create MapView instance failed."); + CallerLogger.e(TAG, "create MapView instance failed."); } } } @@ -82,25 +82,25 @@ public class MogoMapView extends MogoBaseMapView implements ILifeCycle { @Override public void onCreate(Bundle bundle) { super.onCreate(bundle); - CallerLogger.INSTANCE.d(TAG, "onCreate"); + CallerLogger.d(TAG, "onCreate"); } @Override public void onResume() { super.onResume(); - CallerLogger.INSTANCE.d(TAG, "onResume"); + CallerLogger.d(TAG, "onResume"); } @Override public void onPause() { super.onPause(); - CallerLogger.INSTANCE.d(TAG, "onPause"); + CallerLogger.d(TAG, "onPause"); } @Override public void onDestroy() { super.onDestroy(); - CallerLogger.INSTANCE.d(TAG, "onDestroy"); + CallerLogger.d(TAG, "onDestroy"); } @Override diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/utils/PointInterpolatorUtil.java b/libraries/mogo-map/src/main/java/com/mogo/map/utils/PointInterpolatorUtil.java index a89a9ddf2d..f68b2ce783 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/utils/PointInterpolatorUtil.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/utils/PointInterpolatorUtil.java @@ -39,13 +39,13 @@ public class PointInterpolatorUtil { MogoLatLng current = points.get(i); MogoLatLng next = points.get(i + 1); float distance = CoordinateUtils.calculateLineDistance(current.lon, current.lat, next.lon, next.lat); - CallerLogger.INSTANCE.d(TAG, i + ": " + distance); + CallerLogger.d(TAG, i + ": " + distance); if (distance > DISTANCE_THRESHOLD) { int inter = (int) (distance / DISTANCE_THRESHOLD) + 1; for (int j = 1; j < inter; j++) { double newLat = current.lat + (next.lat - current.lat) * j / inter; double newLon = current.lon + (next.lon - current.lon) * j / inter; - CallerLogger.INSTANCE.d(TAG, "distance: " + distance + ", j: " + j + ", nextLat: " + next.lat + ", nextLon: " + next.lon + ", newLat: " + newLat + ", newLon: " + newLon); + CallerLogger.d(TAG, "distance: " + distance + ", j: " + j + ", nextLat: " + next.lat + ", nextLon: " + next.lon + ", newLat: " + newLat + ", newLon: " + newLon); points.add(i + 1, new MogoLatLng(newLat, newLon)); current = points.get(++i); } 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 266a399abf..b0c6964cfa 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 @@ -206,7 +206,7 @@ public class ApmCrashReportProvider implements ITestCrashReportProvider { //************************************* CMDB绑定的信息 *********************************************** if (mInfo != null) { - CallerLogger.INSTANCE.d(TAG, "nuber = " + mInfo.getNumber_plate() + "--brand = " + mInfo.getBrand() + "--modle = " + mInfo.getModel()); + CallerLogger.d(TAG, "nuber = " + mInfo.getNumber_plate() + "--brand = " + mInfo.getBrand() + "--modle = " + mInfo.getModel()); map.put("CMDB_PLATE_NUMBER", mInfo.getNumber_plate()); map.put("CMDB_BRAND", mInfo.getBrand()); map.put("CMDB_MODEL", mInfo.getModel()); diff --git a/tts/tts-pad/src/main/java/com/mogo/tts/pad/PadTTS.java b/tts/tts-pad/src/main/java/com/mogo/tts/pad/PadTTS.java index c96d698363..4c3e8705cf 100644 --- a/tts/tts-pad/src/main/java/com/mogo/tts/pad/PadTTS.java +++ b/tts/tts-pad/src/main/java/com/mogo/tts/pad/PadTTS.java @@ -71,7 +71,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList private LinkedList> linkedList = new LinkedList<>(); public void release() { - CallerLogger.INSTANCE.d(TAG, "release"); + CallerLogger.d(TAG, "release"); ThreadUtils.runOnUiThread(() -> { if (mCmdMap != null && !mCmdMap.isEmpty() && mVoiceClient != null) { for (String cmd : mCmdMap.keySet()) { @@ -143,7 +143,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList private void initTtsConfig(String sn) { try { - CallerLogger.INSTANCE.d(TAG, "initTtsConfig"); + CallerLogger.d(TAG, "initTtsConfig"); //在线授权配置 AuthConfig.Builder onlineBuilder = new AuthConfig.Builder() .setType(AuthType.ONLINE) @@ -183,7 +183,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList .create(), new DUILiteSDK.InitListener() { @Override public void success() { - CallerLogger.INSTANCE.d(TAG, "授权成功"); + CallerLogger.d(TAG, "授权成功"); isAuthing = false; ThreadUtils.runOnUiThread(() -> { mHasAuth = true; @@ -193,7 +193,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList @Override public void error(String errorCode, final String errorInfo) { - CallerLogger.INSTANCE.e(TAG, "error code : " + errorCode + " , error info :" + errorInfo); + CallerLogger.e(TAG, "error code : " + errorCode + " , error info :" + errorInfo); isAuthing = false; if (retryCount++ < 3) { initDUILiteSDK(onlineBuilder, echoConfig); @@ -203,15 +203,15 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList }); // boolean isAuthorized = DUILiteSDK.isAuthorized(mContext);//查询授权状态，DUILiteSDK.init之后随时可以调 -// CallerLogger.INSTANCE.d(TAG, "DUILite SDK is isAuthorized ？ " + isAuthorized); +// CallerLogger.d(TAG, "DUILite SDK is isAuthorized ？ " + isAuthorized); // // String core_version = DUILiteSDK.getCoreVersion();//获取内核版本号 -// CallerLogger.INSTANCE.d(TAG, "core version is: " + core_version); +// CallerLogger.d(TAG, "core version is: " + core_version); } private void initTtsEngine() { if (isInitEngine) return; - CallerLogger.INSTANCE.d(TAG, "initTtsEngine"); + CallerLogger.d(TAG, "initTtsEngine"); // AILocalTTSConfig config = new AILocalTTSConfig(); // // 设置assets目录下合成字典名 // config.setDictResource(TTS_DICT_RES);//普通话字典 @@ -260,7 +260,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList * 初始化 */ private void initSpeech(Context context) { - CallerLogger.INSTANCE.d(TAG, "initSpeech"); + CallerLogger.d(TAG, "initSpeech"); mogoVoiceManager = MogoVoiceManagerImpl.getInstance(); mogoVoiceManager.init(context, new OnConnStatusListener() { @Override @@ -290,7 +290,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList if (!mCmdMap.containsKey(cmd)) { return; } - CallerLogger.INSTANCE.d(TAG, "received command : " + cmd); + CallerLogger.d(TAG, "received command : " + cmd); Iterator iterator = null; try { @@ -403,7 +403,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList * @param text */ public void speakTTSVoice(String text) { - CallerLogger.INSTANCE.d(TAG, "speakTTSVoice"); + CallerLogger.d(TAG, "speakTTSVoice"); if (mEngine != null && mHasAuth) { // 合成并播放 mEngine.speak(text, text, mAILocalTTSIntent); @@ -416,14 +416,14 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList if (ttsLevel == curTtsLevel) { // 对应p3、p2级别的排队 if (ttsLevel == 0 || ttsLevel == 1) { - CallerLogger.INSTANCE.d(TAG, "==================="); - CallerLogger.INSTANCE.d(TAG, "插入消息：" + text + ",level为：" + ttsLevel); + CallerLogger.d(TAG, "==================="); + CallerLogger.d(TAG, "插入消息：" + text + ",level为：" + ttsLevel); insertTts(text, ttsLevel); return; } else { // 打断并合成新的 stopTts(); - CallerLogger.INSTANCE.d(TAG, "非Level1同级别打断!"); + CallerLogger.d(TAG, "非Level1同级别打断!"); } } else { // 将要TTS的比现在正在TTS的优先级高 @@ -432,11 +432,11 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList // 打断并合成高优先级的 stopTts(); } - CallerLogger.INSTANCE.d(TAG, "高优先级打断低级别的!"); + CallerLogger.d(TAG, "高优先级打断低级别的!"); } else { if (ttsLevel == 0 || ttsLevel == 1) { - CallerLogger.INSTANCE.d(TAG, "==================="); - CallerLogger.INSTANCE.d(TAG, "插入消息：" + text + ",level为：" + ttsLevel); + CallerLogger.d(TAG, "==================="); + CallerLogger.d(TAG, "插入消息：" + text + ",level为：" + ttsLevel); insertTts(text, ttsLevel); } return; @@ -445,7 +445,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList curTtsLevel = ttsLevel; curTtsContent = text; // 合成并播放 - CallerLogger.INSTANCE.d(TAG, "tts准备合成：" + text + ",curTtsLevel为：" + curTtsLevel); + CallerLogger.d(TAG, "tts准备合成：" + text + ",curTtsLevel为：" + curTtsLevel); mEngine.speak(text, text, mAILocalTTSIntent); } } @@ -477,9 +477,9 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList } for (Pair ttsPair: linkedList) { - CallerLogger.INSTANCE.d(TAG, "tts文本为：" + ttsPair.first + ",level为：" + ttsPair.second); + CallerLogger.d(TAG, "tts文本为：" + ttsPair.first + ",level为：" + ttsPair.second); } - CallerLogger.INSTANCE.d(TAG, "==================="); + CallerLogger.d(TAG, "==================="); } /** @@ -579,7 +579,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList mVoiceClient.registerCustomWakeupCmd(cmd, cmdWords); mCacheUnWakeupCommands.remove(cmd); } - CallerLogger.INSTANCE.i(TAG, "cache un wakeup command2. " + cmd); + CallerLogger.i(TAG, "cache un wakeup command2. " + cmd); mCacheUnWakeupCommands.put(cmd, cmdWords); } @@ -595,7 +595,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList mVoiceClient.registerCustomWakeupCmd(cmd, cmdWords); mCacheUnWakeupCommands.remove(cmd); } - CallerLogger.INSTANCE.i(TAG, "cache un wakeup command. " + cmd); + CallerLogger.i(TAG, "cache un wakeup command. " + cmd); mCacheUnWakeupCommands.put(cmd, cmdWords); } @@ -647,14 +647,14 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList * @param status window_start_cancel 0 - 结束， 1 - 显示， 2 - 未激活调试进入 */ public static void startAssistant(Context context, int status) { - CallerLogger.INSTANCE.w(TAG, "startAssistant status = " + status); + CallerLogger.w(TAG, "startAssistant status = " + status); final Intent intent = new Intent(); intent.setFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES); intent.setAction("pvetec.intent.action.txz.switch"); intent.putExtra("window_start_cancel", status); intent.putExtra("extra_switch_type", "window_start_cancel"); - CallerLogger.INSTANCE.d(TAG, "status = " + status); + CallerLogger.d(TAG, "status = " + status); context.sendBroadcast(intent); } @@ -663,7 +663,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList return; } mHasFlush = true; - CallerLogger.INSTANCE.d(TAG, "flush cache voice command when voice service ready."); + CallerLogger.d(TAG, "flush cache voice command when voice service ready."); final Map tmp = new HashMap<>(mCacheUnWakeupCommands); for (String cmd : tmp.keySet()) { registerUnWakeupCommand(cmd, tmp.get(cmd)); @@ -672,11 +672,11 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList private boolean isVoiceServiceReady(Context context) { if (isProcessRunning(context, getPackageUid(context, "com.zhidao.speech"))) { - CallerLogger.INSTANCE.d(TAG, "pad txz is voiceServiceReady"); + CallerLogger.d(TAG, "pad txz is voiceServiceReady"); return true; } else if (isProcessRunning(context, getPackageUid(context, "com.txznet.txz")) && isProcessRunning(context, getPackageUid(context, "com.txznet.adapter"))) { - CallerLogger.INSTANCE.d(TAG, "txz is voiceServiceReady"); + CallerLogger.d(TAG, "txz is voiceServiceReady"); return true; } return true; @@ -762,7 +762,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList } else { initSpeech(context); } - CallerLogger.INSTANCE.w(TAG, "voice is mHasFlush = " + mHasFlush + " mInitReady= " + mInitReady); + CallerLogger.w(TAG, "voice is mHasFlush = " + mHasFlush + " mInitReady= " + mInitReady); } } @@ -773,13 +773,13 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList @Override public void startAIAssist(Context context, int status) { - CallerLogger.INSTANCE.w(TAG, "startAIAssist status = " + status); + CallerLogger.w(TAG, "startAIAssist status = " + status); final Intent intent = new Intent(); intent.setFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES); intent.setAction("pvetec.intent.action.txz.switch"); intent.putExtra("window_start_cancel", status); intent.putExtra("extra_switch_type", "window_start_cancel"); - CallerLogger.INSTANCE.d(TAG, "status = " + status); + CallerLogger.d(TAG, "status = " + status); context.sendBroadcast(intent); } @@ -787,17 +787,17 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList @Override public void onInit(int status) { - CallerLogger.INSTANCE.d(TAG, "初始化完成，返回值：" + status); + CallerLogger.d(TAG, "初始化完成，返回值：" + status); if (status == AIConstant.OPT_SUCCESS) { - CallerLogger.INSTANCE.d(TAG, "初始化成功!"); + CallerLogger.d(TAG, "初始化成功!"); } else { - CallerLogger.INSTANCE.d(TAG, "初始化失败!code:" + status); + CallerLogger.d(TAG, "初始化失败!code:" + status); } } @Override public void onError(String utteranceId, AIError aiError) { - CallerLogger.INSTANCE.d(TAG, "检测到错误:" + aiError.toString()); + CallerLogger.d(TAG, "检测到错误:" + aiError.toString()); curTtsLevel = -1; curTtsContent = ""; IMogoTTSCallback callBack = PadTTS.this.mSpeakVoiceMap.remove(utteranceId); @@ -808,14 +808,14 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList @Override public void onReady(String s) { - CallerLogger.INSTANCE.d(TAG, "开始播放"); + CallerLogger.d(TAG, "开始播放"); } @Override public void onCompletion(String utteranceId) { curTtsLevel = -1; curTtsContent = ""; - CallerLogger.INSTANCE.d(TAG, "播放完成"); + CallerLogger.d(TAG, "播放完成"); ttsNext(); IMogoTTSCallback callBack = PadTTS.this.mSpeakVoiceMap.remove(utteranceId); if (callBack != null) { @@ -825,12 +825,12 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList @Override public void onProgress(int currentTime, int totalTime, boolean isRefTextTTSFinished) { - //CallerLogger.INSTANCE.d(TAG, "当前:" + currentTime + "ms, 总计:" + totalTime + "ms, 可信度:" + isRefTextTTSFinished); + //CallerLogger.d(TAG, "当前:" + currentTime + "ms, 总计:" + totalTime + "ms, 可信度:" + isRefTextTTSFinished); } @Override public void onSynthesizeStart(String utteranceId) { - CallerLogger.INSTANCE.d(TAG, "合成开始"); + CallerLogger.d(TAG, "合成开始"); } @Override @@ -841,7 +841,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList @Override public void onSynthesizeFinish(String utteranceId) { - CallerLogger.INSTANCE.d(TAG, "合成结束"); + CallerLogger.d(TAG, "合成结束"); } } @@ -849,11 +849,11 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList private void ttsNext() { if (!linkedList.isEmpty()) { Pair ttsPair = linkedList.removeFirst(); - CallerLogger.INSTANCE.i(TAG, "排队播放的下一条文本为：" + ttsPair.first + ",级别为：" + ttsPair.second); + CallerLogger.i(TAG, "排队播放的下一条文本为：" + ttsPair.first + ",级别为：" + ttsPair.second); curTtsLevel = ttsPair.second; speakTTSVoice(ttsPair.first); } else { - CallerLogger.INSTANCE.i(TAG, "队列为空"); + CallerLogger.i(TAG, "队列为空"); } }