Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
@@ -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 );
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user