文件传输

talkview/src/js/controller/transmitterController.js

@@ -38,7 +38,28 @@ angular.module('appMessage').controller('TransmitterController', ['$scope', '$in
     };
 
     $scope.getProgress = function(item) {
-        return parseInt((item.completedLength / item.length) * 100) + '%';
+        return parseInt((item.completedLength / item.length) * 100).toString() + '%';
+    };
+
+    $scope.getSpeed = function(item) {
+        if (item.completedLength / item.takeTime > 1024 * 1024)
+            return parseInt((item.completedLength / item.takeTime) / 1024).toString() + ' MB/S';
+        else if (item.completedLength / item.takeTime)
+            return parseInt(item.completedLength / item.takeTime).toString() + ' KB/S';
+        else
+            return '';
+    };
+
+    $scope.getreTime = function(item) {
+        var reTime = (item.length - item.completedLength) / (item.completedLength / item.takeTime) / 1000;
+        if (reTime > 60 * 60)
+            return (parseInt(reTime / 60 * 60) / 100).toFixed(2).slice(-2) + ':' + (parseInt((reTime % (60 * 60)) / 60) / 100).toFixed(2).slice(-2) + ':' + (parseInt((reTime % (60 * 60)) % 60) / 100).toFixed(2).slice(-2);
+        else if (reTime > 60)
+            return '00:' + (parseInt(reTime / 60) / 100).toFixed(2).slice(-2) + ':' + (parseInt(reTime % 60) / 100).toFixed(2).slice(-2);
+        else if (reTime)
+            return '00:' + '00:' + (parseInt(reTime) / 100).toFixed(2).slice(-2);
+        else
+            return '';
     };
 
     $scope.accept = function(item) {

talkview/src/less/app.main.less

@@ -183,7 +183,7 @@
         height:50px;
     }
     >input{
-        margin:5px 0px 2px; 
+        margin:5px 0px 0px;
         border: none;
         outline: none;
         width: 61%;
@@ -198,6 +198,13 @@
 }
 #progress{
     position: absolute;
-    top: 27px;
+    top: 28px;
     left: 257px;
+    font-size: 11px;
+}
+#speed{
+    position: absolute;
+    top: 40px;
+    left: 50px;
+    font-size: 11px;
 }

talkview/src/templates/transmitter.html

@@ -5,6 +5,7 @@
         </div>
     </div>
     <span id="progress">{{getProgress(item)}}</span>
+    <span id="speed">{{getSpeed(item)}}&nbsp;&nbsp;{{getreTime(item)}}</span>
     <a ng-show="item.direction==1" ng-click="accept(item)">接收</a><a ng-show="item.direction==1" ng-click="saveAs(item)">另存为</a><a ng-show="item.direction==1" ng-click="decline(item)">取消</a>
     <a ng-show="item.direction==0" ng-click="turnToOffline(item)">转为离线</a><a ng-show="item.direction==0" ng-click="cancel(item)">取消</a>
 </div>