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 cc8f2fc571..3692ba8b97 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.* @@ -21,6 +23,20 @@ class VipIdentificationView @JvmOverloads constructor( LayoutInflater.from(context).inflate(R.layout.view_vip_identification, this, true) } + override fun onAttachedToWindow() { + super.onAttachedToWindow() + val lp = this.layoutParams as LayoutParams + if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) { + lp.marginStart = resources.getDimension(R.dimen.module_vip_margin_left_bus).toInt() + lp.topMargin = resources.getDimension(R.dimen.module_vip_margin_top_bus).toInt() + } else { + lp.marginStart = resources.getDimension(R.dimen.module_vip_margin_left_taxi).toInt() + lp.topMargin = resources.getDimension(R.dimen.module_vip_margin_top_taxi).toInt() + } + this.layoutParams = lp + invalidate() + } + fun setVipIdentificationVisible(visible: Boolean) { UiThreadHandler.post { ivVipIdentification.visibility = visibility diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml index f2b87a5de9..bf10165a96 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml @@ -44,8 +44,6 @@ android:id="@+id/flVipIdentificationView" android:layout_width="@dimen/module_vip_width" android:layout_height="@dimen/module_vip_height" - android:layout_marginStart="@dimen/module_vip_margin_left" - android:layout_marginTop="@dimen/module_vip_margin_top" android:visibility="gone" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" /> 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 b2b69f3973..82d3e800dc 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 @@ -6,8 +6,11 @@ 104px 104px - 540px - 40px + 540px + 40px + + 640px + 80px 30px 130px 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 8cdb61e3f0..d7bbdd0449 100644 --- a/core/mogo-core-res/src/main/res/values/dimens.xml +++ b/core/mogo-core-res/src/main/res/values/dimens.xml @@ -14,8 +14,11 @@ 104px 104px - 380px - 40px + 380px + 40px + + 380px + 40px 20px 110px diff --git a/gradle.properties b/gradle.properties index 6e1c82fba7..9c24d6d6c1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -82,7 +82,7 @@ MOGO_LOCATION_VERSION=1.3.55 MOGO_TELEMATIC_VERSION=1.3.55 ######## MogoAiCloudSDK Version ######## # 自研地图 -MAP_SDK_VERSION=2.1.0.6-2 +MAP_SDK_VERSION=2.1.1 MAP_SDK_OPERATION_VERSION=1.0.12 # websocket WEBSOCKET_VERSION=1.1.7