[charter]

[3.2.0] [日志+debugview]
2023-05-06 15:23:34 +08:00
parent 629cc39705
commit 04be64e9b9
10 changed files with 73 additions and 7 deletions
--- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/event/DebugView.kt
+++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/event/DebugView.kt
@@ -0,0 +1,3 @@
+package com.mogo.och.bus.passenger.bean.event
+
+data class DebugView(val type: String)
--- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
+++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
@@ -32,6 +32,7 @@ import com.mogo.och.bus.passenger.constant.CharterPassengerConst
 import com.mogo.och.bus.passenger.net.BusPassengerModelLoopManager
 import com.mogo.och.bus.passenger.net.BusPassengerServiceManager
 import com.mogo.och.bus.passenger.utils.VoiceFocusManager
+import com.mogo.och.common.module.bean.dpmsg.BaseDPMsg
 import com.mogo.och.common.module.bean.dpmsg.ChangeDestMsg
 import com.mogo.och.common.module.biz.common.socketmessage.OCHSocketMessageManager
 import com.mogo.och.common.module.biz.constant.LoginStatusManager
@@ -861,6 +862,7 @@ object CharterPassengerModel {
                                                OchCommonConst.BUSINESS_STRING,
                                                GsonUtils.toJson(msg).toByteArray()
                                            )
+                                            CallerLogger.d(M_BUS_P + BaseDPMsg.TAG, "到站发送数据${msg}")

                                            // 到站结束自驾
                                            CallerAutoPilotControlManager.cancelAutoPilot()
--- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt
+++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt
@@ -10,6 +10,7 @@ import com.mogo.eagle.core.function.call.telematic.CallerTelematicListenerManage
 import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager
 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.mogo.logger.scene.SceneConstant.Companion.M_BUS_P
 import com.mogo.eagle.core.utilcode.util.GsonUtils
 import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.och.bus.passenger.bean.LoopInfo
@@ -23,6 +24,7 @@ import com.mogo.och.bus.passenger.model.OrderStatusEnum
 import com.mogo.och.bus.passenger.net.BusPassengerModelLoopManager
 import com.mogo.och.bus.passenger.net.BusPassengerServiceManager
 import com.mogo.och.bus.passenger.ui.dialogfragment.fragment.M1OrderLineFragment
+import com.mogo.och.common.module.bean.dpmsg.BaseDPMsg
 import com.mogo.och.common.module.bean.dpmsg.ChangeDestMsg
 import com.mogo.och.common.module.bean.dpmsg.DPMsgType
 import com.mogo.och.common.module.bean.dpmsg.LineSite
@@ -180,6 +182,7 @@ class BusPassengerFunctionOrderPresenter(view: M1OrderLineFragment?) :
                        String(byteArray),
                        ChangeDestMsg::class.java
                    ) as ChangeDestMsg
+                    CallerLogger.d(M_BUS_P + BaseDPMsg.TAG, "接受数据：切换站点${msg}")
                    if (msg.type == DPMsgType.TYPE_CHANGE_DEST.type) {
                        if (msg.isConfirmed) {
                            ToastUtils.showShort("站点确定")
@@ -235,6 +238,7 @@ class BusPassengerFunctionOrderPresenter(view: M1OrderLineFragment?) :
                OchCommonConst.BUSINESS_STRING,
                GsonUtils.toJson(msg).toByteArray()
            )
+            CallerLogger.d(M_BUS_P + BaseDPMsg.TAG, "发送数据：切换站点${msg}")
        }
        mView?.startAni()
        // 启动查看和司机端链接
--- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt
+++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt
@@ -11,7 +11,6 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListener
 import com.mogo.eagle.core.function.call.telematic.CallerTelematicListenerManager
 import com.mogo.eagle.core.function.view.SiteMarkerBean
 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.mogo.logger.scene.SceneConstant.Companion.M_BUS_P
 import com.mogo.eagle.core.utilcode.util.GsonUtils
 import com.mogo.eagle.core.utilcode.util.ToastUtils
@@ -27,7 +26,6 @@ import com.mogo.och.bus.passenger.model.CharterPassengerModel
 import com.mogo.och.bus.passenger.model.IOrderStatusChangeListener
 import com.mogo.och.bus.passenger.model.OrderStatusEnum
 import com.mogo.och.bus.passenger.ui.MainFragment
-import com.mogo.och.bus.passenger.ui.dialogfragment.M1ContainFragment
 import com.mogo.och.common.module.bean.dpmsg.DPMsgType
 import com.mogo.och.common.module.biz.common.socketmessage.OCHSocketMessageManager
 import com.mogo.och.common.module.biz.constant.OchCommonConst
@@ -98,6 +96,7 @@ class BusPassengerPresenter(view: MainFragment?) :
                    ) as BaseDPMsg
                    when (msg.type) {
                        DPMsgType.TYPE_OPEN_CLOSE_DOOR.type -> {
+                            CallerLogger.d(M_BUS_P + BaseDPMsg.TAG, "收到数据：开关门")
                            val doorStatus = LightAirconditionDoorStatusManager.doorStatus
                            if (doorStatus.isOpen) {
                                LightAirconditionDoorManager.go2OpenDoor(false)
@@ -106,6 +105,7 @@ class BusPassengerPresenter(view: MainFragment?) :
                            }
                        }
                        DPMsgType.TYPE_COMMON.type -> {
+                            CallerLogger.d(M_BUS_P + BaseDPMsg.TAG, "收到数据：常规数据")
                            val msg = GsonUtils.fromJson(
                                String(byteArray),
                                DPCommonOperationMsg::class.java
--- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/OrderInfoPresenter.kt
+++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/OrderInfoPresenter.kt
@@ -3,11 +3,14 @@ package com.mogo.och.bus.passenger.presenter
 import androidx.lifecycle.LifecycleOwner
 import com.mogo.eagle.core.data.BaseData
 import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
+import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS_P
 import com.mogo.eagle.core.utilcode.util.GsonUtils
 import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.och.bus.passenger.callback.ITimeCallback
 import com.mogo.och.bus.passenger.model.CharterPassengerModel
 import com.mogo.och.bus.passenger.ui.dialogfragment.fragment.OrderInfoFragment
+import com.mogo.och.common.module.bean.dpmsg.BaseDPMsg
 import com.mogo.och.common.module.bean.dpmsg.EndOrderMsg
 import com.mogo.och.common.module.biz.constant.OchCommonConst
 import com.mogo.och.common.module.biz.network.OchCommonServiceCallback
@@ -62,6 +65,7 @@ class OrderInfoPresenter(view: OrderInfoFragment?) :
                        OchCommonConst.BUSINESS_STRING,
                        GsonUtils.toJson(msg).toByteArray()
                    )
+                    CallerLogger.d(M_BUS_P + BaseDPMsg.TAG, "发送数据：结束订单${msg}")
                }
            }

--- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt
+++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt
@@ -22,9 +22,9 @@ import com.mogo.eagle.core.utilcode.util.ClickUtils
 import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.mogo.och.bus.passenger.R
+import com.mogo.och.bus.passenger.bean.event.DebugView
 import com.mogo.och.bus.passenger.bean.event.EventLineSites
-import com.mogo.och.bus.passenger.bean.response.LineInfoResponse
-import com.mogo.och.bus.passenger.bean.response.SiteInfoResponse
+import com.mogo.och.bus.passenger.model.CharterPassengerModel
 import com.mogo.och.bus.passenger.presenter.BusPassengerPresenter
 import com.mogo.och.bus.passenger.ui.dialogfragment.M1CarUserNoOrderFragment
 import com.mogo.och.bus.passenger.ui.dialogfragment.M1ContainFragment
@@ -102,6 +102,9 @@ class MainFragment :
        aciv_enter_video.setOnClickListener{
            openSettingPage(M1ContainFragment.VIDEOTAB)
        }
+        debug_arrive_dest.setOnClickListener {
+            CharterPassengerModel.arriveDest()
+        }
    }

    private fun openSettingPage(tab: String) {
@@ -266,6 +269,15 @@ class MainFragment :
        mPresenter?.getLineTrajectory(eventLineSites.lineInfo,eventLineSites.sites)
    }

+    @Subscribe(threadMode = ThreadMode.MAIN)
+    fun changeDebugView(debugView: DebugView) {
+       if(debug_arrive_dest.visibility==View.GONE||debug_arrive_dest.visibility==View.INVISIBLE){
+           debug_arrive_dest.visibility = View.VISIBLE
+       }else{
+           debug_arrive_dest.visibility = View.GONE
+       }
+    }
+
    fun drawOverMapViewStation(stationsList: MutableList<SiteMarkerBean>){
        omvOverMap?.drawSiteMarkers(stationsList)
    }
--- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/statusbar/StatusBarView.kt
+++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/statusbar/StatusBarView.kt
@@ -2,6 +2,7 @@ package com.mogo.och.bus.passenger.view.statusbar

 import android.annotation.SuppressLint
 import android.content.Context
+import android.os.SystemClock
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.ViewGroup
@@ -20,8 +21,10 @@ import com.mogo.eagle.core.function.hmi.ui.widget.DemoModeView
 import com.mogo.eagle.core.utilcode.util.ClickUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.mogo.och.bus.passenger.R
+import com.mogo.och.bus.passenger.bean.event.DebugView
 import kotlinx.android.synthetic.main.m1_statusview_datetime.view.*
 import me.jessyan.autosize.utils.AutoSizeUtils
+import org.greenrobot.eventbus.EventBus
 import kotlin.math.roundToInt

 class StatusBarView @JvmOverloads constructor(
@@ -32,6 +35,21 @@ class StatusBarView @JvmOverloads constructor(

    companion object {
        const val TAG = "StatusBarView"
+        private const val COUNTS = 4 // 点击次数
+        private const val DURATION: Long = 1000 // 规定有效时间
+    }
+
+    private var mHits = LongArray(COUNTS)
+
+    private fun continuousClick() {
+        //每次点击时，数组向前移动一位
+        System.arraycopy(mHits, 1, mHits, 0, mHits.size - 1)
+        //为数组最后一位赋值
+        mHits[mHits.size - 1] = SystemClock.uptimeMillis()
+        if (mHits[0] >= (SystemClock.uptimeMillis() - DURATION)) {
+            mHits = LongArray(COUNTS) //重新初始化数组
+            EventBus.getDefault().post(DebugView("show"))
+        }
    }

    init {
@@ -58,6 +76,10 @@ class StatusBarView @JvmOverloads constructor(

        updateStatusBarRightView(FunctionBuildConfig.isDemoMode, "demoMode", DemoModeView(this.context))

+        bizz_view.setOnClickListener {
+            continuousClick()
+        }
+
        progress.progress = 50
        tv_power_cos.text = "50%"
    }
--- a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_main_fragment.xml
+++ b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_main_fragment.xml
@@ -29,6 +29,16 @@
        android:layout_width="0dp"
        android:layout_height="match_parent"/>

+    <TextView
+        android:text="到站"
+        android:id="@+id/debug_arrive_dest"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginTop="@dimen/dp_47"
+        app:layout_constraintEnd_toEndOf="@+id/mapBizView"
+        android:visibility="gone"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
    <com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugViewTrigger
        android:layout_height="@dimen/dp_400"
        android:layout_width="@dimen/dp_100"
--- a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_statusview_datetime.xml
+++ b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_statusview_datetime.xml
@@ -16,13 +16,17 @@
        android:gravity="center"
        app:layout_constraintTop_toTopOf="parent"
        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:layout_marginEnd="@dimen/dp_90"
+        app:layout_constraintEnd_toStartOf="@+id/bizz_view"
        android:textColor="@color/bus_p_m1_1b2546"
        android:includeFontPadding="false"
        android:textSize="@dimen/dp_22"
        android:textStyle="bold" />

+    <View
+        android:id="@+id/bizz_view"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:layout_width="@dimen/dp_90"
+        android:layout_height="match_parent"/>
    <!--Wifi状态-->
    <com.mogo.eagle.core.function.hmi.ui.widget.WifiStateView
        android:id="@+id/wifiStateView"
--- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/bean/dpmsg/DataBean.kt
+++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/bean/dpmsg/DataBean.kt
@@ -9,7 +9,12 @@ object BusCacheKey{
    const val BUS_LOGIN_STATUS_CACHE = "bus_login_status_cache"
 }

-open class BaseDPMsg(open var type: Int) // 0: 常规 1：确认路线/站点 2：开/关车门 3：结束订单
+open class BaseDPMsg(open var type: Int){// 0: 常规 1：确认路线/站点 2：开/关车门 3：结束订单
+    companion object{
+        const val TAG = "BaseDPMsg"
+    }
+}
+

 data class LoginCacheStatus(
    var loginStatus: Int,