From 299824fb7424bb7e4b10b6d244ae15369548ea1a Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Thu, 11 May 2023 14:58:29 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[3.2.0]=20bus=E4=B9=98=E5=AE=A2=E5=B1=8F?= =?UTF-8?q?=E8=A7=86=E9=A2=91/=E5=9C=B0=E5=9B=BE=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IBusPassegerDriverStatusCallback.java | 1 + .../passenger/model/BusPassengerModel.java | 5 +++- .../presenter/BaseBusPassengerPresenter.java | 5 ++++ .../ui/BusPassengerRouteFragment.java | 27 +++++++++++-------- .../res/drawable/bottom_radius_bg.xml | 7 +++++ .../res/layout/bus_p_base_fragment.xml | 2 ++ .../jinlvvan/res/layout/bus_p_map_view.xml | 3 ++- .../res/layout/bus_p_route_fragment.xml | 19 +++++-------- .../hmi/ui/widget/DriverMonitorView.kt | 10 +++---- 9 files changed, 46 insertions(+), 33 deletions(-) create mode 100644 OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/bottom_radius_bg.xml diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassegerDriverStatusCallback.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassegerDriverStatusCallback.java index 06885b74ab..f4f5bed60c 100644 --- a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassegerDriverStatusCallback.java +++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassegerDriverStatusCallback.java @@ -7,4 +7,5 @@ package com.mogo.och.bus.passenger.callback; public interface IBusPassegerDriverStatusCallback { void changeOperationStatus(boolean changeStatus); void updatePlateNumber(String plateNumber); + void updateDriverSn(String sn); } diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java index 47ac92cb81..cf6ed84226 100644 --- a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java +++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java @@ -377,7 +377,10 @@ public class BusPassengerModel { private final IReceivedMsgListener mReceivedMsgListener = new IReceivedMsgListener() { @Override public void onReceivedServerSn(@Nullable String sn) { - + Logger.d(SceneConstant.M_BUS_P+TAG,"onReceivedServerSn = "+sn); + if (mDriverStatusCallback != null) { + mDriverStatusCallback.updateDriverSn(sn); + } } @Override diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java index c84bec8c79..20bfc21db5 100644 --- a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java +++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java @@ -126,6 +126,11 @@ public class BaseBusPassengerPresenter extends Presenter mView.updatePlateNum(plateNumber)); } + @Override + public void updateDriverSn(String sn) { + runOnUIThread(() -> mView.updateDriverSn(sn)); + } + @Override public void updateLineInfo(String lineName, String lineDurTime) { runOnUIThread(() -> mView.updateLineInfo(lineName, lineDurTime)); diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java index dece299fd2..d8278a128f 100644 --- a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java +++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java @@ -4,6 +4,7 @@ import android.annotation.SuppressLint; import android.graphics.drawable.AnimationDrawable; import android.os.Bundle; import android.text.Html; +import android.view.LayoutInflater; import android.view.View; import android.widget.TextView; @@ -59,6 +60,8 @@ public class BusPassengerRouteFragment extends private AppCompatTextView mCurrentArriveStationTitle; private AppCompatTextView mCurrentArriveTip; private AppCompatImageView mSpeakArrivedIv; + + private View busPDriverMonitorView; private DriverMonitorView driverMonitorView; private ConstraintLayout indicatorView; private View mapIndicator; @@ -116,21 +119,15 @@ public class BusPassengerRouteFragment extends mapIndicator = findViewById(R.id.firstIndicator); liveIndicator = findViewById(R.id.secondIndicator); - driverMonitorView = new DriverMonitorView(getContext()); + busPDriverMonitorView = LayoutInflater.from(getContext()) + .inflate(R.layout.bus_p_driver_monitor_view,null); + + driverMonitorView = busPDriverMonitorView.findViewById(R.id.buDriverMonitorView); driverMonitorView.setLiveListener(new DriverMonitorView.LiveListener() { @Override public void onPlayError() { goneLiveShadow(); } - - @Override - public void showOrHideLiveBtn(boolean isShow) { - if (isShow){ - visibleLiveShadow(); - }else { - goneLiveShadow(); - } - } }); //测试 @@ -151,7 +148,7 @@ public class BusPassengerRouteFragment extends private void initLiveView() { views.add(new View(getContext()));// 其实是空的，真正小地图还在fragment里 - views.add(driverMonitorView); + views.add(busPDriverMonitorView); mapAndLiveVideoView.setData(views); mapAndLiveVideoView.setVisibility(View.GONE); indicatorView.setVisibility(View.GONE); @@ -172,6 +169,14 @@ public class BusPassengerRouteFragment extends mMapDirectionView.setVisibility(position == 0? View.VISIBLE:View.GONE); } + public void updateDriverSn(String sn) { + if (driverMonitorView.isSOPDriverSn(sn)){ + visibleLiveShadow(); + }else { + goneLiveShadow(); + } + } + @Override protected void openOrCloseLiveVideo() { if (videoSwitch.isSelected()){ diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/bottom_radius_bg.xml b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/bottom_radius_bg.xml new file mode 100644 index 0000000000..8153865510 --- /dev/null +++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/bottom_radius_bg.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml index b483e24f21..5f48333a3d 100644 --- a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml +++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml @@ -38,6 +38,7 @@ android:background="@drawable/roma_bus_p_bg_selector" app:layout_constraintBottom_toBottomOf="parent" android:layout_marginBottom="@dimen/dp_20" + android:layout_marginLeft="10dp" app:layout_constraintLeft_toRightOf="@+id/video_switch_iv" app:roma_close="@drawable/roma_bus_p_bg_selector" app:roma_open="@drawable/iv_roma_bus_passenger_press_bg" /> @@ -85,6 +86,7 @@ app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintBottom_toBottomOf="parent" android:scaleType="fitCenter" + android:visibility="gone" android:layout_marginLeft="@dimen/dp_20" android:layout_marginBottom="@dimen/dp_20"/> diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_map_view.xml b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_map_view.xml index d9fadd6ef5..0fa596993e 100644 --- a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_map_view.xml +++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_map_view.xml @@ -2,7 +2,8 @@ + android:layout_height="match_parent" + android:background="@drawable/bottom_radius_bg"> - - - - - - + - - \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/DriverMonitorView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/DriverMonitorView.kt index dda4370a8d..3e8ba6d17c 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/DriverMonitorView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/DriverMonitorView.kt @@ -95,12 +95,6 @@ class DriverMonitorView : sopShowDriverMap["20211112X2RI32A"] = "F803EB2046PZD00274"//京A40776D sopShowDriverMap["202204085X310A1"] = "F803EB2046PZD00263"//湘D09005D - Logger.d(TAG, "getServerToken = ${CallerTelematicManager.getServerToken()}") - - liveListener?.showOrHideLiveBtn( - sopShowDriverMap.containsKey(CallerTelematicManager.getServerToken()) - ) - // TODO SOP演示需求，只有乘客屏幕才会触发这个逻辑 END // 点击重新连接直播 ivNormal.setOnClickListener { @@ -110,6 +104,9 @@ class DriverMonitorView : mHandler.postDelayed(mRunnable, 1000) // 1 second delay } + fun isSOPDriverSn(sn: String) :Boolean{ + return sopShowDriverMap.containsKey(sn) + } override fun onDetachedFromWindow() { super.onDetachedFromWindow() @@ -213,7 +210,6 @@ class DriverMonitorView : interface LiveListener { fun onPlayError() - fun showOrHideLiveBtn(isShow: Boolean) } } \ No newline at end of file From bbee9856b75b08e98d3bb8194d08f5199877245c Mon Sep 17 00:00:00 2001 From: zhongchao Date: Thu, 11 May 2023 16:01:51 +0800 Subject: [PATCH 2/3] [3.2.0-aka-2.15.2]change the batchMarker deleteRule --- .../mogo-map/src/main/java/com/mogo/map/AMapWrapper.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java index 997ba4625d..67bb311df4 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java @@ -147,7 +147,7 @@ public class AMapWrapper implements IMogoMap { MarkerHelper.INSTANCE.updateBatchMarkerPositon(batchMarkerOptions); } - BatchMarkerOptions aiBatchMarkerOptions = new BatchMarkerOptions(); + @SuppressLint("NewApi") @Override @@ -169,13 +169,14 @@ public class AMapWrapper implements IMogoMap { return; } long time = markerOptionsArrayList.get(0).getTime(); + BatchMarkerOptions aiBatchMarkerOptions = new BatchMarkerOptions(); // 最后一个参数，是否管理锚点的删除 aiBatchMarkerOptions.list = markerOptionsArrayList; aiBatchMarkerOptions.delayStrategy = false; aiBatchMarkerOptions.ruleAngle = FunctionBuildConfig.isBeautyMode ? 8.0f : 0f; aiBatchMarkerOptions.controlIcon = 1; aiBatchMarkerOptions.duration = (int) time; - aiBatchMarkerOptions.deleteRule = 1; + aiBatchMarkerOptions.deleteRule = 0; MarkerHelper.INSTANCE.updateBatchMarkerPositon(aiBatchMarkerOptions); } From d8eb1cd8b8dc6b1ea6ef02669898db236702528c Mon Sep 17 00:00:00 2001 From: zhongchao Date: Thu, 11 May 2023 16:13:26 +0800 Subject: [PATCH 3/3] [3.2.0-aka-2.15.2] remove plenty logs in small mapview --- .../com/mogo/eagle/core/function/smp/view/SmallMapView.kt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/view/SmallMapView.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/view/SmallMapView.kt index b39d7745e6..0007077814 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/view/SmallMapView.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/view/SmallMapView.kt @@ -140,8 +140,6 @@ class SmallMapView @JvmOverloads constructor( @UiThread fun clearPolyline() { - CallerLogger.d( - SceneConstant.M_MAP + TAG, "SmallMapView clearPolyline mPolyline -----> ") if (mPolyline != null) { mPolyline!!.remove() mPolyline = null @@ -325,8 +323,6 @@ class SmallMapView @JvmOverloads constructor( val tempStatus = autoPilotStatusInfo.pilotmode if (tempStatus != 1) { UiThreadHandler.post { - CallerLogger.d( - SceneConstant.M_MAP + TAG, "onAutopilotStatusResponse tempStatus = $tempStatus ---clearPolyline() ") clearPolyline() } } else if (tempStatus == 1 && autoPilotStatus == 0) {