diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
index ab3d2e9a95..1f27b99be6 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
@@ -155,11 +155,7 @@ class TaxiPassengerBaseFragment() :
}
private fun initCheckView() {
- mArrivedCheckView = WeakReference(
- TaxiPassengerCheckView(
- context
- )
- )
+ mArrivedCheckView = WeakReference(TaxiPassengerCheckView(context))
mArrivedCheckView!!.get()!!.iTaxiPassengerCommonValueCallback =
ITaxiPassengerCommonValueCallback { phoneTail: String? ->
getPresenter()!!.checkAndUpdateStatus(phoneTail)
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugEvent.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugEvent.kt
new file mode 100644
index 0000000000..ce7b533953
--- /dev/null
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugEvent.kt
@@ -0,0 +1,4 @@
+package com.mogo.och.taxi.passenger.ui.debug
+
+class DebugEvent {
+}
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugView.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugView.kt
new file mode 100644
index 0000000000..6a05cb281d
--- /dev/null
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugView.kt
@@ -0,0 +1,91 @@
+package com.mogo.och.taxi.passenger.ui.debug
+
+import android.content.Context
+import android.os.SystemClock
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.fragment.app.FragmentActivity
+import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
+import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
+import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager
+import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager
+import com.mogo.eagle.core.function.call.setting.CallerSkinModeListenerManager
+import com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugView
+import com.mogo.eagle.core.utilcode.kotlin.onClick
+import com.mogo.eagle.core.utilcode.util.ActivityUtils
+import com.mogo.och.common.module.manager.debug.DebugViewWatchDogFragment
+import com.mogo.och.taxi.passenger.R
+import com.mogo.och.taxi.passenger.ui.TaxiPassengerBaseFragment
+import kotlinx.android.synthetic.main.taxi_p_debug.view.tv_show_arrive
+import kotlinx.android.synthetic.main.taxi_p_debug.view.tv_show_phone_check
+import kotlinx.android.synthetic.main.taxi_p_debug.view.tv_show_start_autopilot
+import kotlinx.android.synthetic.main.taxi_p_statusview.view.iv_biz_icon
+import me.jessyan.autosize.utils.AutoSizeUtils
+import org.greenrobot.eventbus.EventBus
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+import java.lang.ref.WeakReference
+
+class DebugView @JvmOverloads constructor(
+ context: Context,
+ attrs: AttributeSet? = null,
+ defStyleAttr: Int = 0
+) : ConstraintLayout(context, attrs, defStyleAttr), IMoGoAutopilotStatusListener {
+
+ companion object {
+ const val TAG = "DebugView"
+ }
+
+ init {
+ LayoutInflater.from(context).inflate(R.layout.taxi_p_debug, this, true)
+ visibility = GONE
+ }
+
+ private var fragment:TaxiPassengerBaseFragment?=null
+
+ override fun onAttachedToWindow() {
+ super.onAttachedToWindow()
+
+ EventBus.getDefault().register(this)
+
+ val activityByContext = ActivityUtils.getActivityByContext(context)
+ if(activityByContext is FragmentActivity){
+ val fragment =
+ activityByContext.supportFragmentManager.findFragmentByTag(TaxiPassengerBaseFragment.TAG)
+ if(fragment is TaxiPassengerBaseFragment){
+ this.fragment = fragment
+ }
+ }
+
+ tv_show_arrive.onClick {
+ fragment?.showOrHideArrivedEndLayout(true)
+ }
+ tv_show_phone_check.onClick {
+ fragment?.showOrHidePressengerCheckPager(isShow = true)
+ }
+ tv_show_start_autopilot.onClick {
+ fragment?.showOrHideStartAutopilotView(true)
+ }
+
+ }
+ @Subscribe(threadMode = ThreadMode.MAIN)
+ fun changeOverview(debugEvent: DebugEvent) {
+ if(visibility== VISIBLE){
+ visibility = GONE
+ }else{
+ visibility = VISIBLE
+ }
+ }
+
+
+
+
+ override fun onDetachedFromWindow() {
+ super.onDetachedFromWindow()
+ EventBus.getDefault().unregister(this)
+ }
+
+}
+
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/statusview/StatusBarView.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/statusview/StatusBarView.kt
index c4a7dca1c8..8528a5541f 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/statusview/StatusBarView.kt
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/statusview/StatusBarView.kt
@@ -4,6 +4,7 @@ import android.content.Context
import android.os.SystemClock
import android.util.AttributeSet
import android.view.LayoutInflater
+import android.view.View
import android.view.ViewGroup
import androidx.constraintlayout.widget.ConstraintLayout
import androidx.fragment.app.FragmentActivity
@@ -13,11 +14,15 @@ import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager
import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager
import com.mogo.eagle.core.function.call.setting.CallerSkinModeListenerManager
import com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugView
+import com.mogo.eagle.core.utilcode.kotlin.onClick
import com.mogo.eagle.core.utilcode.util.ActivityUtils
import com.mogo.och.common.module.manager.debug.DebugViewWatchDogFragment
import com.mogo.och.taxi.passenger.R
+import com.mogo.och.taxi.passenger.ui.debug.DebugEvent
import kotlinx.android.synthetic.main.taxi_p_statusview.view.iv_biz_icon
+import kotlinx.android.synthetic.main.taxi_p_statusview.view.vShowDebugView
import me.jessyan.autosize.utils.AutoSizeUtils
+import org.greenrobot.eventbus.EventBus
import java.lang.ref.WeakReference
class StatusBarView @JvmOverloads constructor(
@@ -70,9 +75,11 @@ class StatusBarView @JvmOverloads constructor(
CallerAutoPilotStatusListenerManager.addListener(TAG, this)
-// bizz_view.setOnClickListener { continuousClick(bizz) }
-//
iv_biz_icon.setOnClickListener { continuousClick(debugView) }
+ vShowDebugView.setOnLongClickListener {
+ EventBus.getDefault().post(DebugEvent())
+ false
+ }
}
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_score_success.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_score_success.xml
deleted file mode 100644
index 530c056746..0000000000
--- a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_score_success.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-