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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
tongchenfei
2020-11-16 17:54:15 +08:00
parent a17f5f48a0 b00acb8b56
commit e5944d04b2
47 changed files with 467 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
View File

@@ -1,7 +1,6 @@
package com.mogo.module.extensions.entrance;
import android.content.Intent;
import android.content.SharedPreferences;
import android.graphics.Rect;
import android.os.Bundle;
import android.os.Debug;
@@ -262,7 +261,7 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
});
mUploadRoadCondition.setOnLongClickListener(view -> {
mApis.getMogoMonitorApi().showLogDebugDialog();
mApis.getMogoMonitorApi().getMogoMonitorLog().showLogDebugDialog();
return true;
});
}

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

@@ -34,27 +34,27 @@ public abstract class BaseNaviInfoView {
protected void fillNextCrossDistance( TextView target, TextView unit, int distance ) {
if ( distance >= 1000 ) {
target.setText( String.format( "%.1f", distance / 1000f ) );
unit.setText( "km" );
unit.setText( "公里" );
} else {
target.setText( distance + "" );
unit.setText( "m" );
unit.setText( "米" );
}
}
protected void fillFormatSurplusDistance( int m, StringBuilder builder ) {
if ( m >= 1000 ) {
builder.append( String.format( "%.1fkm", m / 1000f ) );
builder.append( String.format( "%.1f公里", m / 1000f ) );
} else {
builder.append( m ).append( "m" );
builder.append( m ).append( "米" );
}
}
protected String getFormatSurplusDistance( int m ) {
if ( m >= 1000 ) {
mFormatSurplusDistanceUnit = "km";
mFormatSurplusDistanceUnit = "公里";
return String.format( "%.1f", m / 1000f );
} else {
mFormatSurplusDistanceUnit = "m";
mFormatSurplusDistanceUnit = "米";
return String.format( "%d", m );
}
}

6
modules/mogo-module-extensions/src/main/res/drawable/module_ext_drawable_shadow_bg.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/module_ext_shadow_bkg" android:state_pressed="true" />
<item android:drawable="@drawable/module_ext_shadow_bkg" android:state_pressed="false" />
<item android:drawable="@drawable/module_ext_shadow_bkg" />
</selector>

2
modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
View File

@@ -20,7 +20,7 @@
android:id="@+id/module_entrance_id_move2_current_location"
android:layout_width="@dimen/module_ext_operation_panel_width"
android:layout_height="@dimen/module_ext_operation_panel_move2_height"
android:background="@drawable/module_ext_shadow_bkg"
android:background="@drawable/module_ext_drawable_shadow_bg"
android:scaleType="centerInside"
android:src="@drawable/module_map_ic_move2_current_location"
app:layout_constraintBottom_toBottomOf="parent"

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

@@ -138,7 +138,6 @@
<dimen name="module_ext_north_goneMarginTop">142px</dimen>
<dimen name="module_ext_button_width">66px</dimen>
<dimen name="module_ext_button_height">66px</dimen>
<dimen name="module_ext_button_height_small">44px</dimen>
<dimen name="module_ext_camera_button_marginTop">10px</dimen>
<dimen name="module_ext_display_overview_textSize">12px</dimen>
<dimen name="module_ext_display_overview_textSize_large">14px</dimen>