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

This commit is contained in:
tongchenfei
2020-11-19 18:11:44 +08:00
545 changed files with 13634 additions and 259 deletions

View File

@@ -67,16 +67,16 @@ public abstract class BaseNaviInfoView {
protected String getFormatSurplusTime( int seconds ) {
if ( seconds > 60 * 60 ) {
mFormatSurplusTimeUnit = "h";
mFormatSurplusTimeUnit = "小时";
return String.format( "%.1f", ( ( float ) seconds ) / ( 60 * 60 ) );
}
if ( seconds > 60 ) {
mFormatSurplusTimeUnit = "min";
mFormatSurplusTimeUnit = "分钟";
return String.format( "%.1f", ( ( float ) seconds ) / 60 );
}
mFormatSurplusTimeUnit = "s";
mFormatSurplusTimeUnit = "";
return String.format( "%d", seconds );
}