From 785d5fec1171e296aa5ee19c5ac892dc08786240 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Mon, 21 Nov 2022 12:45:37 +0800 Subject: [PATCH 1/3] fix bug of status bar --- .../core/function/hmi/ui/MoGoHmiFragment.kt | 51 +------------------ 1 file changed, 2 insertions(+), 49 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt index a593620e3a..88520e219a 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt @@ -136,7 +136,6 @@ class MoGoHmiFragment : MvpFragment(), private var mSOPSettingView: SOPSettingView? = null //StatusView - private var statusBarViewFloat: WarningFloat.Builder? = null private var statusBarView: StatusBarView? = null private var mNoticeFloat: WarningFloat.Builder? = null @@ -198,10 +197,10 @@ class MoGoHmiFragment : MvpFragment(), } override fun initViews() { - toggleStatusBarView() - initViewShowWithConfig() + val decorView = requireActivity().window.decorView as FrameLayout + statusBarView = decorView.findViewWithTag("status_bar") as StatusBarView? //设置StatusBar初始状态 if (FunctionBuildConfig.isDemoMode) { statusBarView?.updateRightView(true, "demoMode", DemoModeView(requireContext())) @@ -744,52 +743,6 @@ class MoGoHmiFragment : MvpFragment(), } } - private fun toggleStatusBarView() { - activity?.let{ - if(statusBarViewFloat!= null){ - WarningFloat.dismiss(statusBarViewFloat!!.config.floatTag, false) - statusBarViewFloat = null - statusBarView = null - }else{ - if (statusBarView == null){ - statusBarView = StatusBarView(it) - } - val side = TOP - val gravity = Gravity.TOP - statusBarViewFloat = WarningFloat.with(it) - .setTag("statusBarView") - .setLayout(statusBarView!!) - .setSidePattern(side) - .setWindowWidth(ScreenUtils.getScreenWidth()) - .setWindowHeight(BarUtils.getStatusBarHeight()) - .setGravity(gravity, 0) - .setImmersionStatusBar(true) - .setAnimator(object : DefaultAnimator() { - override fun enterAnim( - view: View, - params: LayoutParams, - windowManager: WindowManager, - sidePattern: SidePattern - ): Animator? = - super.enterAnim(view, params, windowManager, sidePattern) - ?.apply { - interpolator = LinearInterpolator() - } - - override fun exitAnim( - view: View, - params: LayoutParams, - windowManager: WindowManager, - sidePattern: SidePattern - ): Animator? = - super.exitAnim(view, params, windowManager, sidePattern) - ?.setDuration(200) - }) - .show() - } - } - } - /** * 展示VR下V2X预警 * From a464d8fa22025da8db922defa9b06cc138a964a0 Mon Sep 17 00:00:00 2001 From: pangfan Date: Mon, 21 Nov 2022 15:00:37 +0800 Subject: [PATCH 2/3] [2.12.2-hotfix]release v2.12.2,2120200 --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 111c18c586..668478f0ad 100644 --- a/gradle.properties +++ b/gradle.properties @@ -93,8 +93,8 @@ WEBSOCKET_VERSION=1.1.7 applicationId=com.mogo.launcer applicationName=IntelligentPilot # RoboBus司机端：2.5.1；RoboTaxi司机端：2.5.1；RoboTaxi乘客端：1.0.0 -versionCode=2120000 -versionName=2.12.0 +versionCode=2120200 +versionName=2.12.2 ################# 新架构模块Maven版本管理 ################# MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.58.10 From 0de061b63c4419efa32ddbdfcc9933334748f903 Mon Sep 17 00:00:00 2001 From: lianglihui Date: Thu, 5 Jan 2023 15:10:30 +0800 Subject: [PATCH 3/3] =?UTF-8?q?2.13.0=20=E4=BF=AE=E5=A4=8D=E5=B0=8F?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E8=BD=A8=E8=BF=B9=E6=B6=88=E5=A4=B1=E5=BC=82?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/eagle/core/function/smp/SmallMapFragment.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/SmallMapFragment.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/SmallMapFragment.java index b621f93dfc..129bf728c3 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/SmallMapFragment.java +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/SmallMapFragment.java @@ -90,8 +90,13 @@ public class SmallMapFragment extends BaseFragment @Override public void drawablePolyline(List coordinates) { if (mSmallMapDirectionView != null) { - mSmallMapDirectionView.convert(coordinates); - UiThreadHandler.post(() -> mSmallMapDirectionView.drawablePolyline()); + UiThreadHandler.post(new Runnable() { + @Override + public void run() { + mSmallMapDirectionView.convert(coordinates); + mSmallMapDirectionView.drawablePolyline(); + } + }); } }