文件传输

talkview/src/js/controller/messageController.js

@@ -1,4 +1,4 @@
-angular.module('appMessage').controller('MessageController', ['$scope', function($scope) {
+angular.module('appMessage').controller('MessageController', ['$scope', '$filter', function($scope, $filter) {
         lxtalkClient.Invoke('{15180DEF-D508-45F7-BAEB-6486CD8752C8}', '_Register', '', $scope);
         $scope.glued = true;
         $scope.count = true;
@@ -39,6 +39,10 @@ angular.module('appMessage').controller('MessageController', ['$scope', function
             $scope.historymessages.push(msg);
         }
 
+        $scope.getTime = function(item) {
+            return $filter("date")(item.ts, "yyyy-MM-dd HH:mm:ss");
+        };
+
         $scope.getMore = function() {
             lxtalkClient.Invoke('{15180DEF-D508-45F7-BAEB-6486CD8752C8}', 'LoadHistoryMessages', '', $scope);
             $scope.count = false;

talkview/src/js/directive/currentmessage.js

@@ -30,6 +30,12 @@
                 return arr[arr.length - 1];
             };
 
+            var getUserID = function() {
+                var arr = scope.appContent.directory.user.split("\\");
+                var userself = arr[arr.length - 2];
+                return scope.msg.sender.indexOf(userself) !== -1;
+            };
+
             var getFileSize = function(item) {
                 var fileSize = item.length;
                 if (fileSize > 1024 * 1024 * 1024)
@@ -158,6 +164,14 @@
             console.log(html);
             var newElement = angular.element(html);
             element.append(newElement);
+            console.log(getUserID());
+            // if (getUserID()) {
+            //     angular.element(".fit-content").removeClass("well");
+            //     angular.element(".fit-content").addClass("wellself");
+            // } else if (!getUserID()) {
+            //     angular.element(".fit-content").removeClass("wellself");
+            //     angular.element(".fit-content").addClass("well");
+            // }
             // $(function() {
             //     $("img.lazy").lazyload();
             // });

talkview/src/js/directive/historymessages.js

@@ -5,9 +5,9 @@
         .module('appMessage')
         .directive('ngHistoryMsg', HistoryMsg);
 
-    HistoryMsg.inject = ['$location', '$anchorScroll'];
+    HistoryMsg.inject = ['$location', '$anchorScroll', '$filter'];
 
-    function HistoryMsg($location, $anchorScroll) {
+    function HistoryMsg($location, $anchorScroll, $filter) {
         var directive = {
             link: link,
             restrict: 'A',
@@ -31,6 +31,12 @@
                 return arr[arr.length - 1];
             };
 
+            var getUserID = function() {
+                var arr = scope.appContent.directory.user.split("\\");
+                var userself = arr[arr.length - 2];
+                return scope.msg.sender.indexOf(userself) !== -1;
+            };
+
             var getFileSize = function(item) {
                 var fileSize = item.length;
                 if (fileSize > 1024 * 1024 * 1024)
@@ -41,6 +47,10 @@
                     return (Math.round(fileSize * 100 / 1024) / 100).toString() + 'KB';
             };
 
+            var getTime = function(item) {
+                return $filter("date")(item.ts, "yyyy-MM-dd HH:mm:ss");
+            };
+
             var replaceSystemFace = function(content) {
                 //匹配表情
                 var g = (/\/\:([\w]+)/).exec(content);
@@ -141,14 +151,21 @@
                 '<div class="media-body">' +
                 '<p><strong>' +
                 scope.msg.senderDisplayName +
-                '</strong><small class="text-muted">-2017-2-6 15:57:17&nbsp' +
-                scope.msg.ts + '</small></p>' +
+                '</strong><small class="text-muted">-' +
+                getTime(scope.msg) + '</small></p>' +
                 '<div class="well m-l-xs m-t-xs fit-content" >' +
                 '<div class="text-point"></div>' + html +
                 '</div></div></div>';
 
             angular.element("#loadmore").prepend(html_g);
             console.log(html_g);
+            // if (getUserID()) {
+            //     angular.element(".fit-content").removeClass("well");
+            //     angular.element(".fit-content").addClass("wellself");
+            // } else if (!getUserID()) {
+            //     angular.element(".fit-content").removeClass("wellself");
+            //     angular.element(".fit-content").addClass("well");
+            // }
             if (scope.count) {
                 message.addEventListener('load', gotoBottom());
             }

talkview/src/less/app.main.less

@@ -82,7 +82,39 @@
         }
     }
 }
-
+.wellself {
+        position: relative;
+        float: left;
+        word-wrap:break-word;
+        word-break:break-all;
+        background-color: #009BDB;
+        color: #000000;
+        border-radius: 6px;
+        border: none;
+        box-shadow: none;
+        outline: none;
+        margin-left: 10px;
+        margin-top: -2px;
+        margin-bottom: 0px;
+        margin-right: 25px;
+        padding: 7px 14px 7px 12px;
+        font-size: 12px;
+        line-height: 16px;
+        .text-point {
+            z-index: -99;
+            position:absolute;
+            top:-18px;
+            left:8px;
+            width:0;
+            height:0;
+            font-size:0;
+            border-top:solid 10px;
+            border-bottom:solid 10px;
+            border-right: solid 7px;
+            border-left: solid 7px;
+            border-color:transparent transparent #009BDB transparent;
+        }
+    }
 .fit-content {
     width: fit-content;
 }

talkview/src/templates/messages.html

@@ -16,7 +16,7 @@
         <div class="feed-element animate" ng-repeat="item in sendmessages track by $index">
             <div class="media-body">
                 <p>
-                    <strong>{{item.senderDisplayName === undefined || item.senderDisplayName == ''? item.sender : item.senderDisplayName}}</strong><small class="text-muted">-2017-2-6 15:57:17 {{item.ts}}</small>
+                    <strong>{{item.senderDisplayName === undefined || item.senderDisplayName == ''? item.sender : item.senderDisplayName}}</strong><small class="text-muted">-{{getTime(item)}}</small>
                 </p>
                 <div class="well m-l-xs m-t-xs fit-content" ng-current-msg="item" ng-app-content="appContent" id="message">
                     <div class="text-point"></div>