From 6313e0cb2ad1af9da5ad70bf37b06b2621002d84 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 3 Jul 2024 11:20:43 +0800 Subject: [PATCH] =?UTF-8?q?[6.5.0]=20[fea]=20[=E6=8A=BD=E5=87=BAdebug?= =?UTF-8?q?=E3=80=81statusbar]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../passenger/ui/TaxiPassengerBaseFragment.kt | 11 +- .../och/taxi/passenger/ui/debug/DebugView.kt | 109 ------------------ .../passenger/ui/statusview/StatusBarView.kt | 108 ----------------- .../ui/statusview/TaxiPBlueToothView.kt | 66 ----------- .../taxi_p_blue_tooth_close.png | Bin 1484 -> 0 bytes .../drawable-nodpi/taxi_p_blue_tooth_open.png | Bin 851 -> 0 bytes .../main/res/layout/taxi_p_base_fragment.xml | 2 +- .../src/main/res/layout/taxi_p_blue_tooth.xml | 15 --- .../src/main/res/layout/taxi_p_statusview.xml | 64 ---------- .../taxi/passenger/ui/debug/DebugCallback.kt | 11 ++ .../och/taxi/passenger/ui/debug/DebugEvent.kt | 0 .../och/taxi}/passenger/ui/debug/DebugView.kt | 35 +++--- .../passenger/ui/debug/DebugViewModel.kt | 2 +- .../passenger/ui/statusview/StatusBarView.kt | 6 +- .../ui/statusview/TaxiPBlueToothView.kt | 4 +- .../taxt_u_p_blue_tooth_close.png | Bin .../taxt_u_p_blue_tooth_open.png | Bin .../drawable-nodpi/taxt_u_p_status_bg.png} | Bin .../main/res/layout/taxt_u_p_blue_tooth.xml | 0 .../src/main/res/layout/taxt_u_p_debug.xml} | 25 +++- .../main/res/layout/taxt_u_p_statusview.xml | 4 +- .../TaxiUnmannedPassengerProvider.kt | 2 +- .../passenger/ui/TaxiPassengerBaseFragment.kt | 13 ++- .../unmanned/passenger/ui/debug/DebugEvent.kt | 4 - .../passenger/widget/ConsultVideoPlayer.kt | 2 +- .../res/layout/taxt_u_p_base_fragment.xml | 2 +- 26 files changed, 79 insertions(+), 406 deletions(-) delete mode 100644 OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugView.kt delete mode 100644 OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/statusview/StatusBarView.kt delete mode 100644 OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/statusview/TaxiPBlueToothView.kt delete mode 100644 OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_blue_tooth_close.png delete mode 100644 OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_blue_tooth_open.png delete mode 100644 OCH/taxi/passenger/src/main/res/layout/taxi_p_blue_tooth.xml delete mode 100644 OCH/taxi/passenger/src/main/res/layout/taxi_p_statusview.xml create mode 100644 OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugCallback.kt rename OCH/taxi/{passenger => pcommon}/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugEvent.kt (100%) rename OCH/taxi/{unmanned-passenger/src/main/java/com/mogo/och/unmanned => pcommon/src/main/java/com/mogo/och/taxi}/passenger/ui/debug/DebugView.kt (77%) rename OCH/taxi/{unmanned-passenger/src/main/java/com/mogo/och/unmanned => pcommon/src/main/java/com/mogo/och/taxi}/passenger/ui/debug/DebugViewModel.kt (98%) rename OCH/taxi/{unmanned-passenger/src/main/java/com/mogo/och/unmanned => pcommon/src/main/java/com/mogo/och/taxi}/passenger/ui/statusview/StatusBarView.kt (96%) rename OCH/taxi/{unmanned-passenger/src/main/java/com/mogo/och/unmanned => pcommon/src/main/java/com/mogo/och/taxi}/passenger/ui/statusview/TaxiPBlueToothView.kt (95%) rename OCH/taxi/{unmanned-passenger => pcommon}/src/main/res/drawable-nodpi/taxt_u_p_blue_tooth_close.png (100%) rename OCH/taxi/{unmanned-passenger => pcommon}/src/main/res/drawable-nodpi/taxt_u_p_blue_tooth_open.png (100%) rename OCH/taxi/{passenger/src/main/res/drawable-nodpi/taxi_p_status_bg.png => pcommon/src/main/res/drawable-nodpi/taxt_u_p_status_bg.png} (100%) rename OCH/taxi/{unmanned-passenger => pcommon}/src/main/res/layout/taxt_u_p_blue_tooth.xml (100%) rename OCH/taxi/{passenger/src/main/res/layout/taxi_p_debug.xml => pcommon/src/main/res/layout/taxt_u_p_debug.xml} (72%) rename OCH/taxi/{unmanned-passenger => pcommon}/src/main/res/layout/taxt_u_p_statusview.xml (95%) delete mode 100644 OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/debug/DebugEvent.kt diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt index dd1a23cc83..591b531499 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt @@ -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(), 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 } diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugView.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugView.kt deleted file mode 100644 index 561d3048a2..0000000000 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugView.kt +++ /dev/null @@ -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) - } - -} - diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/statusview/StatusBarView.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/statusview/StatusBarView.kt deleted file mode 100644 index c56795f23f..0000000000 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/statusview/StatusBarView.kt +++ /dev/null @@ -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? = 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() - } - -} - diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/statusview/TaxiPBlueToothView.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/statusview/TaxiPBlueToothView.kt deleted file mode 100644 index b27eeb0c21..0000000000 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/statusview/TaxiPBlueToothView.kt +++ /dev/null @@ -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) {} - -} \ No newline at end of file diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_blue_tooth_close.png b/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_blue_tooth_close.png deleted file mode 100644 index f114ddbb6721744c72fd1c332dee9634b8ff5916..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1484 zcmV;-1vC1IP)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91HlPCl1ONa40RR91HUIzs0P{mGqyPW~Hc3Q5RA>e5Sba4V~G(A z*cb}2#VGg@V~k(vAExRb)-<+XF)ouxv^ z(>P^?7-Jwb4iLzNnBEtt4?Ud*XU5$^fcPlYbqDh&)b<}MYdaq1_10x@fll5C)U~&W zCMZ=bTg0krJBw7%#&APe15|&nqOSd!R6&w;l+Zr>o82J}B__JIxX<59eiaH@>OtRAT*FT7O*;|n(Vdy@1*%|#cu$cW>k10x0NOO4H7Bj< z+h}B+n1N+{ba1qwX!A6R_gKJo%1x!>*BZ*dwqR@7WJ!n_(Z@d<_@Zz_>E8tCeb`J{ z^0?uAm6Ictyuy5^44-U1ws*zFz<69Y9Y974%mj@Q#r0Hkt?#eJ#t`jWGGd`nNC|5v zkKnF%S88y0M$}@*D(X6lQ}^4`E(x)=wxgH*@;m7xKptEa9)OpC{z;%Vv~y8AfzGV2 zF~&kUrza-|@C$QME^}d74qm$Yo&QuX^f-t&jFB}gwA-+o;c){yBK>Y%Iihstd$~O*m%`{VnfNK5ba@Qg}jvq2ZSDR z6X{N*@|{T!WXFUS9;(^-Nqc|&2zyrV;cs1DIdpsv1sl48h z_c!`}_A1`BcnZN|7{v*VKX@WpKQlcw7GPaBCUhci+r;)XbzB{po;i-lZl4E00ZCQj zNunBo&w-xrk4r|$72fK7o)Q=|^#RETO*77&!jCOtfySO|&PVhU82uIwfl4LVfuzy` zt6|;O z;ewU3^bdb`pBxPV{0R!#)XMzdCimHC+bTsnfiL*}K#79oTlPm5#xf0Is}xNmW!S)< zfnl$byRM}v`=ksgmuSXl7hc`@ja#Y=^I_TiA`#2Qty?`7M+L*JP38M7BXkU%3^*BZ mGT>yu$$*mqCjZ#^NA%Cx&(BWL^R}E~ycoX}-P; zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyy~yTfmH9gA{&t)?32Bz_i!X#W5s< z_3aGX9zREsw*6oC3)y=Ia0qrTNXg1XIp5Wx>|Gv3Vh+g zI_<#ca{2O|>t1lY51SP>gT;@7GQRWdQcM&wXa1&YY+QaWThd<5 z=TTilvhL5wUE7Ubd2g^ctn!+1gmdwNwGN$%|MITu$$b~>xZz(Q({hG;x8DWv3msYO zKJmB7eOO=nn6W6GS!K@#=Oa06!Hs|1e_U%?v#sHx^P_bS=I767ZCM%pGri$n+2?B| zwanWZ*DQPgNNdB9EAv>+p4U?AnQ(7W-J0{)&l~OLJ@7#2!xOm&(X2^_Og`FhK8Zc7 ze(>lG))^Ir`X6!&>uQtT8?G73*Gt7uTz2yCI->2<(tF~U)H+O1Xj3cW%IC^_??b>t5jSh_yD9_PQQakUnkEng>bO^*f{3-m$y9tmo5q%Ktq3^UD1@ zWZCCbX&)5Xz;s29St#c(`_Ahk|F8TME#~KGRLU{cajM=|{DZyWzP8s4pWg=qA53ov z|538$WL8xBJjUN{E?-&_MTM6M$mZuU&0hbFcf#3g#+z1UduC3vejstQC0EH$oniL+ zZPPj(C!EbQ-lY0<>Tg>{Ghjshzxniax~@;Rt4zt= z(NOJ@c;mSk!_SA-C~QqXa4(|hNOTV|aWZvGor{q!Y zpFJB+tGw_qPB&Z5Z@y-0!fW1>Tk@~;Es0v|fCLZJ2Q}I=a|hYounwOGO3 diff --git a/OCH/taxi/passenger/src/main/res/layout/taxi_p_blue_tooth.xml b/OCH/taxi/passenger/src/main/res/layout/taxi_p_blue_tooth.xml deleted file mode 100644 index ae7dafde3a..0000000000 --- a/OCH/taxi/passenger/src/main/res/layout/taxi_p_blue_tooth.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/OCH/taxi/passenger/src/main/res/layout/taxi_p_statusview.xml b/OCH/taxi/passenger/src/main/res/layout/taxi_p_statusview.xml deleted file mode 100644 index c377a4756a..0000000000 --- a/OCH/taxi/passenger/src/main/res/layout/taxi_p_statusview.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugCallback.kt b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugCallback.kt new file mode 100644 index 0000000000..8b6e4fb07c --- /dev/null +++ b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugCallback.kt @@ -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() +} \ No newline at end of file diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugEvent.kt b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugEvent.kt similarity index 100% rename from OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugEvent.kt rename to OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugEvent.kt diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/debug/DebugView.kt b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugView.kt similarity index 77% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/debug/DebugView.kt rename to OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugView.kt index b8d6cf9fcb..eb1fd52eb5 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/debug/DebugView.kt +++ b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugView.kt @@ -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() diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/debug/DebugViewModel.kt b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugViewModel.kt similarity index 98% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/debug/DebugViewModel.kt rename to OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugViewModel.kt index f8eb4e7c4d..27f2fda68e 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/debug/DebugViewModel.kt +++ b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugViewModel.kt @@ -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 diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/statusview/StatusBarView.kt b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/statusview/StatusBarView.kt similarity index 96% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/statusview/StatusBarView.kt rename to OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/statusview/StatusBarView.kt index 8376b60a2f..101bd64887 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/statusview/StatusBarView.kt +++ b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/statusview/StatusBarView.kt @@ -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 diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/statusview/TaxiPBlueToothView.kt b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/statusview/TaxiPBlueToothView.kt similarity index 95% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/statusview/TaxiPBlueToothView.kt rename to OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/statusview/TaxiPBlueToothView.kt index 9e80940f8c..9f4218aa35 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/statusview/TaxiPBlueToothView.kt +++ b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/statusview/TaxiPBlueToothView.kt @@ -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 /** diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_blue_tooth_close.png b/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_u_p_blue_tooth_close.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_blue_tooth_close.png rename to OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_u_p_blue_tooth_close.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_blue_tooth_open.png b/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_u_p_blue_tooth_open.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_blue_tooth_open.png rename to OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_u_p_blue_tooth_open.png diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_status_bg.png b/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_u_p_status_bg.png similarity index 100% rename from OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_status_bg.png rename to OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_u_p_status_bg.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_blue_tooth.xml b/OCH/taxi/pcommon/src/main/res/layout/taxt_u_p_blue_tooth.xml similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_blue_tooth.xml rename to OCH/taxi/pcommon/src/main/res/layout/taxt_u_p_blue_tooth.xml diff --git a/OCH/taxi/passenger/src/main/res/layout/taxi_p_debug.xml b/OCH/taxi/pcommon/src/main/res/layout/taxt_u_p_debug.xml similarity index 72% rename from OCH/taxi/passenger/src/main/res/layout/taxi_p_debug.xml rename to OCH/taxi/pcommon/src/main/res/layout/taxt_u_p_debug.xml index a3eea40080..d91de2aa8b 100644 --- a/OCH/taxi/passenger/src/main/res/layout/taxi_p_debug.xml +++ b/OCH/taxi/pcommon/src/main/res/layout/taxt_u_p_debug.xml @@ -25,6 +25,7 @@ android:text="启动自驾页面" android:layout_width="wrap_content" android:layout_height="wrap_content"/> + + + + + + + + + \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_statusview.xml b/OCH/taxi/pcommon/src/main/res/layout/taxt_u_p_statusview.xml similarity index 95% rename from OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_statusview.xml rename to OCH/taxi/pcommon/src/main/res/layout/taxt_u_p_statusview.xml index 95cf3634c6..c786a40c48 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_statusview.xml +++ b/OCH/taxi/pcommon/src/main/res/layout/taxt_u_p_statusview.xml @@ -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" /> - (), 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) { diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/debug/DebugEvent.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/debug/DebugEvent.kt deleted file mode 100644 index c3819fc803..0000000000 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/debug/DebugEvent.kt +++ /dev/null @@ -1,4 +0,0 @@ -package com.mogo.och.unmanned.passenger.ui.debug - -class DebugEvent { -} \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/ConsultVideoPlayer.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/ConsultVideoPlayer.kt index c0ac16b9e8..cb2f1ddd09 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/ConsultVideoPlayer.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/ConsultVideoPlayer.kt @@ -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 diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml index 3e65ed0c7a..530ac26356 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml @@ -222,7 +222,7 @@ android:layout_marginBottom="-80dp" app:layout_constraintEnd_toEndOf="parent" /> -