From dc62cf54666d238f2d7f582b69c14eacb3fc0732 Mon Sep 17 00:00:00 2001 From: renwj Date: Sat, 12 Oct 2024 19:42:59 +0800 Subject: [PATCH] =?UTF-8?q?[6.7.0][=E8=A7=86=E8=A7=92=E5=8F=98=E6=8D=A2]?= =?UTF-8?q?=20=E4=BF=AE=E6=AD=A3=E8=BF=9C=E8=A7=86=E8=A7=92=EF=BC=8C?= =?UTF-8?q?=E6=89=8B=E5=8A=A8=E5=88=87=E6=8D=A2=E8=A7=92=E5=BA=A6=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E8=87=AA=E5=8A=A8=E9=94=81=E8=BD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/function/hmi/ui/widget/WifiStateView.kt | 3 ++- .../zhidaoauto/map/sdk/open/view/MapAutoView.kt | 14 +++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/WifiStateView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/WifiStateView.kt index 1f5598d1be..8ab18f4cf6 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/WifiStateView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/WifiStateView.kt @@ -16,6 +16,7 @@ import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.function.api.setting.IMoGoSkinModeChangeListener import com.mogo.eagle.core.function.call.setting.CallerSkinModeListenerManager import com.mogo.eagle.core.function.hmi.R +import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler import kotlinx.android.synthetic.main.view_wifi_state.view.viewStatusBarTag @@ -80,7 +81,7 @@ class WifiStateView @JvmOverloads constructor( val a = context.obtainStyledAttributes(attrs, R.styleable.WifiStateView, defStyleAttr, 0) txtSize = a.getDimension( R.styleable.WifiStateView_wifi_size, - resources.getDimension(R.dimen.dp_35) + resources.getDimension(R.dimen.dp_30) ) a.recycle() viewStatusBarTag.setTextSize(TypedValue.COMPLEX_UNIT_PX,AutoSizeUtils.dp2px(context,txtSize).toFloat()) diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/view/MapAutoView.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/view/MapAutoView.kt index 21e2072e16..fc13a88e29 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/view/MapAutoView.kt +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/view/MapAutoView.kt @@ -447,13 +447,13 @@ open class MapAutoView : FrameLayout, LonLatPointListener, ITraffic,ILockLocatio mLocationAlt = lonLatPoint.altitude.toFloat() mLocationHeading = lonLatPoint.angle mLocationView?.getMyLocationStyle()?.setLonLat(lonLat, lonLatPoint.angle) - mMapStyleParams?.let { - if(it.getVrAngleMode() == ConstantExt.MAP_STYLE_VR_ANGLE_FAR - && TransformUtils.outOfScreen(context, lonLatPoint.longitude, lonLatPoint.latitude,mMapController)){ - setCenter() - mMapController?.resetChangeAngleTime() - } - } +// mMapStyleParams?.let { +// if(it.getVrAngleMode() == ConstantExt.MAP_STYLE_VR_ANGLE_FAR +// && TransformUtils.outOfScreen(context, lonLatPoint.longitude, lonLatPoint.latitude,mMapController)){ +// setCenter() +// mMapController?.resetChangeAngleTime() +// } +// } } val mogoLocation = MogoLocation() mogoLocation.lon = lonLatPoint.longitude