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

[6.5.0] wait to fix ui

Browse Source
This commit is contained in:
EmArrow
2024-07-18 18:32:48 +08:00
parent 9e2eb16a79
commit 583e35dd89
6 changed files with 122 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -84,6 +84,7 @@ class TaxiPassengerBaseFragment() :
override fun setSettingAndMusicShow(settingShow: Boolean, musicShow: Boolean) {
clSettingView.visibility = if(settingShow) View.VISIBLE else View.GONE
mv_music_info.visibility = if(musicShow) View.VISIBLE else View.GONE
// CallerHmiViewControlListenerManager.invokeV2XEvent(View.VISIBLE) //todo emArrow test
}
})

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

@@ -194,9 +194,9 @@
<!-- 前方路况探查 -->
<com.mogo.eagle.core.function.view.RoadCrossRoamView
android:layout_width="@dimen/dp_650"
android:layout_width="@dimen/dp_600"
android:layout_height="@dimen/dp_948"
android:layout_marginTop="@dimen/dp_400"
android:layout_marginTop="@dimen/dp_395"
android:visibility="gone"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />

5
core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamListAdapter.kt
View File

@@ -1,7 +1,6 @@
package com.mogo.eagle.core.function.view
import android.content.Context
import android.util.Log
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
@@ -22,11 +21,9 @@ class RoadCrossRoamListAdapter(private val mContext: Context, private val lightM
items.add("路口危险车辆分析")
items.add("路口交通事故分析")
items.add("路口行人碰撞分析")
Log.i("emArrow","lightmode:$lightMode")
if(lightMode){
items.add("路口非机动车分析")
items.add("路口灯态分析")
Log.i("emArrow","day mode add, list size : ${items.size}")
}
}
@@ -36,12 +33,10 @@ class RoadCrossRoamListAdapter(private val mContext: Context, private val lightM
}
override fun getItemCount(): Int {
Log.i("emArrow","count mode: $lightMode")
return if(lightMode) 6 else 4
}
override fun onBindViewHolder(holder: ViewHolder, position: Int) {
Log.i("emArrow","onBindViewHolder item size: ${items.size} , count:${itemCount}")
val item = items[position]
if(lightMode){
holder.textView.setTextColor(mContext.getColor(R.color.color_191A1C))

34
core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamView.kt
View File

@@ -8,11 +8,14 @@ import android.os.Handler
import android.os.Looper
import android.os.Message
import android.util.AttributeSet
import android.util.Log
import android.util.TypedValue
import android.view.LayoutInflater
import android.view.View
import android.view.animation.LinearInterpolator
import androidx.constraintlayout.widget.ConstraintLayout
import androidx.core.view.marginBottom
import androidx.core.view.marginTop
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.mogo.commons.voice.AIAssist
@@ -107,6 +110,13 @@ class RoadCrossRoamView @JvmOverloads constructor(
}
}
override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
super.onSizeChanged(w, h, oldw, oldh)
Log.i("emArrow","roadCrossRoamView anim width : $w , old w : $oldw" +
"height : $h , old h : $oldh" +
"marginTop : ${this.marginTop} , marginBottom : ${this.marginBottom}")
}
override fun v2xEventVisible(v: Int, tag: String) {
super.v2xEventVisible(v, tag)
if (this.visibility == View.GONE) {
@@ -117,7 +127,7 @@ class RoadCrossRoamView @JvmOverloads constructor(
}
if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) {
if (tag == V2X_EVENT_TAG && v == View.VISIBLE) {
val anim = ValueAnimator.ofInt(height, 475)
val anim = ValueAnimator.ofInt(height, 460)
anim.duration = 500
anim.addUpdateListener { animation ->
val value = animation.animatedValue as Int
@@ -125,7 +135,7 @@ class RoadCrossRoamView @JvmOverloads constructor(
}
anim.start()
val animMap = ValueAnimator.ofInt(160, 80)
val animMap = ValueAnimator.ofInt(160, 90)
animMap.duration = 500
animMap.addUpdateListener { animation ->
val value = animation.animatedValue as Int
@@ -133,6 +143,10 @@ class RoadCrossRoamView @JvmOverloads constructor(
(clScanningBg.layoutParams as? MarginLayoutParams)?.topMargin = value
}
animMap.start()
(mapRoamView.layoutParams as? MarginLayoutParams)?.height = 280
(clScanningBg.layoutParams as? MarginLayoutParams)?.height = 280
mapRoamView.requestLayout()
clScanningBg.requestLayout()
lvRoadCrossRoamTip.visibility = View.GONE
ivZhiRoadRoamSet.visibility = View.GONE
@@ -179,10 +193,17 @@ class RoadCrossRoamView @JvmOverloads constructor(
}
private fun attachView() {
// 没有路线不做提示
if (CallerAutoPilotStatusListenerManager.getLineId() == 0L) {
if(this.visibility == View.VISIBLE){
return
}
Log.i("emArrow","roadCrossRoamView width : ${this.layoutParams.width} , " +
"height : ${this.layoutParams.height} , " +
"margin : ${this.marginTop} , ${this.marginBottom}")
// 没有路线不做提示
// if (CallerAutoPilotStatusListenerManager.getLineId() == 0L) {
// return
// }
// 处于漫游模式下不做处理
if (CallerMapIdentifyManager.roam.second) {
if (CallerMapIdentifyManager.roam.first != TAG) {
@@ -268,6 +289,11 @@ class RoadCrossRoamView @JvmOverloads constructor(
)
ivZhiRoadRoamView.visibility = View.VISIBLE
tvRoadRoamTitle.text = context.resources.getString(R.string.road_cross_roam_tip)
(mapRoamView.layoutParams as? MarginLayoutParams)?.height = 300
(clScanningBg.layoutParams as? MarginLayoutParams)?.height = 300
mapRoamView.requestLayout()
clScanningBg.requestLayout()
animScale = false
}
CallerHmiViewControlListenerManager.invokeV2XEvent(View.GONE, TAG)

BIN
core/function-impl/mogo-core-function-map/src/main/res/drawable/bg_nor_test_light.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

168
core/function-impl/mogo-core-function-map/src/main/res/layout/view_road_cross_roam_light.xml
View File

@@ -4,94 +4,104 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/bg_road_cross_roam_light">
<ImageView
android:id="@+id/ivRoadRoamClose"
android:layout_width="@dimen/dp_60"
android:layout_height="@dimen/dp_60"
android:layout_marginTop="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_20"
android:scaleType="center"
android:src="@drawable/bg_close_nor_light"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="ContentDescription" />
<ImageView
android:id="@+id/ivZhiRoadRoamSet"
android:layout_width="@dimen/dp_50"
android:layout_height="@dimen/dp_50"
android:layout_marginStart="@dimen/dp_42"
android:layout_marginTop="@dimen/dp_56"
android:src="@drawable/bg_road_roam_anim_set"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="ContentDescription" />
<ImageView
android:id="@+id/ivZhiRoadRoamView"
android:layout_width="@dimen/dp_84"
android:layout_height="@dimen/dp_84"
android:layout_marginStart="@dimen/dp_26"
android:layout_marginTop="@dimen/dp_38"
android:background="@drawable/anim_road_roam"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="ContentDescription" />
<TextView
android:id="@+id/tvRoadRoamTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_35"
android:layout_marginTop="@dimen/dp_32"
android:lineSpacingExtra="@dimen/dp_8"
android:text="@string/road_cross_roam_tip"
android:textColor="@color/color_131415"
android:textSize="@dimen/dp_30"
app:layout_constraintLeft_toRightOf="@id/ivZhiRoadRoamView"
app:layout_constraintTop_toTopOf="parent" />
<com.mogo.eagle.core.function.view.MapRoamView
android:id="@+id/mapRoamView"
android:layout_width="@dimen/dp_520"
android:layout_height="@dimen/dp_300"
android:layout_marginTop="@dimen/dp_160"
app:isWeatherEnable="true"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:styleMode="MAP_STYLE_DAY_VR_TAXI" />
android:background="@drawable/bg_nor_test_light">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/clScanningBg"
android:layout_width="@dimen/dp_520"
android:layout_height="@dimen/dp_300"
android:layout_marginStart="@dimen/dp_26"
android:layout_marginTop="@dimen/dp_160"
android:layout_width="@dimen/dp_580"
android:layout_height="match_parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent">
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintBottom_toBottomOf="parent">
<ImageView
android:id="@+id/ivRoadRoamClose"
android:layout_width="@dimen/dp_60"
android:layout_height="@dimen/dp_60"
android:layout_marginTop="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_20"
android:scaleType="center"
android:src="@drawable/bg_close_nor_light"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="ContentDescription" />
<ImageView
android:id="@+id/ivCoverRoam"
android:layout_width="@dimen/dp_120"
android:layout_height="@dimen/dp_300"
android:src="@drawable/icon_cover_road_roam"
android:id="@+id/ivZhiRoadRoamSet"
android:layout_width="@dimen/dp_50"
android:layout_height="@dimen/dp_50"
android:layout_marginStart="@dimen/dp_42"
android:layout_marginTop="@dimen/dp_56"
android:src="@drawable/bg_road_roam_anim_set"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="ContentDescription" />
<ImageView
android:id="@+id/ivZhiRoadRoamView"
android:layout_width="@dimen/dp_84"
android:layout_height="@dimen/dp_84"
android:layout_marginStart="@dimen/dp_26"
android:layout_marginTop="@dimen/dp_38"
android:background="@drawable/anim_road_roam"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="ContentDescription" />
<TextView
android:id="@+id/tvRoadRoamTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_35"
android:layout_marginTop="@dimen/dp_32"
android:lineSpacingExtra="@dimen/dp_8"
android:text="@string/road_cross_roam_tip"
android:textColor="@color/color_131415"
android:textSize="@dimen/dp_30"
app:layout_constraintLeft_toRightOf="@id/ivZhiRoadRoamView"
app:layout_constraintTop_toTopOf="parent" />
<com.mogo.eagle.core.function.view.MapRoamView
android:id="@+id/mapRoamView"
android:layout_width="@dimen/dp_500"
android:layout_height="@dimen/dp_300"
android:layout_marginTop="@dimen/dp_160"
app:isWeatherEnable="true"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:styleMode="MAP_STYLE_DAY_VR_TAXI" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/clScanningBg"
android:layout_width="@dimen/dp_500"
android:layout_height="@dimen/dp_300"
android:layout_marginStart="@dimen/dp_26"
android:layout_marginTop="@dimen/dp_160"
app:layout_constraintLeft_toLeftOf="@+id/mapRoamView"
app:layout_constraintRight_toRightOf="@+id/mapRoamView"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/ivCoverRoam"
android:layout_width="@dimen/dp_120"
android:layout_height="@dimen/dp_300"
android:src="@drawable/icon_cover_road_roam"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="ContentDescription" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/lvRoadCrossRoamTip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_30"
android:layout_marginTop="@dimen/dp_30"
android:layout_marginRight="@dimen/dp_30"
app:layout_constraintLeft_toLeftOf="@+id/mapRoamView"
app:layout_constraintRight_toRightOf="@+id/mapRoamView"
app:layout_constraintTop_toBottomOf="@id/mapRoamView" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/lvRoadCrossRoamTip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_30"
android:layout_marginTop="@dimen/dp_30"
android:layout_marginRight="@dimen/dp_30"
app:layout_constraintLeft_toLeftOf="@+id/mapRoamView"
app:layout_constraintRight_toRightOf="@+id/mapRoamView"
app:layout_constraintTop_toBottomOf="@id/mapRoamView" />
</androidx.constraintlayout.widget.ConstraintLayout>