yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/v2.0.0' into feature/v2.0.0

Browse Source
This commit is contained in:
tongchenfei
2020-05-29 14:40:19 +08:00
parent ce285f88a8 33266019f7
commit 51ee317868
23 changed files with 308 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/BaseNaviInfoView.java
View File

@@ -68,7 +68,7 @@ public abstract class BaseNaviInfoView {
protected String getFormatSurplusTime( int seconds ) {
if ( seconds > 60 * 60 ) {
mFormatSurplusDistanceUnit = "h";
return String.format( "%.1f", ( ( float ) seconds ) / 60 * 60 );
return String.format( "%.1f", ( ( float ) seconds ) / ( 60 * 60 ) );
}
if ( seconds > 60 ) {

2
modules/mogo-module-extensions/src/main/res/values-ldpi/dimens.xml
View File

@@ -121,7 +121,7 @@
<!-- 导航查看全程显示范围-->
<dimen name="module_map_display_overview_left_margin">526px</dimen>
<dimen name="module_map_display_overview_top_margin">200px</dimen>
<dimen name="module_map_display_overview_bottom_margin">30px</dimen>
<dimen name="module_map_display_overview_bottom_margin">83px</dimen>
<dimen name="module_map_display_overview_right_margin">82px</dimen>
<dimen name="module_ext_common_corner">16px</dimen>
<dimen name="module_ext_north_goneMarginTop">142px</dimen>

2
modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml
View File

@@ -118,7 +118,7 @@
<!-- 导航查看全程显示范围-->
<dimen name="module_map_display_overview_left_margin">950px</dimen>
<dimen name="module_map_display_overview_top_margin">320px</dimen>
<dimen name="module_map_display_overview_bottom_margin">60px</dimen>
<dimen name="module_map_display_overview_bottom_margin">150px</dimen>
<dimen name="module_map_display_overview_right_margin">150px</dimen>
<dimen name="module_ext_north_goneMarginTop">240px</dimen>
<dimen name="module_ext_common_corner">30px</dimen>

2
modules/mogo-module-extensions/src/main/res/values/dimens.xml
View File

@@ -115,7 +115,7 @@
<!-- 导航查看全程显示范围-->
<dimen name="module_map_display_overview_left_margin">950px</dimen>
<dimen name="module_map_display_overview_top_margin">320px</dimen>
<dimen name="module_map_display_overview_bottom_margin">60px</dimen>
<dimen name="module_map_display_overview_bottom_margin">150px</dimen>
<dimen name="module_map_display_overview_right_margin">150px</dimen>
<dimen name="module_ext_common_corner">30px</dimen>
<dimen name="module_ext_north_goneMarginTop">240px</dimen>