diff --git a/.idea/gradle.xml b/.idea/gradle.xml index b59a552525..8e9756d758 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -77,7 +77,6 @@ diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_include_seeking_help_notice.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_include_seeking_help_notice.xml index b058025837..2a952d9aaa 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_include_seeking_help_notice.xml +++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_include_seeking_help_notice.xml @@ -11,6 +11,9 @@ android:layout_marginLeft="@dimen/module_common_shadow_width_pos" android:layout_marginTop="@dimen/module_common_shadow_width_pos" android:layout_marginRight="@dimen/module_common_shadow_width_pos" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toTopOf="parent" android:background="@drawable/module_ext_drawable_seek_help_notice_bg" /> diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml index 23aa95ed07..1fa92b0372 100644 --- a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml @@ -158,6 +158,7 @@ 10px + 20px 44px 1060px 100px diff --git a/modules/mogo-module-extensions/src/main/res/values/dimens.xml b/modules/mogo-module-extensions/src/main/res/values/dimens.xml index 2c1cfff501..fcf04ade3f 100644 --- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml @@ -170,4 +170,5 @@ 18px 10px 22px + 16px \ No newline at end of file diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerBaseView.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerBaseView.java index 0e51579ecc..1d748b46eb 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerBaseView.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerBaseView.java @@ -85,6 +85,7 @@ public abstract class MapMarkerBaseView extends LinearLayout implements IMarkerV } protected void loadPoiTypeIcon(String url,int res) { + ivIcon.setImageResource(res); if ( Looper.myLooper() != Looper.getMainLooper() ) { UiThreadHandler.post( ()-> loadPoiTypeIconInUiThread(url, res)); } else { @@ -93,7 +94,7 @@ public abstract class MapMarkerBaseView extends LinearLayout implements IMarkerV } private void loadPoiTypeIconInUiThread(String url,int res) { - ivIcon.setImageResource(res); + if (!url.isEmpty()) { ivIcon.setPlaceHolder(res); ivIcon.setFailureHolder(res);