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 5b7955d84a..b467795782 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
@@ -125,6 +125,7 @@ class TaxiPassengerBaseFragment() :
}
rbv_setting_music.setShowOnlySetting(0)
lbv_go2_center.visibility = View.VISIBLE
+ lbv_go2_center.showAngle()
pcnActionView.visibility = View.VISIBLE
CallerHmiManager.showTrafficLightView()
infoVideoView.visibility = View.GONE
@@ -138,7 +139,8 @@ class TaxiPassengerBaseFragment() :
romaPView.updateVisible(false)
romaDistanceView.visibility = View.GONE
rbv_setting_music.setShowOnlySetting(0)
- lbv_go2_center.visibility = View.GONE
+ lbv_go2_center.visibility = View.VISIBLE
+ lbv_go2_center.showOnlyCenter()
pcnActionView.visibility = View.VISIBLE
CallerHmiManager.showTrafficLightView()
infoVideoView.visibility = View.GONE
diff --git a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/bar/LeftBarView.kt b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/bar/LeftBarView.kt
index 55b4ae0a25..eab1bc98b9 100644
--- a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/bar/LeftBarView.kt
+++ b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/bar/LeftBarView.kt
@@ -8,7 +8,10 @@ import androidx.constraintlayout.widget.ConstraintLayout
import com.mogo.eagle.core.utilcode.kotlin.onClick
import com.mogo.och.common.module.wigets.map.switchvisual.SeekBarView
import com.mogo.och.taxi.passenger.common.R
-import kotlinx.android.synthetic.main.taxi_p_leftbar.view.iv_center_location_bg
+import kotlinx.android.synthetic.main.taxi_p_leftbar.view.aciv_only_center
+import kotlinx.android.synthetic.main.taxi_p_leftbar.view.clgroup_self_map
+import kotlinx.android.synthetic.main.taxi_p_leftbar.view.clgroup_self_only_map
+import kotlinx.android.synthetic.main.taxi_p_leftbar.view.iv_center_location
import kotlinx.android.synthetic.main.taxi_p_leftbar.view.iv_visual_angle_title_bottom
import kotlinx.android.synthetic.main.taxi_p_leftbar.view.iv_visual_angle_title_head
import kotlinx.android.synthetic.main.taxi_p_leftbar.view.iv_visual_angle_title_value_bg
@@ -34,7 +37,10 @@ class LeftBarView : ConstraintLayout {
private fun initView() {
LayoutInflater.from(context).inflate(R.layout.taxi_p_leftbar, this, true)
- iv_center_location_bg.onClick {
+ iv_center_location.onClick {
+ this.rightBarCallback?.setGo2CenterClick()
+ }
+ aciv_only_center.onClick {
this.rightBarCallback?.setGo2CenterClick()
}
@@ -54,6 +60,16 @@ class LeftBarView : ConstraintLayout {
}
}
+ fun showAngle(){
+ clgroup_self_map.visibility = VISIBLE
+ clgroup_self_only_map.visibility = GONE
+ }
+
+ fun showOnlyCenter(){
+ clgroup_self_map.visibility = GONE
+ clgroup_self_only_map.visibility = VISIBLE
+ }
+
override fun onVisibilityAggregated(isVisible: Boolean) {
super.onVisibilityAggregated(isVisible)
}
diff --git a/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_only_center_bg.png b/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_only_center_bg.png
new file mode 100644
index 0000000000..b27a38babd
Binary files /dev/null and b/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_only_center_bg.png differ
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 23d9eb9a9d..f08843282f 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
@@ -8,8 +8,8 @@
@@ -35,9 +35,11 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/TaxiPassengerBaseFragment.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/TaxiPassengerBaseFragment.kt
index e7fff75ec4..550269a4b8 100644
--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/TaxiPassengerBaseFragment.kt
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/TaxiPassengerBaseFragment.kt
@@ -9,6 +9,7 @@ import android.view.View
import com.alibaba.android.arouter.launcher.ARouter
import com.mogo.commons.mvp.MvpFragment
import com.mogo.commons.voice.AIAssist
+import com.mogo.eagle.core.data.map.MogoLatLng
import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
@@ -18,6 +19,7 @@ import com.mogo.eagle.core.utilcode.util.UiThreadHandler
import com.mogo.map.listener.IMogoMapListener
import com.mogo.och.common.module.biz.provider.CommonService
import com.mogo.och.common.module.constant.OchCommonConst
+import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager
import com.mogo.och.common.module.manager.xiaozhi.ZhiStateManager
import com.mogo.och.common.module.utils.RxUtils
import com.mogo.och.common.module.voice.VoiceNotice
@@ -108,7 +110,8 @@ class TaxiPassengerBaseFragment() :
BottomBar.SelectView.PRECISIONMAP -> {
//切换到地图中间
mapBizView.getUI()?.let {
- it.changeMapVisualAngle(it.getVrAngleDefaultMode(), null)
+ val wgs02Location = OchLocationManager.getWgs02Location()
+ it.moveToCenter(MogoLatLng(wgs02Location.latitude,wgs02Location.longitude))
}
}
BottomBar.SelectView.OVERMAPVIEW -> {
@@ -141,6 +144,7 @@ class TaxiPassengerBaseFragment() :
}
rbv_setting_music.setShowOnlySetting(0)
lbv_go2_center.visibility = View.VISIBLE
+ lbv_go2_center.showAngle()
pcnActionView.visibility = View.VISIBLE
CallerHmiManager.showTrafficLightView()
infoVideoView.visibility = View.GONE
@@ -154,7 +158,8 @@ class TaxiPassengerBaseFragment() :
romaPView.updateVisible(false)
romaDistanceView.visibility = View.GONE
rbv_setting_music.setShowOnlySetting(0)
- lbv_go2_center.visibility = View.GONE
+ lbv_go2_center.visibility = View.VISIBLE
+ lbv_go2_center.showOnlyCenter()
pcnActionView.visibility = View.VISIBLE
CallerHmiManager.showTrafficLightView()
infoVideoView.visibility = View.GONE