yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replace taxi and bus logger to callerlogger

Browse Source
This commit is contained in:
zhongchao
2022-03-17 20:02:42 +08:00
parent 1a262230ca
commit 11dd8057b1
37 changed files with 356 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/OchBusProvider.java
View File

@@ -1,12 +1,14 @@
package com.mogo.och.bus;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS;
import android.content.Context;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
import com.mogo.map.MogoMapUIController;
import com.mogo.module.common.MogoApisHandler;
@@ -36,7 +38,7 @@ public class OchBusProvider implements IMogoOCH {
* 进入鹰眼模式，设置手势缩放地图失效
*/
private void stepIntoVrMode(){
Logger.d( TAG, "进入vr模式" );
CallerLogger.INSTANCE.d( M_BUS + TAG, "进入vr模式" );
MogoMapUIController.getInstance()
.openVrMode(false);
}
@@ -51,18 +53,18 @@ public class OchBusProvider implements IMogoOCH {
private void showFragment() {
if (busFragment == null) {
Logger.d(TAG, "准备add fragment======");
CallerLogger.INSTANCE.d(TAG, "准备add fragment======");
busFragment = new OchBusFragment();
activity.getSupportFragmentManager().beginTransaction().add(containerId, busFragment).commitAllowingStateLoss();
return;
}
Logger.d(TAG, "准备show fragment");
CallerLogger.INSTANCE.d(TAG, "准备show fragment");
activity.getSupportFragmentManager().beginTransaction().show(busFragment).commitAllowingStateLoss();
}
private void hideFragment() {
if (busFragment != null) {
Logger.d(TAG, "准备hide fragment");
CallerLogger.INSTANCE.d(TAG, "准备hide fragment");
activity.getSupportFragmentManager().beginTransaction().hide(busFragment).commitAllowingStateLoss();
}

2
OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/adapter/OchBusStationAdapter.java
View File

@@ -53,7 +53,7 @@ public class OchBusStationAdapter extends RecyclerView.Adapter<OchBusStationAdap
@Override
public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
// Logger.d("OchBusStationAdapter", "position: " + position + " currPos: " + currentStation + " station: " + stationList.get(position));
// CallerLogger.INSTANCE.d(M_BUS + "OchBusStationAdapter", "position: " + position + " currPos: " + currentStation + " station: " + stationList.get(position));
holder.tvStationName.setText(stationList.get(position).getName());
if (position == currentStation) {
if (currentStation == 0) {

9
OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseOchBusTabFragment.java
View File

@@ -1,9 +1,10 @@
package com.mogo.och.bus.fragment;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS;
import android.animation.ObjectAnimator;
import android.content.Intent;
import android.graphics.Color;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.animation.LinearInterpolator;
@@ -28,7 +29,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListener
import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotIdentifyListenerManager;
import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager;
import com.mogo.eagle.core.function.call.hmi.CallerHmiManager;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
import com.mogo.map.MogoMapUIController;
import com.mogo.map.MogoMarkerManager;
@@ -136,7 +137,7 @@ public abstract class BaseOchBusTabFragment<V extends IView, P extends Presenter
if (DebugConfig.isDebug()) {
mouduleArc.setLongClickable(true);
mouduleArc.setOnLongClickListener(v -> {
Log.d(TAG, "长按显示状态工具栏");
CallerLogger.INSTANCE.d(M_BUS + TAG, "长按显示状态工具栏");
Intent intent = new Intent();
intent.putExtra("oper", 52);
MogoApisHandler.getInstance().getApis().getIntentManagerApi().invoke("com.mogo.mock", intent);
@@ -299,7 +300,7 @@ public abstract class BaseOchBusTabFragment<V extends IView, P extends Presenter
}
private void changeAutopilotBtnView(int autopilotStatus, boolean isAnimateRunning) {
Logger.d(TAG, "onStateChangeChangeAutopilotBtnView: " + autopilotStatus + "isAnimateRunning = " + isAnimateRunning);
CallerLogger.INSTANCE.d(M_BUS + TAG, "onStateChangeChangeAutopilotBtnView: " + autopilotStatus + "isAnimateRunning = " + isAnimateRunning);
if (IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE
== autopilotStatus) {//0不可用
if (isAnimateRunning) {

22
OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/OchBusFragment.java
View File

@@ -1,25 +1,24 @@
package com.mogo.och.bus.fragment;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS;
import android.content.Intent;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.util.Log;
import android.view.View;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.mogo.commons.AbsMogoApplication;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.commons.voice.AIAssist;
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.eagle.core.utilcode.mogo.toast.TipToast;
import com.mogo.map.MogoMarkerManager;
import com.mogo.map.marker.MogoMarkerOptions;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.och.bus.R;
import com.mogo.och.bus.bean.OchBusStation;
import com.mogo.och.bus.constant.OchBusConst;
@@ -27,7 +26,6 @@ import com.mogo.och.bus.presenter.OchBusPresenter;
import com.mogo.och.bus.ui.BusSwitchLineActivity;
import com.mogo.och.bus.view.SlidePanelView;
import java.util.ArrayList;
import java.util.List;
import mogo.telematics.pad.MessagePad;
@@ -88,7 +86,7 @@ public class OchBusFragment extends BaseOchBusTabFragment<OchBusFragment, OchBus
});
}
Logger.d(TAG, "initView: " + CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getState());
CallerLogger.INSTANCE.d(M_BUS + TAG, "initView: " + CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getState());
// 初始化的时候设置 UI 按钮状态
switch (CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getState()) {
case IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE:
@@ -153,7 +151,7 @@ public class OchBusFragment extends BaseOchBusTabFragment<OchBusFragment, OchBus
*/
private void renderCurrentStationStatus(List<OchBusStation> stationList, int currentStation
, int nextStation, boolean isArrived) {
Log.d("MapMaker= ", "currentStation=" + currentStation + ",nextStation=" + nextStation + "isArrived=" + isArrived);
CallerLogger.INSTANCE.d(M_BUS + "MapMaker ", "currentStation=" + currentStation + ",nextStation=" + nextStation + "isArrived=" + isArrived);
String currentStationName = null;
String nextStationName = null;
int startStationFlagVisibility = View.INVISIBLE;
@@ -174,13 +172,13 @@ public class OchBusFragment extends BaseOchBusTabFragment<OchBusFragment, OchBus
startStationFlagVisibility = View.VISIBLE;
isArriveAtStartStation = true;
mStartStationFlag.setText(getResources().getString(R.string.bus_arrive_to_end_start));
// Log.d("MapMaker= ","起点=");
// CallerLogger.INSTANCE.d("MapMaker= ","起点=");
setOrRemoveMapMaker(true, OchBusConst.BUS_START_MAP_MAKER, startStation.getLat()
, startStation.getLon(), R.drawable.icon_station_start_end);
setOrRemoveMapMaker(true, OchBusConst.BUS_END_MAP_MAKER, endStation.getLat()
, endStation.getLon(), R.drawable.icon_station_start_end);
} else if (currentStation > 0 && currentStation < stationList.size() - 1) {// 是否到达站点
// Log.d("MapMaker= ","中间=");
// CallerLogger.INSTANCE.d("MapMaker= ","中间=");
isArriveAtStation = true;
// mStartStationFlag.setText(getResources().getString(R.string.bus_arrive_to_end_start1));
setOrRemoveMapMaker(false, OchBusConst.BUS_START_MAP_MAKER, startStation.getLat()
@@ -188,7 +186,7 @@ public class OchBusFragment extends BaseOchBusTabFragment<OchBusFragment, OchBus
setOrRemoveMapMaker(true, OchBusConst.BUS_END_MAP_MAKER, endStation.getLat()
, endStation.getLon(), R.drawable.icon_station_start_end);
} else if (currentStation == stationList.size() - 1) {// 是否到达终点
// Log.d("MapMaker= ","终点=");
// CallerLogger.INSTANCE.d("MapMaker= ","终点=");
isArriveEndStation = true;
nextStationName = "--";
mStartStationFlag.setText(getResources().getString(R.string.bus_arrive_to_end_end));
@@ -323,7 +321,7 @@ public class OchBusFragment extends BaseOchBusTabFragment<OchBusFragment, OchBus
*/
private void setOrRemoveMapMaker(boolean isAdd, String uuid, double lat, double longi, int iconId) {
if (isAdd) {
Log.d("setMapMaker= ", uuid + "=latitude=" + lat + ",longitude=" + longi);
CallerLogger.INSTANCE.d("setMapMaker= ", uuid + "=latitude=" + lat + ",longitude=" + longi);
MogoMarkerOptions options = new MogoMarkerOptions();
options.anchorColor("#000000");//不设置报错，暂时随便设置个
options.setGps(true);//使用wgs 必须设置true
@@ -334,7 +332,7 @@ public class OchBusFragment extends BaseOchBusTabFragment<OchBusFragment, OchBus
options.longitude(longi);
MogoMarkerManager.getInstance(AbsMogoApplication.getApp()).addMarker(uuid, options);
}else {
Log.d("RemoveMapMaker=",uuid+"=latitude="+lat+",longitude="+longi);
CallerLogger.INSTANCE.d("RemoveMapMaker=",uuid+"=latitude="+lat+",longitude="+longi);
MogoMarkerManager.getInstance(AbsMogoApplication.getApp()).removeMarkers(uuid);
}
}

10
OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/net/OCHBusServiceManager.java
View File

@@ -1,12 +1,14 @@
package com.mogo.och.bus.net;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS;
import android.content.Context;
import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
import com.mogo.eagle.core.data.BaseData;
import com.mogo.eagle.core.network.RequestOptions;
import com.mogo.eagle.core.network.SubscribeImpl;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.och.bus.bean.BusQueryLinesResponse;
import com.mogo.och.bus.bean.CarHeartbeatReqBean;
@@ -247,7 +249,7 @@ public class OCHBusServiceManager {
@Override
public void onSuccess(T o) {
super.onSuccess(o);
Logger.e(TAG,apiName + ": onSuccess() " + o.msg);
CallerLogger.INSTANCE.e(M_BUS + TAG,apiName + ": onSuccess() " + o.msg);
if (callback != null) {
callback.onSuccess(o);
}
@@ -256,7 +258,7 @@ public class OCHBusServiceManager {
@Override
public void onError(String message, int code) {
super.onError(message, code);
Logger.e(TAG,apiName + ": onError() " +"msg="+ message+" code="+code);
CallerLogger.INSTANCE.e(M_BUS + TAG,apiName + ": onError() " +"msg="+ message+" code="+code);
if (callback != null) {
callback.onFail("msg="+ message+" code="+code);
}
@@ -265,7 +267,7 @@ public class OCHBusServiceManager {
@Override
public void onError(Throwable e) {
super.onError(e);
Logger.e(TAG,apiName + ": onError() " +" e="+e.getMessage());
CallerLogger.INSTANCE.e(M_BUS + TAG,apiName + ": onError() " +" e="+e.getMessage());
if (callback != null) {
callback.onFail(e.getMessage());
}

1
OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusLineModel.java
View File

@@ -3,7 +3,6 @@ package com.mogo.och.bus.presenter;
import android.content.Context;
import com.mogo.commons.AbsMogoApplication;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
import com.mogo.eagle.core.utilcode.mogo.toast.TipToast;
import com.mogo.och.bus.bean.BusQueryLinesResponse;
import com.mogo.och.bus.bean.OchBusRoutesResponse;

8
OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusModelLoopManager.java
View File

@@ -1,6 +1,8 @@
package com.mogo.och.bus.presenter;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.och.bus.constant.OchBusConst;
import java.util.concurrent.TimeUnit;
@@ -33,7 +35,7 @@ public class OchBusModelLoopManager {
if (mHeartbeatDisposable != null && !mHeartbeatDisposable.isDisposed()) {
return;
}
Logger.i(TAG, "startHeartbeatLoop()");
CallerLogger.INSTANCE.i(M_BUS + TAG, "startHeartbeatLoop()");
mHeartbeatDisposable = Observable.interval(OchBusConst.LOOP_DELAY,
OchBusConst.LOOP_PERIOD_60S, TimeUnit.MILLISECONDS)
.map((aLong -> aLong + 1))
@@ -44,7 +46,7 @@ public class OchBusModelLoopManager {
public void stopHeartbeatLoop() {
if (mHeartbeatDisposable != null) {
Logger.i(TAG, "stopHeartbeatLoop()");
CallerLogger.INSTANCE.i(M_BUS + TAG, "stopHeartbeatLoop()");
mHeartbeatDisposable.dispose();
mHeartbeatDisposable = null;
}

81
OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusOrderModel.java
View File

@@ -1,5 +1,6 @@
package com.mogo.och.bus.presenter;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS;
import static com.mogo.och.bus.constant.OchBusConst.STATION_STATUS_STOPPED;
import android.content.Context;
@@ -7,20 +8,18 @@ import android.location.Location;
import android.os.Handler;
import android.os.Message;
import android.text.TextUtils;
import android.util.Log;
import com.mogo.commons.AbsMogoApplication;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.commons.voice.AIAssist;
import com.mogo.eagle.core.data.BaseData;
import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters;
import com.mogo.eagle.core.data.autopilot.AutopilotStationInfo;
import com.mogo.eagle.core.data.config.FunctionBuildConfig;
import com.mogo.eagle.core.data.map.MogoLocation;
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager;
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.eagle.core.utilcode.mogo.toast.TipToast;
import com.mogo.eagle.core.utilcode.util.NetworkUtils;
import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
@@ -148,31 +147,31 @@ public class OchBusOrderModel {
public void accept(Throwable e) {
if (e instanceof UndeliverableException) {
e = e.getCause();
Log.d(TAG,"UndeliverableException");
CallerLogger.INSTANCE.d(M_BUS + TAG,"UndeliverableException");
}
if ((e instanceof IOException)) {//
// fine, irrelevant network problem or API that throws on cancellation
Log.d(TAG,"IOException");
CallerLogger.INSTANCE.d(M_BUS + TAG,"IOException");
return;
}
if (e instanceof InterruptedException) {
// fine, some blocking code was interrupted by a dispose call
Log.d(TAG,"InterruptedException");
CallerLogger.INSTANCE.d(M_BUS + TAG,"InterruptedException");
return;
}
if ((e instanceof NullPointerException) || (e instanceof IllegalArgumentException)) {
// that's likely a bug in the application
Log.d(TAG,"NullPointerException or IllegalArgumentException");
CallerLogger.INSTANCE.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
Log.d(TAG,"IllegalStateException");
CallerLogger.INSTANCE.d(M_BUS + TAG,"IllegalStateException");
Thread.currentThread().getUncaughtExceptionHandler().uncaughtException(Thread.currentThread(), e);
return;
}
Log.d(TAG,"Undeliverable exception");
CallerLogger.INSTANCE.d(M_BUS + TAG,"Undeliverable exception");
}
});
@@ -216,7 +215,7 @@ public class OchBusOrderModel {
@Override
public void onSuccess(OchBusOrdersResponse o) {
if (o.data != null && o.data.orders != null && o.data.orders.size() > 0) {
Logger.d( TAG, "获取到bus订单数据: " + o.data.orders.toString() );
CallerLogger.INSTANCE.d( M_BUS + TAG, "获取到bus订单数据: " + o.data.orders.toString() );
List<OchBusOrder> busOrders = o.data.orders;
for (int i = 0; i < busOrders.size(); i++) {
OchBusOrder order = busOrders.get(i);
@@ -231,7 +230,7 @@ public class OchBusOrderModel {
e.printStackTrace();
tailNum = order.getPassengerPhone();
}
Logger.d(TAG, "TTS:" + tailNum);
CallerLogger.INSTANCE.d(M_BUS + TAG, "TTS:" + tailNum);
AIAssist.getInstance(mContext).speakTTSVoice("接到新订单，尾号 " + tailNum
+ " 上车站点为 " + order.getStartStationName());
prevBusOrderNos.add(order.getOrderNo());
@@ -284,11 +283,11 @@ public class OchBusOrderModel {
};
// 自车定位
private IMogoCarLocationChangedListener2 mCarLocationChangedListener2 = new IMogoCarLocationChangedListener2() {
private final IMogoCarLocationChangedListener2 mCarLocationChangedListener2 = new IMogoCarLocationChangedListener2() {
@Override
public void onCarLocationChanged2( Location location ) {
// Log.d(TAG,"location = "+location.getLongitude()+","+location.getLatitude());
// CallerLogger.INSTANCE.d(M_BUS + TAG,"location = "+location.getLongitude()+","+location.getLatitude());
IMogoServiceApis apis = MogoApisHandler.getInstance().getApis();
MogoLocation mogoLocation = new MogoLocation();
mogoLocation.setAccuracy(location.getAccuracy());
@@ -320,7 +319,7 @@ public class OchBusOrderModel {
* 查询小巴路线
*/
public void queryBusRoutes() {
Logger.d( TAG, "查询小巴路线");
CallerLogger.INSTANCE.d(M_BUS + TAG, "查询小巴路线");
OCHBusServiceManager.getInstance().queryBusRoutes(mContext, new OCHServiceCallback<OchBusRoutesResponse>() {
@Override
public void onSuccess(OchBusRoutesResponse data) {
@@ -330,7 +329,7 @@ public class OchBusOrderModel {
|| data.getResult().getSites().isEmpty() ) {
return;
}
Logger.d( TAG, "获取到小巴路线数据: " + data );
CallerLogger.INSTANCE.d(M_BUS + TAG, "获取到小巴路线数据: " + data );
renderBusStationsStatus( data.getResult());
}
@Override
@@ -346,12 +345,12 @@ public class OchBusOrderModel {
* 测试、重置站点状态
*/
public void debugResetStationStatus() {
Logger.d( TAG, "测试、重置站点状态");
CallerLogger.INSTANCE.d( M_BUS + TAG, "测试、重置站点状态");
OCHBusServiceManager.getInstance().resetStationStatus(mContext, currentLineId
, new OCHServiceCallback<OchBusRoutesResponse>() {
@Override
public void onSuccess(OchBusRoutesResponse o) {
Logger.d(TAG, "获取到小巴路线数据: " + o);
CallerLogger.INSTANCE.d(M_BUS + TAG, "获取到小巴路线数据: " + o);
isGoingToNextStation = false;
if (o.getResult() == null || o.getResult().getSites() == null || o.getResult().getSites().isEmpty()) {
return;
@@ -372,7 +371,7 @@ public class OchBusOrderModel {
* 离站上报
*/
public void leaveStation(boolean isOneWayOver,boolean isRestart){
Log.d(TAG,"leaveStation-backgroundCurrentStationIndex = "+backgroundCurrentStationIndex);
CallerLogger.INSTANCE.d(M_BUS + TAG,"leaveStation-backgroundCurrentStationIndex = "+backgroundCurrentStationIndex);
OCHBusServiceManager.getInstance().leaveStation(mContext, stationList.get(backgroundCurrentStationIndex).getSeq()
, stationList.get(backgroundCurrentStationIndex).getSiteId(), new OCHServiceCallback<OchBusRoutesResponse>() {
@Override
@@ -381,11 +380,11 @@ public class OchBusOrderModel {
return;
}
if (!isOneWayOver){
Logger.d( TAG, "自动驾驶开启开往下一站====" );
CallerLogger.INSTANCE.d( M_BUS + TAG, "自动驾驶开启开往下一站====" );
//需要更改当前站和下一站的状态 然后渲染
RenderLeaveStationSuccess(o.getResult(),isRestart);
}else {
Logger.d( TAG, "单程真的结束了====" );
CallerLogger.INSTANCE.d( M_BUS + TAG, "单程真的结束了====" );
isGoingToNextStation = false;
currentStationIndex = 0;
backgroundCurrentStationIndex = 0;
@@ -443,7 +442,7 @@ public class OchBusOrderModel {
currentAutopilot.endLatLon = new AutopilotControlParameters
.AutoPilotLonLat( nextStation.getLat(), nextStation.getLon() );
currentAutopilot.vehicleType = VEHICLE_TYPE;
Logger.d( TAG, "开启自动驾驶====" + currentAutopilot.toString()
CallerLogger.INSTANCE.d( M_BUS + TAG, "开启自动驾驶====" + currentAutopilot.toString()
+" startLatLon="+currentStation.getName()+"，endLatLon="+nextStation.getName());
CallerAutoPilotManager.INSTANCE.startAutoPilot(currentAutopilot);
if (mControllerStatusCallback != null) {
@@ -455,13 +454,13 @@ public class OchBusOrderModel {
* 到站后重置站点状态
*/
private void arriveSiteStation(boolean isRestart) {
Log.d(TAG,"arriveSiteStation-currentStationIndex = "+currentStationIndex);
CallerLogger.INSTANCE.d(M_BUS + TAG,"arriveSiteStation-currentStationIndex = "+currentStationIndex);
OCHBusServiceManager.getInstance().arriveSiteStation(mContext
, stationList.get(currentStationIndex).getSeq(), stationList.get(currentStationIndex).getSiteId()
, new OCHServiceCallback<BaseData>() {
@Override
public void onSuccess(BaseData o) {
Log.d(TAG,"arriveSiteStation success");
CallerLogger.INSTANCE.d(M_BUS + TAG,"arriveSiteStation success");
if (!isRestart){
renderArriveBusStation();
}
@@ -491,7 +490,7 @@ public class OchBusOrderModel {
* 查询到站下车乘客
*/
private void queryStationLeaveAwayPassengers() {
Logger.d( TAG, "查询到站下车乘客");
CallerLogger.INSTANCE.d( M_BUS + TAG, "查询到站下车乘客");
OCHBusServiceManager.getInstance().queryStationLeaveAwayPassengers(mContext
, stationList.get(currentStationIndex).getSeq(), stationList.get(currentStationIndex).getSiteId()
@@ -565,14 +564,14 @@ public class OchBusOrderModel {
* 查询运营状态
*/
public void queryOperationStatus() {
Logger.d( TAG, "查询运营状态");
CallerLogger.INSTANCE.d( M_BUS + TAG, "查询运营状态");
OCHBusServiceManager.getInstance().queryOperationStatus(mContext
, new OCHServiceCallback<OchBusOperationStatusResponse>() {
@Override
public void onSuccess(OchBusOperationStatusResponse o) {
if ( o.data != null ) {
mIsWorking = o.data.serviceStatus == 1;
Logger.d( TAG, "查询运营状态 result.status: " + o.data.serviceStatus);
CallerLogger.INSTANCE.d( M_BUS + TAG, "查询运营状态 result.status: " + o.data.serviceStatus);
startOrStopOrderLoop(mIsWorking);
}
carOperationStatusCallback.changeOperationStatus(isWorking());
@@ -625,7 +624,7 @@ public class OchBusOrderModel {
}
backgroundCurrentStationIndex = currentStationIndex;
OchBusStation currentStation = stationList.get(currentStationIndex);
Logger.d( TAG, "渲染站点信息服务端currentStationIndex="+currentStationIndex
CallerLogger.INSTANCE.d( M_BUS + TAG, "渲染站点信息服务端currentStationIndex="+currentStationIndex
+" isLeaving()="+currentStation.isLeaving());
//当前站点是始发站，告诉服务端到达始发站。 如果没有这个节点， 服务器不知道始发站到达状态
// ，订单开始站下在始发站的状态流转有问题
@@ -637,7 +636,7 @@ public class OchBusOrderModel {
&& currentStationIndex < stationList.size()-1)
|| (stationList.get(0).isLeaving() || stationList.get(stationList.size() -1).isLeaving()))){//行驶过程中设置美化
FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = true;
Logger.d(TAG, "美化模式-ignore：置为true（每次滑动出发）");
CallerLogger.INSTANCE.d(M_BUS + TAG, "美化模式-ignore：置为true（每次滑动出发）");
}
if (refreshBusStationsCallback != null){
if (currentStation.isLeaving()){//如果服务端的当前站是leaving状态，展示当前站需要+1
@@ -660,7 +659,7 @@ public class OchBusOrderModel {
* @param lastStopStation
*/
private void resetNextStopStation( int lastStopStation ) {
Logger.d( TAG, "重置下一站");
CallerLogger.INSTANCE.d( M_BUS + TAG, "重置下一站");
int nextStopStation = getNextStopStation();
if ( nextStopStation < 0 ) {
return;
@@ -705,7 +704,7 @@ public class OchBusOrderModel {
* 在踩刹车、控制方向盘等操作后，会停止自动驾驶，重启自动驾驶的话相当于重新设置自动驾驶目的地
*/
public void restartAutopilot() {
Logger.d( TAG, "重启自动驾驶===" + isGoingToNextStation );
CallerLogger.INSTANCE.d( M_BUS + TAG, "重启自动驾驶===" + isGoingToNextStation );
if ( isGoingToNextStation ) {
autoDriveToNextStation( true );
}
@@ -717,7 +716,7 @@ public class OchBusOrderModel {
* @param awayPassengersResponse
*/
private void playLeavePassengersMsg( QueryLeaveAwayPassengersResponse awayPassengersResponse ) {
Logger.d( TAG, "播报下车乘客信息currentStationIndex="+currentStationIndex);
CallerLogger.INSTANCE.d( M_BUS + TAG, "播报下车乘客信息currentStationIndex="+currentStationIndex);
if ( currentStationIndex > stationList.size() - 1 ) {
return;
@@ -730,7 +729,7 @@ public class OchBusOrderModel {
}
if ( awayPassengersResponse == null || awayPassengersResponse.data == null
|| awayPassengersResponse.data.orders == null || awayPassengersResponse.data.orders.isEmpty() ) {
Logger.d( TAG, "播报下车乘客信息为null");
CallerLogger.INSTANCE.d( M_BUS + TAG, "播报下车乘客信息为null");
} else {
builder.append( ",请尾号为 " );
for ( QueryLeaveAwayPassengersResponse.LeaveAwayPassenger leaveAwayPassenger : awayPassengersResponse.data.orders ) {
@@ -749,7 +748,7 @@ public class OchBusOrderModel {
builder.append( "的乘客下车" );
}
builder.append(",带好随身物品,下车请注意安全");
Logger.d(TAG, "TTS:" + builder.toString());
CallerLogger.INSTANCE.d(M_BUS + TAG, "TTS:" + builder.toString());
AIAssist.getInstance( mContext ).speakTTSVoice( builder.toString() );
}
@@ -757,7 +756,7 @@ public class OchBusOrderModel {
* 修改小巴运营状态
*/
public void onChangeOperationStatus() {
Logger.d( TAG, "修改小巴运营状态");
CallerLogger.INSTANCE.d( M_BUS + TAG, "修改小巴运营状态");
if (isWorking()){//收车
stopTakeOrder();
}else {//出车
@@ -769,13 +768,13 @@ public class OchBusOrderModel {
* 行程结束
*/
private void travelOver() {
// Logger.d( TAG, "行程结束");
// CallerLogger.INSTANCE.d( M_BUS + TAG, "行程结束");
if ( currentStationIndex >= stationList.size() ) {
Logger.e( TAG, "travel over index out of station list" );
CallerLogger.INSTANCE.e( M_BUS + TAG, "travel over index out of station list" );
return;
}
Logger.d( TAG, "单程结束====" );
CallerLogger.INSTANCE.d( M_BUS + TAG, "单程结束====" );
CallerAutoPilotManager.INSTANCE.cancelAutoPilot();
AIAssist.getInstance( mContext ).speakTTSVoice( "感谢您体验'蘑菇车联'无人驾驶小巴车，请您携带好随身物品，我们下次再见" );
leaveStation(true,true);
@@ -791,14 +790,14 @@ public class OchBusOrderModel {
*/
public void onArriveAt( MessagePad.ArrivalNotification data){
if ( currentStationIndex > stationList.size() - 1 ) {
Logger.e( TAG, "到站异常，取消后续操作结束" );
CallerLogger.INSTANCE.e( M_BUS + TAG, "到站异常，取消后续操作结束" );
return;
}
if (FunctionBuildConfig.isDemoMode && currentStationIndex == stationList.size() - 1){//到达最后一站结束美化
FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = false;
Logger.d(TAG, "美化模式-ignore：置为false（到最后一站）");
CallerLogger.INSTANCE.d(M_BUS + TAG, "美化模式-ignore：置为false（到最后一站）");
}
Logger.d( TAG, "到站====currentStationIndex=" + currentStationIndex);
CallerLogger.INSTANCE.d( M_BUS + TAG, "到站====currentStationIndex=" + currentStationIndex);
isGoingToNextStation = false;
// 到达站点后，更新站点状态
// currentStationIndex = getNextStopStation();
@@ -835,7 +834,7 @@ public class OchBusOrderModel {
}
private void startOrStopOrderLoop(boolean start) {
Logger.d(TAG, "startOrStopOrderLoop() " + start);
CallerLogger.INSTANCE.d(M_BUS + TAG, "startOrStopOrderLoop() " + start);
if (start) {
OchBusModelLoopManager.getInstance().startHeartbeatLoop();
} else {

15
OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusPresenter.java
View File

@@ -1,8 +1,9 @@
package com.mogo.och.bus.presenter;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS;
import android.location.Location;
import android.os.Looper;
import android.util.Log;
import androidx.annotation.NonNull;
import androidx.lifecycle.LifecycleOwner;
@@ -12,7 +13,7 @@ import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo;
import com.mogo.eagle.core.data.config.FunctionBuildConfig;
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
import com.mogo.och.bus.bean.OchBusStation;
import com.mogo.och.bus.callback.CarOperationStatusCallback;
@@ -116,14 +117,14 @@ public class OchBusPresenter extends Presenter<OchBusFragment>
mStationList.addAll(stationList);
mCurrentStation = currentStation;
functionDemoModeChange();
Log.d("OchBusOrderModel =", " mCurrentStation =" + mCurrentStation);
CallerLogger.INSTANCE.d(M_BUS + "OchBusOrderModel =", " mCurrentStation =" + mCurrentStation);
if (mView != null) {
mView.refreshBusStations(stationList, currentStation, nextStation, isArrived);
}
}
private void functionDemoModeChange() {
// Log.d("OchBusOrderModel ="," functionDemoModeChange ="+mCurrentStation);
// CallerLogger.INSTANCE.d(M_BUS + "OchBusOrderModel ="," functionDemoModeChange ="+mCurrentStation);
if (FunctionBuildConfig.isDemoMode
&& (
(mCurrentStation > 0 && mCurrentStation < mStationList.size() - 1)
@@ -158,7 +159,7 @@ public class OchBusPresenter extends Presenter<OchBusFragment>
public void onAutopilotStatusResponse(@NotNull AutopilotStatusInfo autopilotStatusInfo) {
if (autopilotStatusInfo == null) return;
int state = autopilotStatusInfo.getState();
Logger.d(TAG, "onStateChange: " + state + "currentAutopilotStatus = " + currentAutopilotStatus);
CallerLogger.INSTANCE.d(M_BUS + TAG, "onStateChange: " + state + "currentAutopilotStatus = " + currentAutopilotStatus);
switch (state) {
case IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE:
if (currentAutopilotStatus != IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE) {
@@ -180,7 +181,7 @@ public class OchBusPresenter extends Presenter<OchBusFragment>
)
)
) {
Log.d("OchBusOrderModel=", "有美化功能");
CallerLogger.INSTANCE.d(M_BUS + "OchBusOrderModel=", "有美化功能");
return;
}
// 改变UI自动驾驶状态
@@ -211,7 +212,7 @@ public class OchBusPresenter extends Presenter<OchBusFragment>
)
)
) {
Log.d("OchBusOrderModel=", "有美化功能");
CallerLogger.INSTANCE.d(M_BUS + "OchBusOrderModel=", "有美化功能");
return;
}
mView.onAutopilotEnableChange(false);

6
OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/receiver/TestOchBusBroadcastReceiver.java
View File

@@ -1,10 +1,12 @@
package com.mogo.och.bus.receiver;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.och.bus.constant.OchBusConst;
/**
@@ -23,7 +25,7 @@ public class TestOchBusBroadcastReceiver extends BroadcastReceiver {
try {
this.mContext = context;
int sceneType = intent.getIntExtra(OchBusConst.BROADCAST_TEST_BUS_CONTROL_TYPE_EXTRA_KEY, 0);
Logger.d(TAG, "sceneType:" + sceneType);
CallerLogger.INSTANCE.d(M_BUS + TAG, "sceneType:" + sceneType);
// 分发场景
dispatchSceneTest(sceneType);

12
OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/MogoOCHTaxi.java
View File

@@ -1,12 +1,14 @@
package com.mogo.och.taxi.passenger;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI_P;
import android.content.Context;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
import com.mogo.map.MogoMapUIController;
import com.mogo.module.common.MogoApisHandler;
@@ -34,7 +36,7 @@ class MogoOCHTaxi implements IMogoOCH, IMogoStatusChangedListener {
private int mContainerId;
@Override
public void init( Context context ) {
Logger.d( TAG, "init" );
CallerLogger.INSTANCE.d( M_TAXI_P + TAG, "init" );
MogoApisHandler.getInstance().getApis().getStatusManagerApi().registerStatusChangedListener("ochTaxi", StatusDescriptor.VR_MODE,this);
MogoApisHandler.getInstance().getApis().getStatusManagerApi().registerStatusChangedListener("ochTaxi", StatusDescriptor.TOP_VIEW,this);
}
@@ -43,19 +45,19 @@ class MogoOCHTaxi implements IMogoOCH, IMogoStatusChangedListener {
* 进入鹰眼模式，设置手势缩放地图失效
*/
private void stepIntoVrMode() {
Logger.d( TAG, "进入vr模式" );
CallerLogger.INSTANCE.d( M_TAXI_P + TAG, "进入vr模式" );
MogoMapUIController.getInstance()
.openVrMode( false );
}
private void showFragment() {
if (ochTaxiPassengerFragment == null) {
Logger.d(TAG, "准备add fragment======");
CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "准备add fragment======");
ochTaxiPassengerFragment = new TaxiPassengerBaseFragment();
mActivity.getSupportFragmentManager().beginTransaction().add(mContainerId, ochTaxiPassengerFragment).commitAllowingStateLoss();
return;
}
Logger.d(TAG, "准备show fragment");
CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "准备show fragment");
mActivity.getSupportFragmentManager().beginTransaction().show(ochTaxiPassengerFragment).commitAllowingStateLoss();
}

22
OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java
View File

@@ -1,5 +1,7 @@
package com.mogo.och.taxi.passenger.model;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI_P;
import android.content.Context;
import android.content.Intent;
import android.location.Location;
@@ -24,7 +26,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListener
import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotPlanningListenerManager;
import com.mogo.eagle.core.function.call.v2x.CallLimitingVelocityListenerManager;
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
import com.mogo.eagle.core.utilcode.util.NetworkUtils;
import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
@@ -216,7 +218,7 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback
}
private void startOrStopOrderLoop(boolean start) {
Logger.d(TAG, "startOrStopOrderLoop() " + start);
CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "startOrStopOrderLoop() " + start);
if (start) {
TaxiPassengerModelLoopManager.getInstance().startInAndWaitOrdersLoop();
// TaxiPassengerModelLoopManager.getInstance().startHeartbeatLoop();
@@ -389,10 +391,10 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback
}
//监听网络变化，避免启动机器时无网导致无法更新订单信息
private IMogoIntentListener mNetWorkIntentListener = new IMogoIntentListener() {
private final IMogoIntentListener mNetWorkIntentListener = new IMogoIntentListener() {
@Override
public void onIntentReceived( String intentStr, Intent intent ) {
Logger.d( TAG, "onIntentReceived = %s", intentStr );
CallerLogger.INSTANCE.d( M_TAXI_P + TAG, "onIntentReceived = %s", intentStr );
if ( ConnectivityManager.CONNECTIVITY_ACTION.equals( intentStr ) ) {
if ( NetworkUtils.isConnected( mContext ) ) {
if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
@@ -403,7 +405,7 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback
}
};
private IMogoStatusChangedListener mMogoStatusChangedListener = new IMogoStatusChangedListener() {
private final IMogoStatusChangedListener mMogoStatusChangedListener = new IMogoStatusChangedListener() {
// VR mode变更回调
@Override
public void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) {
@@ -417,15 +419,15 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback
}
};
private IMogoLifecycleListener mSocketLifeCycleLisnter = new IMogoLifecycleListener() {
private final IMogoLifecycleListener mSocketLifeCycleLisnter = new IMogoLifecycleListener() {
@Override
public void onConnectFailure() { Logger.e(TAG,"socket onConnectFailure"); }
public void onConnectFailure() { CallerLogger.INSTANCE.e(M_TAXI_P + TAG,"socket onConnectFailure"); }
@Override
public void onConnectSuccess() { Logger.e(TAG,"socket onConnectSuccess"); }
public void onConnectSuccess() { CallerLogger.INSTANCE.e(M_TAXI_P + TAG,"socket onConnectSuccess"); }
@Override
public void onConnectLost() { Logger.e(TAG,"socket onConnectLost"); }
public void onConnectLost() { CallerLogger.INSTANCE.e(M_TAXI_P + TAG,"socket onConnectLost"); }
};
// 自车定位
@@ -476,7 +478,7 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback
public void onAutopilotStatusResponse(@NotNull AutopilotStatusInfo autopilotStatusInfo) {
if (autopilotStatusInfo == null) return;
int state = autopilotStatusInfo.getState();
Logger.d( TAG, "state = %s", state );
CallerLogger.INSTANCE.d( M_TAXI_P + TAG, "state = %s", state );
if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING) {
if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotRunning();
if (mCurrentOCHOrder != null

12
OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModelLoopManager.java
View File

@@ -1,6 +1,8 @@
package com.mogo.och.taxi.passenger.model;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI_P;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.och.taxi.passenger.constant.TaxiPassengerConst;
import java.util.concurrent.TimeUnit;
@@ -34,7 +36,7 @@ public class TaxiPassengerModelLoopManager {
if (mInAndWaitServiceDisposable != null && !mInAndWaitServiceDisposable.isDisposed()) {
return;
}
Logger.i(TAG, "startInAndWaitOrdersLoop()");
CallerLogger.INSTANCE.i(M_TAXI_P + TAG, "startInAndWaitOrdersLoop()");
mInAndWaitServiceDisposable = Observable.interval(TaxiPassengerConst.LOOP_DELAY,
TaxiPassengerConst.LOOP_PERIOD_2S, TimeUnit.MILLISECONDS)
.map((aLong -> aLong + 1))
@@ -45,7 +47,7 @@ public class TaxiPassengerModelLoopManager {
public void stopInAndWaitOrdersLoop() {
if (mInAndWaitServiceDisposable != null) {
Logger.i(TAG, "stopInAndWaitOrdersLoop()");
CallerLogger.INSTANCE.i(M_TAXI_P + TAG, "stopInAndWaitOrdersLoop()");
mInAndWaitServiceDisposable.dispose();
mInAndWaitServiceDisposable = null;
}
@@ -56,7 +58,7 @@ public class TaxiPassengerModelLoopManager {
// if (mHeartbeatDisposable != null && !mHeartbeatDisposable.isDisposed()) {
// return;
// }
// Logger.i(TAG, "startHeartbeatLoop()");
// CallerLogger.INSTANCE.i(M_TAXI_P + TAG, "startHeartbeatLoop()");
// mHeartbeatDisposable = Observable.interval(TaxiPassengerConst.LOOP_DELAY,
// TaxiPassengerConst.LOOP_PERIOD_60S, TimeUnit.MILLISECONDS)
// .map((aLong -> aLong + 1))
@@ -67,7 +69,7 @@ public class TaxiPassengerModelLoopManager {
// public void stopHeartbeatLoop() {
// if (mHeartbeatDisposable != null) {
// Logger.i(TAG, "stopHeartbeatLoop()");
// CallerLogger.INSTANCE.i(M_TAXI_P + TAG, "stopHeartbeatLoop()");
// mHeartbeatDisposable.dispose();
// mHeartbeatDisposable = null;
// }

12
OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerNaviToDestinationModel.java
View File

@@ -1,5 +1,7 @@
package com.mogo.och.taxi.passenger.model;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI_P;
import android.Manifest;
import android.content.Context;
import android.widget.Toast;
@@ -22,7 +24,7 @@ import com.amap.api.navi.model.AimLessModeStat;
import com.amap.api.navi.model.NaviInfo;
import com.amap.api.navi.model.NaviLatLng;
import com.autonavi.tbt.TrafficFacilityInfo;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
import com.mogo.eagle.core.utilcode.util.NetworkUtils;
import com.mogo.och.taxi.passenger.callback.IOCHTaxiPassengerNaviChangedCallback;
@@ -123,14 +125,14 @@ public class TaxiPassengerNaviToDestinationModel implements AMapNaviListener {
@Override
public void onCalculateRouteSuccess(int[] ints) {
//多路径算路成功回调
Logger.d(TAG,"onCalculateRouteSuccess");
CallerLogger.INSTANCE.d(M_TAXI_P + TAG,"onCalculateRouteSuccess");
mAMapNavi.startNavi(NaviType.GPS);
}
@Override
public void onNaviInfoUpdate(NaviInfo naviinfo) {
//导航过程中的信息更新，请看NaviInfo的具体说明
Logger.d(TAG,"naviinfo = "+naviinfo.getPathRetainDistance()+" ,"+naviinfo.getPathRetainTime()
CallerLogger.INSTANCE.d(M_TAXI_P + TAG,"naviinfo = "+naviinfo.getPathRetainDistance()+" ,"+naviinfo.getPathRetainTime()
+" ,"+naviinfo.getCurrentRoadName());
if (mFirstcalculateDriveRoute == 0 && SharedPrefsMgr.getInstance(mContext).getInt(TaxiPassengerConst.SP_KEY_ORDER_SUM_DIS,0) == 0){
@@ -175,8 +177,8 @@ public class TaxiPassengerNaviToDestinationModel implements AMapNaviListener {
// }else if (result.getErrorCode() == 6){
// TipToast.longTip("终点坐标错误");
// }
Logger.i(TAG, "路线计算失败：错误码=" + result.getErrorCode() + ",Error Message= " + result.getErrorDetail());
Logger.i(TAG, "错误码详细链接见：http://lbs.amap.com/api/android-navi-sdk/guide/tools/errorcode/");
CallerLogger.INSTANCE.i(M_TAXI_P + TAG, "路线计算失败：错误码=" + result.getErrorCode() + ",Error Message= " + result.getErrorDetail());
CallerLogger.INSTANCE.i(M_TAXI_P + TAG, "错误码详细链接见：http://lbs.amap.com/api/android-navi-sdk/guide/tools/errorcode/");
}
@Override
public void onStartNavi(int type) {

12
OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.java
View File

@@ -1,15 +1,15 @@
package com.mogo.och.taxi.passenger.network;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI_P;
import android.content.Context;
import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
import com.mogo.eagle.core.data.BaseData;
import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager;
import com.mogo.eagle.core.network.RequestOptions;
import com.mogo.eagle.core.network.SubscribeImpl;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.och.taxi.passenger.bean.TaxiPassengerCarHeartbeatReqBean;
import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrderQueryReqBean;
import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrderQueryRespBean;
import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrdersInServiceQueryRespBean;
@@ -117,7 +117,7 @@ public class TaxiPassengerServiceManager {
@Override
public void onSuccess(T o) {
super.onSuccess(o);
Logger.e(TAG,apiName + ": onSuccess() " + o.msg);
CallerLogger.INSTANCE.e(M_TAXI_P + TAG,apiName + ": onSuccess() " + o.msg);
if (callback != null) {
callback.onSuccess(o);
}
@@ -126,7 +126,7 @@ public class TaxiPassengerServiceManager {
@Override
public void onError(Throwable e) {
super.onError(e);
Logger.e(TAG,apiName + ": onError() " + e.getMessage());
CallerLogger.INSTANCE.e(M_TAXI_P + TAG,apiName + ": onError() " + e.getMessage());
if (callback != null) {
callback.onError();
}
@@ -135,7 +135,7 @@ public class TaxiPassengerServiceManager {
@Override
public void onError(String message, int code) {
super.onError(message, code);
Logger.e(TAG,String.format(apiName + ": onError() code = %d; message = %s;", code, message));
CallerLogger.INSTANCE.e(M_TAXI_P + TAG,String.format(apiName + ": onError() code = %d; message = %s;", code, message));
if (callback != null) {
callback.onFail(code, message);
}

9
OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.java
View File

@@ -1,8 +1,9 @@
package com.mogo.och.taxi.passenger.presenter;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI_P;
import android.location.Location;
import android.os.Looper;
import android.util.Log;
import androidx.annotation.NonNull;
import androidx.lifecycle.LifecycleOwner;
@@ -11,7 +12,7 @@ import com.mogo.commons.AbsMogoApplication;
import com.mogo.commons.mvp.Presenter;
import com.mogo.commons.voice.AIAssist;
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
import com.mogo.och.taxi.passenger.R;
@@ -46,7 +47,7 @@ public class BaseTaxiPassengerPresenter extends Presenter<TaxiPassengerBaseFragm
@Override
public void onCreate( @NonNull LifecycleOwner owner ) {
super.onCreate( owner );
Logger.d( TAG, "网约车-出租车拿到订单" );
CallerLogger.INSTANCE.d( M_TAXI_P + TAG, "网约车-出租车拿到订单" );
}
@Override
@@ -120,7 +121,7 @@ public class BaseTaxiPassengerPresenter extends Presenter<TaxiPassengerBaseFragm
@Override
public void onCurrentOrderStatusChanged(TaxiPassengerOrderQueryRespBean.Result order) {
Log.d(TAG,"order = "+order.toString());
CallerLogger.INSTANCE.d(M_TAXI_P + TAG,"order = "+order.toString());
if (mCurrentPassengerOrder == null){
mCurrentPassengerOrder = order; //当前无订单
updateOrderView(order);

13
OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerMapDirectionView.java
View File

@@ -1,10 +1,11 @@
package com.mogo.och.taxi.passenger.ui;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI_P;
import android.content.Context;
import android.graphics.Color;
import android.os.Bundle;
import android.util.AttributeSet;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View;
@@ -31,7 +32,7 @@ import com.mogo.eagle.core.data.map.MogoLatLng;
import com.mogo.eagle.core.data.map.MogoLocation;
import com.mogo.eagle.core.function.api.map.listener.IMoGoMapLocationListener;
import com.mogo.eagle.core.function.call.map.CallerMapLocationListenerManager;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.och.taxi.passenger.R;
import com.mogo.och.taxi.passenger.callback.ITaxiPassengerMapViewCallback;
import com.mogo.och.taxi.passenger.utils.TaxiPassengerMapAssetStyleUtil;
@@ -87,7 +88,7 @@ public class TaxiPassengerMapDirectionView
}
private void initView(Context context) {
Logger.d(TAG, "initView");
CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "initView");
mContext = context;
@@ -147,7 +148,7 @@ public class TaxiPassengerMapDirectionView
mAMap.setOnMapLoadedListener(new AMap.OnMapLoadedListener() {
@Override
public void onMapLoaded() {
Logger.d(TAG, "smp---onMapLoaded");
CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "smp---onMapLoaded");
// 加载自定义样式
CustomMapStyleOptions customMapStyleOptions = new CustomMapStyleOptions()
.setEnable(true)
@@ -172,7 +173,7 @@ public class TaxiPassengerMapDirectionView
@Override
public void onLocationChanged(@Nullable MogoLocation location) {
Logger.d(TAG, "onCarLocationChanged2 :" + location.getLatitude()+":"+location.getLongitude());
CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "onCarLocationChanged2 :" + location.getLatitude()+":"+location.getLongitude());
if (location == null){
return;
}
@@ -180,7 +181,7 @@ public class TaxiPassengerMapDirectionView
//更新车辆位置
if (mCarMarker != null) {
Log.d(TAG, "location.getBearing() = " + location.getBearing());
CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "location.getBearing() = " + location.getBearing());
mCarMarker.setRotateAngle(360 - location.getBearing());
mCarMarker.setPosition(currentLatLng);
mCarMarker.setToTop();

13
OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerServingOrderFragment.java
View File

@@ -1,11 +1,12 @@
package com.mogo.och.taxi.passenger.ui;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI_P;
import android.location.Location;
import android.os.Build;
import android.os.Bundle;
import android.os.Looper;
import android.text.SpannableStringBuilder;
import android.util.Log;
import android.view.View;
import android.view.animation.Animation;
import android.view.animation.RotateAnimation;
@@ -18,7 +19,7 @@ import androidx.annotation.RequiresApi;
import com.mogo.commons.mvp.MvpFragment;
import com.mogo.eagle.core.data.map.MogoLatLng;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
import com.mogo.och.taxi.passenger.R;
@@ -331,7 +332,7 @@ public class TaxiPassengerServingOrderFragment extends
private void setSeekBarMax() {
//计算订单起点和终点距离
int maxInt = SharedPrefsMgr.getInstance(getContext()).getInt(TaxiPassengerConst.SP_KEY_ORDER_SUM_DIS,0);
Logger.d(TAG, "maxInt = " + maxInt);
CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "maxInt = " + maxInt);
mProgressSeekBar.setMax(maxInt);
}
@@ -375,7 +376,7 @@ public class TaxiPassengerServingOrderFragment extends
}
public void routeResult(List<MogoLatLng> latLngList) {
Log.d(TAG, "routeResult:" + latLngList.size());
CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "routeResult:" + latLngList.size());
if (latLngList.size() > 0) {
drawablePolyline(latLngList);
} else {
@@ -467,7 +468,7 @@ public class TaxiPassengerServingOrderFragment extends
*/
private void updateSpeedView(float newSpeed) {
int speed = (int) (Math.abs(newSpeed) * 3.6F); // 倒车时工控机反馈定位信息中speed为负值
Logger.d(TAG,"mLimitingVelocity = "+mLimitingVelocity);
CallerLogger.INSTANCE.d(M_TAXI_P + TAG,"mLimitingVelocity = "+mLimitingVelocity);
if (speed < mLimitingVelocity) {
mTPSpeedTv.setText(getSpeedTextStyle(String.valueOf(speed), true));
mSpeedLayoutBg.setBackgroundResource(R.drawable.taxi_p_speed_light_green_bg);
@@ -518,7 +519,7 @@ public class TaxiPassengerServingOrderFragment extends
*/
private void startIvCompass(float bearing) {
bearing = 360 - bearing;
Log.d(TAG, "startIvCompass: " + bearing);
CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "startIvCompass: " + bearing);
rotateAnimation = new RotateAnimation(lastBearing, bearing, Animation.RELATIVE_TO_SELF
, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f);
rotateAnimation.setFillAfter(true);

13
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxi.java
View File

@@ -1,13 +1,14 @@
package com.mogo.och.taxi;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI;
import android.content.Context;
import android.util.Log;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
import com.mogo.map.MogoMapUIController;
import com.mogo.module.common.MogoApisHandler;
@@ -35,7 +36,7 @@ class MogoOCHTaxi implements IMogoOCH , IMogoStatusChangedListener {
private int mContainerId;
@Override
public void init( Context context ) {
Logger.d( TAG, "init" );
CallerLogger.INSTANCE.d( M_TAXI + TAG, "init" );
MogoApisHandler.getInstance().getApis().getStatusManagerApi().registerStatusChangedListener("ochTaxi", StatusDescriptor.VR_MODE,this);
MogoApisHandler.getInstance().getApis().getStatusManagerApi().registerStatusChangedListener("ochTaxi", StatusDescriptor.TOP_VIEW,this);
}
@@ -44,19 +45,19 @@ class MogoOCHTaxi implements IMogoOCH , IMogoStatusChangedListener {
* 进入鹰眼模式，设置手势缩放地图失效
*/
private void stepIntoVrMode() {
Logger.d( TAG, "进入vr模式" );
CallerLogger.INSTANCE.d( M_TAXI + TAG, "进入vr模式" );
MogoMapUIController.getInstance()
.openVrMode( false );
}
private void showFragment() {
if (ochTaxiFragment == null) {
Logger.d(TAG, "准备add fragment======");
CallerLogger.INSTANCE.d(M_TAXI + TAG, "准备add fragment======");
ochTaxiFragment = new OCHTaxiFragment();
mActivity.getSupportFragmentManager().beginTransaction().add(mContainerId, ochTaxiFragment).commitAllowingStateLoss();
return;
}
Logger.d(TAG, "准备show fragment");
CallerLogger.INSTANCE.d(M_TAXI + TAG, "准备show fragment");
mActivity.getSupportFragmentManager().beginTransaction().show(ochTaxiFragment).commitAllowingStateLoss();
}

54
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/MogoOCHTaxiModelNew.java
View File

@@ -1,10 +1,11 @@
package com.mogo.och.taxi.model;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI;
import android.content.Context;
import android.content.Intent;
import android.location.Location;
import android.net.ConnectivityManager;
import android.util.Log;
import androidx.annotation.Nullable;
@@ -16,7 +17,6 @@ import com.mogo.commons.debug.DebugConfig;
import com.mogo.eagle.core.data.BaseData;
import com.mogo.eagle.core.data.autopilot.ADASTrajectoryInfo;
import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters;
import com.mogo.eagle.core.data.autopilot.AutopilotRouteInfo;
import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo;
import com.mogo.eagle.core.data.config.FunctionBuildConfig;
import com.mogo.eagle.core.data.map.MogoLocation;
@@ -25,7 +25,7 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager;
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotPlanningListenerManager;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
import com.mogo.eagle.core.utilcode.mogo.toast.TipToast;
import com.mogo.eagle.core.utilcode.util.NetworkUtils;
@@ -148,31 +148,31 @@ public class MogoOCHTaxiModelNew {
public void accept(Throwable e) {
if (e instanceof UndeliverableException) {
e = e.getCause();
Log.d(TAG, "UndeliverableException");
CallerLogger.INSTANCE.d(M_TAXI + TAG, "UndeliverableException");
}
if ((e instanceof IOException)) {//
// fine, irrelevant network problem or API that throws on cancellation
Log.d(TAG, "IOException");
CallerLogger.INSTANCE.d(M_TAXI + TAG, "IOException");
return;
}
if (e instanceof InterruptedException) {
// fine, some blocking code was interrupted by a dispose call
Log.d(TAG, "InterruptedException");
CallerLogger.INSTANCE.d(M_TAXI + TAG, "InterruptedException");
return;
}
if ((e instanceof NullPointerException) || (e instanceof IllegalArgumentException)) {
// that's likely a bug in the application
Log.d(TAG, "NullPointerException or IllegalArgumentException");
CallerLogger.INSTANCE.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
Log.d(TAG, "IllegalStateException");
CallerLogger.INSTANCE.d(M_TAXI + TAG, "IllegalStateException");
Thread.currentThread().getUncaughtExceptionHandler().uncaughtException(Thread.currentThread(), e);
return;
}
Log.d(TAG,"Undeliverable exception");
CallerLogger.INSTANCE.d(M_TAXI + TAG,"Undeliverable exception");
}
});
@@ -241,7 +241,7 @@ public class MogoOCHTaxiModelNew {
}
private void startOrStopOrderLoop(boolean start) {
Logger.d(TAG, "startOrStopOrderLoop() " + start);
CallerLogger.INSTANCE.d(M_TAXI + TAG, "startOrStopOrderLoop() " + start);
if (start) {
OCHTaxiModelLoopManager.getInstance().startInAndWaitOrdersLoop();
OCHTaxiModelLoopManager.getInstance().startNewBookingOrderLoop();
@@ -299,7 +299,7 @@ public class MogoOCHTaxiModelNew {
if (mCarStatusCallback != null) {
mCarStatusCallback.onCarStatusChanged(mOCHCarStatus == 1);
}
Logger.d(TAG, "changeCarStatus:" + status);
CallerLogger.INSTANCE.d(M_TAXI + TAG, "changeCarStatus:" + status);
}
}
@@ -751,7 +751,7 @@ public class MogoOCHTaxiModelNew {
&& mCurrentOCHOrder.orderStatus == OrderStatusEnum.OnTheWayToEndStation.getCode()) {
// 当美化模式（演示模式）开启时: 订单对应自动驾驶开启后，置true
FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = true;
Logger.d(TAG, "美化模式-ignore：置为true（更新本地order信息）");
CallerLogger.INSTANCE.d(M_TAXI + TAG, "美化模式-ignore：置为true（更新本地order信息）");
}
}
@@ -762,7 +762,7 @@ public class MogoOCHTaxiModelNew {
if (FunctionBuildConfig.isDemoMode) {
// 当美化模式（演示模式）开启时: 取消或订单已完成时，置false
FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = false;
Logger.d(TAG, "美化模式-ignore：置为false（清除当前订单）");
CallerLogger.INSTANCE.d(M_TAXI + TAG, "美化模式-ignore：置为false（清除当前订单）");
}
}
@@ -779,7 +779,7 @@ public class MogoOCHTaxiModelNew {
//以当前订单为基础，开启自动驾驶
public void startAutoPilot() {
if (!checkCurrentOCHOrder()) {
Logger.e(TAG, "no order or order is empty.");
CallerLogger.INSTANCE.e(M_TAXI + TAG, "no order or order is empty.");
TipToast.shortTip("当前订单不存在或异常！");
return;
}
@@ -802,7 +802,7 @@ public class MogoOCHTaxiModelNew {
parameters.startLatLon = new AutopilotControlParameters.AutoPilotLonLat(startWgsLat, startWgsLon);
parameters.endLatLon = new AutopilotControlParameters.AutoPilotLonLat(endWgsLat, endWgsLon);
CallerAutoPilotManager.INSTANCE.startAutoPilot(parameters);
Logger.d(TAG, "start autopilot with parameter: %s", GsonUtil.jsonFromObject(parameters)
CallerLogger.INSTANCE.d(M_TAXI + TAG, "start autopilot with parameter: %s", GsonUtil.jsonFromObject(parameters)
+ " ,startSiteName=" + mCurrentOCHOrder.startSiteAddr + " ,endSiteName=" + mCurrentOCHOrder.endSiteAddr);
if (DebugConfig.isDebug()) {
// TipToast.shortTip("Start autopilot!");
@@ -816,7 +816,7 @@ public class MogoOCHTaxiModelNew {
public void cancelAutopilot() {
try {
CallerAutoPilotManager.INSTANCE.cancelAutoPilot();
Logger.d(TAG, "结束自动驾驶");
CallerLogger.INSTANCE.d(M_TAXI + TAG, "结束自动驾驶");
} catch (Exception e) {
e.printStackTrace();
}
@@ -838,7 +838,7 @@ public class MogoOCHTaxiModelNew {
// TipToast.shortTip("距离上车点：" + Double.valueOf(distance).intValue());
}
Logger.i(TAG, "judgeStartStation() distance = " + distance);
CallerLogger.INSTANCE.i(M_TAXI + TAG, "judgeStartStation() distance = " + distance);
// if (mOrderStatusCallback != null && distance >= 0) {
// mOrderStatusCallback.onCurrentOrderDistToStartChanged((long) distance, 0);
// }
@@ -871,10 +871,10 @@ public class MogoOCHTaxiModelNew {
}
//监听网络变化，避免启动机器时无网导致无法更新订单信息
private IMogoIntentListener mNetWorkIntentListener = new IMogoIntentListener() {
private final IMogoIntentListener mNetWorkIntentListener = new IMogoIntentListener() {
@Override
public void onIntentReceived(String intentStr, Intent intent) {
Logger.d(TAG, "onIntentReceived = %s", intentStr);
CallerLogger.INSTANCE.d(M_TAXI + TAG, "onIntentReceived = %s", intentStr);
if (ConnectivityManager.CONNECTIVITY_ACTION.equals(intentStr)) {
if (NetworkUtils.isConnected(mContext)) {
startOrStopOrderLoop(mOCHCarStatus == 1);
@@ -884,7 +884,7 @@ public class MogoOCHTaxiModelNew {
}
};
private IMogoStatusChangedListener mMogoStatusChangedListener = new IMogoStatusChangedListener() {
private final IMogoStatusChangedListener mMogoStatusChangedListener = new IMogoStatusChangedListener() {
// VR mode变更回调
@Override
public void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) {
@@ -896,25 +896,25 @@ public class MogoOCHTaxiModelNew {
}
};
private IMogoLifecycleListener mSocketLifeCycleLisnter = new IMogoLifecycleListener() {
private final IMogoLifecycleListener mSocketLifeCycleLisnter = new IMogoLifecycleListener() {
@Override
public void onConnectFailure() {
Logger.e(TAG, "socket onConnectFailure");
CallerLogger.INSTANCE.e(M_TAXI + TAG, "socket onConnectFailure");
}
@Override
public void onConnectSuccess() {
Logger.e(TAG, "socket onConnectSuccess");
CallerLogger.INSTANCE.e(M_TAXI + TAG, "socket onConnectSuccess");
}
@Override
public void onConnectLost() {
Logger.e(TAG, "socket onConnectLost");
CallerLogger.INSTANCE.e(M_TAXI + TAG, "socket onConnectLost");
}
};
// 自车定位
private IMogoCarLocationChangedListener2 mCarLocationChangedListener2 = new IMogoCarLocationChangedListener2() {
private final IMogoCarLocationChangedListener2 mCarLocationChangedListener2 = new IMogoCarLocationChangedListener2() {
@Override
public void onCarLocationChanged2(Location location) {
@@ -991,7 +991,7 @@ public class MogoOCHTaxiModelNew {
public void onAutopilotStatusResponse(@NotNull AutopilotStatusInfo autopilotStatusInfo) {
if (autopilotStatusInfo == null) return;
int state = autopilotStatusInfo.getState();
Logger.d(TAG, "state = %s", state);
CallerLogger.INSTANCE.d(M_TAXI + TAG, "state = %s", state);
if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING) {
if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotRunning();
if (mCurrentOCHOrder != null
@@ -1003,7 +1003,7 @@ public class MogoOCHTaxiModelNew {
if (FunctionBuildConfig.isDemoMode) {
// 当美化模式（演示模式）开启时: 订单对应自动驾驶开启后，置true
FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = true;
Logger.d(TAG, "美化模式-ignore：置为true（到达出发点且已开启自动驾驶）");
CallerLogger.INSTANCE.d(M_TAXI + TAG, "美化模式-ignore：置为true（到达出发点且已开启自动驾驶）");
}
}
} else if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE) {

12
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/NaviToDestinationModel.java
View File

@@ -1,8 +1,9 @@
package com.mogo.och.taxi.model;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI;
import android.Manifest;
import android.content.Context;
import android.util.Log;
import android.widget.Toast;
import com.amap.api.navi.AMapNavi;
@@ -23,6 +24,7 @@ import com.amap.api.navi.model.AimLessModeStat;
import com.amap.api.navi.model.NaviInfo;
import com.amap.api.navi.model.NaviLatLng;
import com.autonavi.tbt.TrafficFacilityInfo;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.eagle.core.utilcode.mogo.toast.TipToast;
import com.mogo.eagle.core.utilcode.util.NetworkUtils;
import com.mogo.och.taxi.callback.IOCHTaxiNaviChangedCallback;
@@ -170,8 +172,8 @@ public class NaviToDestinationModel implements AMapNaviListener {
// }else if (result.getErrorCode() == 6){
// TipToast.longTip("终点坐标错误");
// }
Log.i("dm", "路线计算失败：错误码=" + result.getErrorCode() + ",Error Message= " + result.getErrorDetail());
Log.i("dm", "错误码详细链接见：http://lbs.amap.com/api/android-navi-sdk/guide/tools/errorcode/");
CallerLogger.INSTANCE.i(M_TAXI + "dm", "路线计算失败：错误码=" + result.getErrorCode() + ",Error Message= " + result.getErrorDetail());
CallerLogger.INSTANCE.i(M_TAXI + "dm", "错误码详细链接见：http://lbs.amap.com/api/android-navi-sdk/guide/tools/errorcode/");
}
@Override
public void onStartNavi(int type) {
@@ -257,7 +259,7 @@ public class NaviToDestinationModel implements AMapNaviListener {
// //当前用户要执行的动作
// int recommend = aMapLaneInfo.frontLane[i];
//
// Log.e("ggb", "---->>> background is " + background + " ; recommend is " + recommend);
// CallerLogger.INSTANCE.e(M_TAXI + "ggb", "---->>> background is " + background + " ; recommend is " + recommend);
// //根据文档中每个动作对应的枚举类型，显示对应的图片
// try {
// sb.append("，第" + (i + 1) + "车道为" + array[background]);
@@ -269,7 +271,7 @@ public class NaviToDestinationModel implements AMapNaviListener {
// e.printStackTrace();
// }
// }
// Log.e("showLaneInfo", sb.toString());
// CallerLogger.INSTANCE.e(M_TAXI + "showLaneInfo", sb.toString());
}
@Override

20
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/OCHTaxiModelLoopManager.java
View File

@@ -1,6 +1,8 @@
package com.mogo.och.taxi.model;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.och.taxi.constant.OCHTaxiConst;
import java.util.concurrent.TimeUnit;
@@ -36,7 +38,7 @@ public class OCHTaxiModelLoopManager {
if (mInAndWaitServiceDisposable != null && !mInAndWaitServiceDisposable.isDisposed()) {
return;
}
Logger.i(TAG, "startInAndWaitOrdersLoop()");
CallerLogger.INSTANCE.i(M_TAXI + TAG, "startInAndWaitOrdersLoop()");
mInAndWaitServiceDisposable = Observable.interval(OCHTaxiConst.LOOP_DELAY,
OCHTaxiConst.LOOP_PERIOD_2S, TimeUnit.MILLISECONDS)
.map((aLong -> aLong + 1))
@@ -47,7 +49,7 @@ public class OCHTaxiModelLoopManager {
public void stopInAndWaitOrdersLoop() {
if (mInAndWaitServiceDisposable != null) {
Logger.i(TAG, "stopInAndWaitOrdersLoop()");
CallerLogger.INSTANCE.i(M_TAXI + TAG, "stopInAndWaitOrdersLoop()");
mInAndWaitServiceDisposable.dispose();
mInAndWaitServiceDisposable = null;
}
@@ -57,7 +59,7 @@ public class OCHTaxiModelLoopManager {
if (mNewBookingOrderDisposable != null && !mNewBookingOrderDisposable.isDisposed()) {
return;
}
Logger.i(TAG, "startNewBookingOrderLoop()");
CallerLogger.INSTANCE.i(M_TAXI + TAG, "startNewBookingOrderLoop()");
mNewBookingOrderDisposable = Observable.interval(OCHTaxiConst.LOOP_DELAY,
OCHTaxiConst.LOOP_PERIOD_1S, TimeUnit.MILLISECONDS)
.map((aLong -> aLong + 1))
@@ -68,7 +70,7 @@ public class OCHTaxiModelLoopManager {
public void stopNewBookingOrderLoop() {
if (mNewBookingOrderDisposable != null) {
Logger.i(TAG, "stopNewBookingOrderLoop()");
CallerLogger.INSTANCE.i(M_TAXI + TAG, "stopNewBookingOrderLoop()");
mNewBookingOrderDisposable.dispose();
mNewBookingOrderDisposable = null;
}
@@ -78,7 +80,7 @@ public class OCHTaxiModelLoopManager {
if (mGrabResultDisposable != null && !mGrabResultDisposable.isDisposed()) {
return;
}
Logger.i(TAG, "startGrabResultLoop()");
CallerLogger.INSTANCE.i(M_TAXI + TAG, "startGrabResultLoop()");
mGrabResultDisposable = Observable.interval(OCHTaxiConst.LOOP_DELAY,
OCHTaxiConst.LOOP_PERIOD_1S, TimeUnit.MILLISECONDS)
.map((aLong -> aLong + 1))
@@ -89,7 +91,7 @@ public class OCHTaxiModelLoopManager {
public void stopGrabResultLoop() {
if (mGrabResultDisposable != null) {
Logger.i(TAG, "stopGrabResultLoop()");
CallerLogger.INSTANCE.i(M_TAXI + TAG, "stopGrabResultLoop()");
mGrabResultDisposable.dispose();
mGrabResultDisposable = null;
}
@@ -99,7 +101,7 @@ public class OCHTaxiModelLoopManager {
if (mHeartbeatDisposable != null && !mHeartbeatDisposable.isDisposed()) {
return;
}
Logger.i(TAG, "startHeartbeatLoop()");
CallerLogger.INSTANCE.i(M_TAXI + TAG, "startHeartbeatLoop()");
mHeartbeatDisposable = Observable.interval(OCHTaxiConst.LOOP_DELAY,
OCHTaxiConst.LOOP_PERIOD_60S, TimeUnit.MILLISECONDS)
.map((aLong -> aLong + 1))
@@ -110,7 +112,7 @@ public class OCHTaxiModelLoopManager {
public void stopHeartbeatLoop() {
if (mHeartbeatDisposable != null) {
Logger.i(TAG, "stopHeartbeatLoop()");
CallerLogger.INSTANCE.i(M_TAXI + TAG, "stopHeartbeatLoop()");
mHeartbeatDisposable.dispose();
mHeartbeatDisposable = null;
}

10
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/OCHTaxiServiceManagerNew.java
View File

@@ -1,12 +1,14 @@
package com.mogo.och.taxi.network;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI;
import android.content.Context;
import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
import com.mogo.eagle.core.data.BaseData;
import com.mogo.eagle.core.network.RequestOptions;
import com.mogo.eagle.core.network.SubscribeImpl;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.och.taxi.bean.CarHeartbeatReqBean;
import com.mogo.och.taxi.bean.DriverServiceDataRespBean;
@@ -375,7 +377,7 @@ public class OCHTaxiServiceManagerNew {
@Override
public void onSuccess(T o) {
super.onSuccess(o);
Logger.e(TAG,apiName + ": onSuccess() " + o.msg);
CallerLogger.INSTANCE.e(M_TAXI + TAG,apiName + ": onSuccess() " + o.msg);
if (callback != null) {
callback.onSuccess(o);
}
@@ -384,7 +386,7 @@ public class OCHTaxiServiceManagerNew {
@Override
public void onError(Throwable e) {
super.onError(e);
Logger.e(TAG,apiName + ": onError() " + e.getMessage());
CallerLogger.INSTANCE.e(M_TAXI + TAG,apiName + ": onError() " + e.getMessage());
if (callback != null) {
callback.onError();
}
@@ -393,7 +395,7 @@ public class OCHTaxiServiceManagerNew {
@Override
public void onError(String message, int code) {
super.onError(message, code);
Logger.e(TAG,String.format(apiName + ": onError() code = %d; message = %s;", code, message));
CallerLogger.INSTANCE.e(M_TAXI + TAG,String.format(apiName + ": onError() code = %d; message = %s;", code, message));
if (callback != null) {
callback.onFail(code, message);
}

9
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/OCHTaxiPresenter.java
View File

@@ -1,9 +1,10 @@
package com.mogo.och.taxi.presenter;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI;
import android.location.Location;
import android.os.Build;
import android.os.Looper;
import android.util.Log;
import androidx.annotation.NonNull;
import androidx.annotation.RequiresApi;
@@ -12,7 +13,7 @@ import androidx.lifecycle.LifecycleOwner;
import com.mogo.commons.AbsMogoApplication;
import com.mogo.commons.mvp.Presenter;
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
import com.mogo.och.taxi.constant.OrderStatusEnum;
import com.mogo.och.taxi.bean.OrderQueryRespBean;
@@ -48,7 +49,7 @@ public class OCHTaxiPresenter extends Presenter<OCHTaxiFragment> implements IOCH
@Override
public void onCreate( @NonNull LifecycleOwner owner ) {
super.onCreate( owner );
Logger.d( TAG, "网约车-出租车拿到订单" );
CallerLogger.INSTANCE.d( M_TAXI + TAG, "网约车-出租车拿到订单" );
}
@Override
@@ -184,7 +185,7 @@ public class OCHTaxiPresenter extends Presenter<OCHTaxiFragment> implements IOCH
@RequiresApi(api = Build.VERSION_CODES.P)
@Override
public void onCurrentOrderStatusChanged(OrderQueryRespBean.Result order) {
Log.d(TAG,"order = "+order.toString());
CallerLogger.INSTANCE.d(M_TAXI + TAG,"order = "+order.toString());
mView.updateCurrentOrderStatusChanged(order);
}

19
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseOchTaxiTabFragment.java
View File

@@ -1,11 +1,12 @@
package com.mogo.och.taxi.ui;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI;
import android.animation.ObjectAnimator;
import android.content.Intent;
import android.graphics.drawable.AnimationDrawable;
import android.os.Handler;
import android.os.Looper;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.animation.LinearInterpolator;
@@ -35,7 +36,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotIdentifyListen
import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager;
import com.mogo.eagle.core.function.call.hmi.CallerHmiManager;
import com.mogo.eagle.core.function.call.map.CallerSmpManager;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.map.MogoMapUIController;
import com.mogo.map.MogoMarkerManager;
import com.mogo.map.listener.IMogoMapListener;
@@ -104,7 +105,7 @@ public abstract class BaseOchTaxiTabFragment<V extends IView, P extends Presente
// onAutopilotStatusChanged(false);
// });
mSpeedView.setOnLongClickListener(v -> {
Log.d(TAG, "长按显示状态工具栏");
CallerLogger.INSTANCE.d(M_TAXI + TAG, "长按显示状态工具栏");
Intent intent = new Intent();
intent.putExtra("oper", 52);
MogoApisHandler.getInstance().getApis().getIntentManagerApi().invoke("com.mogo.mock", intent);
@@ -188,7 +189,7 @@ public abstract class BaseOchTaxiTabFragment<V extends IView, P extends Presente
// MogoApisHandler.getInstance().getApis()
// .getAdasControllerApi()
// .mockOchStatus(IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE, "不能使用");
//// Logger.d("lianglihui","模拟 不可自动驾驶");
//// CallerLogger.INSTANCE.d(M_TAXI + "lianglihui","模拟 不可自动驾驶");
// }
// );
@@ -199,7 +200,7 @@ public abstract class BaseOchTaxiTabFragment<V extends IView, P extends Presente
// .getAdasControllerApi()
// .mockOchStatus(IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE, "能使用");
//
//// Logger.d("lianglihui","模拟 可自动驾驶");
//// CallerLogger.INSTANCE.d(M_TAXI + "lianglihui","模拟 可自动驾驶");
// }
// );
@@ -209,7 +210,7 @@ public abstract class BaseOchTaxiTabFragment<V extends IView, P extends Presente
// MogoApisHandler.getInstance().getApis()
// .getAdasControllerApi()
// .mockOchStatus(IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING, "Running");
//// Logger.d("lianglihui","模拟 自动驾驶能力");
//// CallerLogger.INSTANCE.d(M_TAXI + "lianglihui","模拟 自动驾驶能力");
// }
// );
@@ -219,14 +220,14 @@ public abstract class BaseOchTaxiTabFragment<V extends IView, P extends Presente
// MogoApisHandler.getInstance().getApis()
// .getAdasControllerApi().mockOchStatus(-1, "Arrived");
//
//// Logger.d("lianglihui","模拟 自动驾驶站");
//// CallerLogger.INSTANCE.d(M_TAXI + "lianglihui","模拟 自动驾驶站");
// }
// );
// 模拟 站点下发工控
findViewById(R.id.btnAutopilotControl).setOnClickListener(view ->
{
// Logger.d("lianglihui","模拟 站点下发工控");
// CallerLogger.INSTANCE.d(M_TAXI + "lianglihui","模拟 站点下发工控");
AutopilotControlParameters currentAutopilot = new AutopilotControlParameters();
currentAutopilot.isSpeakVoice = true;
// 万集东门站
@@ -235,7 +236,7 @@ public abstract class BaseOchTaxiTabFragment<V extends IView, P extends Presente
currentAutopilot.endLatLon = new AutopilotControlParameters.AutoPilotLonLat(40.1939540844, 116.720067);
// 订单运营类型 （9出租车，10小巴）
currentAutopilot.vehicleType = 10;
Logger.d(TAG, "模拟 订单站点下发：" + currentAutopilot);
CallerLogger.INSTANCE.d(M_TAXI + TAG, "模拟 订单站点下发：" + currentAutopilot);
CallerAutoPilotManager.INSTANCE.startAutoPilot(currentAutopilot);
}
);

8
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHNaviFragment.java
View File

@@ -1,8 +1,9 @@
package com.mogo.och.taxi.ui;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI;
import android.graphics.BitmapFactory;
import android.os.Bundle;
import android.util.Log;
import android.view.View;
import com.amap.api.maps.AMap;
@@ -12,6 +13,7 @@ import com.amap.api.navi.AMapNaviViewListener;
import com.amap.api.navi.AMapNaviViewOptions;
import com.amap.api.navi.model.RouteOverlayOptions;
import com.mogo.eagle.core.utilcode.mogo.MapAssetStyleUtils;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.och.taxi.R;
import com.mogo.och.taxi.callback.IOCHTaxiNaviChangedCallback;
import com.mogo.och.taxi.model.NaviToDestinationModel;
@@ -199,8 +201,8 @@ public class OCHNaviFragment extends BaseTaxiUIFragment implements AMapNaviViewL
@Override
public void onNaviViewLoaded() {
Log.d("wlx", "导航页面加载成功");
Log.d("wlx", "请不要使用AMapNaviView.getMap().setOnMapLoadedListener();会overwrite导航SDK内部画线逻辑");
CallerLogger.INSTANCE.d(M_TAXI + "wlx", "导航页面加载成功");
CallerLogger.INSTANCE.d(M_TAXI + "wlx", "请不要使用AMapNaviView.getMap().setOnMapLoadedListener();会overwrite导航SDK内部画线逻辑");
}
@Override

32
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiBeingServerdOrdersFragment.java
View File

@@ -1,5 +1,7 @@
package com.mogo.och.taxi.ui;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI;
import android.app.Activity;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
@@ -8,7 +10,6 @@ import android.graphics.drawable.GradientDrawable;
import android.os.Build;
import android.os.Bundle;
import android.text.Html;
import android.util.Log;
import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;
@@ -21,13 +22,12 @@ import com.amap.api.navi.model.NaviLatLng;
import com.mogo.commons.AbsMogoApplication;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.commons.voice.AIAssist;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.eagle.core.utilcode.mogo.toast.TipToast;
import com.mogo.eagle.core.utilcode.util.DateTimeUtils;
import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
import com.mogo.map.MogoMarkerManager;
import com.mogo.map.marker.MogoMarkerOptions;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.och.taxi.callback.IOCHTaxiNaviChangedCallback;
import com.mogo.och.taxi.constant.OCHTaxiConst;
import com.mogo.och.taxi.constant.OrderStatusEnum;
@@ -163,7 +163,7 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem
mTaxiFragment.queryCurOrderRouteInfo();
mContentModule3.setVisibility(View.GONE);
mContentModule2.setVisibility(View.VISIBLE);
Logger.d(TAG, "已经达到终点");
CallerLogger.INSTANCE.d(M_TAXI + TAG, "已经达到终点");
mOrderStatus.setText(R.string.module_och_taxi_arrive_at_end_station2);
mOrderServerStatus.setText(R.string.module_och_taxi_order_server_end);
mOrderServerStatus.setTextColor(Color.parseColor("#FFFFFF"));
@@ -178,7 +178,7 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem
// + "<font color=\"#CAD6FF\">用时 </font>" + "<b><font color=\"#FFFFFF\">- -</font></b>" + "<font color=\"#CAD6FF\"> 分钟</font>";
// mDistanceAndTime.setText(Html.fromHtml(strHtml2));
} else if (OrderStatusEnum.OnTheWayToEndStation.getCode() == order.orderStatus) {
Logger.d(TAG, "已经去往终点");
CallerLogger.INSTANCE.d(M_TAXI + TAG, "已经去往终点");
mContentModule3.setVisibility(View.GONE);
mContentModule2.setVisibility(View.VISIBLE);
mOrderStatus.setText(R.string.module_och_taxi_on_the_way_2_end_station);
@@ -196,7 +196,7 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem
// + "<font color=\"#CAD6FF\">用时 </font>" + "<b><font color=\"#FFFFFF\">- -</font></b>" + "<font color=\"#CAD6FF\"> 分钟</font>";
// mDistanceAndTime.setText(Html.fromHtml(strHtml4));
} else if (OrderStatusEnum.ArriveAtStartStation.getCode() == order.orderStatus) {
Logger.d(TAG, "已经达到起点");
CallerLogger.INSTANCE.d(M_TAXI + TAG, "已经达到起点");
mContentModule2.setVisibility(View.GONE);
mContentModule3.setVisibility(View.VISIBLE);
mArrivedStartTimeTv32.setVisibility(View.VISIBLE);
@@ -233,7 +233,7 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem
}
mDistanceAndTime3.setText(Html.fromHtml(strHtml13));
} else if (MogoOCHTaxiModelNew.getInstance().checkCurrentOCHOrder()) {
Logger.d(TAG, "前往乘客上车地点");
CallerLogger.INSTANCE.d(M_TAXI + TAG, "前往乘客上车地点");
mContentModule2.setVisibility(View.GONE);
mContentModule3.setVisibility(View.VISIBLE);
mContentModule31.setVisibility(View.VISIBLE);
@@ -278,7 +278,7 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem
private void startNaviToStartStation(boolean isShow, double orderStartStationLat, double orderStartStationLng) {
NaviToDestinationModel.getInstance(getContext()).destroyAmaNavi();
Log.d(TAG, "currentLatLng=" + mTaxiFragment.mCurLatitude + " " + mTaxiFragment.mCurLongitude);
CallerLogger.INSTANCE.d(M_TAXI + TAG, "currentLatLng=" + mTaxiFragment.mCurLatitude + " " + mTaxiFragment.mCurLongitude);
NaviLatLng startNaviLatLng = new NaviLatLng(mTaxiFragment.mCurLatitude, mTaxiFragment.mCurLongitude);
NaviLatLng endNaviLatLng = new NaviLatLng(orderStartStationLat, orderStartStationLng);
NaviToDestinationModel.getInstance(getContext()).initAMapNavi(startNaviLatLng, endNaviLatLng);
@@ -295,7 +295,7 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem
}
public void updateDistanceAndTime(long meters, long timeInSecond) {
// Log.d(TAG,"meters = "+meters);
// CallerLogger.INSTANCE.d(M_TAXI + TAG,"meters = "+meters);
if (mContentModule3 != null && mContentModule3.getVisibility() == View.VISIBLE) {
DecimalFormat fnum = new DecimalFormat("##0.0");
String dis = fnum.format((float) meters / 1000);
@@ -313,7 +313,7 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem
}
public void onCurrentOrderRouteInfoGot(OrderQueryRouteInfoRespBean.Result routeInfo) {
Log.d(TAG, "meters = " + routeInfo.durationToEnd);
CallerLogger.INSTANCE.d(M_TAXI + TAG, "meters = " + routeInfo.durationToEnd);
DecimalFormat fnum = new DecimalFormat("##0.0");
String dis = fnum.format((float) routeInfo.distanceToEnd / 1000);
String strHtml2 = "<font color=\"#CAD6FF\">距离 </font>" + "<b><font color=\"#FFFFFF\">" + dis + "</font></b>" + "<font color=\"#CAD6FF\"> 公里</font>"
@@ -352,7 +352,7 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem
public void onOrderStatusChanged(OrderQueryRespBean.Result order) {
int status = order.orderStatus;
Log.d(TAG, "status==" + status);
CallerLogger.INSTANCE.d(M_TAXI + TAG, "status==" + status);
mActivity.runOnUiThread(() -> {
if (status == OrderStatusEnum.None.getCode() || status == OrderStatusEnum.Cancel.getCode() || status == OrderStatusEnum.JourneyCompleted.getCode()) {
isSpeakedEndingNotice = false;
@@ -415,7 +415,7 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem
* @param being
*/
public void isHaveBeingOrder(boolean being) {
Log.d(TAG, "isHaveBeingOrder = " + being);
CallerLogger.INSTANCE.d(M_TAXI + TAG, "isHaveBeingOrder = " + being);
if (being) {
mNoDataView.setVisibility(View.GONE);
mBeingOrderLayout.setVisibility(View.VISIBLE);
@@ -434,7 +434,7 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem
switch (mOrderServerStatus.getText().toString().trim()) {
case "开始服务":
case "服务完成":
Log.d(TAG, mOrderServerStatus.getText().toString());
CallerLogger.INSTANCE.d(M_TAXI + TAG, mOrderServerStatus.getText().toString());
startOrEndService(mOrderServerStatus.getText().toString().trim());
break;
}
@@ -490,7 +490,7 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem
@Override
public void reInitNaviAmap(boolean isPlay, boolean isRestart) {
Log.d(TAG, "isPlay = " + isPlay + ", isRestart=" + isRestart);
CallerLogger.INSTANCE.d(M_TAXI + TAG, "isPlay = " + isPlay + ", isRestart=" + isRestart);
if (!isRestart) {
mTaxiFragment.showNaviToStartStationFragment(false);
return;
@@ -526,7 +526,7 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem
*/
private void setOrRemoveMapMaker(boolean isAdd, String uuid, List<Double> station, int iconId){
if (isAdd){
Log.d("setMapMaker= ",uuid+"=latitude="+station.get(1)+",longitude="+station.get(0));
CallerLogger.INSTANCE.d(M_TAXI + "setMapMaker= ",uuid+"=latitude="+station.get(1)+",longitude="+station.get(0));
MogoMarkerOptions options = new MogoMarkerOptions();
options.anchorColor("#000000");//不设置报错，暂时随便设置个
options.setGps(true);//使用wgs 必须设置true
@@ -537,7 +537,7 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem
options.longitude(station.get(0));
MogoMarkerManager.getInstance(AbsMogoApplication.getApp()) .addMarker(uuid, options);
}else {
Log.d("RemoveMapMaker=",uuid+"=latitude="+station.get(1)+",longitude="+station.get(0));
CallerLogger.INSTANCE.d(M_TAXI + "RemoveMapMaker=",uuid+"=latitude="+station.get(1)+",longitude="+station.get(0));
MogoMarkerManager.getInstance(AbsMogoApplication.getApp()) .removeMarkers(uuid);
}
}

153
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java
View File

@@ -1,5 +1,7 @@
package com.mogo.och.taxi.ui;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI;
import android.content.Context;
import android.os.Build;
import android.os.Bundle;
@@ -7,16 +9,13 @@ import android.view.View;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import androidx.fragment.app.FragmentTransaction;
import com.amap.api.maps.CoordinateConverter;
import com.amap.api.maps.model.LatLng;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.eagle.core.data.autopilot.AutopilotRouteInfo;
import com.mogo.eagle.core.data.map.MogoLatLng;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.och.taxi.R;
import com.mogo.och.taxi.constant.OrderStatusEnum;
@@ -39,10 +38,10 @@ import mogo.telematics.pad.MessagePad;
/**
* @author congtaowang
* @since 2021/1/18
*
* <p>
* 网约车-出租车UI
*/
public class OCHTaxiFragment extends BaseOchTaxiTabFragment<OCHTaxiFragment, OCHTaxiPresenter> implements OCHTaxiView{
public class OCHTaxiFragment extends BaseOchTaxiTabFragment<OCHTaxiFragment, OCHTaxiPresenter> implements OCHTaxiView {
public static final String TAG = "OCHTaxiFragment";
@@ -51,9 +50,10 @@ public class OCHTaxiFragment extends BaseOchTaxiTabFragment<OCHTaxiFragment, OCH
Bundle args = new Bundle();
OCHTaxiFragment fragment = new OCHTaxiFragment();
fragment.setArguments( args );
fragment.setArguments(args);
return fragment;
}
private OCHTaxiGrabOrderFragment grabOrderFragment;
private OCHTaxiServerOrdersFragment serverOrdersFragment;
private WeakReference<OCHTaxiPersonalDialogFragment> personalDialogFragment = null;
@@ -69,7 +69,7 @@ public class OCHTaxiFragment extends BaseOchTaxiTabFragment<OCHTaxiFragment, OCH
public void restartAutopilot() {
// 在自动驾驶中，才会有重新开启自动驾驶的操作
if (mPresenter.getCurOrderStatus() == OrderStatusEnum.OnTheWayToEndStation) {
Logger.d( TAG, "restartAutopilot" );
CallerLogger.INSTANCE.d(M_TAXI + TAG, "restartAutopilot");
mPresenter.startAutoPilot();
startOrStopLoadingAnim(true);
}
@@ -87,10 +87,10 @@ public class OCHTaxiFragment extends BaseOchTaxiTabFragment<OCHTaxiFragment, OCH
mPersonalBtn.setVisibility(View.GONE);
initFragment();
hidPanel();
if ( MogoApisHandler.getInstance()
if (MogoApisHandler.getInstance()
.getApis()
.getStatusManagerApi()
.isVrMode() ) {
.isVrMode()) {
switchVRFlatMode(true);
} else {
switchVRFlatMode(false);
@@ -109,27 +109,27 @@ public class OCHTaxiFragment extends BaseOchTaxiTabFragment<OCHTaxiFragment, OCH
grabOrderFragment = OCHTaxiGrabOrderFragment.newInstance();
FragmentTransaction transaction = getChildFragmentManager().beginTransaction();
//默认显示OCHTaxiServerOrdersFragment
transaction.add(R.id.fragment_container,serverOrdersFragment).show(serverOrdersFragment);
transaction.add(R.id.fragment_container,grabOrderFragment).hide(grabOrderFragment);
transaction.add(R.id.fragment_container, serverOrdersFragment).show(serverOrdersFragment);
transaction.add(R.id.fragment_container, grabOrderFragment).hide(grabOrderFragment);
transaction.commitAllowingStateLoss();
}
private void showGrabFragmentAndUpdate() {
FragmentTransaction transaction = getChildFragmentManager().beginTransaction();
if (grabOrderFragment == null){
if (grabOrderFragment == null) {
grabOrderFragment = OCHTaxiGrabOrderFragment.newInstance();
transaction.add(R.id.fragment_container,grabOrderFragment).show(grabOrderFragment).commitAllowingStateLoss();
}else {
transaction.add(R.id.fragment_container, grabOrderFragment).show(grabOrderFragment).commitAllowingStateLoss();
} else {
transaction.show(grabOrderFragment).hide(serverOrdersFragment).commitAllowingStateLoss();
}
}
public void showServerFragmentAndUpdate() {
FragmentTransaction transaction = getChildFragmentManager().beginTransaction();
if (serverOrdersFragment == null){
if (serverOrdersFragment == null) {
serverOrdersFragment = OCHTaxiServerOrdersFragment.newInstance();
transaction.add(R.id.fragment_container,serverOrdersFragment).show(serverOrdersFragment);
}else {
transaction.add(R.id.fragment_container, serverOrdersFragment).show(serverOrdersFragment);
} else {
transaction.show(serverOrdersFragment).hide(grabOrderFragment).commitAllowingStateLoss();
}
}
@@ -137,7 +137,7 @@ public class OCHTaxiFragment extends BaseOchTaxiTabFragment<OCHTaxiFragment, OCH
@NonNull
@Override
protected OCHTaxiPresenter createPresenter() {
return new OCHTaxiPresenter( this );
return new OCHTaxiPresenter(this);
}
@Override
@@ -158,17 +158,17 @@ public class OCHTaxiFragment extends BaseOchTaxiTabFragment<OCHTaxiFragment, OCH
}
public void updateOperationStatus(boolean inOperation) {
Logger.e(TAG,"onOperationChanged:"+ inOperation);
CallerLogger.INSTANCE.e(M_TAXI + TAG, "onOperationChanged:" + inOperation);
isOperationStatus = inOperation;
if ( inOperation ) {
tvOperationStatus.setText( "收车" );
if (inOperation) {
tvOperationStatus.setText("收车");
mPersonalBtn.setVisibility(View.VISIBLE);
tvOperationStatus.setCompoundDrawablesWithIntrinsicBounds(getResources().getDrawable(R.drawable.taxi_back_btn),null,null,null);
tvOperationStatus.setCompoundDrawablesWithIntrinsicBounds(getResources().getDrawable(R.drawable.taxi_back_btn), null, null, null);
showPanel();
} else {
// AIAssist.getInstance(getContext()).speakTTSVoice("已收车");
tvOperationStatus.setText("出车");
tvOperationStatus.setCompoundDrawablesWithIntrinsicBounds(getResources().getDrawable(R.drawable.taxi_out_btn),null,null,null);
tvOperationStatus.setCompoundDrawablesWithIntrinsicBounds(getResources().getDrawable(R.drawable.taxi_out_btn), null, null, null);
mPersonalBtn.setVisibility(View.GONE);
hidPanel();
}
@@ -177,19 +177,19 @@ public class OCHTaxiFragment extends BaseOchTaxiTabFragment<OCHTaxiFragment, OCH
@Override
protected void onGoToTaxiOrders() {
personalDialogFragment = new WeakReference<>(new OCHTaxiPersonalDialogFragment(this));
personalDialogFragment.get().show(getActivity().getSupportFragmentManager(),"service_data");
personalDialogFragment.get().show(getActivity().getSupportFragmentManager(), "service_data");
}
// public void routeResult(List<AutopilotRouteInfo.RouteModels> routeList) {
// public void routeResult(List<AutopilotRouteInfo.RouteModels> routeList) {
// if (routeList == null ) return;
// double distance = calculateTravelDistance(mogoLocation,routeList);
// if ( MogoOCHTaxiModel.getInstance().checkCurrentOCHOrder() ) {
// MogoOCHTaxiModel.getInstance().getCurrentOCHOrder().decreaseTravelDistance( distance );
// updateOrderBaseStatusInfo();
// }
// Logger.d("lianglihui","routeResult 剩余导航距离:"+distance);
// CallerLogger.INSTANCE.d(M_TAXI + "lianglihui","routeResult 剩余导航距离:"+distance);
// if (routeList != null && routeList.size() >0){
// Logger.d("lianglihui","routeResult:"+routeList.size());
// CallerLogger.INSTANCE.d(M_TAXI + "lianglihui","routeResult:"+routeList.size());
// //adas回调导航路径 绘制引导线
// if ( ochTaxiOverlayManager == null){
// ochTaxiOverlayManager = new OCHTaxiOverlayManager(this.getContext());
@@ -204,67 +204,80 @@ public class OCHTaxiFragment extends BaseOchTaxiTabFragment<OCHTaxiFragment, OCH
public void updateAutopilotStatus(int status) {
onAutopilotStatusChanged(status);
}
/**
* 收到自动驾驶通知的成功状态之后，设置本地状态及服务端状态
*/
private void resetOCHTaxiOrderAutopilotStatus() {
mPresenter.updateCurOrderStatus(OrderStatusEnum.OnTheWayToEndStation);
}
@RequiresApi(api = Build.VERSION_CODES.P)
public void updateCurrentOrderStatusChanged(OrderQueryRespBean.Result order){
if (serverOrdersFragment != null){
public void updateCurrentOrderStatusChanged(OrderQueryRespBean.Result order) {
if (serverOrdersFragment != null) {
serverOrdersFragment.updateCurrentOrderStatusChanged(order);
}
}
public void startAutoPilot(){
public void startAutoPilot() {
mPresenter.startAutoPilot();
startOrStopLoadingAnim(true);
}
public void completeOrderService(OrderStatusEnum status){
public void completeOrderService(OrderStatusEnum status) {
mPresenter.updateCurOrderStatus(status);
}
public void cancelCurOrder(int reasonType, String reaso){
mPresenter.cancelCurOrder(reasonType,reaso);
public void cancelCurOrder(int reasonType, String reaso) {
mPresenter.cancelCurOrder(reasonType, reaso);
}
public void cancelOrderById(String orderNo, int reasonType, String reason){
mPresenter.cancelOrderById(orderNo,reasonType,reason);
public void cancelOrderById(String orderNo, int reasonType, String reason) {
mPresenter.cancelOrderById(orderNo, reasonType, reason);
}
public void onCurrentOrderCancelDone(){
public void onCurrentOrderCancelDone() {
if (null == serverOrdersFragment) return;
serverOrdersFragment.onCurrentOrderCancelDone();
}
public void onOrderCancelDone(String orderNo){
public void onOrderCancelDone(String orderNo) {
if (null == serverOrdersFragment) return;
serverOrdersFragment.onOrderCancelDone(orderNo);
}
public void onNewBookingOrderGot(OrderQueryRespBean.Result order){
public void onNewBookingOrderGot(OrderQueryRespBean.Result order) {
if (null == order) return;
showGrabFragmentAndUpdate();
grabOrderFragment.updateGrabOrder(order);
}
public void grabOrder(){
public void grabOrder() {
mPresenter.grabOrder();
}
public void cancelNewBookingOrder(){
public void cancelNewBookingOrder() {
mPresenter.cancelNewBookingOrder();
showServerFragmentAndUpdate();
}
public void onGrabOrderExecuteDone(){
public void onGrabOrderExecuteDone() {
if (null == grabOrderFragment) return;
grabOrderFragment.onGrabOrderExecuteDone();
}
public void onGrabOrderSuccess(OrderQueryRespBean.Result order){
public void onGrabOrderSuccess(OrderQueryRespBean.Result order) {
if (null == grabOrderFragment) return;
if (null == order){
if (null == order) {
showServerFragmentAndUpdate();
return;
}
showGrabFragmentAndUpdate();
grabOrderFragment.onGrabOrderSuccess();
}
public void onGrabOrderFailed(OrderQueryRespBean.Result order){
if (order == null){
public void onGrabOrderFailed(OrderQueryRespBean.Result order) {
if (order == null) {
showServerFragmentAndUpdate();
return;
}
@@ -272,44 +285,56 @@ public class OCHTaxiFragment extends BaseOchTaxiTabFragment<OCHTaxiFragment, OCH
showGrabFragmentAndUpdate();
grabOrderFragment.onGrabOrderFailed();
}
public void onOrdersWaitServiceChanged(List<OrderQueryRespBean.Result> waitServiceList){
public void onOrdersWaitServiceChanged(List<OrderQueryRespBean.Result> waitServiceList) {
if (null == waitServiceList) return;
if (null == serverOrdersFragment) return;
serverOrdersFragment.onOrdersWaitServiceChanged(waitServiceList);
}
public void queryOrdersList(int page, int size){
mPresenter.queryOrdersList(page,size);
public void queryOrdersList(int page, int size) {
mPresenter.queryOrdersList(page, size);
}
public void onOrdersListPageRefresh(List<OrderQueryRespBean.Result> ordersList){
if (null == personalDialogFragment) personalDialogFragment = new WeakReference<>(new OCHTaxiPersonalDialogFragment(this));
public void onOrdersListPageRefresh(List<OrderQueryRespBean.Result> ordersList) {
if (null == personalDialogFragment)
personalDialogFragment = new WeakReference<>(new OCHTaxiPersonalDialogFragment(this));
personalDialogFragment.get().onOrdersListPageRefresh(ordersList);
}
public void queryDriverServiceData(){
public void queryDriverServiceData() {
mPresenter.queryDriverServiceData();
}
public void onServiceDataUpdate(long dailyTimeDuration, long dailyOrderNum){
public void onServiceDataUpdate(long dailyTimeDuration, long dailyOrderNum) {
if (null == personalDialogFragment) return;
personalDialogFragment.get().onServiceDataUpdate(dailyTimeDuration,dailyOrderNum);
personalDialogFragment.get().onServiceDataUpdate(dailyTimeDuration, dailyOrderNum);
}
public void queryCurOrderRouteInfo(){
public void queryCurOrderRouteInfo() {
mPresenter.queryCurOrderRouteInfo();
}
public void onCurrentOrderRouteInfoGot(OrderQueryRouteInfoRespBean.Result routeInfo){
public void onCurrentOrderRouteInfoGot(OrderQueryRouteInfoRespBean.Result routeInfo) {
if (null == serverOrdersFragment) return;
serverOrdersFragment.onCurrentOrderRouteInfoGot(routeInfo);
}
public void onCurrentOrderDistToStartChanged(long meters, long timeInSecond){
public void onCurrentOrderDistToStartChanged(long meters, long timeInSecond) {
// if (null == serverOrdersFragment) return;
// serverOrdersFragment.onCurrentOrderDistToStartChanged(meters,timeInSecond);
}
public void onCurrentOrderDistToEndChanged(long meters, long timeInSecond){
public void onCurrentOrderDistToEndChanged(long meters, long timeInSecond) {
if (null == serverOrdersFragment) return;
serverOrdersFragment.onCurrentOrderDistToEndChanged(meters,timeInSecond);
serverOrdersFragment.onCurrentOrderDistToEndChanged(meters, timeInSecond);
}
public void updateLocation(double latitude,double longitude){
public void updateLocation(double latitude, double longitude) {
this.mCurLatitude = latitude;
this.mCurLongitude = longitude;
}
/**
* 订单流转debug START
*/
@@ -320,7 +345,7 @@ public class OCHTaxiFragment extends BaseOchTaxiTabFragment<OCHTaxiFragment, OCH
findViewById(R.id.test_bar_to_end).setOnClickListener(v -> {
MogoOCHTaxiModelNew.getInstance().setArriveAtEndStation();
});
findViewById(R.id.test_bar_on_the_way_to_end).setOnClickListener(v ->{
findViewById(R.id.test_bar_on_the_way_to_end).setOnClickListener(v -> {
showNotice("自动驾驶已启动，请系好安全带");
MogoOCHTaxiModelNew.getInstance().setOnTheWayToEndStation();
});
@@ -508,14 +533,14 @@ public class OCHTaxiFragment extends BaseOchTaxiTabFragment<OCHTaxiFragment, OCH
try {
JSONObject jsonObject = new JSONObject(listStr);
JSONArray jsonElements = jsonObject.getJSONArray("models");
for (int i = 0; i < jsonElements.length(); i++){
for (int i = 0; i < jsonElements.length(); i++) {
JSONObject s = jsonElements.getJSONObject(i);
MessagePad.Location.Builder builder = MessagePad.Location.newBuilder();
builder.setLatitude(s.getDouble("lat"));
builder.setLongitude(s.getDouble("lon"));
list.add(builder.build());
}
List<MessagePad.Location> list1 = CoordinateConverterFrom84ForList(getContext(),list);
List<MessagePad.Location> list1 = CoordinateConverterFrom84ForList(getContext(), list);
MogoOCHTaxiModelNew.getInstance().updateOrderRoute(list1);
} catch (JSONException e) {
e.printStackTrace();
@@ -543,7 +568,7 @@ public class OCHTaxiFragment extends BaseOchTaxiTabFragment<OCHTaxiFragment, OCH
return latLng;
}
public void clickTestBar(){
public void clickTestBar() {
View testBar = findViewById(R.id.module_och_taxi_order_status_change_test_bar);
if (testBar.getVisibility() == View.VISIBLE) {
testBar.setVisibility(View.GONE);

6
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiOrderCancelDialog.java
View File

@@ -1,5 +1,7 @@
package com.mogo.och.taxi.ui;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI;
import android.app.AlertDialog;
import android.content.Context;
import android.graphics.Color;
@@ -7,7 +9,6 @@ import android.graphics.drawable.ColorDrawable;
import android.os.Build;
import android.os.Bundle;
import android.text.TextUtils;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -19,6 +20,7 @@ import android.widget.TextView;
import androidx.annotation.RequiresApi;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.eagle.core.utilcode.mogo.toast.TipToast;
import com.mogo.och.taxi.constant.OrderStatusEnum;
import com.mogo.och.taxi.R;
@@ -144,7 +146,7 @@ public class OCHTaxiOrderCancelDialog extends AlertDialog implements View.OnClic
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
Log.d(TAG,"mCurrentReason ="+ mContentArrays[position]);
CallerLogger.INSTANCE.d(M_TAXI + TAG,"mCurrentReason ="+ mContentArrays[position]);
mCurrentReason = mContentArrays[position];
// GradientDrawable background = (GradientDrawable) mCancelBt.getBackground();//GradientDrawable是Drawable的子类
// background.setColor(Color.parseColor("#2B6EFF"));

12
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiPersonalDialogFragment.java
View File

@@ -6,7 +6,6 @@ import android.graphics.Point;
import android.graphics.Typeface;
import android.os.Build;
import android.os.Bundle;
import android.util.Log;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
@@ -31,7 +30,7 @@ import androidx.recyclerview.widget.RecyclerView;
import androidx.viewpager.widget.ViewPager;
import com.google.android.material.tabs.TabLayout;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.och.taxi.constant.OrderStatusEnum;
import com.mogo.och.taxi.R;
import com.mogo.och.taxi.bean.OrderQueryRespBean;
@@ -43,6 +42,7 @@ import java.util.Calendar;
import java.util.List;
import static androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI;
/**
* @author: wangmingjun
@@ -99,7 +99,7 @@ public class OCHTaxiPersonalDialogFragment extends DialogFragment implements Vie
windowManager.getDefaultDisplay().getSize(point);
params.width = (int)(point.x * 0.375);
params.height = ViewGroup.LayoutParams.MATCH_PARENT;
Log.d(TAG,"width= "+params.width+"height= "+params.height);
CallerLogger.INSTANCE.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);
@@ -203,13 +203,13 @@ public class OCHTaxiPersonalDialogFragment extends DialogFragment implements Vie
ImageView imageView = (ImageView) tab.getCustomView().findViewById(R.id.operation_tab_line_iv);
if (isSelected){
textView.setTextSize(23);
Log.d(TAG,"SelectTv = "+ textView.getText());
CallerLogger.INSTANCE.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(20);
Log.d(TAG,"unSelectTv = "+ textView.getText());
CallerLogger.INSTANCE.d(M_TAXI + TAG,"unSelectTv = "+ textView.getText());
textView.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));
textView.setTextColor(Color.parseColor("#A7B6F0"));
imageView.setImageDrawable(null);
@@ -462,7 +462,7 @@ public class OCHTaxiPersonalDialogFragment extends DialogFragment implements Vie
LinearLayoutManager linearLayoutManager = (LinearLayoutManager) manager;
int lastItemPosition = linearLayoutManager.findLastCompletelyVisibleItemPosition();
int itemCount = linearLayoutManager.getItemCount();
Log.d(TAG,"lastItemPosition=="+lastItemPosition+",itemCount=="+itemCount);
CallerLogger.INSTANCE.d(M_TAXI + TAG,"lastItemPosition=="+lastItemPosition+",itemCount=="+itemCount);
//向上滑动到最后一个
if ((lastItemPosition == itemCount-1) && isUpwardSliding){
onLoadMore();

15
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiServerOrdersFragment.java
View File

@@ -1,10 +1,11 @@
package com.mogo.och.taxi.ui;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI;
import android.graphics.Color;
import android.graphics.Typeface;
import android.os.Build;
import android.os.Bundle;
import android.util.Log;
import android.view.View;
import android.widget.TextView;
@@ -18,7 +19,7 @@ import androidx.fragment.app.FragmentTransaction;
import androidx.viewpager.widget.ViewPager;
import com.google.android.material.tabs.TabLayout;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.och.taxi.R;
import com.mogo.och.taxi.bean.OrderQueryRespBean;
import com.mogo.och.taxi.bean.OrderQueryRouteInfoRespBean;
@@ -91,7 +92,7 @@ public class OCHTaxiServerOrdersFragment extends BaseTaxiUIFragment {
}
}
Log.d(TAG,"activity="+getActivity());
CallerLogger.INSTANCE.d(M_TAXI + TAG,"activity="+getActivity());
mTaxiOrderTab.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
@Override
@@ -134,13 +135,13 @@ public class OCHTaxiServerOrdersFragment extends BaseTaxiUIFragment {
if (isSelected){
textView.setBackground(getActivity().getDrawable(R.drawable.taxi_driver_tab_item_bg));
textView.setTextSize(20);
Log.d(TAG,"SelectTv = "+ textView.getText());
CallerLogger.INSTANCE.d(M_TAXI + TAG,"SelectTv = "+ textView.getText());
textView.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD));
textView.setTextColor(Color.parseColor("#FFFFFF"));
}else {
textView.setBackground(null);
textView.setTextSize(18);
Log.d(TAG,"unSelectTv = "+ textView.getText());
CallerLogger.INSTANCE.d(M_TAXI + TAG,"unSelectTv = "+ textView.getText());
textView.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));
textView.setTextColor(Color.parseColor("#CCD4F5"));
}
@@ -158,7 +159,7 @@ public class OCHTaxiServerOrdersFragment extends BaseTaxiUIFragment {
@NonNull
@Override
public Fragment getItem(int position) {
Logger.d( TAG, "getItem="+position);
CallerLogger.INSTANCE.d( M_TAXI + TAG, "getItem="+position);
return fragments.get(position);
}
@@ -170,7 +171,7 @@ public class OCHTaxiServerOrdersFragment extends BaseTaxiUIFragment {
@Nullable
@Override
public CharSequence getPageTitle(int position) {
Logger.d( TAG, "getPageTitle="+position);
CallerLogger.INSTANCE.d( M_TAXI + TAG, "getPageTitle="+position);
return mTabTitles[position];
}
}

4
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/scene/SceneManager.kt
View File

@@ -14,6 +14,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OBU
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OLD_ROUTE
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_TAXI
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_TAXI_P
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_V2X
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneLogCache
@@ -33,6 +34,7 @@ class SceneManager {
private const val NET = "NET"
private const val BUS = "BUS"
private const val TAXI = "TAXI"
private const val TAXI_P = "TAXI-P"
val sceneManager: SceneManager by lazy(LazyThreadSafetyMode.SYNCHRONIZED) {
SceneManager()
@@ -54,6 +56,7 @@ class SceneManager {
sceneModuleTAG.map[NET] = SceneModule(true, M_NETWORK)
sceneModuleTAG.map[BUS] = SceneModule(false, M_BUS)
sceneModuleTAG.map[TAXI] = SceneModule(false, M_TAXI)
sceneModuleTAG.map[TAXI_P] = SceneModule(false, M_TAXI_P)
sceneLogTAG.map[TAXI] = SceneTAG(false)
sceneLogTAG.map[BUS] = SceneTAG(false)
@@ -106,6 +109,7 @@ class SceneManager {
when (name) {
TAXI -> {
sceneCache[M_TAXI]?.logger = logger
sceneCache[M_TAXI_P]?.logger = logger
sceneCache[M_NETWORK]?.logger = logger
sceneCache[M_ADAS_IMPL]?.logger = logger
sceneCache[M_HMI]?.logger = logger

4
core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/logger/scene/Scene.kt
View File

@@ -9,6 +9,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OLD_ROUTE
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OTHER
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_TAXI
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_TAXI_P
import java.util.*
/**
@@ -48,6 +49,9 @@ class Scene {
//初始化TAXI
val taxiMap = SceneLogCache(mutableMapOf(), false)
sceneCache[M_TAXI] = taxiMap
//初始化TAXI-P
val taxiPMap = SceneLogCache(mutableMapOf(), false)
sceneCache[M_TAXI_P] = taxiPMap
//初始化BUS
val busMap = SceneLogCache(mutableMapOf(), false)
sceneCache[M_BUS] = busMap

3
core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/logger/scene/SceneConstant.kt
View File

@@ -31,6 +31,9 @@ class SceneConstant {
const val M_BUS = "M_BUS_"
//出租车
const val M_TAXI = "M_TAXI_"
//出租车乘客屏
const val M_TAXI_P = "M_TAXI_P"
}
}

1
libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java
View File

@@ -84,7 +84,6 @@ public class AMapWrapper implements IMogoMap {
@Override
public IMogoMarker addMarker(String tag, MogoMarkerOptions options) {
//Logger.i(TAG, "autoop-addMarker: " + tag + ",MogoMarkerOptions:" + options + ",AMap:" + (mAMap != null) + ",this:" + this);
if (!checkAMap()) {
return null;
}

2
test/crashreport-bugly/src/main/java/com/mogo/test/crashreport/bugly/BuglyCrashReportProvider.java
View File

@@ -6,7 +6,6 @@ import android.text.TextUtils;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
import com.mogo.eagle.core.utilcode.util.AppUtils;
import com.mogo.test.crashreport.CrashReportConstants;
import com.mogo.test.crashreport.ITestCrashReportProvider;
@@ -31,7 +30,6 @@ public class BuglyCrashReportProvider implements ITestCrashReportProvider {
@Override
public void init(Context context) {
Logger.d(TAG, "init");
String packageName = context.getPackageName();
String processName = getProcessName(android.os.Process.myPid());
CrashReport.UserStrategy strategy = new CrashReport.UserStrategy(context);

10
tts/tts-zhi/src/main/java/com/mogo/tts/pad/ZhiTTS.java
View File

@@ -5,7 +5,6 @@ import android.content.Intent;
import android.text.TextUtils;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
import com.mogo.eagle.core.utilcode.util.AppUtils;
import com.mogo.tts.base.IMogoTTS;
import com.mogo.tts.base.IMogoTTSCallback;
@@ -43,7 +42,6 @@ class ZhiTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsListener {
private Context mContext;
public synchronized void release() {
Logger.d( TAG, "release" );
if ( mCmdMap != null && !mCmdMap.isEmpty() && mVoiceClient != null ) {
for ( String cmd : mCmdMap.keySet() ) {
try {
@@ -109,7 +107,6 @@ class ZhiTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsListener {
if ( !mCmdMap.containsKey( cmd ) ) {
return;
}
Logger.d( TAG, "received command: %s", cmd );
Iterator< IMogoTTSCallback > iterator = null;
try {
@@ -291,7 +288,6 @@ class ZhiTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsListener {
mVoiceClient.registerCustomWakeupCmd( cmd, cmdWords );
mCacheUnWakeupCommands.remove( cmd );
}
Logger.i( TAG, "cache un wakeup command2. %s", cmd );
mCacheUnWakeupCommands.put( cmd, cmdWords );
}
@@ -307,7 +303,6 @@ class ZhiTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsListener {
mVoiceClient.registerCustomWakeupCmd( cmd, cmdWords );
mCacheUnWakeupCommands.remove( cmd );
}
Logger.i( TAG, "cache un wakeup command. %s", cmd );
mCacheUnWakeupCommands.put( cmd, cmdWords );
}
@@ -361,7 +356,6 @@ class ZhiTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsListener {
intent.setAction( "pvetec.intent.action.txz.switch" );
intent.putExtra( "window_start_cancel", status );
intent.putExtra( "extra_switch_type", "window_start_cancel" );
Logger.d( TAG, "status = %d", status );
context.sendBroadcast( intent );
}
@@ -370,7 +364,6 @@ class ZhiTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsListener {
return;
}
mHasFlush = true;
Logger.d( TAG, "flush cache voice command when voice service ready." );
final Map< String, String[] > tmp = new HashMap<>( mCacheUnWakeupCommands );
for ( String cmd : tmp.keySet() ) {
registerUnWakeupCommand( cmd, tmp.get( cmd ) );
@@ -383,7 +376,6 @@ class ZhiTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsListener {
return true;
} else if ( AppUtils.isProcessRunning( context, AppUtils.getPackageUid( context, "com.txznet.txz" ) )
&& AppUtils.isProcessRunning( context, AppUtils.getPackageUid( context, "com.txznet.adapter" ) ) ) {
Logger.d( TAG, "txz is voiceServiceReady" );
return true;
}
return false;
@@ -460,7 +452,6 @@ class ZhiTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsListener {
mVoiceClient.setCallBack( this );
initFlushStatus();
initSpeech( context );
Logger.w( TAG, "voice is ready = %s", mHasFlush );
}
}
@@ -476,7 +467,6 @@ class ZhiTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsListener {
intent.setAction( "pvetec.intent.action.txz.switch" );
intent.putExtra( "window_start_cancel", status );
intent.putExtra( "extra_switch_type", "window_start_cancel" );
Logger.d( TAG, "status = %d", status );
context.sendBroadcast( intent );
}
}