Merge branch 'dev_robotaxi-d-app-module_2110_220915_2.11.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robotaxi-d-app-module_2110_220915_2.11.0

OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/IBusLinesCallback.java

@@ -10,5 +10,5 @@ import com.mogo.och.bus.bean.BusQueryLinesResponse;
 public interface IBusLinesCallback {
     void onBusLinesChange(BusQueryLinesResponse lines);
     void onChangeLineIdSuccess();
-    void onBusLineTasks(BusQueryLineTaskResponse o, int position);
+    void onBusLineTasks(BusQueryLineTaskResponse o, int position,boolean autoRefresh);
 }

OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusLineModel.java

@@ -71,17 +71,17 @@ public class BusLineModel {
      * @param lineId
      * @param position 位置
      */
-    public void queryBusLineTasksById(int lineId, int position){
+    public void queryBusLineTasksById(int lineId, int position,boolean autoRefresh){
         BusServiceManager.getInstance().queryBusTaskByLineId(mContext, String.valueOf(lineId),new IBusServiceCallback<BusQueryLineTaskResponse>() {
             @Override
             public void onSuccess(BusQueryLineTaskResponse data) {
                 if (null == data && mBusLinesCallback != null) {
-                    mBusLinesCallback.onBusLineTasks(null,position);
+                    mBusLinesCallback.onBusLineTasks(null,position,autoRefresh);
                     return;
                 }
 
                 if (mBusLinesCallback != null){
-                    mBusLinesCallback.onBusLineTasks(data,position);
+                    mBusLinesCallback.onBusLineTasks(data,position,autoRefresh);
                 }
             }
 

OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusLinePresenter.java

@@ -76,9 +76,9 @@ public class BusLinePresenter extends Presenter<BusSwitchLineView> implements IB
         if(close){
             return;
         }
-        BusLineModel.getInstance().queryBusLineTasksById(lineId,position);
+        BusLineModel.getInstance().queryBusLineTasksById(lineId,position,false);
         subscribe = Observable.interval(3, TimeUnit.MINUTES).subscribe(aLong -> {
-            BusLineModel.getInstance().queryBusLineTasksById(lineId,position);
+            BusLineModel.getInstance().queryBusLineTasksById(lineId,position,true);
         });
     }
 
@@ -104,7 +104,7 @@ public class BusLinePresenter extends Presenter<BusSwitchLineView> implements IB
 
 
     @Override
-    public void onBusLineTasks(BusQueryLineTaskResponse o, int position) {
-        mView.onBusLineTasks(o,position);
+    public void onBusLineTasks(BusQueryLineTaskResponse o, int position,boolean autoRefresh) {
+        mView.onBusLineTasks(o,position,autoRefresh);
     }
 }

OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.kt

@@ -71,7 +71,6 @@ class BusSwitchLineActivity : MvpActivity<BusSwitchLineView?, BusLinePresenter?>
         mLineCommitBtn.setOnClickListener(this)
         mLinesListView = findViewById(R.id.switch_line_rv)
         linearLayoutManager = LinearLayoutManager(this)
-        PagerSnapHelper().attachToRecyclerView(mLinesListView)
         mLinesListView.setLayoutManager(linearLayoutManager)
         mLinesListView.setItemAnimator(OpenItemAnimator())
         mAdapter = SwitchLineAdapter(applicationContext, mData)
@@ -144,7 +143,7 @@ class BusSwitchLineActivity : MvpActivity<BusSwitchLineView?, BusLinePresenter?>
         finish()
     }
 
-    override fun onBusLineTasks(lineTaskInfo: BusQueryLineTaskResponse?, position: Int) {
+    override fun onBusLineTasks(lineTaskInfo: BusQueryLineTaskResponse?, position: Int,autoRefresh:Boolean) {
         val result = mData[position]
         if (result.taskList == null) {
             result.taskList = ArrayList()
@@ -161,10 +160,20 @@ class BusSwitchLineActivity : MvpActivity<BusSwitchLineView?, BusLinePresenter?>
             if (lineTaskInfo.data.size != result.taskList.size) { // 不相等有变动 重新赋值
                 result.taskList.clear()
                 result.taskList.addAll(lineTaskInfo.data)
+                if(autoRefresh) {
+                    mAdapter.checkTaskId = -1
+                    mAdapter.checkLineId = -1
+                    lineTaskInfo.data.forEach {
+                        if (it.id == mAdapter.checkTaskId) {
+                            mAdapter.checkTaskId = it.id
+                            mAdapter.checkLineId = result.lineId
+                        }
+                    }
+                }
                 // 打开操作
                 mAdapter.notifyItemChanged(position)
                 linearLayoutManager.stackFromEnd = (position==mData.size-1||position==mData.size-2)&&mData.size>6
-                mLinesListView.scrollToPosition(position)
+                mLinesListView.smoothScrollToPosition(position)
             }else if(lineTaskInfo.data.isEmpty()){
                 mAdapter.notifyItemChanged(position)
             }
@@ -198,7 +207,7 @@ class BusSwitchLineActivity : MvpActivity<BusSwitchLineView?, BusLinePresenter?>
             if(mAdapter.checkLineId!=-1&&mAdapter.checkTaskId!=-1){
                 mPresenter?.commitSwitchLineId(mAdapter.checkTaskId,mAdapter.checkLineId)
             }else{
-                ToastUtils.showLong("请选择时间")
+                ToastUtils.showLong("请选择任务")
             }
         }
     }

OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/BusSwitchLineView.java

@@ -13,6 +13,6 @@ public interface BusSwitchLineView extends IView {
     void onBusLinesChange(BusQueryLinesResponse data);
     void onChangeLineIdSuccess();
 
-    void onBusLineTasks(BusQueryLineTaskResponse o, int position);
+    void onBusLineTasks(BusQueryLineTaskResponse o, int position,boolean autoRefresh);
 }
 

core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/airoad/AiRoadMarker.kt

@@ -36,10 +36,6 @@ object AiRoadMarker {
 
     private val marker by lazy { AtomicReference<Marker>() }
 
-    private val curStopLine by lazy { AtomicReference<StopLine>() }
-
-    private val lastStopLine by lazy { AtomicReference<StopLine>() }
-
     private val carLocation by lazy { AtomicReference<Triple<Double, Double, Double>>() }
 
     private val overlayManager by lazy { MogoOverlayManager.getInstance() }
@@ -130,14 +126,12 @@ object AiRoadMarker {
             if (oldRoadId != roadId) {
                 if (hasCrossRoad) {
                     hasCrossRoad = false
-                    lastStopLine.set(curStopLine.get())
                 }
             }
             this.roadId = roadId
         }
         override fun onStopLineInfo(info: StopLine) {
             Logger.d(TAG, "--- onStopLineInfo --- info: $info")
-            curStopLine.set(info)
             if (!hasCrossRoad) {
                 hasCrossRoad = true
             }
@@ -190,6 +184,7 @@ object AiRoadMarker {
         CallerMapRoadListenerManager.unRegisterRoadListener(TAG)
         CallerMapLocationListenerManager.removeListener(TAG)
         pool.shutdownNow()
+        removeRedLine()
     }
 
 

core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt

@@ -79,7 +79,6 @@ class VipCarManager : IMogoOnMessageListener<VipMessage>, IMoGoTrafficLightListe
         return VipMessage::class.java
     }
 
-    @BizConfig(V2N, "", BIZ_VIP)
     override fun onMsgReceived(vipMessage: VipMessage?) {
         CallerLogger.d("$M_V2X$TAG", "onMsgReceived vipMessage : ${vipMessage.toString()}")
         vipMessage?.let {
@@ -190,6 +189,7 @@ class VipCarManager : IMogoOnMessageListener<VipMessage>, IMoGoTrafficLightListe
         }
     }
 
+    @BizConfig(V2N, "", BIZ_VIP)
     private fun turnLight(controlTime: Int) {
         if (result == null || mContext == null) return
         val locationClient = CallerMapUIServiceManager.getSingletonLocationClient(mContext!!)