From 644789bd3b1ed3f2a33e12382e4487ed9e9092a3 Mon Sep 17 00:00:00 2001
From: zhongchao <zhongchao@zhidaoauto.com>
Date: Wed, 19 Oct 2022 14:48:16 +0800
Subject: [PATCH] fix bug of ui

---
 .../hmi/ui/widget/VipIdentificationView.kt       | 16 ++++++++++++++--
 .../eagle/core/function/v2x/vip/VipCarManager.kt |  4 ++--
 .../main/res/values-xhdpi-2560x1440/dimens.xml   |  3 +++
 .../mogo-core-res/src/main/res/values/dimens.xml |  3 +++
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/VipIdentificationView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/VipIdentificationView.kt
index 88e89bcf3b..70c1dbd01c 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/VipIdentificationView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/VipIdentificationView.kt
@@ -4,7 +4,9 @@ import android.content.Context
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import androidx.constraintlayout.widget.ConstraintLayout
+import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.function.hmi.R
+import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import kotlinx.android.synthetic.main.view_vip_identification.view.*
 
@@ -24,8 +26,18 @@ class VipIdentificationView @JvmOverloads constructor(
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
         val lp = this.layoutParams as LayoutParams
-        lp.marginStart = resources.getDimension(R.dimen.module_vip_margin_left).toInt()
-        lp.topMargin = resources.getDimension(R.dimen.module_vip_margin_top).toInt()
+        if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)
+            && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) {
+            lp.marginStart = resources.getDimension(R.dimen.module_vip_margin_left_bus_passenger).toInt()
+            lp.topMargin = resources.getDimension(R.dimen.module_vip_margin_top_passenger).toInt()
+        } else if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)
+            && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) {
+            lp.marginStart = resources.getDimension(R.dimen.module_vip_margin_left_taxi_passenger).toInt()
+            lp.topMargin = resources.getDimension(R.dimen.module_vip_margin_top_passenger).toInt()
+        } else {
+            lp.marginStart = resources.getDimension(R.dimen.module_vip_margin_left).toInt()
+            lp.topMargin = resources.getDimension(R.dimen.module_vip_margin_top).toInt()
+        }
         this.layoutParams = lp
         invalidate()
     }
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt
index affbba02b8..91548baa38 100644
--- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt
+++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt
@@ -58,9 +58,9 @@ class VipCarManager : IMogoOnMessageListener<VipMessage>, IMoGoTrafficLightListe
         mContext = context
         MogoAiCloudSocketManager.getInstance(context)
             .registerOnMessageListener(401025, this)
-
+        CallerHmiManager.vipIdentification(true)
         //首次进入应用查询是否为VIP车辆
-        requestVip()
+//        requestVip()
     }
 
     override fun handleMessage(msg: Message): Boolean {
diff --git a/core/mogo-core-res/src/main/res/values-xhdpi-2560x1440/dimens.xml b/core/mogo-core-res/src/main/res/values-xhdpi-2560x1440/dimens.xml
index 349297259a..6de53bb489 100644
--- a/core/mogo-core-res/src/main/res/values-xhdpi-2560x1440/dimens.xml
+++ b/core/mogo-core-res/src/main/res/values-xhdpi-2560x1440/dimens.xml
@@ -9,6 +9,9 @@
 
     <dimen name="module_vip_margin_left">640px</dimen>
     <dimen name="module_vip_margin_top">80px</dimen>
+    <dimen name="module_vip_margin_left_taxi_passenger">540px</dimen>
+    <dimen name="module_vip_margin_left_bus_passenger">640px</dimen>
+    <dimen name="module_vip_margin_top_passenger">40px</dimen>
 
     <dimen name="module_ext_speed_width_sm_radius">30px</dimen>
     <dimen name="module_ext_speed_width_big_radius">130px</dimen>
diff --git a/core/mogo-core-res/src/main/res/values/dimens.xml b/core/mogo-core-res/src/main/res/values/dimens.xml
index c8daa54109..dfc124ac5d 100644
--- a/core/mogo-core-res/src/main/res/values/dimens.xml
+++ b/core/mogo-core-res/src/main/res/values/dimens.xml
@@ -17,6 +17,9 @@
 
     <dimen name="module_vip_margin_left">380px</dimen>
     <dimen name="module_vip_margin_top">40px</dimen>
+    <dimen name="module_vip_margin_left_taxi_passenger">380px</dimen>
+    <dimen name="module_vip_margin_left_bus_passenger">380px</dimen>
+    <dimen name="module_vip_margin_top_passenger">40px</dimen>
 
     <dimen name="module_ext_speed_width_sm_radius">20px</dimen>
     <dimen name="module_ext_speed_width_big_radius">110px</dimen>