dgf пре 8 година
родитељ
комит
dd744e967e

BIN
dist/img/Lighthouse1.jpg


BIN
dist/img/more.gif


BIN
dist/img/unkown.png


BIN
talkview/img/unkown.png


+ 5 - 0
talkview/src/js/controller/transmitterController.js

@@ -22,6 +22,11 @@ angular.module('appMessage').controller('TransmitterController', ['$scope', '$in
         return angular.toJson(item, true);
     };
 
+    $scope.getSuffix = function(item) {
+        var arr = item.fileName.split(".");
+        return '../img/file/' + arr[arr.length - 1] + '.png';
+    };
+
     $scope.getFileName = function(item) {
         $scope.arr = item.fileName.split("\\");
         return $scope.arr[$scope.arr.length - 1];

+ 11 - 6
talkview/src/js/directive/currentmessage.js

@@ -30,6 +30,11 @@
                 return arr[arr.length - 1];
             };
 
+            var getSuffix = function(item) {
+                var arr = item.fileName.split(".");
+                return '../img/file/' + arr[arr.length - 1] + '.png';
+            };
+
             var getUserID = function() {
                 var arr = scope.appContent.directory.user.split("\\");
                 var userself = arr[arr.length - 2];
@@ -165,14 +170,14 @@
                     '</a>' +
                     '</span>';
             } else if (scope.msg.contentType == 3) {
-                element.css({
-                    width: '290px'
-                });
-                //element.addClass('file-message');
+                // element.css({
+                //     width: '290px'
+                // });
+                // //element.addClass('file-message');
                 var content = JSON.parse(scope.msg.content);
                 console.log(content);
-                html = '<div class="file-message">' +
-                    '<img src="../img/unkown.png" onError= "this.src = \'../img/file/unkown.png\'">' +
+                html = '<div class="file-message" style="width:265px">' +
+                    '<img src="' + getSuffix(content) + '" onError= "this.src = \'../img/file/unkown.png\'">' +
                     '<p><input type="text" readonly="readonly" value="' + getFileName(content) + '"></p>' +
                     '<span>大小:' + getFileSize(content) + '</span>' +
                     '<div class="p-t-sm text-right">' +

+ 6 - 1
talkview/src/js/directive/historymessages.js

@@ -31,6 +31,11 @@
                 return arr[arr.length - 1];
             };
 
+            var getSuffix = function(item) {
+                var arr = item.fileName.split(".");
+                return '../img/file/' + arr[arr.length - 1] + '.png';
+            };
+
             var getUserID = function() {
                 var arr = scope.appContent.directory.user.split("\\");
                 var userself = arr[arr.length - 2];
@@ -157,7 +162,7 @@
                 var content = JSON.parse(scope.msg.content);
                 console.log(content);
                 html = '<div class="file-message" style="width:265px">' +
-                    '<img src="../img/unkown.png" onError= "this.src = \'../img/file/unkown.png\'">' +
+                    '<img src="' + getSuffix(content) + '" onError= "this.src = \'../img/file/unkown.png\'">' +
                     '<p><input type="text" readonly="readonly" value="' + getFileName(content) + '"></p>' +
                     '<span>大小:' + getFileSize(content) + '</span>' +
                     '<div class="p-t-sm text-right">' +

+ 1 - 1
talkview/src/templates/transmitter.html

@@ -1,5 +1,5 @@
 <div ng-repeat="item in transmitters" id="transmitters">
-    <p id="fileInfo"><img src="../img/unkown.png"><input type="text" readonly="readonly" value="{{getFileName(item)}}"><span>({{getFileSize(item)}})</span></p>
+    <p id="fileInfo"><img ng-src="{{getSuffix(item)}}" onError="this.src = \'../img/file/unkown.png\'"><input type="text" readonly="readonly" value="{{getFileName(item)}}"><span>({{getFileSize(item)}})</span></p>
     <div class="progress">
         <div class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="1" aria-valuemin="0" aria-valuemax="100" style="height:3px; width: {{getPercent(item)}};min-width: 0.1em;">
         </div>