diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/WindowUtils.java b/foudations/mogo-utils/src/main/java/com/mogo/utils/WindowUtils.java index 65416700e8..fa9d8eb49c 100644 --- a/foudations/mogo-utils/src/main/java/com/mogo/utils/WindowUtils.java +++ b/foudations/mogo-utils/src/main/java/com/mogo/utils/WindowUtils.java @@ -29,6 +29,9 @@ public class WindowUtils { return ( int ) ( dpValue * scale + 0.5f ); } + + + /** * 根据手机的分辨率从 px(像素) 的单位 转成为 dp */ diff --git a/libraries/map-amap/build.gradle b/libraries/map-amap/build.gradle index a2c484c213..0bdc7f8fc9 100644 --- a/libraries/map-amap/build.gradle +++ b/libraries/map-amap/build.gradle @@ -29,8 +29,9 @@ dependencies { api rootProject.ext.dependencies.amapnavi3dmap api rootProject.ext.dependencies.amapsearch api rootProject.ext.dependencies.amaplocation + compile project(path: ':foudations:mogo-commons') - if (Boolean.valueOf(RELEASE)) { + if (Boolean.valueOf(RELEASE)) { implementation rootProject.ext.dependencies.mogoutils implementation rootProject.ext.dependencies.mogomapapi } else { diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/utils/MapStyleUtils.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/utils/MapStyleUtils.java index f53f99221e..377ae40f1c 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/utils/MapStyleUtils.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/utils/MapStyleUtils.java @@ -5,6 +5,7 @@ import android.graphics.Bitmap; import android.graphics.Color; import com.amap.api.navi.model.RouteOverlayOptions; +import com.mogo.commons.AbsMogoApplication; import com.mogo.map.impl.amap.R; import com.mogo.utils.ResourcesHelper; import com.mogo.utils.WindowUtils; @@ -40,7 +41,7 @@ public class MapStyleUtils { public static RouteOverlayOptions getRouteOverlayOptions() { RouteOverlayOptions options = new RouteOverlayOptions(); // 设置导航线路的宽度 - options.setLineWidth( 10 ); + options.setLineWidth( AbsMogoApplication.getApp().getResources().getDimension(R.dimen.path_width) ); // 设置交通状况情况良好下的纹理位图 options.setSmoothTraffic( colorToBitmap( ColorEnum.route_overlay_line_normal.getColor() ) ); // 设置路线的图标 diff --git a/libraries/map-amap/src/main/res/values-ldpi/dimens.xml b/libraries/map-amap/src/main/res/values-ldpi/dimens.xml new file mode 100644 index 0000000000..eebbb06a9c --- /dev/null +++ b/libraries/map-amap/src/main/res/values-ldpi/dimens.xml @@ -0,0 +1,4 @@ + + + 10px + \ No newline at end of file diff --git a/libraries/map-amap/src/main/res/values/dimens.xml b/libraries/map-amap/src/main/res/values/dimens.xml new file mode 100644 index 0000000000..9fcbe87bf8 --- /dev/null +++ b/libraries/map-amap/src/main/res/values/dimens.xml @@ -0,0 +1,4 @@ + + + 18px + \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/layout/dialog_navi_notice.xml b/modules/mogo-module-extensions/src/main/res/layout/dialog_navi_notice.xml index 584dff5c93..45dd9cdb22 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/dialog_navi_notice.xml +++ b/modules/mogo-module-extensions/src/main/res/layout/dialog_navi_notice.xml @@ -3,6 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="@dimen/dp_790" android:layout_height="@dimen/dp_440" + app:cardPreventCornerOverlap="false" + android:orientation="vertical" app:cardBackgroundColor="#3F4057" app:cardCornerRadius="@dimen/dp_20" diff --git a/modules/mogo-module-search/src/main/AndroidManifest.xml b/modules/mogo-module-search/src/main/AndroidManifest.xml index 78373a86ed..2d0a21723d 100644 --- a/modules/mogo-module-search/src/main/AndroidManifest.xml +++ b/modules/mogo-module-search/src/main/AndroidManifest.xml @@ -3,6 +3,7 @@ package="com.mogo.module.navi"> + diff --git a/modules/mogo-module-search/src/main/res/layout/dialog_common_notice.xml b/modules/mogo-module-search/src/main/res/layout/dialog_common_notice.xml index ff78f98f77..fbaf16fd9f 100644 --- a/modules/mogo-module-search/src/main/res/layout/dialog_common_notice.xml +++ b/modules/mogo-module-search/src/main/res/layout/dialog_common_notice.xml @@ -3,6 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="@dimen/dp_790" android:layout_height="@dimen/dp_440" + app:cardPreventCornerOverlap="false" + android:orientation="vertical" app:cardBackgroundColor="#3F4057" app:cardCornerRadius="@dimen/dp_20"