From 839eab0eaf264d7d6dcf376c18851b7adec23d59 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Tue, 28 Jul 2020 20:44:17 +0800 Subject: [PATCH 1/6] =?UTF-8?q?1.=20=E4=BF=AE=E5=A4=8D=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E4=B8=AD=E6=97=A0=E6=B3=95=E6=AD=A3=E7=A1=AE=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E8=BD=A6=E5=A4=B4=E5=92=8C=E6=AD=A3=E5=8C=97=E6=A0=87=E8=AF=86?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=202.=20v2x=20=E7=96=B2=E5=8A=B3?= =?UTF-8?q?=E9=A9=BE=E9=A9=B6=E5=9C=BA=E6=99=AF=E6=97=A0=E6=B3=95=E5=AF=BC?= =?UTF-8?q?=E8=88=AA=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/map/impl/amap/AMapNaviViewWrapper.java | 1 + .../extensions/entrance/EntranceFragment.java | 15 ++++++++++++--- .../scene/fatigue/V2XFatigueDrivingWindow.java | 1 - 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java index b02cbfaee4..aef3a1b430 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java @@ -321,6 +321,7 @@ public class AMapNaviViewWrapper implements IMogoMapView, @Override public void onNaviMapMode( int mode ) { Logger.i( TAG, "mode=" + mode ); + MogoMapListenerHandler.getInstance().onMapModeChanged( mode == 0 ? EnumMapUI.CarUp_2D : EnumMapUI.NorthUP_2D ); } @Override diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java index 203580640d..6246462783 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java @@ -239,9 +239,9 @@ public class EntranceFragment extends MvpFragment Date: Wed, 29 Jul 2020 10:18:53 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=AF=94=E4=BA=9A?= =?UTF-8?q?=E8=BF=AA=E5=9F=8B=E7=82=B9fota=E5=8F=82=E6=95=B0=EF=BC=9A?= =?UTF-8?q?=E7=94=A8productFlavor=E4=BB=A3=E6=9B=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mogo/commons/network/ParamsUtil.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/network/ParamsUtil.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/network/ParamsUtil.java index 4eb76d1be3..b6645fa28c 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/network/ParamsUtil.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/network/ParamsUtil.java @@ -30,7 +30,7 @@ public class ParamsUtil { public static Map< String, Object > getDynamicParams() { Map< String, Object > params = new ArrayMap(); - final Map location = LocationHelper.getInstance().getLocationProperties(); + final Map< String, Object > location = LocationHelper.getInstance().getLocationProperties(); if ( location != null ) { params.putAll( location ); } @@ -71,7 +71,8 @@ public class ParamsUtil { public static Map< String, Object > getAnalyticsCustomParams() { Map< String, Object > map = new ArrayMap<>(); map.put( "debug", DebugConfig.isDebug() ? 1 : 0 ); - map.put( "systemversion", Utils.getFotaVersion() ); + String fota = Utils.getFotaVersion(); + map.put( "systemversion", TextUtils.isEmpty( fota ) ? DebugConfig.getProductFlavor() : fota ); map.put( "sn", Utils.getSn() ); return map; } From bb7aeaaa2d4e3ed54774404f6c39e66eab00c705 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Wed, 29 Jul 2020 10:45:08 +0800 Subject: [PATCH 3/6] bugfix: UI-881 --- .../java/com/mogo/module/service/MarkerServiceHandler.java | 7 ++----- .../com/mogo/module/service/marker/MapMarkerManager.java | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java index cb7fa6a938..caaf67dd12 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java @@ -63,8 +63,6 @@ public class MarkerServiceHandler { private static ICarsChattingProvider sCarChatting; private static IMogoGpsSimulatorManager sGpsSimulatorManager; - private static MapMarkerManager sMapMarkerManager; - public static synchronized void init( final Context context ) { if ( sGpsSimulatorManager != null ) { @@ -92,8 +90,7 @@ public class MarkerServiceHandler { sCarChatting = ( ICarsChattingProvider ) ARouter.getInstance().build( CallChattingProviderConstant.CAR_CALL_PROVIDER ).navigation( context ); - sMapMarkerManager = MapMarkerManager.getInstance(); - sMapMarkerManager.init( context ); + MapMarkerManager.getInstance().init( context ); sGpsSimulatorManager = ARouter.getInstance().navigation( IMogoGpsSimulatorManager.class ); } @@ -143,7 +140,7 @@ public class MarkerServiceHandler { } public static MapMarkerManager getMapMarkerManager() { - return sMapMarkerManager; + return MapMarkerManager.getInstance(); } public static IMogoRegisterCenter getRegisterCenter() { diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java index f641febd03..6c2493af4a 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java @@ -77,6 +77,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener, private Rect mMarkerDisplayBounds; private MapMarkerManager() { + mContext = AbsMogoApplication.getApp(); } public static synchronized MapMarkerManager getInstance() { @@ -95,7 +96,6 @@ public class MapMarkerManager implements IMogoMarkerClickListener, * @param context */ public void init( Context context ) { - mContext = context; mRefreshModel = new RefreshModel( mContext ); // 长连接 From ac024ffd37edfa855328286b3f6ba543e122651f Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Wed, 29 Jul 2020 10:59:23 +0800 Subject: [PATCH 4/6] bug fix: UI-2.0/UI-882 not attached to a context --- .../extensions/entrance/EntranceFragment.java | 44 +++++++++++-------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java index 203580640d..68e4ae59a9 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java @@ -168,15 +168,18 @@ public class EntranceFragment extends MvpFragment { - if (!mStatusManager.isDisplayOverview()) { - mMApUIController.displayOverview(mDisplayOverviewBounds); - UiThreadHandler.removeCallbacks(mLockCarRunnable); - UiThreadHandler.postDelayed(mLockCarRunnable, 20_000); - } else { - mMApUIController.recoverLockMode(); - UiThreadHandler.removeCallbacks(mLockCarRunnable); + if(getContext()!=null) { + // 加此判断是解决下面setDisplayOverview后，本Fragment回调中出现not attached to a context问题 + if (!mStatusManager.isDisplayOverview()) { + mMApUIController.displayOverview(mDisplayOverviewBounds); + UiThreadHandler.removeCallbacks(mLockCarRunnable); + UiThreadHandler.postDelayed(mLockCarRunnable, 20_000); + } else { + mMApUIController.recoverLockMode(); + UiThreadHandler.removeCallbacks(mLockCarRunnable); + } + mStatusManager.setDisplayOverview(TAG, !mStatusManager.isDisplayOverview()); } - mStatusManager.setDisplayOverview(TAG, !mStatusManager.isDisplayOverview()); }); mMove2CurrentLocation = findViewById(R.id.module_entrance_id_move2_current_location); @@ -460,19 +463,22 @@ public class EntranceFragment extends MvpFragment Date: Wed, 29 Jul 2020 11:03:47 +0800 Subject: [PATCH 5/6] bug fix: UI-2.0/UI-883 tvCountDown must not be null --- .../module/splash/fragment/BydSplashFragment.kt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/fragment/BydSplashFragment.kt b/modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/fragment/BydSplashFragment.kt index bcd4301496..1148d63378 100644 --- a/modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/fragment/BydSplashFragment.kt +++ b/modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/fragment/BydSplashFragment.kt @@ -34,12 +34,14 @@ class BydSplashFragment :MvpFragment(),Han override fun handleMessage(msg: Message): Boolean { if (msg.what == MSG_COUNT_DOWN) { - countDownTime-- - if(countDownTime>0) { - tvCountDown.text = countDownTime.toString() - handler.sendEmptyMessageDelayed(MSG_COUNT_DOWN, DEFAULT_COUNT_DOWN_DELAY) - }else{ - hideSplash() + tvCountDown?.also { + countDownTime-- + if(countDownTime>0) { + it.text = countDownTime.toString() + handler.sendEmptyMessageDelayed(MSG_COUNT_DOWN, DEFAULT_COUNT_DOWN_DELAY) + }else{ + hideSplash() + } } return true } From 259773d236b2e50cd760f536969745ae1d0b0ddb Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Wed, 29 Jul 2020 11:24:12 +0800 Subject: [PATCH 6/6] opt --- modules/mogo-module-extensions/build.gradle | 1 - .../extensions/entrance/EntranceFragment.java | 39 +++++++------------ 2 files changed, 15 insertions(+), 25 deletions(-) diff --git a/modules/mogo-module-extensions/build.gradle b/modules/mogo-module-extensions/build.gradle index 56876478a7..e9737fc1a3 100644 --- a/modules/mogo-module-extensions/build.gradle +++ b/modules/mogo-module-extensions/build.gradle @@ -43,7 +43,6 @@ dependencies { annotationProcessor rootProject.ext.dependencies.aroutercompiler implementation rootProject.ext.dependencies.rxjava implementation rootProject.ext.dependencies.rxandroid - implementation rootProject.ext.dependencies.tanluupload if (Boolean.valueOf(RELEASE)) { api rootProject.ext.dependencies.mogomap diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java index 68e4ae59a9..93f7e5fc2c 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java @@ -3,13 +3,11 @@ package com.mogo.module.extensions.entrance; import android.content.Intent; import android.graphics.Rect; import android.os.Bundle; -import android.util.Log; import android.text.TextUtils; import android.util.TypedValue; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.Button; import android.widget.ImageView; import android.widget.TextView; @@ -18,6 +16,7 @@ import androidx.annotation.Nullable; import androidx.constraintlayout.widget.ConstraintLayout; import com.alibaba.android.arouter.launcher.ARouter; +import com.mogo.commons.AbsMogoApplication; import com.mogo.commons.debug.DebugConfig; import com.mogo.commons.mvp.MvpFragment; import com.mogo.map.listener.IMogoMapListener; @@ -58,7 +57,6 @@ import com.mogo.utils.ResourcesHelper; import com.mogo.utils.UiThreadHandler; import com.mogo.utils.glide.GlideApp; import com.mogo.utils.logger.Logger; -import com.zhidao.roadcondition.service.DelayService; import java.util.HashMap; import java.util.Map; @@ -168,7 +166,7 @@ public class EntranceFragment extends MvpFragment { - if(getContext()!=null) { + if (getContext() != null) { // 加此判断是解决下面setDisplayOverview后，本Fragment回调中出现not attached to a context问题 if (!mStatusManager.isDisplayOverview()) { mMApUIController.displayOverview(mDisplayOverviewBounds); @@ -463,29 +461,21 @@ public class EntranceFragment extends MvpFragment