[6.1.0]

[common] [初步添加debug包]
2023-09-28 11:55:19 +08:00
parent 8de68a90cf
commit e522f5efa3
7 changed files with 161 additions and 8 deletions
--- a/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/manager/CharterTrajectoryManager.kt
+++ b/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/manager/CharterTrajectoryManager.kt
@@ -87,7 +87,13 @@ object CharterTrajectoryManager {
            // 5. 轨迹管理_轨迹下载超时
            d(SceneConstant.M_CHARTER_D + TAG, "onAutopilotGuardian() 轨迹下载超时")
            // ToastUtils.showShort("轨迹下载超时");
-        } else if ("EMAP_ATTITUDE_INIT_FAILED" == guardianInfo.getCode()) {
+        }  else if ("EMAP_ATTITUDE_INIT_FAILED" == guardianInfo.getCode()) {
+            // 收到ssm的自动驾驶变为ready，再次下发轨迹下载.解决：域控重启，或者102域控启动太早，107节点初始化未完成导致的轨迹未进行下载。
+            d(SceneConstant.M_CHARTER_D + TAG, "onAutopilotGuardian() ssm ready，再次发起下载")
+            get().getBusOrderResult()?.lineId?.let {
+                syncTrajectoryInfo(it,
+                    get().getBusOrderResult()?.lineName!!)
+            }
            CallerMsgBoxManager.saveMsgBox(
                MsgBoxBean(
                    MsgBoxType.OPERATION,
@@ -97,11 +103,6 @@ object CharterTrajectoryManager {
                )
            )
            SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(ActivityUtils.getTopActivity(), R.raw.startautopilot)
-        }  else if ("EMAP_ATTITUDE_INIT_FAILED" == guardianInfo.getCode()) {
-            // 收到ssm的自动驾驶变为ready，再次下发轨迹下载.解决：域控重启，或者102域控启动太早，107节点初始化未完成导致的轨迹未进行下载。
-            d(SceneConstant.M_CHARTER_D + TAG, "onAutopilotGuardian() ssm ready，再次发起下载")
-            syncTrajectoryInfo(get().getBusOrderResult()?.lineId!!,
-                get().getBusOrderResult()?.lineName!!)
        }
    }

--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt
@@ -18,7 +18,6 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager.updateAutopilotControlParameters
 import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager
 import com.mogo.eagle.core.network.utils.GsonUtil
-import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.e
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
@@ -202,7 +201,7 @@ object CharterPassengerModel {
            override fun onAutopilotGuardian(guardianInfo: MogoReportMsg.MogoReportMessage?) {
                super.onAutopilotGuardian(guardianInfo)
                guardianInfo?.let {
-                    if (it.code=="IMAP_TRA_LOADED") {
+                    if (it.code=="EMAP_ATTITUDE_INIT_FAILED") {
                        ToastCharterUtils.showToastShort("请等待车辆完成掉头后再出发吧～")
                    }
                }
--- a/OCH/mogo-och-common-module/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt
+++ b/OCH/mogo-och-common-module/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt
@@ -17,11 +17,13 @@ import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02Lis
 import com.mogo.eagle.core.function.call.autopilot.CallerPlanningRottingListenerManager
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
+import com.mogo.eagle.core.utilcode.util.ActivityUtils
 import com.mogo.eagle.core.utilcode.util.GsonUtils
 import com.mogo.eagle.core.utilcode.util.ThreadUtils
 import com.mogo.och.common.module.debug.location.MogoLocationExit
 import com.mogo.och.common.module.manager.distancemamager.TrajectoryAndDistanceManager
 import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil
+import com.mogo.och.common.module.view.DebugFloatWindow
 import mogo.telematics.pad.MessagePad
 import mogo_msg.MogoReportMsg
 import java.io.BufferedReader
@@ -40,6 +42,7 @@ object DebugDataDispatch {
    const val carNeedTurnAround = "trunAroud"
    const val carLightSwitch = "lightSwitch"
    const val trajectoryStation = "trajectoryStation"
+    const val showDebugView = "showDebugView"

 //    adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "location" --es path "sy73_log.json"
 //    adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "globalPath" --es path "sy73.json"
@@ -109,6 +112,10 @@ object DebugDataDispatch {
                val lineID = intent.getLongExtra("lineID", -1)
                setStation(startLon.toDouble(),startLat.toDouble(),endLon.toDouble(),endLat.toDouble(),lineID)
            }
+            showDebugView -> {
+                val debugFloatWindow = DebugFloatWindow(ActivityUtils.getTopActivity())
+                debugFloatWindow.showFloatWindow()
+            }
            else -> {}
        }
    }
--- a/OCH/mogo-och-common-module/src/debug/java/com/mogo/och/common/module/view/DebugFloatWindow.kt
+++ b/OCH/mogo-och-common-module/src/debug/java/com/mogo/och/common/module/view/DebugFloatWindow.kt
@@ -0,0 +1,107 @@
+package com.mogo.och.common.module.view
+
+import android.app.Activity
+import android.graphics.PixelFormat
+import android.util.DisplayMetrics
+import android.view.*
+import androidx.appcompat.widget.AppCompatButton
+import androidx.appcompat.widget.AppCompatImageView
+import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
+import com.mogo.eagle.core.utilcode.kotlin.onClick
+import com.mogo.eagle.core.utilcode.util.BarUtils
+import com.mogo.och.common.module.R
+import mogo_msg.MogoReportMsg
+
+/**
+ * @author XuXinChao
+ * @description 工控机上报列表面板
+ * @since: 2022/4/13
+ */
+class DebugFloatWindow constructor(activity: Activity) : View.OnTouchListener{
+
+    private var mActivity: Activity = activity
+    private var mWindowParams: WindowManager.LayoutParams? = null
+    private var mWindowManager: WindowManager? = null
+
+    private lateinit var mFloatLayout: View
+    private var mInViewX = 0f
+    private var mInViewY = 0f
+    private var mDownInScreenX = 0f
+    private var mDownInScreenY = 0f
+    private var mInScreenX = 0f
+    private var mInScreenY = 0f
+
+    init {
+        initFloatWindow();
+    }
+
+    private fun initFloatWindow() {
+        mFloatLayout = LayoutInflater.from(mActivity).inflate(R.layout.debug_view, null) as View
+        mFloatLayout.setOnTouchListener(this)
+        mWindowParams = WindowManager.LayoutParams()
+        mWindowManager = mActivity.windowManager
+        mWindowParams?.let {
+            it.format = PixelFormat.RGBA_8888
+            it.flags = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
+            it.gravity = Gravity.START or Gravity.TOP
+            it.width = 800
+            it.height = 1000
+            it.alpha = 0.9f
+        }
+        mFloatLayout.findViewById<AppCompatImageView>(R.id.close_window).onClick {
+            hideFloatWindow()
+        }
+
+        mFloatLayout.findViewById<AppCompatButton>(R.id.acbtn_send_15_dir).onClick {
+            val newBuilder = MogoReportMsg.MogoReportMessage.newBuilder()
+            newBuilder.code = "EMAP_ATTITUDE_INIT_FAILED"
+            newBuilder.timestampBuilder.sec = 0
+            newBuilder.timestampBuilder.nsec = 0
+            newBuilder.src = "2"
+            newBuilder.level = ""
+            CallerAutoPilotStatusListenerManager.invokeAutopilotGuardian(newBuilder.build())
+        }
+    }
+
+    override fun onTouch(v: View?, motionEvent: MotionEvent?): Boolean {
+        when (motionEvent?.action) {
+            MotionEvent.ACTION_DOWN -> {
+                // 获取相对View的坐标，即以此View左上角为原点
+                mInViewX = motionEvent.x
+                mInViewY = motionEvent.y
+                // 获取相对屏幕的坐标，即以屏幕左上角为原点
+                mDownInScreenX = motionEvent.rawX
+                mDownInScreenY = motionEvent.rawY
+                mInScreenX = motionEvent.rawX
+                mInScreenY = motionEvent.rawY
+
+            }
+            MotionEvent.ACTION_MOVE -> {
+                // 更新浮动窗口位置参数
+                mInScreenX = motionEvent.rawX
+                mInScreenY = motionEvent.rawY
+                mWindowParams!!.x = (mInScreenX - mInViewX).toInt()
+                mWindowParams!!.y = (mInScreenY - mInViewY).toInt()
+                // 手指移动的时候更新小悬浮窗的位置
+                mWindowManager!!.updateViewLayout(mFloatLayout, mWindowParams)
+            }
+        }
+        return true
+    }
+
+    fun showFloatWindow() {
+        if (mFloatLayout.parent == null) {
+            val metrics = DisplayMetrics()
+            // 默认固定位置，靠屏幕右边缘的中间
+            mWindowManager!!.defaultDisplay.getMetrics(metrics)
+            mWindowParams!!.x = metrics.widthPixels
+            mWindowParams!!.y = metrics.heightPixels / 2 - BarUtils.getStatusBarHeight()
+            mWindowManager!!.addView(mFloatLayout, mWindowParams)
+        }
+    }
+
+    fun hideFloatWindow() {
+        if (mFloatLayout.parent != null) mWindowManager!!.removeView(mFloatLayout)
+    }
+
+}
--- a/OCH/mogo-och-common-module/src/debug/res/drawable/baseline_close_24.xml
+++ b/OCH/mogo-och-common-module/src/debug/res/drawable/baseline_close_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#717B98"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+</vector>
--- a/OCH/mogo-och-common-module/src/debug/res/drawable/common_close.xml
+++ b/OCH/mogo-och-common-module/src/debug/res/drawable/common_close.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="@color/blue"/>
+</shape>
--- a/OCH/mogo-och-common-module/src/debug/res/layout/debug_view.xml
+++ b/OCH/mogo-och-common-module/src/debug/res/layout/debug_view.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:background="@color/green"
+    android:layout_height="match_parent">
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/close_window"
+        app:layout_constraintTop_toTopOf="parent"
+        android:src="@drawable/baseline_close_24"
+        android:background="@drawable/common_close"
+        android:layout_marginTop="@dimen/dp_40"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:layout_marginEnd="@dimen/dp_40"
+        android:layout_width="@dimen/dp_50"
+        android:layout_height="@dimen/dp_50"/>
+
+    <androidx.appcompat.widget.AppCompatButton
+        android:id="@+id/acbtn_send_15_dir"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        android:layout_marginTop="@dimen/dp_40"
+        android:layout_marginStart="@dimen/dp_40"
+        android:text="15m/方向相反"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>