From af2db07838010aa1ac8d185b22e0211b01bd9818 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 2 Jul 2024 19:01:47 +0800 Subject: [PATCH] =?UTF-8?q?[6.5.0]=20[fea]=20[=E8=A7=86=E8=A7=92=E5=88=87?= =?UTF-8?q?=E6=8D=A2]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wigets/map/orderstatus/OrderStatusView.kt | 2 +- .../wigets/map/switchvisual/SeekBarView.kt | 220 ++++++++++++++++++ .../wigets/map/switchvisual/VisualView.kt | 14 +- .../map/switchvisual/VisualViewModel.kt | 152 +++++++----- .../drawable-nodpi/taxi_p_visual_angle.png | Bin 0 -> 8330 bytes .../drawable-nodpi/taxi_p_visual_angle_bg.png | Bin 0 -> 4617 bytes .../res/layout/taxi_p_seekbar_visualangle.xml | 28 +++ .../main/res/layout/taxi_p_base_fragment.xml | 6 +- .../och/taxi/passenger/ui/bar/LeftBarView.kt | 1 + .../res/drawable-nodpi/taxi_p_left_bar_bg.png | Bin 0 -> 8642 bytes .../drawable-nodpi/taxi_p_title_bottom.png | Bin 0 -> 1716 bytes .../res/drawable-nodpi/taxi_p_title_head.png | Bin 0 -> 3158 bytes .../res/drawable/taxi_p_left_bar_split.xml | 8 + .../src/main/res/layout/taxi_p_leftbar.xml | 65 ++++-- .../src/main/res/layout/taxi_p_seekbar_.xml | 28 +++ .../res/layout/taxi_p_seekbar_visualangle.xml | 28 +++ .../pcommon/src/main/res/values/colors.xml | 3 + .../unmanned/taxi/ui/base/TaxiPresenter.java | 3 - .../layout/unmanned_taxi_base_fragment.xml | 1 + .../unmanned/passenger/ui/debug/DebugView.kt | 35 ++- .../passenger/ui/debug/DebugViewModel.kt | 118 ++++++++++ .../res/layout/taxt_u_p_base_fragment.xml | 9 +- .../src/main/res/layout/taxt_u_p_debug.xml | 16 +- 23 files changed, 653 insertions(+), 84 deletions(-) create mode 100644 OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/switchvisual/SeekBarView.kt create mode 100644 OCH/common/common/src/main/res/drawable-nodpi/taxi_p_visual_angle.png create mode 100644 OCH/common/common/src/main/res/drawable-nodpi/taxi_p_visual_angle_bg.png create mode 100644 OCH/common/common/src/main/res/layout/taxi_p_seekbar_visualangle.xml create mode 100644 OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_left_bar_bg.png create mode 100644 OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_title_bottom.png create mode 100644 OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_title_head.png create mode 100644 OCH/taxi/pcommon/src/main/res/drawable/taxi_p_left_bar_split.xml create mode 100644 OCH/taxi/pcommon/src/main/res/layout/taxi_p_seekbar_.xml create mode 100644 OCH/taxi/pcommon/src/main/res/layout/taxi_p_seekbar_visualangle.xml create mode 100644 OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/debug/DebugViewModel.kt diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/orderstatus/OrderStatusView.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/orderstatus/OrderStatusView.kt index 86f43bff3b..22a28ddd8c 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/orderstatus/OrderStatusView.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/orderstatus/OrderStatusView.kt @@ -25,7 +25,7 @@ class OrderStatusView : AppCompatImageView, OrderStatusViewModel.IVisualCallback ) private fun initView() { - setImageResource(R.drawable.common_visual_medium) + setImageResource(R.drawable.common_status_unorder) } override fun onAttachedToWindow() { diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/switchvisual/SeekBarView.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/switchvisual/SeekBarView.kt new file mode 100644 index 0000000000..5e7d3e3938 --- /dev/null +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/switchvisual/SeekBarView.kt @@ -0,0 +1,220 @@ +package com.mogo.och.common.module.wigets.map.switchvisual + +import android.animation.ObjectAnimator +import android.content.Context +import android.graphics.Canvas +import android.graphics.Color +import android.graphics.LinearGradient +import android.graphics.Paint +import android.graphics.Shader +import android.util.AttributeSet +import android.view.LayoutInflater +import android.view.MotionEvent +import android.widget.ImageView +import androidx.constraintlayout.widget.ConstraintLayout +import androidx.constraintlayout.widget.ConstraintSet +import androidx.lifecycle.ViewModelProvider +import androidx.lifecycle.findViewTreeViewModelStoreOwner +import com.mogo.eagle.core.utilcode.util.UiThreadHandler +import com.mogo.och.common.module.R +import kotlin.properties.Delegates + + +class SeekBarView : ConstraintLayout, VisualViewModel.IVisualCallback { + + //定义、并创建画笔 + var p = Paint().apply { + strokeWidth = 1f + style = Paint.Style.STROKE + isAntiAlias = true + shader = LinearGradient( + 0f, 0f, 600f, 600f, intArrayOf(Color.RED, Color.BLUE, Color.BLACK), + null, Shader.TileMode.CLAMP + ) + } + + constructor(context: Context) : super(context) + + constructor(context: Context, attributeSet: AttributeSet) : super(context, attributeSet) + + constructor(context: Context, attributeSet: AttributeSet, defStyleAttr: Int) : super( + context, + attributeSet, + defStyleAttr + ) + + private var viewModel: VisualViewModel? = null + + override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) { + super.onLayout(changed, left, top, right, bottom) + } + + override fun onDraw(canvas: Canvas) { + super.onDraw(canvas) + + val split = (height - draggableButton.height) / 3f + canvas.drawLine(0f,split,width.toFloat(),split,p) + canvas.drawLine(0f,split*2,width.toFloat(),split*2,p) + canvas.drawLine(0f,(height - draggableButton.height).toFloat(),width.toFloat(),split*3,p) + val translationY = draggableButton.translationY + canvas.drawLine(0f,translationY,width.toFloat(),translationY,p) + } + + private var initialX = 0f + private var initialY = 0f + private val tempSet = ConstraintSet() + + /** + * 为该组件的触碰事件重写事件处理方法 + */ + override fun onTouchEvent(event: MotionEvent?): Boolean { + if(value==VisualViewModel.Visualangle.UnChange){ + return true + } + when (event?.action) { + MotionEvent.ACTION_DOWN -> { + initialX = event.rawX; + initialY = event.rawY; + } + MotionEvent.ACTION_MOVE -> { + + if(draggableButton.translationY<-draggableButton.height){ + tempSet.clone(this) + tempSet.setTranslationY(R.id.iv_setting_only_value,-draggableButton.height.toFloat()) + tempSet.applyTo(this) + return true + }else if (draggableButton.translationY>(height)){ + tempSet.clone(this) + tempSet.setTranslationY(R.id.iv_setting_only_value,(height).toFloat()) + tempSet.applyTo(this) + return true + } + + val dx = event.rawX - initialX; + val dy = event.rawY - initialY; + initialX = event.rawX; + initialY = event.rawY; + + tempSet.clone(this) + tempSet.setTranslationY(R.id.iv_setting_only_value,draggableButton.translationY+dy) + tempSet.applyTo(this) + } + MotionEvent.ACTION_UP -> { + if(draggableButton.translationY<0){ + translationByValue(VisualViewModel.Visualangle.Middle) + }else if (draggableButton.translationY>(height-draggableButton.height)){ + translationByValue(VisualViewModel.Visualangle.Long) + }else{ + val marginTop = draggableButton.translationY + val split = (height - draggableButton.height) / 2 + +// if(marginTop>0&&marginTopsplit&&marginTopsplit&&marginTop<(height - draggableButton.height)){ +// translationByValue(Visualangle.Long) +// } + + if(marginTop>0&&marginTopsplit&&marginTop<(height - draggableButton.height)){ + translationByValue(VisualViewModel.Visualangle.Long) + } + + } + } + else -> {} + } + return true + } + + private var value: VisualViewModel.Visualangle by Delegates.observable(VisualViewModel.Visualangle.None) { _, oldValue, newValue -> + if (oldValue != newValue) { + viewModel?.changeVisualView(newValue) + } + } + + fun translationByValue(visualangle: VisualViewModel.Visualangle){ + value = visualangle + when (visualangle) { + VisualViewModel.Visualangle.Middle -> { + ObjectAnimator.ofFloat(draggableButton, "translationY", draggableButton.translationY, 0f).apply { + duration = 100 + }.start() + } + VisualViewModel.Visualangle.Long -> { + ObjectAnimator.ofFloat( + draggableButton, + "translationY", + draggableButton.translationY, + (height - draggableButton.height).toFloat() + ).apply { + duration = 100 + }.start() + } + VisualViewModel.Visualangle.UnChange -> { + ObjectAnimator.ofFloat( + draggableButton, + "translationY", + draggableButton.translationY, + (height - draggableButton.height) / 2f + ).apply { + duration = 100 + }.start() + alpha = 0.5f + } + } + } + + private lateinit var draggableButton:ImageView + + private fun initView() { + LayoutInflater.from(context).inflate(R.layout.taxi_p_seekbar_visualangle, this, true) + draggableButton = findViewById(R.id.iv_setting_only_value) + } + + override fun onAttachedToWindow() { + super.onAttachedToWindow() + viewModel = findViewTreeViewModelStoreOwner()?.let { + ViewModelProvider(it).get(VisualViewModel::class.java) + } + + viewModel?.setDistanceCallback(this) + + } + + init { + try { + initView() + } catch (e: Exception) { + e.printStackTrace() + } + } + + override fun setMiddleAngle() { + UiThreadHandler.post({ + translationByValue(VisualViewModel.Visualangle.Middle) + }, UiThreadHandler.MODE.QUEUE) + + } + + override fun setLongAngle() { + UiThreadHandler.post({ + translationByValue(VisualViewModel.Visualangle.Long) + }, UiThreadHandler.MODE.QUEUE) + + } + + override fun setUnableChange() { + UiThreadHandler.post({ + translationByValue(VisualViewModel.Visualangle.UnChange) + }, UiThreadHandler.MODE.QUEUE) + } + + override fun setSkyboxAngle() { + UiThreadHandler.post({ + translationByValue(VisualViewModel.Visualangle.Middle) + }, UiThreadHandler.MODE.QUEUE) + } +} \ No newline at end of file diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/switchvisual/VisualView.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/switchvisual/VisualView.kt index f0fca59d4f..5b66ef0c7e 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/switchvisual/VisualView.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/switchvisual/VisualView.kt @@ -62,11 +62,21 @@ class VisualView : AppCompatImageView, VisualViewModel.IVisualCallback { }, UiThreadHandler.MODE.QUEUE) } - override fun setViewResource(resource: Int) { + override fun setMiddleAngle() { UiThreadHandler.post({ - setImageResource(resource) + setImageResource(R.drawable.common_visual_medium) }, UiThreadHandler.MODE.QUEUE) } + override fun setLongAngle() { + UiThreadHandler.post({ + setImageResource(R.drawable.common_visual_long) + }, UiThreadHandler.MODE.QUEUE) + } + + override fun setUnableChange() { + + } + } \ No newline at end of file diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/switchvisual/VisualViewModel.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/switchvisual/VisualViewModel.kt index e29c4df39b..6b1f8631e4 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/switchvisual/VisualViewModel.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/switchvisual/VisualViewModel.kt @@ -1,14 +1,16 @@ package com.mogo.och.common.module.wigets.map.switchvisual import androidx.lifecycle.ViewModel -import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager -import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger -import com.mogo.map.listener.IMogoMapListener -import com.mogo.map.listener.MogoMapListenerHandler +import com.mogo.eagle.core.function.angle.scenes.LongSight +import com.mogo.eagle.core.function.api.map.angle.IMoGoVisualAngleChangeProvider +import com.mogo.eagle.core.function.api.map.angle.Scene +import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager import com.mogo.map.uicontroller.VisualAngleMode -import com.mogo.och.common.module.R +import com.mogo.eagle.core.function.angle.scenes.Default +import com.mogo.eagle.core.utilcode.util.UiThreadHandler -class VisualViewModel : ViewModel(), IMogoMapListener { +class VisualViewModel : ViewModel(), + IMoGoVisualAngleChangeProvider.OnMoGoVisualAngleSceneChangeListener { private val TAG = VisualViewModel::class.java.simpleName @@ -20,72 +22,116 @@ class VisualViewModel : ViewModel(), IMogoMapListener { override fun onCleared() { super.onCleared() - MogoMapListenerHandler.mogoMapListenerHandler.unregisterHostMapListener(TAG) + CallerVisualAngleManager.removeListener(TAG) this.viewCallback = null } fun setDistanceCallback(viewCallback: IVisualCallback) { - MogoMapListenerHandler.mogoMapListenerHandler.registerHostMapListener(TAG, this) + CallerVisualAngleManager.addListener(TAG, this) this.viewCallback = viewCallback } - override fun onMapVisualAngleChanged(visualAngleMode: VisualAngleMode?) { - CallerLogger.d(TAG,"视角切换成功${visualAngleMode}") - visualAngleMode?.let { - if (visualAngleMode.isMediumSight) { - this.viewCallback?.setViewShow(true) - this.viewCallback?.setViewResource(R.drawable.common_visual_medium) - } else if (visualAngleMode.isLongSight) { - this.viewCallback?.setViewShow(true) - this.viewCallback?.setViewResource(R.drawable.common_visual_long) - } else if (visualAngleMode.isCloseSight) { - this.viewCallback?.setViewShow(false) - } else{ - this.viewCallback?.setViewShow(false) - } - } - } + override fun onSceneChanged(scene: Scene) { + if (scene.isCanSwitch) {// 可切换 + when (scene.angle) { + VisualAngleMode.MODE_MEDIUM_SIGHT -> { + UiThreadHandler.post({ + this.viewCallback?.setViewShow(true) + this.viewCallback?.setMiddleAngle() + }, UiThreadHandler.MODE.QUEUE) + } - override fun onMapLoaded() { - super.onMapLoaded() - CallerLogger.d(TAG,"地图加载成功 onMapLoaded") - val mapUIController = CallerMapUIServiceManager.getMapUIController() - mapUIController?.let { - val visualAngleMode = mapUIController.currentMapVisualAngle - if (visualAngleMode.isMediumSight) { - this.viewCallback?.setViewShow(true) - this.viewCallback?.setViewResource(R.drawable.common_visual_medium) - } else if (visualAngleMode.isLongSight) { - this.viewCallback?.setViewShow(true) - this.viewCallback?.setViewResource(R.drawable.common_visual_long) - } else if (visualAngleMode.isCloseSight) { - this.viewCallback?.setViewShow(false) - } else{ - this.viewCallback?.setViewShow(false) + VisualAngleMode.MODE_LONG_SIGHT -> { + UiThreadHandler.post({ + this.viewCallback?.setViewShow(true) + this.viewCallback?.setLongAngle() + }, UiThreadHandler.MODE.QUEUE) + + } + + VisualAngleMode.MAP_STYLE_VR_SKY_BOX -> { + UiThreadHandler.post({ + this.viewCallback?.setViewShow(true) + this.viewCallback?.setSkyboxAngle() + }, UiThreadHandler.MODE.QUEUE) + } + + else -> { + // 不可切换 + UiThreadHandler.post({ + this.viewCallback?.setViewShow(false) + this.viewCallback?.setUnableChange() + }, UiThreadHandler.MODE.QUEUE) + } } + } else {// 不可切换 + UiThreadHandler.post({ + this.viewCallback?.setViewShow(false) + this.viewCallback?.setUnableChange() + }, UiThreadHandler.MODE.QUEUE) } } fun changeVisualView() { - val mapUIController = CallerMapUIServiceManager.getMapUIController() - mapUIController?.currentMapVisualAngle?.let { - CallerLogger.d(TAG,"切换视角：${it}") - if (it.isLongSight) { - mapUIController.setLockMode(true); - mapUIController.changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null); - } else if (it.isMediumSight) { - mapUIController.setLockMode(false); - mapUIController.changeMapVisualAngle(VisualAngleMode.MODE_LONG_SIGHT, null); - } else { - mapUIController.changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null); + CallerVisualAngleManager.getCurrentScene().let { + val default = Default(0) + + when (it.angle) { + VisualAngleMode.MODE_MEDIUM_SIGHT -> { + if(default.angle==VisualAngleMode.MODE_MEDIUM_SIGHT){ + CallerVisualAngleManager.changeScene(LongSight(0)) + } + } + + VisualAngleMode.MODE_LONG_SIGHT -> { + CallerVisualAngleManager.changeScene(Default(0)) + } + VisualAngleMode.MAP_STYLE_VR_SKY_BOX -> { + if(default.angle==VisualAngleMode.MAP_STYLE_VR_SKY_BOX){ + CallerVisualAngleManager.changeScene(LongSight(0)) + } + } + + else -> { + + } } } } + fun changeVisualView(angle: Visualangle) { + + when (angle) { + Visualangle.Middle -> { + CallerVisualAngleManager.changeScene(Default(0)) + } + + Visualangle.Long -> { + CallerVisualAngleManager.changeScene(LongSight(0)) + } + + Visualangle.UnChange -> { + viewCallback?.setUnableChange() + } + } + + } + + enum class Visualangle { + Middle, Long, UnChange,None + } + interface IVisualCallback { - fun setViewShow(boolean: Boolean) + fun setViewShow(boolean: Boolean) {} - fun setViewResource(resource: Int) + fun setMiddleAngle() {} + + fun setLongAngle() {} + + fun setSkyboxAngle() {} + + fun setUnableChange() {} } + } \ No newline at end of file diff --git a/OCH/common/common/src/main/res/drawable-nodpi/taxi_p_visual_angle.png b/OCH/common/common/src/main/res/drawable-nodpi/taxi_p_visual_angle.png new file mode 100644 index 0000000000000000000000000000000000000000..bab0ca819cf5d0633cd66b6584560aafe071aa95 GIT binary patch literal 8330 zcma)iRa6uV(DuSEuq>Sd5(`Mz(hUpJ(%qc`0@9$;ozk_0bVx}fu}Da#uqs{BA>E(v zfAN2}-<hvUR5oRjd7yY2=NWd-MO8`+W+jf=a%l`+Bxl4Bo{^tDN5V&RmlHE1Qwv*BHU!X zpUol5Lu>Cl#c6t8_M_5vCRaiNBs=NXj&U_x8`k#WS@gG_lM}v!aXicUx009V5)_k? z(q|9e!ArEk>TSqs_zB=7rYC$y!%Wh*&)a$TA>Gs951L2P`+70xXY`%TUeO{29-uWE zm>p`UzbN_V2$-x-Ka*`B@ zYulcO|E%zEb*2!PA|wxI(apTh*!cqDVJ?pF=A5at%dVu$r~y)ICf3q5V?X!RXy~e{Kb9+}3YqZx z(h)R9o=8`bggHCxH5o7sV2z{w05pN}@D~WP6w(m5tj^E3sZizy!3}VMaUd^2C`K=F zf!r0gxxL$hx5R>eQ6kyRc*I50x(*)2;VT0sD&{M}NiY?%5#Cir4If4N8;RCB1@F3# zehzD_mvLnzA9x3sFw+WK^Xlh=QnL_(Jbg;u12|8))*?_26BTbGcbJoet2_z+-~oz& zd$-;{LVff^lfhHZ`{d2sJ4`)`bAS=HuiNa%)5g6<6cTb5o&&2al$i7bPS;Y zMDO3aaQTdk#nPc`<~R2H$O#XiElYECS@(#z?7j9WX6~*SZEISsckHE5?2PVVN(yz< zn8D5no&(q-Peoa%N>VaS8GB7T4EM8{78w{0t_#m!XSo(mQmPu^4|)ak=ueUCBJy1qlrBWgy_#XNnP!9Dh#UW&D`PeygCoz8K~Vr6 zOu`!b9lIJzM}IMG5q5e!`oSr5e}?GAhT*?)m9dH7IL|)@SMamiWW`ylm<>Sa?U zBbb_{&|^vDHHihaLxg1Cc@qNS8yR4!RLSe#!6HaY-9rT}GU~D)ZK%&h)~_42$~)+L15|w8&PjewZCM@k`2MxRTE1rDWMB?1 zT`!GE=(b==RE*{Xf3TF-DT(96snV)YBviE12SE^BV`yR6-s#~1j(o1F(2Ht6noqOB zSE4gfBhX0~yD(_OVquvIRs)$Hnuu-eV@&mXDLtLdStIOH+U($6HciFB_ACoaA3c8jo7rKSiKb@Aee5~aB`r=Q zi57YM5>hFk;9T~6&?*IVP_!A&mk7MHzPuL!B=C`t%MfQo|ABNp?{TjxE*v@8NbeDd z^&*apzUwK}{>$0VpUac#8&}5ZjyJL`e9iUtqdP%6k+&7%WUF4O5vt)iC+gf5VXEHn zsy2u)!+MkrW^P;WTppCSxuadPvSdn-8#IpA7%g5XZ24;@=WPZl#|Y%hI;ocKFH$t7 z+Ra$L;V=Z>Ou^&k#_#Y6oBckm8Wl!R`2*uc8#*~#(duT zu|-_*jk#t!C10hBO^qQ@Tu#?2uV{`;-Z}Q~j}RnpM7E!0;Sio4ahew4{n@jEfZN4g zyMQQ4%ns)!#U8Piv zNs3QIwRNOtE#rj;O%&e~-bX9!0tTA5ae8WP;(L*l5(-_#V^TNiiTO*f{MZ2 zw>RbaQh@;{cdQ#+QyaN$wDYB-11z8DuFmr07Sj)FIlm+p$ZVbttpq(eJgtAByZ!7S zb@4f_D0WU@G?|fiF3hG0Z!q_hIz6qMtm@f&pD`qcUII^$LFe>4Nykf({%zCC*79_W zaOdixEqrl^@28PO{u;r7Q;fjWXtrS9U{hv_g4=P$70=6VB#Y)Jqqr_O9F^U_(zjT}zL&!|P!Uz{_`jQ^*1EukaJ{C4Th58j9bejNO_%2q&z_ho0 z1=6Ql#zCNn+sR&buh{%BlL;YBK6mqp?7s0v*>Z1E6I_1nA!ebVJK%bP_yHE3PNH~C zg&3BWo#L{9tC5EgoGN7q31tsMytsyTOAH>r*^G~5jfdxT*QN^{i}Al}jEBBK8-YCs zq~R7Co*}HWU43jw#hnu}CF5Q}4x(TMtQA`?lI zMIhnO>sq;Jj)odbj=sjmFD6exH#|X2yUGqu*-_e}!EVLxcR{U7|HgKa`FodkDa-H?ERrjSx5URehm3Jaz%)cr{2bhT#mb^V4pNo2X+^Q3E8){J+N zCysAQSrc!n;qTX)U`@dY5IDAiA(L7g8OKc-s?)|ktfATdO>P-h1L)_doTsyuNt8Tj zx>agWROKDg$?pq?4pQ5<&J7T?F)DjW2~hdUBxeH{kKj=tP-;Zhvwk_vTd?*XVOF=Y4 z;S21^*3MkYx42v-p9#z~@<^eO2I9xaA1GMoY4T`Gia9ov2aXz zw_;fl5RdNan_|Z_OMSoSN-H$^eWF^*7a?AQ=YRlEis)L};x`K7l3%q0I!WikoC^R3 zJ_3vuBtE9|13iu)iTpsMJhRreJ-Vgk!1Ht&C2JKK0$s9UNjdU}d3(;#XF?3tCbK3< z4P`aFE+l3YV?_J?X&8St8B&4qBk-hn0Xcz^&<=~T_>tk?pA_d%wZGkr&MWYiu{*HM%d&M~OwK?+RHp1%xA7 z`ClJLKMjok+xX{rTR1B1v_3sO|55WbLG@Cnp+Mg%Hjbk1wsPJ+q%l)+toPi`tuqtd z;V)YYt{5rv8XEZ5H|M^~=KcFOXA%2(F2!|<9Ze=`As4|l0d!^gOI0?a;kg6{n4oAL zUD~sv#u0}=3TDQmX-#h>{R){UOkt!9M z+#4uNePBuyQ9Dzz-0x$YK7jZ6vc4o14_iHmg4Or2S}xO()z{hfbLHfL&HVBEYeb3m z6WYiIpuwPU%S6vG8;c>@7-7i6V*sHcEX+zld_MZUQ}TMGQp~vMkV1D}u|~!CX30Dl zMJ$o(`vf1($e+&tu1<-_EM1}r{V2ZB8PVlkO9BX+FXr8`${npq`c!}Q>$m{5VxTo6 zeaWL%oh7#bzyOM=>e~?D)Uat?i4!^`g97W3jm1`lrea)1S&i9+ zEsZ%~MH8-3khifQL_Z68SREJ!qf#ckA*48?uXr_gVmau*eSckW*GbWyhX*N||CJOn zMtnbZO*?bDb|pn+SAmHO@jsDt(eS(p-f8KIJ$KLEk3ntgXL$bZ{E5P380AuG=G=vl zZ~)JAbl;My*T9^4y4X(orB%(Nxvz{1_OCw1^!PFhAck6sV(AHT69HHJh9KT- zLt#+Nf$J49U!u6Z$rueG?qcj~8>ye0sUG!lh!QUBJ={it@fDYoa<5@Z}UP0)1Bsz)vO#qwhdp0x< zhP?Y>T0uDJc%&_7j0n6b)OH;&TM%ygqZTQ$%aMih1A4^!2DcFFXV#S&fz(Ul2kyqm zr~WzZ;95MUOc|#lg4fSPS$;=9`Csk*+E-v0P2c`%ywnxM^xQf6b6R@s10T%S%t;_N z;WzBu;^5H2{g{tN_*Hq|J3%2pk*klQT=6FsE!dR z7%)+tr{{gJ-~{F?j=x+r8I<(FAuG`)^>;Lb>@i#koD-7v_7vh5Z*Fm zsAeOkbCWP$YgLSTw*UK2o}IRCzDr_(D%acmX|*_^(#2*X7&<6@M1FI7Dx$rzk(vhg zut;!t!r?u|G|?LBn-zdYVK)^e5F2PJ1l~uhq}i|&_SLzrj-~VNUY>urhEKaCr8g}r zdv8rgQzsyAN#{RRv(2rz(i*!?-3l5Noz>e{OQ9N*HJdCsFeSrJ?#G_t+t z_AK`M|q)QSZHV763EN*+y;8 zsedKSoDbwf+DK-b7D(K|@6TTMNG80eLK6w+q)RKJOp0>@W;`?s_|yh?FD*}(8|imH zC!1P%T07tGTdN2fY>5W-k{y=#;WIM^gCf+gUPrrAiJRd#f3dGYv(>WFJ+Rahk&G?H zXtmlSsw8FiCzZ{Zx5hEy!W*|}e3!U_Q_%CbwO%6;e|Fu&UB&IpQ;X}31C`j=L=!8W zVCl`8+x>J=E7{C-oAA%RlVxXaq5O%sC) z6KjiHWz0*dF^lNWgqHO)wjMO9z4Q?`Q9KXFxldPq3xo0cgo_RyTaAUjAPwd?Hp??uuETl$buwuxhf1?&Eob#n zG3aS)LHexE;=^$i3WY;he@bj0Gcg1CpvX)M61jtZUdLYa!=er%)ellN4|}BWt|4dl z;`Mi;?z+D3c>T@4Rs(Kj(SH3YKt(ckacVe_@nGz(p^SD78|z#}kTLIBs1D&LF)4Ic^9@7}+C6!2#RX9v7a*qj( z^3S2d3v$PcazB!hnPrS`R=KEKd3UzGU>>kr*RXwwL4w|bZj8w-sVPDM1}dV4sZ)jx zp&(JBR-M4;u)FVYa##feZF2}3l@DpyiO=1$0&AVxP3t$R33w7p|7wlW1#W$ zX)5Pb967f75Ou97DwMc!Vfd80Mc4$S7afY}F-}uXIK)fMG)SA(W1W0Dl=UeOD7!~+ zG-t(fL^r>mEb6#>i#q}nVDx*Dppt`}VrR-R zh;$Ue26!Y?wny`u6JrrirCct-2o{UAlugoYEY;OLee9x)t}Vc2ZU7V(f4B!s*yObs1S9zcG!Irf96tk1EpJDFl)U zB}xYKkKAje2Awd&6S?#Kx0fyfp!Tl5MZk1+&&01-M^~BlI7xiV9e0hPJ4**s+;u!aOD|*4wLK$&VKmBOx@aNke_GUF$NmSAd9-tsh}Lgd5wRN;c2N^RIf0LSd_@CWM5| zFPWlGR@0sAO=U=>4Ag*-`XDUDT%EzXDi=scUqxtUAp7q5(3ekygxQ&er)F<+(&V|} z9s8ioSn!`;_4p|M!~k2nXSmT^!9?2)!B!eR->bioMq$mBizSO!Xyl@OF*Nx6;^XZ0 zJiV5*MbS(B^x!134m$O}NxHg6eN1;YQ{YZYkCJJ6+zd1IYkXpi1s;qAM=;8C>n1U_ zm{FveiL6UrrHzTn1AP{571xW*(X+vLHpa4)pWm9xDwJVC?SF7 zp6n=YdU_if!HF&|eYbkDITk<&qygPH3%8#oncO3j3=(OUC_^NMBc+C+jv!hGRpQbp z^#*(J{iv^FMg?W3F=TuxYOeWoEohkQml~Caz<+Mn&2zrGVCF}DVV%Xx?qYq`+M=9u zmks{C+IMCw`CjJea1CwAQ@!yatXEp1H-B@AmUdPBE$bSCngi`VSjC`$uh&R?C#N}+ zO!$XPzh{_`Zw<=qPqd9i8U_d@l*Ip$&gzX#Sr`@L-m{jKZqQ{#9uPSt;;q%colmh!P3coGi zVrK!)1WC;f=zTIsAhe(24pdvpY7*oMPNM0edA?f_VG|Nf!R%^QRj`HS*>5O5VRY%s zsb*KAn}*TNK&@Hz*P&xb63xBKA$%@tB{|}Ol&7)nEpZQ`SS1^y`%@FrOc6Du^*QI7 zmyX)hKoI>%hgNxX)?Vn^IcCxiD22f54okzOHL(Ha_1NPYv=X)!k|OS+zPBCW1Z>hy zb|>L^tm<|y=!G4HmavqBDZ^lNAs*hNh`w;{(_ng!UYvR#=qTHYvnD5;ODVB!?)l?n zsm+aH^klW67a-J<7=&&CH%Pl4c=_&?m}2B@Z&m2M?UJG5ykMka^#<;LLvX$Ff&0j{ zSj1Cn_=>zAb>Q+vb?ODt8!trsdEIc5rfm^|x=mkEFyr36qB-2-43t+CuE$zK3PT%0 zxLz#!eXaBHh2?Ks;fZ|FwqblLhNvR?aRS(99LOJO;AN7b)AJ8WtzVr4I`;^$$q66v z4yYKUK#D(rKgPbXWhFPpQUU36>2IyB4N(W<7b}Z^SEB;2in-xpQ9@&*5id##H7nS` ziWLN5g8UV%V3o9wj0A&lid=m{<&QBixjajCB0KNFbF$c=)Mu zEo-rX2k>BdrG!iGTomdP^1BPkbj92v9uQI34}P=I4PiXfra0bvgVV zr7~J-PwgOQ@rFI%OKzVB&4=YnInhMbLXK4`Ocs^DD%cCWVs|GTFWdU31rr|iP zIZ>tH-$m|IkNr{4_)n8Cd|ej^doprotH(hh5`LmY5cTs z`AhU`@Ze8;g|&J@ED<&CC4Svi5wr1p)@O8_5?XKkZX|Z(M)#&K;X!U~y#bflGc^~K z@8P{nUgK4g)it3O@5Tzm$KsoJ2GJ9Oh3f2NS$081TsS=39?^%2u6}H`KEam z)O$Z7GlCBId}&|#RI_I)nLzFLj}uRAI)1YZ3R3+{3(nTa7Gjz88@lxnL+I>2PJh5N zu$&t8Aos=`m^)3pvT>dF{C*0s`YFf?3U4LU!%2+Zsw`RP(osIN8eRw%)Tasez$4lGxKI+U9#?=(D=pA&{ z`6H=1KNofleb4p%1ZR?Km9}xc%5`NIue91-(xKX3}zbK`x@KHE13%8 z3cpcO<{zXj;dHnXT6OQ;K+nRL=?yOX6Ci9RVVg~sdnpLpZtvpVHnFvl^>_4*qegGC zt`gxP!@ZJ|h!9R%jR?M}TGAY(bhDg+AzgTyT5+QtknV!0xvJO8)r@#n4s>HH;_$^( z|LFmiqiejt{P}Gbli49z>eFX=F5`a@VWq#Pr#E2q}w?Q9I6P6NX2!@n!H3Sd@THpqwn~1FUt5u>JOIw_9X6bD`sAEdp`m`7=;eB z#cp$Y{*0L;GexT6Twv0jZ{Tj*qLN=;k8na&s|TJH=U)t%>=&CoxrwbaxP+{I$#CWr zIUn_Wj61S?zI_(5{@~)i+U)%6i|BzpF1!6zzX#g!VOjW5kQUMlD_qiVC8rrjo|J!* z&4c+3X5?3-bZ!(=VLf#6#kT7x*L_lV4NG0#8yFD(%m>XHVit!aY6g}9UlE@UVU3rb zs#tdh#?n6HT=QQbF7Qnxp|Aj<&;ALvwEjl+^^}W!nSYTNe%&Bg2#fQ5@evp~oajv9 zhFminmHcYs4*l7AWbxDlx+=*=_r+fR!6K2$bxOIhN887QE0g>5^Yg=#%yosbj>&=c-! z0Bqa?eS?NDYYHtCo8=oB=WvA04&hZ*kQoS4@UpcHt~I#ok)XDNzB$wJC(N*Zk>6ZA zs^gk~&@D#dtoJwL7RmBf4ltM?AY@fVgw~*~)!!9+yPQ_M8~5M61VGKq1Bf2Rm16ms zmU`2fd{XO(1vt)auaM7MHDA4$4{784|9!oY9Yq@ z6UwD4lzj!duB}@xZ1ttR8R#aE|0m2;LY}bLqiTsif8QPd?+-v(UR|zM)-v>e0N1T_ AR{#J2 literal 0 HcmV?d00001 diff --git a/OCH/common/common/src/main/res/drawable-nodpi/taxi_p_visual_angle_bg.png b/OCH/common/common/src/main/res/drawable-nodpi/taxi_p_visual_angle_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..22d2276ab813472f2559369247d1fcda29449eb7 GIT binary patch literal 4617 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 literal 0 HcmV?d00001 diff --git a/OCH/common/common/src/main/res/layout/taxi_p_seekbar_visualangle.xml b/OCH/common/common/src/main/res/layout/taxi_p_seekbar_visualangle.xml new file mode 100644 index 0000000000..4c1bc8426c --- /dev/null +++ b/OCH/common/common/src/main/res/layout/taxi_p_seekbar_visualangle.xml @@ -0,0 +1,28 @@ + + + + + + + + \ No newline at end of file diff --git a/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml b/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml index e84d8a4d64..07808f4913 100644 --- a/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml +++ b/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml @@ -121,10 +121,10 @@ android:id="@+id/lbv_go2_center" app:layout_constraintStart_toStartOf="parent" app:layout_constraintBottom_toBottomOf="parent" - android:layout_marginBottom="@dimen/dp_607" + app:layout_constraintTop_toTopOf="parent" android:layout_marginStart="@dimen/dp_58" - android:layout_width="@dimen/dp_78" - android:layout_height="@dimen/dp_78"/> + android:layout_width="wrap_content" + android:layout_height="wrap_content"/> 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 JtC2Ae{Xd5}8G`@- literal 0 HcmV?d00001 diff --git a/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_title_bottom.png b/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_title_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..dff99356c18daa4f0b0aaef905788daa7c97b9d5 GIT binary patch literal 1716 zcmV;l221&gP)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91ET97b1ONa40RR91EC2ui0Q_#}qW}N~9!W$&R9Fe^SY2#XMHD_WciZmL zRv-aOAhIeLg9zQys428qF~-CM(jPYRpy-1?nE1epMq`2qYK#vg`eKNhC^1IZwh&2( zCL~naQk2xvRxHxgKrEI*p#}QO-aE%{_OEw$@Ai+D5VMnP@64HV&V2WqbI!~yQM#oW zNHdUTU_1uIc$2B-ii-T6L22a+K@Y*fGUz=(#BL%npP1&6z>g>kzkdAsh($jO?v+IC zN{BzC3br*j{P-{Crrf3kIKQOqal!H(04oH*j47{XGhn7mc;Qn_d{U9;P+R@?eYWY8 z-AMy3D5>1R%-igqn8<>I>v#^><+=~K0l8bSaD!d99w+KV#{hi;yYNO!L(Q?MEY)*T zfPL#KwgbW25hp>g^DV$1Xg!htC(%xo%DG)$TKclP*BG5EM+WB!Dd!3{is0iVu)HXu zH)IGZX{xK~w%aB4Cj^{dGuAr4D0x?RIRx;JkNsV zT~P#Jdvj@NsU{|6n*i`mDTF8sSu^*{&A4_XrKd?uNTxlp5D=Wrg7&zE%`SvnbHsdM zpIQ)NJC(a}0k1A@dklsPwJ{QCUu|uznaa^ba=+iNlkmX=y*a^bcODY+yQo|!wI$kj zdX5WNGH(hSiJ+9Om{TW56UhRBfUYQYae7SWTaT~2AcxOaL4GkjC!Q`W-MAo5&o)R2 zSZ6iLQKi;pQb(KX0#|Hy)9MOgY=_}t{4Rs-Ukp|+>MGOJ)D*<{^RQFSFoPMPb)6PT z8Q}fq^^JnWJs~4$>~}Jrsx0!-uRGbfhA;eJdAx68?moo%^LXxc(sL|pk3O*}&&Y69 zVR9Lh=$-Gny5@G`S1+7jR9Qe$l_81m2b-B7<0{I|>7Z%UoM{YP(>lJAidV3myL6vf zY;S3(KA`*d76;f@Qu!7%Uxh-BP3fd!`qYp{=XAp&e_iT64NLuNQY4Te)EZgjanW9Tu@xT6>NSIQ+Dp$gh?l+{$^I4*t#wpb2o{NL9jO{ zmgM%c*D2U0z>iW1wwWB-$Ng1A)ACYVp z>kCs%iG|n(XA`wtY?cp7J}?&24P`B`gl!=+EV4#0<-y%3QUpVqICapn0TN{r{jhn+ zhpihLC;q{_o2BbH$iEt^5=?Di_(r1gT{8YhF?VS!aWAKf`?+rO7!qRnT>=yU#n$Hf z>Z4ISV+=zQF7A4NLu~+z2e5f9k@1~*2s#gxr=p7~DdI53VmPV*fVkyp>iNUd^)>sn ze9iju70MDX=z}Cyo1+FZ^8`737)iOmrS8yga4CGn75ceEm};?oi6p?t4MPWtg-@BN z;_t@~wxj}`wQ#St_8Xo5frr;^`pHACCiLy~I#GT6u@E~?*HwR+Qi;iW63FfP=%17kzc=aA5Vs_ z3@OD1W{Wzy0g*_#$Oz+!)OaWJB*4&(%SxM3D!EN%+Fc0>Cgnd#32z#T;b|{D%Z5pS z@utx_Jj+W@&wUbLL~n3WGK@eOz1=>HAkCuVRI%o)1mlt0+rGxlYYO4z;LM>@dh(nwJB!JtV>-rIfQY_HvL zru#jeoxw%k6&;Ai9ISa0m#=mvS=Cx!T{Y8drTwKDNHg$%X5c??VinS6Lx9Nu0000< KMNUMnLSTXb2N)9o literal 0 HcmV?d00001 diff --git a/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_title_head.png b/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_title_head.png new file mode 100644 index 0000000000000000000000000000000000000000..fa6f5c25e1497899e021b85619bfa4bfea6c78ad GIT binary patch literal 3158 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 literal 0 HcmV?d00001 diff --git a/OCH/taxi/pcommon/src/main/res/drawable/taxi_p_left_bar_split.xml b/OCH/taxi/pcommon/src/main/res/drawable/taxi_p_left_bar_split.xml new file mode 100644 index 0000000000..7bedff4f74 --- /dev/null +++ b/OCH/taxi/pcommon/src/main/res/drawable/taxi_p_left_bar_split.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/OCH/taxi/pcommon/src/main/res/layout/taxi_p_leftbar.xml b/OCH/taxi/pcommon/src/main/res/layout/taxi_p_leftbar.xml index 3c0c76456f..23d9eb9a9d 100644 --- a/OCH/taxi/pcommon/src/main/res/layout/taxi_p_leftbar.xml +++ b/OCH/taxi/pcommon/src/main/res/layout/taxi_p_leftbar.xml @@ -2,28 +2,65 @@ - + app:layout_constraintTop_toTopOf="parent" /> + + + + + app:layout_constraintBottom_toBottomOf="@+id/iv_center_location_bg" + app:layout_constraintEnd_toEndOf="@+id/iv_center_location_bg" + app:layout_constraintStart_toStartOf="@+id/iv_center_location_bg" /> + + + + \ No newline at end of file diff --git a/OCH/taxi/pcommon/src/main/res/layout/taxi_p_seekbar_.xml b/OCH/taxi/pcommon/src/main/res/layout/taxi_p_seekbar_.xml new file mode 100644 index 0000000000..693d5af861 --- /dev/null +++ b/OCH/taxi/pcommon/src/main/res/layout/taxi_p_seekbar_.xml @@ -0,0 +1,28 @@ + + + + + + + + \ No newline at end of file diff --git a/OCH/taxi/pcommon/src/main/res/layout/taxi_p_seekbar_visualangle.xml b/OCH/taxi/pcommon/src/main/res/layout/taxi_p_seekbar_visualangle.xml new file mode 100644 index 0000000000..4c1bc8426c --- /dev/null +++ b/OCH/taxi/pcommon/src/main/res/layout/taxi_p_seekbar_visualangle.xml @@ -0,0 +1,28 @@ + + + + + + + + \ No newline at end of file diff --git a/OCH/taxi/pcommon/src/main/res/values/colors.xml b/OCH/taxi/pcommon/src/main/res/values/colors.xml index 09ff345b07..f4d2515e6e 100644 --- a/OCH/taxi/pcommon/src/main/res/values/colors.xml +++ b/OCH/taxi/pcommon/src/main/res/values/colors.xml @@ -21,4 +21,7 @@ #111D2F #41444D + #9EB0D3 + #009EB0D3 + \ No newline at end of file diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/base/TaxiPresenter.java b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/base/TaxiPresenter.java index 49e6dd146d..199ea3b414 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/base/TaxiPresenter.java +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/base/TaxiPresenter.java @@ -93,9 +93,6 @@ public class TaxiPresenter extends Presenter implements ITaxiADASS TaxiTaskModel.INSTANCE.startNaviToEndStation(isShow); } - public void reportToEndDisAndTime(long lastSumLength, long duration) {//米/秒 -// TaxiModel.INSTANCE.reportOrderRemain(lastSumLength,duration); - } @Override public void onAutopilotArriveEnd() { diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml index 56ac8392a8..b7beb2ae1a 100644 --- a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml +++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml @@ -166,6 +166,7 @@ app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/viewDriverMsgBoxButton" /> + { + UiThreadHandler.post({ + this.viewCallback?.setViewShow(true) + this.viewCallback?.setMiddleAngle() + }, UiThreadHandler.MODE.QUEUE) + } + + VisualAngleMode.MODE_LONG_SIGHT -> { + UiThreadHandler.post({ + this.viewCallback?.setViewShow(true) + this.viewCallback?.setLongAngle() + }, UiThreadHandler.MODE.QUEUE) + } + + VisualAngleMode.MAP_STYLE_VR_SKY_BOX -> { + UiThreadHandler.post({ + this.viewCallback?.setViewShow(true) + this.viewCallback?.setSkyboxAngle() + }, UiThreadHandler.MODE.QUEUE) + } + + else -> { + // 不可切换 + UiThreadHandler.post({ + this.viewCallback?.setViewShow(false) + this.viewCallback?.setUnableChange() + }, UiThreadHandler.MODE.QUEUE) + } + } + } else {// 不可切换 + UiThreadHandler.post({ + this.viewCallback?.setViewShow(false) + this.viewCallback?.setUnableChange() + }, UiThreadHandler.MODE.QUEUE) + } + } + + fun changeVisualView() { + CallerVisualAngleManager.getCurrentScene().let { + val default = Default(0) + + when (it.angle) { + VisualAngleMode.MODE_MEDIUM_SIGHT -> { + if(default.angle==VisualAngleMode.MODE_MEDIUM_SIGHT){ + CallerVisualAngleManager.changeScene(LongSight(0)) + } + } + + VisualAngleMode.MODE_LONG_SIGHT -> { + CallerVisualAngleManager.changeScene(Default(0)) + } + VisualAngleMode.MAP_STYLE_VR_SKY_BOX -> { + if(default.angle==VisualAngleMode.MAP_STYLE_VR_SKY_BOX){ + CallerVisualAngleManager.changeScene(LongSight(0)) + } + } + + else -> { + CallerVisualAngleManager.changeScene(Default(0)) + } + } + } + } + + fun changeVisualView2Cro() { + CallerVisualAngleManager.changeScene(CrossRoad(0)) + } + + interface IVisualCallback { + fun setViewShow(boolean: Boolean) {} + + fun setMiddleAngle() {} + + fun setLongAngle() {} + + fun setSkyboxAngle() {} + + fun setUnableChange() {} + } + +} \ No newline at end of file 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 5d348cc2ae..3e65ed0c7a 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 @@ -121,10 +121,10 @@ android:id="@+id/lbv_go2_center" app:layout_constraintStart_toStartOf="parent" app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintTop_toTopOf="parent" android:layout_marginStart="@dimen/dp_58" - android:layout_marginBottom="@dimen/dp_607" - android:layout_width="@dimen/dp_78" - android:layout_height="@dimen/dp_78"/> + android:layout_width="wrap_content" + android:layout_height="wrap_content"/> - diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_debug.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_debug.xml index 2fb8e73431..d91de2aa8b 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_debug.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_debug.xml @@ -39,13 +39,25 @@ + + + +