From 04be64e9b9fda9b9fcfe8fa856effca0beeb6282 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Sat, 6 May 2023 15:23:34 +0800 Subject: [PATCH] =?UTF-8?q?[charter]=20[3.2.0]=20[=E6=97=A5=E5=BF=97+debug?= =?UTF-8?q?view]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/bus/passenger/bean/event/DebugView.kt | 3 +++ .../passenger/model/CharterPassengerModel.kt | 2 ++ .../BusPassengerFunctionOrderPresenter.kt | 4 ++++ .../presenter/BusPassengerPresenter.kt | 4 ++-- .../passenger/presenter/OrderInfoPresenter.kt | 4 ++++ .../mogo/och/bus/passenger/ui/MainFragment.kt | 16 ++++++++++++-- .../passenger/view/statusbar/StatusBarView.kt | 22 +++++++++++++++++++ .../src/main/res/layout/m1_main_fragment.xml | 10 +++++++++ .../res/layout/m1_statusview_datetime.xml | 8 +++++-- .../och/common/module/bean/dpmsg/DataBean.kt | 7 +++++- 10 files changed, 73 insertions(+), 7 deletions(-) create mode 100644 OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/event/DebugView.kt diff --git 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 new file mode 100644 index 0000000000..b2a2aa2c15 --- /dev/null +++ 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) \ No newline at end of file diff --git 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 index 8965f22169..5b596e3a96 100644 --- 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() diff --git 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 index 7be8d30b7c..dfd9e84c32 100644 --- 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() // 启动查看和司机端链接 diff --git 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 index a443c9ab8d..9159d7a2d8 100644 --- 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 diff --git 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 index 43b3c3d64c..7601664b77 100644 --- 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}") } } diff --git 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 index f7e7d9bec0..2e777e9c3e 100644 --- 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){ omvOverMap?.drawSiteMarkers(stationsList) } diff --git 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 index 22a782b541..053622a980 100644 --- 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%" } diff --git 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 index d1cb6e2f66..4817c92f25 100644 --- 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"/> + + +