From 44d162555d5e96926fddd4b5f6248397014ce6a7 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Sat, 6 May 2023 15:47:05 +0800 Subject: [PATCH] [charter] [3.2.0] [debugview] --- .../mogo/och/bus/passenger/ui/MainFragment.kt | 21 ++++++++++++++----- .../passenger/view/statusbar/StatusBarView.kt | 12 ++++++----- .../res/layout/m1_statusview_datetime.xml | 1 + 3 files changed, 24 insertions(+), 10 deletions(-) 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 2e777e9c3e..202a99b108 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 @@ -13,6 +13,7 @@ import com.mogo.commons.mvp.MvpFragment import com.mogo.eagle.core.data.config.HdMapBuildConfig import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager import com.mogo.eagle.core.function.hmi.ui.msgbox.MMsgBoxButtonView +import com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugView 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 @@ -28,6 +29,7 @@ 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 +import com.mogo.och.bus.passenger.view.statusbar.StatusBarView import com.mogo.och.common.module.biz.constant.LoginStatusManager import com.mogo.och.common.module.voice.VoiceManager import kotlinx.android.synthetic.main.m1_main_fragment.* @@ -271,11 +273,20 @@ class MainFragment : @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 - } + when (debugView.type) { + StatusBarView.bizz -> { + 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 + } + } + else -> { + ToggleDebugView.toggleDebugView.toggle(requireContext()) + } + } + } fun drawOverMapViewStation(stationsList: MutableList){ 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 053622a980..b8539ff1da 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 @@ -37,18 +37,20 @@ class StatusBarView @JvmOverloads constructor( const val TAG = "StatusBarView" private const val COUNTS = 4 // 点击次数 private const val DURATION: Long = 1000 // 规定有效时间 + const val bizz = "bizz" // 业务debug + const val debugView = "debugView" // 业务debug } private var mHits = LongArray(COUNTS) - private fun continuousClick() { + private fun continuousClick(type:String) { //每次点击时,数组向前移动一位 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")) + EventBus.getDefault().post(DebugView(type)) } } @@ -76,9 +78,9 @@ class StatusBarView @JvmOverloads constructor( updateStatusBarRightView(FunctionBuildConfig.isDemoMode, "demoMode", DemoModeView(this.context)) - bizz_view.setOnClickListener { - continuousClick() - } + bizz_view.setOnClickListener { continuousClick(bizz) } + + iv_biz_icon.setOnClickListener { continuousClick(debugView) } progress.progress = 50 tv_power_cos.text = "50%" diff --git 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 index 4300a2c6b4..8c09508bf0 100644 --- 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 @@ -76,6 +76,7 @@ android:layout_height="wrap_content"/>