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 707a69bcf0..2434ecc359 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 @@ -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 } }) 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 3a13579f75..1c70f9a316 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 @@ -194,9 +194,9 @@ diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamListAdapter.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamListAdapter.kt index 78b1f418e1..8aee2c7bc8 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamListAdapter.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamListAdapter.kt @@ -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)) diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamView.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamView.kt index 876405702d..4b1da441b0 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamView.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamView.kt @@ -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) diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable/bg_nor_test_light.9.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable/bg_nor_test_light.9.png new file mode 100644 index 0000000000..81acc4e8c0 Binary files /dev/null and b/core/function-impl/mogo-core-function-map/src/main/res/drawable/bg_nor_test_light.9.png differ diff --git a/core/function-impl/mogo-core-function-map/src/main/res/layout/view_road_cross_roam_light.xml b/core/function-impl/mogo-core-function-map/src/main/res/layout/view_road_cross_roam_light.xml index 2674f89cca..317a1b2a36 100644 --- a/core/function-impl/mogo-core-function-map/src/main/res/layout/view_road_cross_roam_light.xml +++ b/core/function-impl/mogo-core-function-map/src/main/res/layout/view_road_cross_roam_light.xml @@ -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"> - - - - - - - - - - + android:background="@drawable/bg_nor_test_light"> + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintBottom_toBottomOf="parent"> + + + + + + + + + + + + + + - \ No newline at end of file