Merge branch 'dev' of gitlab.ghzhushou.com:halo/assistant-android into 3.1

2017-11-22 15:23:56 +08:00
parent 6c1da15ae4 165059ca2d
commit adbdc55bc4
2 changed files with 3 additions and 3 deletions
--- a/app/src/main/java/com/gh/common/util/DialogUtils.java
+++ b/app/src/main/java/com/gh/common/util/DialogUtils.java
@ -154,8 +154,8 @@ public class DialogUtils {
            sizeName = df.format(size) + "MB";
        }

-        if (sendTime == 0) {
-            sendTime = 1;
+        if (sendTime < 1000) { // 最少设置发送时间为1s（为了简易计算）
+            sendTime = 1000;
        }

        int i = (filesSize / 1024) / (sendTime / 1000);