diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java index 431bad35e9..f5569a39a9 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java @@ -37,7 +37,7 @@ public * @author congtaowang * @since 2021/1/15 * - * 描述 + * 网约车 - 出租车业务逻辑处理 */ class MogoOCHTaxiModel { diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java index fe206ac76f..a09989f479 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java @@ -142,6 +142,7 @@ class OCHTaxiFragment extends BaseOchFragment< OCHTaxiView, OCHTaxiPresenter > i slidePanelView.setVisibility( View.VISIBLE ); slidePanelView.setText( getString( R.string.module_och_taxi_arrive_at_end_station ) ); mOrderStatus.setText( "已到达乘客下车地点" ); + showNotice( "请携带好随身物品，注意侧后\n方来车，感谢体验蘑菇智行自\n动驾驶车" ); } else if ( MogoOCHTaxiModel.getInstance().isOnTheWay2EndStation() ) { Logger.d( TAG, "已经去往终点" ); slidePanelView.setVisibility( View.GONE ); @@ -151,10 +152,10 @@ class OCHTaxiFragment extends BaseOchFragment< OCHTaxiView, OCHTaxiPresenter > i mOrderStatus.setText( "已到达上车地点，等待乘客上车" ); if ( MogoOCHTaxiModel.getInstance().isUserArriveAtStartStation() ) { Logger.d( TAG, "乘客已上车" ); + slidePanelView.setVisibility( View.VISIBLE ); if ( MogoApisHandler.getInstance().getApis().getAdasControllerApi().getAutopilotStatus() == IMogoAdasOCHCallback.STATUS_AUTOPILOT_ENABLE ) { - slidePanelView.setVisibility( View.VISIBLE ); } else { - slidePanelView.setVisibility( View.GONE ); +// slidePanelView.setVisibility( View.GONE ); } slidePanelView.setText( getString( R.string.module_och_taxi_arrive_at_start_station ) ); } @@ -201,7 +202,6 @@ class OCHTaxiFragment extends BaseOchFragment< OCHTaxiView, OCHTaxiPresenter > i public void onArriveAtEndStation() { Logger.d( TAG, "通知达到终点" ); updateOrderStatus(); - showNotice( "请携带好随身物品，注意侧后\n方来车，感谢体验蘑菇智行自\n动驾驶车" ); MogoOCHTaxiModel.getInstance().updateOCHOrderStatus( OCHOrderStatus.ArriveAtEndStation, new OCHOrderStatusCallback() { @Override public void onSuccess( Object data ) { diff --git a/OCH/mogo-och/src/main/java/com/mogo/och/BaseOchFragment.java b/OCH/mogo-och/src/main/java/com/mogo/och/BaseOchFragment.java index 0ad9f649e6..dc9d899663 100644 --- a/OCH/mogo-och/src/main/java/com/mogo/och/BaseOchFragment.java +++ b/OCH/mogo-och/src/main/java/com/mogo/och/BaseOchFragment.java @@ -112,9 +112,9 @@ public abstract class BaseOchFragment> e public void showNotice(String notice) { getActivity().runOnUiThread(() -> { tvNotice.setText(notice); - if (MogoApisHandler.getInstance().getApis().getAdasControllerApi().getAutopilotStatus() == IMogoAdasOCHCallback.STATUS_AUTOPILOT_DISABLE) { - return; - } +// if (MogoApisHandler.getInstance().getApis().getAdasControllerApi().getAutopilotStatus() == IMogoAdasOCHCallback.STATUS_AUTOPILOT_DISABLE) { +// return; +// } AIAssist.getInstance(getContext()).speakTTSVoice(notice); tvNotice.setVisibility(View.VISIBLE); fivNoticeHead.setVisibility(View.VISIBLE); diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapUiSettingsWrapper.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapUiSettingsWrapper.java index 56a3a8d3b2..2dcca99359 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapUiSettingsWrapper.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapUiSettingsWrapper.java @@ -22,7 +22,6 @@ public class AMapUiSettingsWrapper implements IMogoUiSettings { @Override public void setScaleControlsEnabled( boolean enabled ) { if ( mUiSettings != null ) { - } } @@ -93,7 +92,6 @@ public class AMapUiSettingsWrapper implements IMogoUiSettings { @Override public void setIndoorSwitchEnabled( boolean enabled ) { if ( mUiSettings != null ) { - // mUiSettings.setIndoorSwitchEnabled( enabled ); } } diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java index 8515dc0e18..7416748d61 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java @@ -122,6 +122,7 @@ public class AMapViewWrapper implements IMogoMapView, } MapAutoViewHelper options = mMapView.getMapAutoViewHelper(); if ( options != null ) { + options.setZoomGesturesEnabled( true ); // 设置是否开启自动黑夜模式切换，默认为false，不自动切换 // options.setAutoSwitchStyle(false); // 设置6秒后是否自动锁车 diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java index 6468999171..b3b64de650 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java @@ -96,7 +96,7 @@ class CustomMapApiBuilder implements IMogoMapApiBuilder { .setDebugMode( DebugConfig.isDebug() ) .setCoordinateType( MapParams.COORDINATETYPE_GCJ02 ) .setPerspectiveMode( MapParams.MAP_PERSPECTIVE_2D ) - .setZoom( 16 ) + .setZoom( 20 ) .setPointToCenter( 0.734375f, 0.5f ) .setStyleMode( MapParams.MAP_STYLE_NIGHT ), NavParams.Companion.init() ); MapAutoView mapAutoView = new MapAutoView(context); diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/CarModelListInfo.java b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/CarModelListInfo.java index f30cc75145..bfd3601652 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/CarModelListInfo.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/CarModelListInfo.java @@ -10,7 +10,7 @@ public class CarModelListInfo { * 热心指数 eg: 1 1.5 2 2.5 */ private float enthusiasmIndex; - private List imageData; + private List< OwnCarModelEntity > imageData; public String getSn() { return sn; diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java index 89ba0d3bca..0826c0c016 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java @@ -9,15 +9,11 @@ import android.util.Log; import com.alibaba.android.arouter.facade.annotation.Route; import com.mogo.commons.AbsMogoApplication; -import com.mogo.commons.context.ContextHolderUtil; import com.mogo.commons.debug.DebugConfig; import com.mogo.commons.network.SubscribeImpl; import com.mogo.commons.network.Utils; -import com.mogo.map.MogoLatLng; import com.mogo.map.uicontroller.EnumMapUI; import com.mogo.module.common.MogoApisHandler; -import com.mogo.module.common.MogoModule; -import com.mogo.module.common.MogoModulePaths; import com.mogo.module.common.map.MyLocationUtil; import com.mogo.module.common.utils.CarSeries; import com.mogo.service.MogoServicePaths; @@ -34,7 +30,6 @@ import com.mogo.service.adas.entity.ADASRecognizedResult; import com.mogo.service.adas.entity.ADASWarnMessage; import com.mogo.service.adas.entity.AdasOCHData; import com.mogo.service.impl.singleton.SingletonsHolder; -import com.mogo.service.network.IMogoNetwork; import com.mogo.service.statusmanager.IMogoStatusManager; import com.mogo.utils.TipToast; import com.mogo.utils.UiThreadHandler; @@ -52,7 +47,6 @@ import com.zhidao.autopilot.support.api.IAutopolitDataCallBack; import com.zhidao.autopilotservice.model.AdasAIDLAutopilotArriveModel; import com.zhidao.autopilotservice.model.AdasAIDLAutopilotStateModel; import com.zhidao.support.adas.high.OnAdasListener; -import com.zhidao.support.adas.high.bean.CarStateInfo; import com.zhidao.support.adas.high.bean.RectInfo; import com.zhidao.support.adas.high.bean.WarnMessageInfo; import com.zhidao.support.adas.high.msg.MyMessageFactory; @@ -68,11 +62,10 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.concurrent.CopyOnWriteArrayList; import io.reactivex.schedulers.Schedulers; -import java.util.concurrent.CopyOnWriteArrayList; - import static com.mogo.module.common.utils.SPConst.getSpGuide; /**