Merge remote-tracking branch 'origin/dev_robotaxi-d_240912_6.7.0' into dev_robotaxi-d_240912_6.7.0

OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/OrderModel.kt

@@ -18,6 +18,7 @@ import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.mogo.och.common.module.biz.login.LoginStatusManager
 import com.mogo.och.common.module.manager.autopilot.autopilot.bean.ArrivedStation
+import com.mogo.och.common.module.manager.autopilot.line.ILineCallback
 import com.mogo.och.common.module.manager.autopilot.line.LineManager
 import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager
 import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
@@ -73,8 +74,8 @@ object OrderModel {
         // 加载核销模块
         TicketModel.load()
 
-        // 定位监听
-        OchLocationManager.addGCJ02Listener(TAG, 5, mMapLocationListener)
+
+        LineManager.addListener(TAG,arriveStationBySearch)
 
         OchTransform.addListener(TAG,ochTransform)
 
@@ -89,7 +90,7 @@ object OrderModel {
 
         TicketModel.release()
 
-        OchLocationManager.removeGCJ02Listener(TAG)
+        LineManager.removeListener(TAG)
         OchTransform.removeListener(TAG)
     }
 
@@ -107,34 +108,17 @@ object OrderModel {
 
 
     // 自车定位
-    private val mMapLocationListener = object : IMoGoChassisLocationGCJ02Listener {
-        override fun onChassisLocationGCJ02(mogoLocation: MogoLocation?) {
-            if (null == mogoLocation) return
-
+    private val arriveStationBySearch = object : ILineCallback {
+        override fun arrivedStationSuccessBySearch() {
             //是否到站的围栏判断 离站状态并且自动驾驶还未触发到站
             if (isGoingToNextStation && !isArrivedStation) {
                 OCHThreadPoolManager.getsInstance().locationExecute {
-                    judgeArrivedStation(mogoLocation)
+                    onArriveAt(null, "兜底：根据定位计算到站")
                 }
             }
         }
     }
 
-    //根据围栏判断，是否到达站点
-    private fun judgeArrivedStation(location: MogoLocation) {
-        LineManager.getStations { start, end ->
-            val startLon = end.gcjLon
-            val startLat = end.gcjLat
-            val distance = CoordinateUtils.calculateLineDistance(
-                startLon, startLat,
-                location.longitude, location.latitude
-            )
-            if (distance <= BusConst.ARRIVE_AT_END_STATION_DISTANCE) {
-                d(M_BUS + TAG, "行程日志-judgeArrivedStation() distance = $distance to ${end.name}")
-                onArriveAt(null, "兜底：根据定位计算到站")
-            }
-        }
-    }
 
     /**
      * 查询小巴路线

OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/fragment/ShuttleFragment.kt

@@ -1,5 +1,6 @@
 package com.mogo.och.weaknet.ui.fragment
 
+import android.content.Context
 import android.graphics.BitmapFactory
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -10,11 +11,14 @@ import com.mogo.commons.mvp.MvpFragment
 import com.mogo.commons.storage.SharedPrefsMgr
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.temp.EventLogout
+import com.mogo.eagle.core.function.api.och.toolkit.IToolKitItemClickListener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotRecordListenerManager
+import com.mogo.eagle.core.function.call.och.CallerEagleBaseFunctionCall4OchManager
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.och.common.module.utils.createQRCodeWithPicture
 import com.mogo.och.common.module.wigets.BindQRCodeDialog
+import com.mogo.och.common.module.wigets.map.drawline.LineView
 import com.mogo.och.shuttle.weaknet.R
 import com.mogo.och.weaknet.ui.bizswitch.SwitchBizView
 import com.mogo.och.weaknet.ui.taskrunned.RunningTaskManager
@@ -35,6 +39,11 @@ import org.greenrobot.eventbus.ThreadMode
  */
 class ShuttleFragment : MvpFragment<ShuttleFragment?, BusPresenter?>() {
 
+
+    private val runningTaskGateWay = "RUNNINGTASKGATEWAY"
+    private val lineView = "LINEVIEW"
+
+
     override fun getLayoutId(): Int {
         return R.layout.shuttle_weak_base_fragment
     }
@@ -47,6 +56,15 @@ class ShuttleFragment : MvpFragment<ShuttleFragment?, BusPresenter?>() {
 
         context?.let {
             boneContainerView.addBizView(SwitchBizView(it))
+
+            CallerEagleBaseFunctionCall4OchManager.addSingleToolKitDefaultItem(runningTaskGateWay,"本地缓存任务", R.drawable.bus_running_task_history,4)
+            CallerEagleBaseFunctionCall4OchManager.addToolKitDefaultItemClickListener(runningTaskGateWay,object :
+                IToolKitItemClickListener{
+                override fun onItemClick(toolTag: String, ctx: Context?) {
+                    RunningTaskManager.showBadCaseConfigWindow(it)
+                }
+            })
+            CallerEagleBaseFunctionCall4OchManager.addSingleToolKitCustomItem(lineView, LineView(it),10)
         }
 
         initListener()

OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunned/RunningTaskGatewayView.kt

@@ -0,0 +1,53 @@
+package com.mogo.och.weaknet.ui.taskrunned
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.constraintlayout.widget.ConstraintLayout
+import com.mogo.eagle.core.utilcode.kotlin.onClick
+import com.mogo.och.common.module.utils.ResourcesUtils
+import com.mogo.och.shuttle.weaknet.R
+
+/**
+ *
+ */
+class RunningTaskGatewayView : ConstraintLayout {
+
+    private val TAG = "LineView"
+
+    constructor(context: Context) : super(context)
+
+    constructor(context: Context, attributeSet: AttributeSet) : super(context, attributeSet)
+
+    constructor(context: Context, attributeSet: AttributeSet, defStyleAttr: Int) : super(
+        context,
+        attributeSet,
+        defStyleAttr
+    )
+
+    private fun initView() {
+        LayoutInflater.from(context).inflate(R.layout.common_line_view, this, true)
+        findViewById<ImageView>(R.id.iv_toolkit_item_head).setImageResource(R.drawable.bus_running_task_history)
+        findViewById<TextView>(R.id.iv_toolkit_item_title).text = ResourcesUtils.getString(R.string.bus_running_tasked_gateway)
+    }
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+
+        onClick {
+            RunningTaskManager.showBadCaseConfigWindow(context)
+        }
+
+    }
+
+    init {
+        try {
+            initView()
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+    }
+
+}

OCH/shuttle/driver_weaknet/src/main/res/values/strings.xml

@@ -60,6 +60,7 @@
     <string name="bus_before_tips_s">距离发车时间还有%1$s分钟</string>
 
     <string name="bus_pingxing_driver">平行驾驶</string>
+    <string name="bus_running_tasked_gateway">本地缓存任务</string>
 
 
     <!-- region tts  -->