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

[6.5.0]

Browse Source 
[fea]
[乘客屏 全局概览 修改]
This commit is contained in:
yangyakun
2024-07-08 10:25:20 +08:00
parent 332b044d7a
commit da1b42dce4
14 changed files with 248 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/overmapview/OverMapBottomView.kt Normal file
View File

@@ -0,0 +1,41 @@
package com.mogo.och.common.module.wigets.map.overmapview
import android.content.Context
import android.graphics.Color
import android.graphics.drawable.GradientDrawable
import android.util.AttributeSet
import android.view.LayoutInflater
import androidx.constraintlayout.widget.ConstraintLayout
import com.mogo.och.common.module.R
class OverMapBottomView @JvmOverloads constructor(
context: Context,
attrs: AttributeSet? = null,
defStyleAttr: Int = 0
) : ConstraintLayout(context, attrs, defStyleAttr){
private fun initView() {
LayoutInflater.from(context).inflate(R.layout.common_overmap_bottom, this, true)
// 定义渐变的方向
// 定义渐变的方向
val orientation = GradientDrawable.Orientation.LEFT_RIGHT
val temp01 = GradientDrawable(orientation, intArrayOf(
Color.parseColor("#33D7E5FF"),
Color.parseColor("#E6EFFF"),
Color.parseColor("#E6EFFF"),
Color.parseColor("#E6EFFF"),
Color.parseColor("#33D7E5FF"),
))
background = temp01
}
init {
try {
initView()
} catch (e: Exception) {
e.printStackTrace()
}
}
}

112
OCH/common/common/src/main/res/layout/common_overmap_bottom.xml Normal file
View File

@@ -0,0 +1,112 @@
<?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="@dimen/dp_1860"
android:layout_height="@dimen/dp_136"
tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/aciv_quanxiluk"
android:layout_width="@dimen/dp_53"
android:layout_height="@dimen/dp_53"
android:src="@drawable/mogo_quanxi_lukou"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/aciv_quanxiluk_value"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toStartOf="parent"
/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/aciv_quanxiluk_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_19"
android:layout_marginEnd="@dimen/dp_40"
android:text="全息路口"
android:textColor="#0D0D0D"
app:layout_constraintTop_toTopOf="@+id/aciv_quanxiluk"
app:layout_constraintBottom_toBottomOf="@+id/aciv_quanxiluk"
app:layout_constraintEnd_toStartOf="@+id/aciv_jingzhi"
app:layout_constraintStart_toEndOf="@+id/aciv_quanxiluk"
/>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/aciv_jingzhi"
android:layout_width="@dimen/dp_53"
android:layout_height="@dimen/dp_53"
android:layout_marginStart="@dimen/dp_40"
android:src="@drawable/mogo_jingzhi_nor"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/aciv_quanxiluk_value"
app:layout_constraintEnd_toStartOf="@+id/aciv_jingzhi_value"
/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/aciv_jingzhi_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_19"
android:text="全息路口"
android:textColor="#0D0D0D"
android:layout_marginEnd="@dimen/dp_40"
app:layout_constraintTop_toTopOf="@+id/aciv_quanxiluk"
app:layout_constraintBottom_toBottomOf="@+id/aciv_quanxiluk"
app:layout_constraintStart_toEndOf="@+id/aciv_jingzhi"
app:layout_constraintEnd_toStartOf="@+id/aciv_shigong"
/>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/aciv_shigong"
android:layout_width="@dimen/dp_53"
android:layout_height="@dimen/dp_53"
android:src="@drawable/mogo_shigong_image"
android:layout_marginStart="@dimen/dp_40"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toEndOf="@+id/aciv_jingzhi_value"
app:layout_constraintEnd_toStartOf="@+id/aciv_shigong_value"
/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/aciv_shigong_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_19"
android:text="全息路口"
android:textColor="#0D0D0D"
android:layout_marginEnd="@dimen/dp_40"
app:layout_constraintTop_toTopOf="@+id/aciv_shigong"
app:layout_constraintBottom_toBottomOf="@+id/aciv_shigong"
app:layout_constraintStart_toEndOf="@+id/aciv_shigong"
app:layout_constraintEnd_toStartOf="@+id/aciv_shigu"
/>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/aciv_shigu"
android:layout_width="@dimen/dp_53"
android:layout_height="@dimen/dp_53"
android:src="@drawable/mogo_shigu_nor"
android:layout_marginStart="@dimen/dp_40"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/aciv_shigong_value"
app:layout_constraintEnd_toStartOf="@+id/aciv_shigu_value"
/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/aciv_shigu_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_19"
android:text="全息路口"
android:textColor="#0D0D0D"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/aciv_shigu"
app:layout_constraintBottom_toBottomOf="@+id/aciv_shigu"
app:layout_constraintStart_toEndOf="@+id/aciv_shigu"
/>
</merge>

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

@@ -65,7 +65,7 @@ class TaxiPassengerBaseFragment() :
super.initViews(savedInstanceState)
mapBizView!!.onCreate(savedInstanceState)
overMapView.onCreateView(savedInstanceState)
overMapView.hideResetView()
//overMapView.hideResetView()
val commonService = ARouter.getInstance().build(OchCommonConst.TAXI_PASSENGER).navigation();
if(commonService is CommonService){
@@ -96,7 +96,7 @@ class TaxiPassengerBaseFragment() :
}
}
BottomBar.SelectView.OVERMAPVIEW -> {
overMapView.displayCustomOverView()
//overMapView.displayCustomOverView()
}
else -> {}
@@ -138,7 +138,7 @@ class TaxiPassengerBaseFragment() :
romaPView.updateVisible(false)
romaDistanceView.visibility = View.GONE
rbv_setting_music.setShowOnlySetting(0)
lbv_go2_center.visibility = View.VISIBLE
lbv_go2_center.visibility = View.GONE
pcnActionView.visibility = View.VISIBLE
CallerHmiManager.showTrafficLightView()
infoVideoView.visibility = View.GONE
@@ -328,8 +328,8 @@ class TaxiPassengerBaseFragment() :
}
fun showOrHideOverMapView() {
overMapView?.clearV2XMarkers()
overMapView?.clearCustomPolyline()
// overMapView?.clearV2XMarkers()
// overMapView?.clearCustomPolyline()
}

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

@@ -5,23 +5,10 @@
android:layout_height="match_parent">
<!-- 全览地图 -->
<com.mogo.eagle.core.function.view.OverMapView
<com.mogo.och.taxi.passenger.ui.overmapview.OverMapView
android:id="@+id/overMapView"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:arrivedDrawable="@drawable/taxi_p_overmap_arrived"
app:bottomPadding="160"
app:carDrawable="@drawable/taxi_p_map_car"
app:compassDrawable="@drawable/taxi_p_map_car_light"
app:endPointDrawable="@drawable/taxi_p_map_view_dir_end"
app:leftPadding="850"
app:mapStyleExtraPath="style_extra.data"
app:mapStylePath="style.data"
app:resetDrawable="@null"
app:rightPadding="160"
app:startPointDrawable="@drawable/taxi_p_map_view_dir_start"
app:topPadding="160"
app:unArrivedDrawable="@drawable/taxi_p_overmap_arriving" />
android:layout_height="match_parent" />
<!-- 视频播放View -->
<com.mogo.och.taxi.passenger.ui.video.InfoVideoView

46
OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/overmapview/OverMapView.kt Normal file
View File

@@ -0,0 +1,46 @@
package com.mogo.och.taxi.passenger.ui.overmapview
import android.content.Context
import android.os.Bundle
import android.util.AttributeSet
import android.view.LayoutInflater
import android.widget.RelativeLayout
import com.mogo.och.taxi.passenger.common.R
import kotlinx.android.synthetic.main.taxi_p_overmap.view.travelRealityView
class OverMapView @JvmOverloads constructor(
context: Context,
attrs: AttributeSet? = null,
defStyleAttr: Int = 0
) : RelativeLayout(context, attrs, defStyleAttr){
private fun initView() {
LayoutInflater.from(context).inflate(R.layout.taxi_p_overmap, this, true)
}
fun onCreateView(savedInstanceState: Bundle?) {
travelRealityView.onCreateView(savedInstanceState)
}
fun onResume() {
travelRealityView.onResume()
}
fun onPause() {
travelRealityView.onPause()
}
fun onDestroy() {
travelRealityView.onDestroy()
}
init {
try {
initView()
} catch (e: Exception) {
e.printStackTrace()
}
}
}

BIN
OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_u_p_map_car.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.4 KiB

BIN
OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_u_p_map_car_light.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_u_p_map_view_dir_end.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.6 KiB

BIN
OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_u_p_map_view_dir_start.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.4 KiB

BIN
OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_u_p_overmap_arrived.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 768 B

BIN
OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_u_p_overmap_arriving.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1009 B

34
OCH/taxi/pcommon/src/main/res/layout/taxi_p_overmap.xml Normal file
View File

@@ -0,0 +1,34 @@
<?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">
<com.mogo.eagle.core.function.view.TravelRealityView
android:id="@+id/travelRealityView"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:arrivedDrawable="@drawable/taxt_u_p_overmap_arrived"
app:bottomPadding="160"
app:carDrawable="@drawable/taxt_u_p_map_car"
app:compassDrawable="@drawable/taxt_u_p_map_car_light"
app:endPointDrawable="@drawable/taxt_u_p_map_view_dir_end"
app:leftPadding="800"
app:mapStyleExtraPath="style_extra.data"
app:mapStylePath="style.data"
app:resetDrawable="@null"
app:rightPadding="160"
app:startPointDrawable="@drawable/taxt_u_p_map_view_dir_start"
app:topPadding="160"
app:unArrivedDrawable="@drawable/taxt_u_p_overmap_arriving" />
<com.mogo.och.common.module.wigets.map.overmapview.OverMapBottomView
android:layout_width="@dimen/dp_1860"
android:layout_height="@dimen/dp_136"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="@dimen/dp_198"/>
</merge>

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

@@ -80,7 +80,7 @@ class TaxiPassengerBaseFragment() :
super.initViews(savedInstanceState)
mapBizView!!.onCreate(savedInstanceState)
overMapView.onCreateView(savedInstanceState)
overMapView.hideResetView()
//overMapView.hideResetView()
val commonService = ARouter.getInstance().build(OchCommonConst.TAXI_UNMANNED_PASSENGER).navigation();
if(commonService is CommonService){
@@ -112,7 +112,7 @@ class TaxiPassengerBaseFragment() :
}
}
BottomBar.SelectView.OVERMAPVIEW -> {
overMapView.displayCustomOverView()
//overMapView.displayCustomOverView()
}
else -> {}
@@ -154,7 +154,7 @@ class TaxiPassengerBaseFragment() :
romaPView.updateVisible(false)
romaDistanceView.visibility = View.GONE
rbv_setting_music.setShowOnlySetting(0)
lbv_go2_center.visibility = View.VISIBLE
lbv_go2_center.visibility = View.GONE
pcnActionView.visibility = View.VISIBLE
CallerHmiManager.showTrafficLightView()
infoVideoView.visibility = View.GONE
@@ -310,7 +310,7 @@ class TaxiPassengerBaseFragment() :
fun setOverMapDebug(){
overMapView.setDebugMode(true)
//overMapView.setDebugMode(true)
showOrHide(true,"Debug 按钮")
}
override fun setEvaluateView(){
@@ -351,8 +351,8 @@ class TaxiPassengerBaseFragment() :
fun showOrHideOverMapView() {
CallerLogger.d(M_TAXI_P + TAG, "showOrHideOverMapView 清理轨迹和站点")
overMapView?.clearV2XMarkers()
overMapView?.clearCustomPolyline()
//overMapView?.clearV2XMarkers()
//overMapView?.clearCustomPolyline()
}
fun showOverMapView() {

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

@@ -4,23 +4,10 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.mogo.eagle.core.function.view.OverMapView
<com.mogo.och.taxi.passenger.ui.overmapview.OverMapView
android:id="@+id/overMapView"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:arrivedDrawable="@drawable/taxt_u_p_overmap_arrived"
app:bottomPadding="160"
app:carDrawable="@drawable/taxt_u_p_map_car"
app:compassDrawable="@drawable/taxt_u_p_map_car_light"
app:endPointDrawable="@drawable/taxt_u_p_map_view_dir_end"
app:leftPadding="800"
app:mapStyleExtraPath="style_extra.data"
app:mapStylePath="style.data"
app:resetDrawable="@null"
app:rightPadding="160"
app:startPointDrawable="@drawable/taxt_u_p_map_view_dir_start"
app:topPadding="160"
app:unArrivedDrawable="@drawable/taxt_u_p_overmap_arriving" />
android:layout_height="match_parent" />
<!-- 视频播放View -->
<com.mogo.och.unmanned.passenger.ui.video.InfoVideoView