yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[6.5.0]

Browse Source 
[fea]
[抽出debug、statusbar]
This commit is contained in:
yangyakun
2024-07-03 11:20:43 +08:00
parent 8afa02ad48
commit 6313e0cb2a
26 changed files with 79 additions and 406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
View File

@@ -28,6 +28,7 @@ import com.mogo.och.taxi.passenger.ui.bar.LeftBarView
import com.mogo.och.taxi.passenger.ui.bottom.BottomBar
import com.mogo.och.taxi.passenger.ui.checkstartautopilot.ChekAndStartAutopilotView
import com.mogo.och.taxi.passenger.ui.bar.RightBarView
import com.mogo.och.taxi.passenger.ui.debug.DebugCallback
import com.mogo.och.taxi.passenger.ui.statusview.StatusBarView
import io.reactivex.disposables.Disposable
import kotlinx.android.synthetic.main.taxi_p_base_fragment.*
@@ -42,7 +43,7 @@ import kotlinx.android.synthetic.main.taxi_p_base_fragment.*
*/
class TaxiPassengerBaseFragment() :
MvpFragment<TaxiPassengerBaseFragment?, BaseTaxiPassengerPresenter?>(), IMogoMapListener,
TaxiPassengerTaxiView {
TaxiPassengerTaxiView, DebugCallback {
private var statusBarView: StatusBarView? = null
@@ -234,7 +235,7 @@ class TaxiPassengerBaseFragment() :
*
* @param isShow
*/
fun showOrHideServingOrderFragment(isShow: Boolean) {
override fun showOrHideServingOrderFragment(isShow: Boolean) {
when (bottom.getCurrentPage()) {
BottomBar.SelectView.OVERMAPVIEW, BottomBar.SelectView.PRECISIONMAP -> {
if (isShow) {
@@ -257,7 +258,7 @@ class TaxiPassengerBaseFragment() :
fun showOrHideCheckAndStartAutopilotView(status:Int){
override fun showOrHideCheckAndStartAutopilotView(status:Int){
UiThreadHandler.post {
arrivedView.visibility = View.GONE
when (status) {
@@ -303,7 +304,7 @@ class TaxiPassengerBaseFragment() :
*
* @param isShow true 展示 false 隐藏
*/
fun showOrHideArrivedEndLayout(isShow: Boolean) {
override fun showOrHideArrivedEndLayout(isShow: Boolean) {
// chekAndStartAutopilotView.visibility = View.GONE
evaluate.visibility = View.GONE
if (isShow) {
@@ -465,7 +466,7 @@ class TaxiPassengerBaseFragment() :
arrivedView.preLoadImages()
}
fun setEvaluateView(){
override fun setEvaluateView(){
evaluate.visibility = View.VISIBLE
}

109
OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugView.kt
View File

@@ -1,109 +0,0 @@
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.alibaba.android.arouter.launcher.ARouter
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.biz.provider.CommonService
import com.mogo.och.common.module.constant.OchCommonConst
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_evaluate
import kotlinx.android.synthetic.main.taxi_p_debug.view.tv_show_order_info
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_debug.view.tv_show_start_autopilot_success
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 commonService = ARouter.getInstance().build(OchCommonConst.TAXI_UNMANNED_PASSENGER)
.navigation() as CommonService?
commonService?.let {
val fragment = it.getFragment()
if(fragment is TaxiPassengerBaseFragment){
this.fragment = fragment
}
}
}
tv_show_arrive.onClick {
fragment?.showOrHideArrivedEndLayout(true)
}
tv_show_phone_check.onClick {
fragment?.showOrHideCheckAndStartAutopilotView(0)
}
tv_show_start_autopilot.onClick {
fragment?.showOrHideCheckAndStartAutopilotView(1)
}
tv_show_start_autopilot_success.onClick {
fragment?.showOrHideCheckAndStartAutopilotView(2)
}
tv_show_order_info.onClick {
fragment?.showOrHideServingOrderFragment(true)
fragment?.preLoadArrivedImages()
}
tv_show_evaluate.onClick {
fragment?.setEvaluateView()
}
}
@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)
}
}

108
OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/statusview/StatusBarView.kt
View File

@@ -1,108 +0,0 @@
package com.mogo.och.taxi.passenger.ui.statusview
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
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.autopilot.autopilot.IOchAutopilotStatusListener
import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotStatusListenerManager
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(
context: Context,
attrs: AttributeSet? = null,
defStyleAttr: Int = 0
) : ConstraintLayout(context, attrs, defStyleAttr), IOchAutopilotStatusListener {
companion object {
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 debugViewWatchDogFragment: WeakReference<DebugViewWatchDogFragment>? = null
private var mHits = LongArray(COUNTS)
private fun continuousClick(type:String) {
if (ToggleDebugView.toggleDebugView.isShowIng()) {
ToggleDebugView.toggleDebugView.dismiss()
return
}
//每次点击时，数组向前移动一位
System.arraycopy(mHits, 1, mHits, 0, mHits.size - 1)
//为数组最后一位赋值
mHits[mHits.size - 1] = SystemClock.uptimeMillis()
if (mHits[0] >= (SystemClock.uptimeMillis() - DURATION)) {
mHits = LongArray(COUNTS) //重新初始化数组
showDebugView()
}
}
init {
LayoutInflater.from(context).inflate(R.layout.taxi_p_statusview, this, true)
setBackgroundResource(R.drawable.taxi_p_status_bg)
isClickable = true
isFocusable = true
}
override fun onAttachedToWindow() {
super.onAttachedToWindow()
post {
val params: ViewGroup.LayoutParams = layoutParams
params.height = AutoSizeUtils.dp2px(context,120f)
layoutParams = params
}
OchAutoPilotStatusListenerManager.addListener(TAG, this)
iv_biz_icon.setOnClickListener { continuousClick(debugView) }
vShowDebugView.setOnLongClickListener {
EventBus.getDefault().post(DebugEvent())
false
}
}
private fun showDebugView() {
if (debugViewWatchDogFragment?.get() == null) {
debugViewWatchDogFragment = WeakReference(DebugViewWatchDogFragment.newInstance())
}
val debugViewFragment = debugViewWatchDogFragment?.get()
if (ActivityUtils.getTopActivity() is FragmentActivity) {
val fragmentActivity = ActivityUtils.getTopActivity() as FragmentActivity
DebugViewWatchDogFragment.showDebugView(fragmentActivity.supportFragmentManager,fragmentActivity.supportFragmentManager,debugViewFragment)
}
}
override fun onDetachedFromWindow() {
super.onDetachedFromWindow()
CallerHmiViewControlListenerManager.removeListener(TAG)
CallerSkinModeListenerManager.removeListener(TAG)
CallerDevaToolsManager.hideStatusBar()
}
}

66
OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/statusview/TaxiPBlueToothView.kt
View File

@@ -1,66 +0,0 @@
package com.mogo.och.taxi.passenger.ui.statusview
import android.annotation.SuppressLint
import android.content.Context
import android.util.AttributeSet
import android.view.LayoutInflater
import android.widget.RelativeLayout
import com.mogo.eagle.core.function.api.devatools.mofang.IMoGoMoFangProvider
import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager
import com.mogo.och.taxi.passenger.R
import kotlinx.android.synthetic.main.taxi_p_blue_tooth.view.mofangView
/**
* 魔戒蓝牙控件
* 放置于StatusBar右侧位置
* todo arrow
*/
class TaxiPBlueToothView : RelativeLayout, IMoGoMoFangProvider.OnMoFangStatusListener {
companion object{
const val TAG = "TaxiPBlueToothView"
}
constructor(context: Context) : this(context, null)
constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, 0)
constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : this(context, attrs, defStyleAttr, 0)
constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes)
init {
LayoutInflater.from(context).inflate(R.layout.taxi_p_blue_tooth, this, true)
}
override fun onAttachedToWindow() {
super.onAttachedToWindow()
CallerDevaToolsManager.mofang()?.registerMoFangStatusListener(TAG, this)
}
override fun onDetachedFromWindow() {
super.onDetachedFromWindow()
CallerDevaToolsManager.mofang()?.unRegisterMoFangStatusListener(this)
}
override fun onMoFangConnected() {
mofangView.setImageResource(R.drawable.taxi_p_blue_tooth_close)
}
override fun onMoFangDisconnected() {
mofangView.setImageResource(R.drawable.taxi_p_blue_tooth_open)
}
@SuppressLint("SetTextI18n")
override fun onMoFangBatteryChanged(battery: Int) {
}
override fun onMoFangClicked(keyCode: Int) {}
override fun onMoFangLongClicked(keyCode: Int) {}
override fun onMoFangCombineClicked(vararg keyCodes: Int) {}
override fun onMoFangStatusError(msg: String) {}
}

BIN
OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_blue_tooth_close.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 KiB

BIN
OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_blue_tooth_open.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 851 B

2
OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml
View File

@@ -224,7 +224,7 @@
<com.mogo.och.taxi.passenger.ui.debug.DebugView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent" />

15
OCH/taxi/passenger/src/main/res/layout/taxi_p_blue_tooth.xml
View File

@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="@dimen/dp_54"
android:layout_height="@dimen/dp_54">
<ImageView
android:id="@+id/mofangView"
android:layout_width="@dimen/dp_54"
android:layout_height="@dimen/dp_54"
android:scaleType="fitXY"
android:src="@drawable/taxi_p_blue_tooth_close"
tools:ignore="ContentDescription" />
</RelativeLayout>

64
OCH/taxi/passenger/src/main/res/layout/taxi_p_statusview.xml
View File

@@ -1,64 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_120"
android:background="@drawable/taxi_p_status_bg"
tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout"
tools:ignore="MissingDefaultResource">
<com.mogo.och.common.module.wigets.DriverConnectStatusView
app:layout_constraintTop_toTopOf="@+id/vShowDebugView"
app:layout_constraintBottom_toBottomOf="@+id/gl_horizontal"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="@dimen/dp_381"
android:layout_width="@dimen/dp_41"
android:layout_height="@dimen/dp_41"/>
<!--Wifi状态-->
<com.mogo.eagle.core.function.hmi.ui.widget.WifiStateView
android:id="@+id/wifiStateView"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_54"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="@+id/gl_horizontal"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="@dimen/dp_237"
android:layout_gravity="center" />
<!--魔方连接状态-->
<com.mogo.och.taxi.passenger.ui.statusview.TaxiPBlueToothView
android:id="@+id/blueToothView"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="@+id/gl_horizontal"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="@dimen/dp_93"
android:layout_width="@dimen/dp_54"
android:layout_height="@dimen/dp_54"
android:src="@drawable/taxi_p_blue_tooth_open"
android:layout_gravity="center"/>
<androidx.constraintlayout.widget.Guideline
android:id="@+id/gl_horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintGuide_begin="@dimen/dp_70"
android:orientation="horizontal"/>
<View
android:id="@+id/iv_biz_icon"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_width="@dimen/dp_300"
android:layout_height="match_parent"/>
<View
android:id="@+id/vShowDebugView"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_width="@dimen/dp_92"
android:layout_height="match_parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>

11
OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugCallback.kt Normal file
View File

@@ -0,0 +1,11 @@
package com.mogo.och.taxi.passenger.ui.debug
interface DebugCallback {
fun showOrHideArrivedEndLayout(isShow: Boolean)
fun showOrHideCheckAndStartAutopilotView(status:Int)
fun showOrHideServingOrderFragment(isShow: Boolean)
fun setEvaluateView()
}

0
OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugEvent.kt → OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugEvent.kt
View File

35
OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/debug/DebugView.kt → OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugView.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.unmanned.passenger.ui.debug
package com.mogo.och.taxi.passenger.ui.debug
import android.content.Context
import android.util.AttributeSet
@@ -11,11 +11,10 @@ import com.alibaba.android.arouter.launcher.ARouter
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
import com.mogo.eagle.core.utilcode.kotlin.onClick
import com.mogo.eagle.core.utilcode.util.ActivityUtils
import com.mogo.eagle.core.utilcode.util.UiThreadHandler
import com.mogo.och.common.module.biz.provider.CommonService
import com.mogo.och.common.module.constant.OchCommonConst
import com.mogo.och.unmanned.passenger.ui.TaxiPassengerBaseFragment
import com.mogo.och.unmanned.taxi.passenger.R
import com.mogo.och.common.module.utils.ProjectUtils
import com.mogo.och.taxi.passenger.common.R
import kotlinx.android.synthetic.main.taxt_u_p_debug.view.tv_map_visual
import kotlinx.android.synthetic.main.taxt_u_p_debug.view.tv_map_visual_cro
import kotlinx.android.synthetic.main.taxt_u_p_debug.view.tv_show_arrive
@@ -44,7 +43,7 @@ class DebugView @JvmOverloads constructor(
visibility = GONE
}
private var fragment: TaxiPassengerBaseFragment?=null
private var debugCallback: DebugCallback?=null
override fun onAttachedToWindow() {
super.onAttachedToWindow()
@@ -53,12 +52,18 @@ class DebugView @JvmOverloads constructor(
val activityByContext = ActivityUtils.getActivityByContext(context)
if(activityByContext is FragmentActivity){
val commonService = ARouter.getInstance().build(OchCommonConst.TAXI_UNMANNED_PASSENGER)
.navigation() as CommonService?
val path = if (ProjectUtils.isSaas()) {
OchCommonConst.TAXI_UNMANNED_PASSENGER
}else if(ProjectUtils.isMogo()){
OchCommonConst.TAXI_PASSENGER
}else{
OchCommonConst.TAXI_PASSENGER
}
val commonService = ARouter.getInstance().build(path).navigation() as CommonService?
commonService?.let {
val fragment = it.getFragment()
if(fragment is TaxiPassengerBaseFragment){
this.fragment = fragment
if(fragment is DebugCallback){
this.debugCallback = fragment
}
}
}
@@ -70,22 +75,22 @@ class DebugView @JvmOverloads constructor(
viewModel?.setDistanceCallback(this)
tv_show_arrive.onClick {
fragment?.showOrHideArrivedEndLayout(true)
debugCallback?.showOrHideArrivedEndLayout(true)
}
tv_show_phone_check.onClick {
fragment?.showOrHideCheckAndStartAutopilotView(0)
debugCallback?.showOrHideCheckAndStartAutopilotView(0)
}
tv_show_start_autopilot.onClick {
fragment?.showOrHideCheckAndStartAutopilotView(1)
debugCallback?.showOrHideCheckAndStartAutopilotView(1)
}
tv_show_order_info.onClick {
fragment?.showOrHideServingOrderFragment(true)
debugCallback?.showOrHideServingOrderFragment(true)
}
tv_show_start_autopilot_success.onClick {
fragment?.showOrHideCheckAndStartAutopilotView(2)
debugCallback?.showOrHideCheckAndStartAutopilotView(2)
}
tv_show_evaluate.onClick {
fragment?.setEvaluateView()
debugCallback?.setEvaluateView()
}
tv_map_visual.onClick {
viewModel?.changeVisualView()

2
OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/debug/DebugViewModel.kt → OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugViewModel.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.unmanned.passenger.ui.debug
package com.mogo.och.taxi.passenger.ui.debug
import androidx.lifecycle.ViewModel
import com.mogo.eagle.core.function.angle.scenes.CrossRoad

6
OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/statusview/StatusBarView.kt → OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/statusview/StatusBarView.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.unmanned.passenger.ui.statusview
package com.mogo.och.taxi.passenger.ui.statusview
import android.content.Context
import android.os.SystemClock
@@ -15,8 +15,8 @@ import com.mogo.eagle.core.utilcode.util.ActivityUtils
import com.mogo.och.common.module.manager.autopilot.autopilot.IOchAutopilotStatusListener
import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotStatusListenerManager
import com.mogo.och.common.module.manager.debug.DebugViewWatchDogFragment
import com.mogo.och.unmanned.passenger.ui.debug.DebugEvent
import com.mogo.och.unmanned.taxi.passenger.R
import com.mogo.och.taxi.passenger.common.R
import com.mogo.och.taxi.passenger.ui.debug.DebugEvent
import kotlinx.android.synthetic.main.taxt_u_p_statusview.view.vShowDebugView
import kotlinx.android.synthetic.main.taxt_u_p_statusview.view.iv_biz_icon
import me.jessyan.autosize.utils.AutoSizeUtils

4
OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/statusview/TaxiPBlueToothView.kt → OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/statusview/TaxiPBlueToothView.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.unmanned.passenger.ui.statusview
package com.mogo.och.taxi.passenger.ui.statusview
import android.annotation.SuppressLint
import android.content.Context
@@ -7,7 +7,7 @@ import android.view.LayoutInflater
import android.widget.RelativeLayout
import com.mogo.eagle.core.function.api.devatools.mofang.IMoGoMoFangProvider
import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager
import com.mogo.och.unmanned.taxi.passenger.R
import com.mogo.och.taxi.passenger.common.R
import kotlinx.android.synthetic.main.taxt_u_p_blue_tooth.view.mofangView
/**

0
OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_blue_tooth_close.png → OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_u_p_blue_tooth_close.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

0
OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_blue_tooth_open.png → OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_u_p_blue_tooth_open.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 851 B

After

Width:  |  Height:  |  Size: 851 B

0
OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_status_bg.png → OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_u_p_status_bg.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 221 KiB

After

Width:  |  Height:  |  Size: 221 KiB

0
OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_blue_tooth.xml → OCH/taxi/pcommon/src/main/res/layout/taxt_u_p_blue_tooth.xml
View File

25
OCH/taxi/passenger/src/main/res/layout/taxi_p_debug.xml → OCH/taxi/pcommon/src/main/res/layout/taxt_u_p_debug.xml
View File

@@ -25,6 +25,7 @@
android:text="启动自驾页面"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<TextView
android:id="@+id/tv_show_start_autopilot_success"
android:text="启动自驾成功"
@@ -35,10 +36,30 @@
android:text="订单信息"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<TextView
android:id="@+id/tv_show_evaluate"
android:text="评论"
android:id="@+id/tv_show_overmap_debug"
android:text="高精地图轨迹点展示"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<TextView
android:id="@+id/tv_show_evaluate"
android:text="结束评论"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<TextView
android:id="@+id/tv_map_visual"
android:text="角度变更"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<TextView
android:id="@+id/tv_map_visual_cro"
android:text="变更为路口视角"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</androidx.appcompat.widget.LinearLayoutCompat>

4
OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_statusview.xml → OCH/taxi/pcommon/src/main/res/layout/taxt_u_p_statusview.xml
View File

@@ -12,7 +12,7 @@
app:layout_constraintTop_toTopOf="@+id/vShowDebugView"
app:layout_constraintBottom_toBottomOf="@+id/gl_horizontal"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="@dimen/dp_381"
app:layout_constraintEnd_toStartOf="@+id/wifiStateView"
android:layout_width="@dimen/dp_41"
android:layout_height="@dimen/dp_41"/>
@@ -29,7 +29,7 @@
android:layout_gravity="center" />
<!--魔方连接状态-->
<com.mogo.och.unmanned.passenger.ui.statusview.TaxiPBlueToothView
<com.mogo.och.taxi.passenger.ui.statusview.TaxiPBlueToothView
android:id="@+id/blueToothView"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="@+id/gl_horizontal"

2
OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/TaxiUnmannedPassengerProvider.kt
View File

@@ -9,7 +9,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
import com.mogo.och.common.module.constant.OchCommonConst
import com.mogo.och.common.module.biz.provider.CommonServiceImpl
import com.mogo.och.unmanned.passenger.ui.TaxiPassengerBaseFragment
import com.mogo.och.unmanned.passenger.ui.statusview.StatusBarView
import com.mogo.och.taxi.passenger.ui.statusview.StatusBarView
/**

13
OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/TaxiPassengerBaseFragment.kt
View File

@@ -27,8 +27,9 @@ import com.mogo.och.taxi.passenger.ui.bar.LeftBarView
import com.mogo.och.taxi.passenger.ui.bar.RightBarView
import com.mogo.och.unmanned.passenger.presenter.BaseTaxiPassengerPresenter
import com.mogo.och.taxi.passenger.ui.bottom.BottomBar
import com.mogo.och.taxi.passenger.ui.debug.DebugCallback
import com.mogo.och.unmanned.passenger.ui.checkstartautopilot.ChekAndStartAutopilotView
import com.mogo.och.unmanned.passenger.ui.statusview.StatusBarView
import com.mogo.och.taxi.passenger.ui.statusview.StatusBarView
import io.reactivex.disposables.Disposable
import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.arrivedView
import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.bottom
@@ -57,7 +58,7 @@ import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.speedView
*/
class TaxiPassengerBaseFragment() :
MvpFragment<TaxiPassengerBaseFragment?, BaseTaxiPassengerPresenter?>(), IMogoMapListener,
TaxiPassengerTaxiView {
TaxiPassengerTaxiView, DebugCallback {
private var statusBarView: StatusBarView? = null
@@ -247,7 +248,7 @@ class TaxiPassengerBaseFragment() :
*
* @param isShow
*/
fun showOrHideServingOrderFragment(isShow: Boolean) {
override fun showOrHideServingOrderFragment(isShow: Boolean) {
when (bottom.getCurrentPage()) {
BottomBar.SelectView.OVERMAPVIEW, BottomBar.SelectView.PRECISIONMAP -> {
if (isShow) {
@@ -270,7 +271,7 @@ class TaxiPassengerBaseFragment() :
fun showOrHideCheckAndStartAutopilotView(status:Int){
override fun showOrHideCheckAndStartAutopilotView(status:Int){
UiThreadHandler.post {
arrivedView.visibility = View.GONE
when (status) {
@@ -312,7 +313,7 @@ class TaxiPassengerBaseFragment() :
overMapView.setDebugMode(true)
showOrHide(true,"Debug 按钮")
}
fun setEvaluateView(){
override fun setEvaluateView(){
evaluate.visibility = View.VISIBLE
}
@@ -325,7 +326,7 @@ class TaxiPassengerBaseFragment() :
*
* @param isShow true 展示 false 隐藏
*/
fun showOrHideArrivedEndLayout(isShow: Boolean) {
override fun showOrHideArrivedEndLayout(isShow: Boolean) {
//chekAndStartAutopilotView.visibility = View.GONE
evaluate.visibility = View.GONE
if (isShow) {

4
OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/debug/DebugEvent.kt
View File

@@ -1,4 +0,0 @@
package com.mogo.och.unmanned.passenger.ui.debug
class DebugEvent {
}

2
OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/ConsultVideoPlayer.kt
View File

@@ -23,7 +23,7 @@ import com.mogo.eagle.core.widget.media.video.TextureVideoViewOutlineProvider
import com.mogo.och.common.module.manager.audiofocus.AudioFocusManager
import com.mogo.och.common.module.wigets.media.MediaItem
import com.mogo.och.unmanned.taxi.passenger.R
import com.mogo.och.unmanned.passenger.ui.statusview.StatusBarView
import com.mogo.och.taxi.passenger.ui.statusview.StatusBarView
import com.mogo.och.unmanned.passenger.ui.video.FullVideoUtils
import com.mogo.och.unmanned.passenger.utils.ZoomDrawable
import com.shuyu.gsyvideoplayer.listener.VideoAllCallBack

2
OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml
View File

@@ -222,7 +222,7 @@
android:layout_marginBottom="-80dp"
app:layout_constraintEnd_toEndOf="parent" />
<com.mogo.och.unmanned.passenger.ui.debug.DebugView
<com.mogo.och.taxi.passenger.ui.debug.DebugView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"