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

[8.0.0]

Browse Source 
[fea]
[Home + 路程信息]
This commit is contained in:
yangyakun
2025-04-21 17:02:51 +08:00
parent dc78ecc834
commit 0d7c8165b3
24 changed files with 249 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/base/CharterBaseFragment.kt
View File

@@ -55,7 +55,7 @@ abstract class CharterBaseFragment<V : IView?, P : Presenter<V>?>() : MvpFragmen
}
override fun initViews() {
mapBizView = findViewById(R.id.mapBizView)
mapBizView = findViewById(R.id.mHomeView)
groupTestPanel = findViewById(R.id.groupTestPanel)
ctvAutopilotStatus = findViewById(R.id.autopilot_status)
flStationPanelContainer = findViewById(R.id.module_mogo_och_station_panel_container)

2
OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml
View File

@@ -7,7 +7,7 @@
android:layout_marginTop="@dimen/dp_status_bar_height">
<!--高精地图-->
<com.mogo.eagle.core.function.view.MapBizView
android:id="@+id/mapBizView"
android:id="@+id/mHomeView"
app:isWeatherEnable="false"
app:locationIcon3DRes="@raw/m1"
android:layout_width="match_parent"

17
OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/MainFragment.kt
View File

@@ -10,7 +10,6 @@ import com.amap.api.maps.model.LatLng
import com.mogo.commons.AbsMogoApplication
import com.mogo.commons.mvp.MvpFragment
import com.mogo.eagle.core.data.config.HdMapBuildConfig
import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager.getMapUIController
import com.mogo.eagle.core.function.view.SiteMarkerBean
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
@@ -39,7 +38,7 @@ import kotlinx.android.synthetic.main.charter_p_main_fragment.biz_orderinfo
import kotlinx.android.synthetic.main.charter_p_main_fragment.biz_selectline
import kotlinx.android.synthetic.main.charter_p_main_fragment.biz_softcontrol
import kotlinx.android.synthetic.main.charter_p_main_fragment.biz_video
import kotlinx.android.synthetic.main.charter_p_main_fragment.mapBizView
import kotlinx.android.synthetic.main.charter_p_main_fragment.mHomeView
import kotlinx.android.synthetic.main.charter_p_main_fragment.mcv_play_music
import kotlinx.android.synthetic.main.charter_p_main_fragment.omvOverMap
import org.greenrobot.eventbus.EventBus
@@ -165,7 +164,7 @@ class MainFragment : MvpFragment<MainFragment?, BusPassengerPresenter?>(), IMogo
}
aciv_map_2_default.setOnClickListener {
omvOverMap.displayCustomOverView()
mapBizView.getUI()?.let {
mHomeView.getUI()?.let {
it.changeMapVisualAngle(it.getVrAngleDefaultMode(), null)
}
}
@@ -226,7 +225,7 @@ class MainFragment : MvpFragment<MainFragment?, BusPassengerPresenter?>(), IMogo
override fun initViews(savedInstanceState: Bundle?) {
super.initViews(savedInstanceState)
mapBizView.onCreate(savedInstanceState)
mHomeView.onCreate(savedInstanceState)
omvOverMap.onCreateView(savedInstanceState)
}
@@ -243,28 +242,28 @@ class MainFragment : MvpFragment<MainFragment?, BusPassengerPresenter?>(), IMogo
override fun onResume() {
super.onResume()
mapBizView.onResume()
mHomeView.onResume()
omvOverMap.onResume()
}
override fun onSaveInstanceState(outState: Bundle) {
super.onSaveInstanceState(outState)
mapBizView.onSaveInstanceState(outState)
mHomeView.onSaveInstanceState(outState)
}
override fun onLowMemory() {
super.onLowMemory()
mapBizView.onLowMemory()
mHomeView.onLowMemory()
}
override fun onPause() {
super.onPause()
mapBizView.onPause()
mHomeView.onPause()
omvOverMap.onPause()
}
override fun onDestroyView() {
mapBizView.onDestroy()
mHomeView.onDestroy()
omvOverMap.onDestroy()
MogoMapListenerHandler.mogoMapListenerHandler.unregisterHostMapListener(TAG)
EventBus.getDefault().unregister(this)

10
OCH/charter/passenger/src/main/res/layout/charter_p_main_fragment.xml
View File

@@ -5,7 +5,7 @@
android:layout_height="match_parent">
<com.mogo.och.charter.passenger.ui.map.BizMapView
android:id="@+id/mapBizView"
android:id="@+id/mHomeView"
android:layout_width="0dp"
app:layout_constraintWidth_percent="0.6045"
android:layout_height="match_parent"
@@ -21,7 +21,7 @@
app:isClearArrived="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/mapBizView"
app:layout_constraintStart_toEndOf="@+id/mHomeView"
app:layout_constraintTop_toTopOf="parent"
app:mapStyleExtraPath="m1_style_extra.data"
app:mapStylePath="m1_style.data"
@@ -56,7 +56,7 @@
android:layout_height="@dimen/dp_100"
android:layout_marginBottom="@dimen/dp_180"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/mapBizView"
app:layout_constraintEnd_toEndOf="@+id/mHomeView"
app:layout_constraintStart_toStartOf="parent" />
@@ -103,7 +103,7 @@
android:paddingBottom="@dimen/dp_34_5"
android:visibility="gone"
app:layout_constraintBottom_toTopOf="@+id/bb_boorombar"
app:layout_constraintEnd_toEndOf="@+id/mapBizView"
app:layout_constraintEnd_toEndOf="@+id/mHomeView"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -143,7 +143,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_47"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="@+id/mapBizView"
app:layout_constraintEnd_toEndOf="@+id/mHomeView"
app:layout_constraintTop_toTopOf="parent" />
<!--锁定状态和解锁入口-->

2
OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/BusPassengerBaseFragment.java
View File

@@ -38,7 +38,7 @@ public abstract class BusPassengerBaseFragment<V extends IView, P extends Presen
@Override
protected void initViews() {
mapBizView = findViewById(R.id.mapBizView);
mapBizView = findViewById(R.id.mHomeView);
showRouteFragment();
}

14
OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/PM2HPMapFragment.kt
View File

@@ -11,7 +11,7 @@ import com.mogo.och.shuttle.weaknet.passenger.R
import com.mogo.och.shuttle.weaknet.passenger.constant.M2Const.Companion.TYPE_MARKER_M2_LINE
import com.mogo.och.shuttle.weaknet.passenger.presenter.PM2ADASPresenter
import com.mogo.och.common.module.utils.OCHThreadPoolManager
import kotlinx.android.synthetic.main.shuttle_p_m2_hpmap_fragment.mapBizView
import kotlinx.android.synthetic.main.shuttle_p_m2_hpmap_fragment.mHomeView
import java.util.*
@@ -39,31 +39,31 @@ class PM2HPMapFragment :
override fun initViews(savedInstanceState: Bundle?) {
super.initViews(savedInstanceState)
mapBizView.onCreate(savedInstanceState)
mHomeView.onCreate(savedInstanceState)
}
override fun onResume() {
super.onResume()
mapBizView.onResume()
mHomeView.onResume()
}
override fun onLowMemory() {
super.onLowMemory()
mapBizView.onLowMemory()
mHomeView.onLowMemory()
}
override fun onSaveInstanceState(outState: Bundle) {
super.onSaveInstanceState(outState)
mapBizView.onSaveInstanceState(outState)
mHomeView.onSaveInstanceState(outState)
}
override fun onPause() {
super.onPause()
mapBizView.onPause()
mHomeView.onPause()
}
override fun onDestroyView() {
mapBizView.onDestroy()
mHomeView.onDestroy()
super.onDestroyView()
}

2
OCH/shuttle/passenger_weaknet/src/main/res/jinlv/layout/shuttle_p_weak_jl_base_fragment.xml
View File

@@ -6,7 +6,7 @@
android:layout_height="match_parent">
<com.mogo.eagle.core.function.view.MapBizView
android:id="@+id/mapBizView"
android:id="@+id/mHomeView"
android:layout_width="1810dp"
android:layout_height="match_parent"
app:styleMode="MAP_STYLE_DAY_VR"

2
OCH/shuttle/passenger_weaknet/src/main/res/m2/layout/shuttle_p_m2_hpmap_fragment.xml
View File

@@ -6,7 +6,7 @@
<!-- 高精地图 -->
<com.mogo.eagle.core.function.view.MapBizView
android:id="@+id/mapBizView"
android:id="@+id/mHomeView"
app:styleMode="MAP_STYLE_DAY_VR"
app:carPosition="-1"
app:default_perspective="MAP_STYLE_VR_ERHAI_B2"

2
OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/fragment/BaseSweeperCloudTabFragment.java
View File

@@ -104,7 +104,7 @@ public abstract class BaseSweeperCloudTabFragment<V extends IView, P extends Pre
@Override
protected void initViews() {
mapBizView = findViewById(R.id.mapBizView);
mapBizView = findViewById(R.id.mHomeView);
groupTestPanel = findViewById(R.id.groupTestPanel);
flTaskListPanelContainer = findViewById(R.id.module_mogo_och_task_list_container);
mTrafficDataView = findViewById(R.id.sweeper_arc);

2
OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/fragment/BaseSweeperOperateTabFragment.java
View File

@@ -112,7 +112,7 @@ public abstract class BaseSweeperOperateTabFragment<V extends IView, P extends P
@Override
protected void initViews() {
mapBizView = findViewById(R.id.mapBizView);
mapBizView = findViewById(R.id.mHomeView);
groupTestPanel = findViewById(R.id.groupTestPanel);
mGroupNaviPanel = findViewById(R.id.group_navi_panel);
flTaskListPanelContainer = findViewById(R.id.module_mogo_och_task_list_container);

2
OCH/sweeper/driver/src/main/res/layout/sweeper_base_fragment.xml
View File

@@ -9,7 +9,7 @@
android:clickable="true">
<com.mogo.eagle.core.function.view.MapBizView
android:id="@+id/mapBizView"
android:id="@+id/mHomeView"
app:isWeatherEnable="false"
app:locationIcon3DRes="@raw/huanwei"
android:layout_width="match_parent"

2
OCH/sweeper/driver/src/main/res/layout/sweeper_cloud_base_fragment.xml
View File

@@ -9,7 +9,7 @@
android:clickable="true">
<com.mogo.eagle.core.function.view.MapBizView
android:id="@+id/mapBizView"
android:id="@+id/mHomeView"
app:isWeatherEnable="false"
app:locationIcon3DRes="@raw/huanwei"
android:layout_width="match_parent"

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

@@ -9,7 +9,6 @@ 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.hmi.CallerHmiViewControlListenerManager
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
@@ -19,7 +18,6 @@ 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.bridge.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
@@ -41,7 +39,7 @@ import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.infoVideoView
import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.itinerary
import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.lbv_go2_center
import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.light_setting
import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.mapBizView
import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.mHomeView
import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.mv_music_info
import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.overMapView
import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.pcnActionView
@@ -80,7 +78,7 @@ class TaxiPassengerBaseFragment :
override fun initViews(savedInstanceState: Bundle?) {
super.initViews(savedInstanceState)
mapBizView!!.onCreate(savedInstanceState)
mHomeView!!.onCreate(savedInstanceState)
overMapView.onCreateView(savedInstanceState)
//overMapView.hideResetView()
@@ -120,10 +118,10 @@ class TaxiPassengerBaseFragment :
when (bottom.getCurrentPage()) {
BottomBar.SelectView.PRECISIONMAP -> {
//切换到地图中间
mapBizView.getUI()?.let {
val wgs02Location = OchLocationManager.getWgs02Location()
it.moveToCenter(MogoLatLng(wgs02Location.latitude,wgs02Location.longitude))
}
// mapBizView.getUI()?.let {
// val wgs02Location = OchLocationManager.getWgs02Location()
// it.moveToCenter(MogoLatLng(wgs02Location.latitude,wgs02Location.longitude))
// }
}
BottomBar.SelectView.OVERMAPVIEW -> {
//overMapView.displayCustomOverView()
@@ -144,7 +142,7 @@ class TaxiPassengerBaseFragment :
BottomBar.SelectView.PRECISIONMAP -> {
CallerHmiViewControlListenerManager.invokeMainPageViewVisible(View.VISIBLE)
overMapView.visibility = View.GONE
mapBizView.visibility = View.VISIBLE
mHomeView.visibility = View.VISIBLE
presenter?.setItineraryVisibility()
speedView.visibility = View.VISIBLE
if (DeviceUtils.isLeOrEb5Model()) {
@@ -165,7 +163,7 @@ class TaxiPassengerBaseFragment :
BottomBar.SelectView.OVERMAPVIEW -> {
CallerHmiViewControlListenerManager.invokeMainPageViewVisible(View.GONE)
overMapView.visibility = View.VISIBLE
mapBizView.visibility = View.GONE
mHomeView.visibility = View.GONE
presenter?.setItineraryVisibility()
speedView.visibility = View.VISIBLE
romaPView.updateVisible(false)
@@ -181,7 +179,7 @@ class TaxiPassengerBaseFragment :
BottomBar.SelectView.VIDEO -> {
CallerHmiViewControlListenerManager.invokeMainPageViewVisible(View.GONE)
overMapView.visibility = View.GONE
mapBizView.visibility = View.GONE
mHomeView.visibility = View.GONE
presenter?.setItineraryVisibility()
speedView.visibility = View.GONE
lbv_go2_center.visibility = View.GONE
@@ -196,7 +194,7 @@ class TaxiPassengerBaseFragment :
BottomBar.SelectView.MUSIC -> {
CallerHmiViewControlListenerManager.invokeMainPageViewVisible(View.GONE)
overMapView.visibility = View.GONE
mapBizView.visibility = View.GONE
mHomeView.visibility = View.GONE
presenter?.setItineraryVisibility()
speedView.visibility = View.GONE
lbv_go2_center.visibility = View.GONE
@@ -241,7 +239,7 @@ class TaxiPassengerBaseFragment :
override fun onResume() {
super.onResume()
mapBizView!!.onResume()
mHomeView!!.onResume()
overMapView.onResume()
CallerLogger.d(M_TAXI_P + TAG, "onResume")
}
@@ -252,23 +250,23 @@ class TaxiPassengerBaseFragment :
override fun onLowMemory() {
super.onLowMemory()
mapBizView!!.onLowMemory()
mHomeView!!.onLowMemory()
}
override fun onSaveInstanceState(outState: Bundle) {
super.onSaveInstanceState(outState)
mapBizView!!.onSaveInstanceState(outState)
mHomeView!!.onSaveInstanceState(outState)
}
override fun onPause() {
super.onPause()
mapBizView!!.onPause()
mHomeView!!.onPause()
overMapView?.onPause()
CallerLogger.d(M_TAXI_P + TAG, "onPause")
}
override fun onDestroyView() {
mapBizView!!.onDestroy()
mHomeView!!.onDestroy()
overMapView?.onDestroy()
super.onDestroyView()
}

56
OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/homepage/HomeView.kt Normal file
View File

@@ -0,0 +1,56 @@
package com.mogo.och.unmanned.passenger.ui.homepage
import android.content.Context
import android.os.Bundle
import android.util.AttributeSet
import android.view.LayoutInflater
import androidx.constraintlayout.widget.ConstraintLayout
import com.mogo.och.unmanned.taxi.passenger.R
import kotlinx.android.synthetic.main.taxi_p_home.view.hdMapView
class HomeView @JvmOverloads constructor(
context: Context,
attrs: AttributeSet? = null,
defStyleAttr: Int = 0
) : ConstraintLayout(context, attrs, defStyleAttr){
private fun initView() {
LayoutInflater.from(context).inflate(R.layout.taxi_p_home, this, true)
}
fun onCreate(savedInstanceState: Bundle?) {
hdMapView.onCreate(savedInstanceState)
}
fun onSaveInstanceState(outState: Bundle) {
hdMapView.onSaveInstanceState(outState)
}
fun onResume() {
hdMapView.onResume()
}
fun onLowMemory() {
hdMapView.onLowMemory()
}
fun onPause() {
hdMapView.onPause()
}
fun onDestroy() {
hdMapView.onDestroy()
}
init {
try {
initView()
} catch (e: Exception) {
e.printStackTrace()
}
}
}

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

@@ -56,7 +56,6 @@ class StatusBarView @JvmOverloads constructor(
init {
LayoutInflater.from(context).inflate(R.layout.taxt_u_p_statusview, this, true)
setBackgroundResource(R.drawable.taxt_u_p_status_bg)
isClickable = true
isFocusable = true
}

BIN
OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_all_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 479 KiB

BIN
OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_bar_center_logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.5 KiB

79
OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_home.xml Normal file
View File

@@ -0,0 +1,79 @@
<?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:parentTag="RelativeLayout">
<androidx.cardview.widget.CardView
android:id="@+id/leftContainer"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginRight="@dimen/dp_12_5"
app:cardElevation="0dp"
app:cardCornerRadius="20.0dp"
app:layout_constraintEnd_toEndOf="@id/leftEndGuideline"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<com.mogo.eagle.core.function.view.MapBizView
android:id="@+id/hdMapView"
app:styleMode="MAP_STYLE_DAY_VR_TAXI"
app:default_perspective="MAP_STYLE_VR_SKY_BOX"
app:isWeatherEnable="true"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</androidx.cardview.widget.CardView>
<androidx.constraintlayout.widget.Guideline
android:id="@+id/leftEndGuideline"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.333" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/midStartGuideline"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.333" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/midContainer"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/dp_12_5"
android:layout_marginRight="@dimen/dp_12_5"
app:cardElevation="4dp"
app:cardCornerRadius="20.0dp"
app:layout_constraintEnd_toEndOf="@id/rightStartGuideline"
app:layout_constraintStart_toStartOf="@id/midStartGuideline">
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.Guideline
android:id="@+id/rightStartGuideline"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.666" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/rightContainer"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/dp_12_5"
app:cardCornerRadius="20.0dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@id/rightStartGuideline">
</androidx.constraintlayout.widget.ConstraintLayout>
</merge>

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

@@ -1,28 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="@drawable/taxi_p_all_bg"
android:layout_width="match_parent"
android:layout_height="match_parent">
<!-- 全览地图 -->
<com.mogo.och.unmanned.passenger.ui.overmapview.OverMapView
android:id="@+id/overMapView"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<!-- 视频播放View -->
<com.mogo.och.unmanned.passenger.ui.video.InfoVideoView
android:id="@+id/infoVideoView"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<!-- 高精地图 -->
<com.mogo.eagle.core.function.view.MapBizView
android:id="@+id/mapBizView"
app:styleMode="MAP_STYLE_DAY_VR_TAXI"
app:default_perspective="MAP_STYLE_VR_SKY_BOX"
app:isWeatherEnable="true"
<com.mogo.och.unmanned.passenger.ui.homepage.HomeView
android:id="@+id/mHomeView"
android:layout_marginTop="@dimen/dp_121"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@+id/bottom"
android:layout_marginBottom="@dimen/dp_31"
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:layout_marginStart="@dimen/dp_40"
android:layout_marginEnd="@dimen/dp_40"
android:layout_height="0dp" />
<com.mogo.och.unmanned.passenger.ui.music.MusicView
android:id="@+id/mv_music_info"
@@ -175,7 +182,8 @@
android:layout_width="@dimen/dp_822"
android:layout_height="@dimen/dp_246"
android:visibility="gone"
android:layout_marginBottom="-28dp"
android:layout_marginStart="@dimen/dp_34"
android:layout_marginBottom="@dimen/dp_11"
app:layout_constraintBottom_toTopOf="@+id/bottom"
app:layout_constraintStart_toStartOf="parent" />

67
OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_statusview.xml
View File

@@ -3,49 +3,72 @@
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/taxt_u_p_status_bg"
android:layout_height="@dimen/dp_121"
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"
<TextClock
android:id="@+id/textClockDate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:format12Hour="MM月dd日 HH:mm:ss"
android:format24Hour="MM月dd日 HH:mm:ss"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:gravity="center"
android:includeFontPadding="false"
android:layout_marginStart="@dimen/dp_40"
android:textColor="@color/taxi_cp_394047"
android:textSize="@dimen/dp_40" />
<androidx.appcompat.widget.AppCompatImageView
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintEnd_toStartOf="@+id/wifiStateView"
android:layout_width="@dimen/dp_41"
android:layout_height="@dimen/dp_41"/>
android:src="@drawable/taxi_p_bar_center_logo"
android:layout_width="@dimen/dp_225"
android:layout_height="@dimen/dp_58"/>
<!--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"
android:layout_height="@dimen/dp_50"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="@+id/gl_horizontal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="@dimen/dp_237"
android:layout_marginEnd="@dimen/dp_40"
android:layout_gravity="center" />
<!--魔方连接状态-->
<com.mogo.och.unmanned.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"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/wifiStateView"
android:layout_marginEnd="@dimen/dp_60"
android:layout_width="@dimen/dp_50"
android:layout_height="@dimen/dp_50"
android:src="@drawable/taxt_u_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"/>
<com.mogo.och.common.module.wigets.DriverConnectStatusView
app:layout_constraintTop_toTopOf="@+id/vShowDebugView"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/blueToothView"
android:layout_marginEnd="@dimen/dp_60"
android:layout_width="@dimen/dp_50"
android:layout_height="@dimen/dp_50"/>
<View
android:id="@+id/iv_biz_icon"

1
OCH/taxi/unmanned-passenger/src/main/res/values/colors.xml
View File

@@ -91,6 +91,7 @@
<color name="taxi_cp_80D4E4F0">#80D4E4F0</color>
<color name="taxi_cp_A3C9EA">#A3C9EA</color>
<color name="taxi_cp_394047">#394047</color>

14
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/map/MapContainerLayout.kt
View File

@@ -25,7 +25,7 @@ import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
import com.mogo.eagle.core.utilcode.mogo.view.OnPreventFastClickListener
import com.mogo.map.listener.IMogoMapListener
import com.mogo.map.listener.MogoMapListenerHandler
import kotlinx.android.synthetic.main.view_map_container.view.mapBizView
import kotlinx.android.synthetic.main.view_map_container.view.mHomeView
import kotlinx.android.synthetic.main.view_map_container.view.overMapView
import kotlinx.android.synthetic.main.view_map_container.view.shadowView
import kotlinx.android.synthetic.main.view_map_container.view.visualAngleToggle
@@ -63,30 +63,30 @@ class MapContainerLayout @JvmOverloads constructor(
}
fun onCreate(savedInstanceState: Bundle?) {
mapBizView.onCreate(savedInstanceState)
mHomeView.onCreate(savedInstanceState)
overMapView.onCreateView(savedInstanceState)
}
fun onResume() {
mapBizView.onResume()
mHomeView.onResume()
overMapView.onResume()
}
fun onPause() {
mapBizView.onPause()
mHomeView.onPause()
overMapView.onPause()
}
fun onLowMemory() {
mapBizView.onLowMemory()
mHomeView.onLowMemory()
}
fun onSaveInstanceState(outState: Bundle) {
mapBizView.onSaveInstanceState(outState)
mHomeView.onSaveInstanceState(outState)
}
fun onDestroy() {
mapBizView.onDestroy()
mHomeView.onDestroy()
overMapView.onDestroy()
}

2
core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_map_container.xml
View File

@@ -9,7 +9,7 @@
<!--高精地图-->
<com.mogo.eagle.core.function.view.MapBizView
android:id="@+id/mapBizView"
android:id="@+id/mHomeView"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:isWeatherEnable="false"

1
core/mogo-core-res/src/main/res/values/dimens.xml
View File

@@ -39,6 +39,7 @@
<dimen name="dp_10">10dp</dimen>
<dimen name="dp_11">11dp</dimen>
<dimen name="dp_12">12dp</dimen>
<dimen name="dp_12_5">12.5dp</dimen>
<dimen name="dp_13">13dp</dimen>
<dimen name="dp_14">14dp</dimen>
<dimen name="dp_15">15dp</dimen>