From c42e41cb8baf0399c80229fcd80463aa262692da Mon Sep 17 00:00:00 2001 From: liujing Date: Fri, 11 Sep 2020 14:44:55 +0800 Subject: [PATCH 1/8] =?UTF-8?q?D=E7=83=AD=E5=BF=83=E6=8C=87=E6=95=B0?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/mogo-module-v2x/src/main/res/values/dimens.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/res/values/dimens.xml b/modules/mogo-module-v2x/src/main/res/values/dimens.xml index b049144d59..9f5a8fb1f3 100644 --- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml @@ -55,8 +55,8 @@ 18px 20px 16px - 16px - 20px + 20px + 16px 82px 16px 117px From 7d9291fd4f38db4cc98e605f0fefb5fc8282560d Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Fri, 11 Sep 2020 15:03:55 +0800 Subject: [PATCH 2/8] =?UTF-8?q?bugfix:=20=E4=BF=AE=E5=A4=8D=E5=9C=A8guide?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=8C=89back=E9=94=AE=E5=90=8E=EF=BC=8Cadas?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/module/guide/fragment/GuideFragment.kt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/fragment/GuideFragment.kt b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/fragment/GuideFragment.kt index 66b90abc08..b08d4375a9 100644 --- a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/fragment/GuideFragment.kt +++ b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/fragment/GuideFragment.kt @@ -112,6 +112,11 @@ class GuideFragment : MvpFragment(), GuideC GuideBizManager.invokeAuthorize() } + override fun onDestroyView() { + closeGuideFragment() + super.onDestroyView() + } + override fun onDestroy() { super.onDestroy() invokeAuthorize() From 99297cfad5f452632a650723e2391ae389c0948f Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Fri, 11 Sep 2020 15:05:54 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=88=A0=E9=99=A4adas=E7=AE=97=E6=B3=95?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E6=96=B9=E6=B3=95=E8=B0=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/module/main/independent/MainIndependentActivity.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/main-extensions/mogo-module-main-independent/src/main/java/com/zhidao/mogo/module/main/independent/MainIndependentActivity.java b/main-extensions/mogo-module-main-independent/src/main/java/com/zhidao/mogo/module/main/independent/MainIndependentActivity.java index 6cb5363e2d..f3ae390679 100644 --- a/main-extensions/mogo-module-main-independent/src/main/java/com/zhidao/mogo/module/main/independent/MainIndependentActivity.java +++ b/main-extensions/mogo-module-main-independent/src/main/java/com/zhidao/mogo/module/main/independent/MainIndependentActivity.java @@ -46,9 +46,6 @@ public class MainIndependentActivity extends MainActivity { @Override protected void onResume() { super.onResume(); - if ( mCoverUpLayout.getVisibility() != View.VISIBLE ) { - mServiceApis.getAdasControllerApi().setUseAlgorithm( true ); - } if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.N){ fixInMultiWindowMode(); } @@ -65,7 +62,6 @@ public class MainIndependentActivity extends MainActivity { @Override protected void onPause() { super.onPause(); - mServiceApis.getAdasControllerApi().setUseAlgorithm( true ); } @Override From ae8907c01eac741a3c5b5b79aab88c27673db180 Mon Sep 17 00:00:00 2001 From: liujing Date: Fri, 11 Sep 2020 15:15:16 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E7=82=B9=E8=B5=9E=E6=95=B0UI=E5=BE=AE?= =?UTF-8?q?=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/module_v2x_event_share_item.xml | 9 +++------ .../mogo-module-v2x/src/main/res/values-mdpi/dimens.xml | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml index edcc11341e..e85015dc28 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml @@ -31,9 +31,7 @@ android:layout_height="wrap_content" android:layout_alignParentRight="true" android:layout_centerInParent="true" - android:gravity="left" - android:paddingRight="@dimen/dp_24" - android:paddingLeft="@dimen/dp_24" + android:paddingRight="@dimen/dp_28" android:text="100" android:textColor="#FFFFFF" android:textSize="@dimen/dp_34" /> @@ -54,9 +52,8 @@ android:layout_height="wrap_content" android:layout_centerInParent="true" android:layout_toLeftOf="@id/road_case_useless" - android:gravity="center" - android:paddingRight="@dimen/dp_24" - android:paddingLeft="@dimen/dp_24" + android:gravity="left" + android:paddingRight="@dimen/dp_28" android:text="100" android:textColor="#FFFFFF" android:textSize="@dimen/dp_34" /> diff --git a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml index c9ce0a563d..2d45b0b58f 100644 --- a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml @@ -56,7 +56,7 @@ 20px 16px 17px - 15.4px + 14px 82px 16px 117px From 15e1b3f9b99ce4804384345d52a64183c7a7a0b2 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Fri, 11 Sep 2020 15:37:32 +0800 Subject: [PATCH 5/8] fix: bugly#11002 --- .../mogo/map/impl/amap/AMapNaviViewWrapper.java | 16 ++++++++++++---- .../com/mogo/map/impl/amap/AMapViewWrapper.java | 2 +- 2 files changed, 13 insertions(+), 5 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 24f557de14..d2e2aaf6e6 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 @@ -522,7 +522,7 @@ public class AMapNaviViewWrapper implements IMogoMapView, Logger.d( TAG, Log.getStackTraceString( new Throwable() ) ); } if ( checkAMapView() ) { - MyLocationStyle style = mMapView.getMap().getMyLocationStyle(); + MyLocationStyle style = getMyLocationStyle(); if ( style == null ) { style = new MyLocationStyle(); } @@ -544,7 +544,7 @@ public class AMapNaviViewWrapper implements IMogoMapView, Logger.d( TAG, Log.getStackTraceString( new Throwable() ) ); } if ( checkAMapView() ) { - MyLocationStyle style = mMapView.getMap().getMyLocationStyle(); + MyLocationStyle style = getMyLocationStyle(); if ( style == null ) { style = new MyLocationStyle(); } @@ -557,7 +557,7 @@ public class AMapNaviViewWrapper implements IMogoMapView, public void initMyLocation() { if ( checkAMapView() ) { mMapView.getMap().setMyLocationEnabled( true ); - MyLocationStyle style = mMapView.getMap().getMyLocationStyle(); + MyLocationStyle style = getMyLocationStyle(); style.myLocationType( MyLocationStyle.LOCATION_TYPE_LOCATION_ROTATE_NO_CENTER ); style.interval( 1000 ); style.anchor( 0.5F, 0.5F ); @@ -864,7 +864,7 @@ public class AMapNaviViewWrapper implements IMogoMapView, if ( mMapView.getMap() == null ) { return; } - MyLocationStyle style = mMapView.getMap().getMyLocationStyle(); + MyLocationStyle style = getMyLocationStyle(); if ( mCarCursorOption.getCarCursorBmp() != null && !mCarCursorOption.getCarCursorBmp().isRecycled() ) { style.myLocationIcon( BitmapDescriptorFactory.fromBitmap( mCarCursorOption.getCarCursorBmp() ) ); } else { @@ -877,6 +877,14 @@ public class AMapNaviViewWrapper implements IMogoMapView, mMapView.getMap().setMyLocationStyle( style ); } + private MyLocationStyle getMyLocationStyle() { + try { + return mMapView.getMap().getMyLocationStyle(); + } catch ( Exception e ) { + return new MyLocationStyle(); + } + } + @Override public MapCameraPosition getMapCameraPosition() { if ( checkAMapView() ) { diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java index 7b6e72ea7a..f189b0646e 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java @@ -790,7 +790,7 @@ public class AMapViewWrapper implements IMogoMapView, if ( mMapView.getMap() == null ) { return; } - MyLocationStyle style = mMapView.getMap().getMyLocationStyle(); + MyLocationStyle style = getMyLocationStyle(); if ( mCarCursorOption.getCarCursorBmp() != null && !mCarCursorOption.getCarCursorBmp().isRecycled() ) { style.myLocationIcon( BitmapDescriptorFactory.fromBitmap( mCarCursorOption.getCarCursorBmp() ) ); } else { From 9e5833db735d9b2e349a0ae23e76ea289da017ec Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Fri, 11 Sep 2020 15:44:40 +0800 Subject: [PATCH 6/8] fix: bugly#7002 & #15002 --- .../com/mogo/map/impl/amap/AMapNaviViewWrapper.java | 10 ++++++++-- .../java/com/mogo/map/impl/amap/AMapViewWrapper.java | 10 ++++++++-- .../mogo/map/impl/amap/marker/AMapMarkerWrapper.java | 2 +- 3 files changed, 17 insertions(+), 5 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 d2e2aaf6e6..0a05343782 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 @@ -878,10 +878,16 @@ public class AMapNaviViewWrapper implements IMogoMapView, } private MyLocationStyle getMyLocationStyle() { + MyLocationStyle style = null; try { - return mMapView.getMap().getMyLocationStyle(); + style = mMapView.getMap().getMyLocationStyle(); } catch ( Exception e ) { - return new MyLocationStyle(); + style = new MyLocationStyle(); + } finally { + if ( style == null ) { + style = new MyLocationStyle(); + } + return style; } } diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java index f189b0646e..2c70ee3345 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java @@ -465,10 +465,16 @@ public class AMapViewWrapper implements IMogoMapView, } private MyLocationStyle getMyLocationStyle() { + MyLocationStyle style = null; try { - return mMapView.getMap().getMyLocationStyle(); + style = mMapView.getMap().getMyLocationStyle(); } catch ( Exception e ) { - return new MyLocationStyle(); + style = new MyLocationStyle(); + } finally { + if ( style == null ) { + style = new MyLocationStyle(); + } + return style; } } diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/marker/AMapMarkerWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/marker/AMapMarkerWrapper.java index d4f71eb6a0..679e008277 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/marker/AMapMarkerWrapper.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/marker/AMapMarkerWrapper.java @@ -82,8 +82,8 @@ public class AMapMarkerWrapper implements IMogoMarker, Observer { mMogoMarkerOptions = null; } if ( mMarker != null ) { - mMarker.remove(); mMarker.setObject( null ); + mMarker.remove(); mMarker = null; } if ( mMovingPointOverlay != null ) { From 56154c268e5cdcdf1931a697b0f8c9e1ff40e745 Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Fri, 11 Sep 2020 17:28:21 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=85=E9=9A=9C?= =?UTF-8?q?=E6=B1=82=E5=8A=A9type=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/service/tanlu/IMogoTanluProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/tanlu/IMogoTanluProvider.java b/services/mogo-service-api/src/main/java/com/mogo/service/tanlu/IMogoTanluProvider.java index 20c64855e3..77cebf1b3a 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/tanlu/IMogoTanluProvider.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/tanlu/IMogoTanluProvider.java @@ -48,7 +48,7 @@ public interface IMogoTanluProvider extends IProvider { /** * 故障求助 */ - String TYPE_SEEK_HELP = "99999"; + String TYPE_SEEK_HELP = "9999"; /** * 用户手点上报 From 94f9b07bd1837cffc7b8d37d42f4ef98a01f7fa9 Mon Sep 17 00:00:00 2001 From: liujing Date: Mon, 14 Sep 2020 12:03:04 +0800 Subject: [PATCH 8/8] fix null crash --- .../module/v2x/fragment/V2XEventPanelFragment.kt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt index 5a277dafae..30d2b671de 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt @@ -51,7 +51,7 @@ class V2XEventPanelFragment : MvpFragment try { - rbScenarioHistory?.isChecked=true + rbScenarioHistory?.isChecked = true } catch (e: java.lang.Exception) { e.printStackTrace() } @@ -60,7 +60,7 @@ class V2XEventPanelFragment : MvpFragment try { - rbSurroundingEvent?.isChecked=true + rbSurroundingEvent?.isChecked = true } catch (e: java.lang.Exception) { e.printStackTrace() } @@ -69,7 +69,7 @@ class V2XEventPanelFragment : MvpFragment try { - rbShareEvents?.isChecked=true + rbShareEvents?.isChecked = true } catch (e: java.lang.Exception) { e.printStackTrace() } @@ -126,9 +126,11 @@ class V2XEventPanelFragment : MvpFragment