聊天界面

talkview/src/js/controller/messageController.js

@@ -1,8 +1,7 @@
-angular.module('appMessage').controller('MessageController', ['$scope', '$filter', '$location', '$anchorScroll', function($scope, $filter, $location, $anchorScroll) {
+angular.module('appMessage').controller('MessageController', ['$scope', '$filter', '$location', '$anchorScroll', '$element', function($scope, $filter, $location, $anchorScroll, $element) {
         lxtalkClient.Invoke('{15180DEF-D508-45F7-BAEB-6486CD8752C8}', '_Register', '', $scope);
         $scope.glued = true;
         $scope.count = true;
-        $scope.h = document.body.scrollHeight;
         $scope.appContent = {};
         $scope.sendmessages = [];
         $scope.historymessages = [];

talkview/src/js/directive/currentmessage.js

@@ -126,7 +126,6 @@
             if (scope.appContent === undefined || scope.appContent.faceConfig === undefined || scope.appContent.faceConfig.sys === undefined) {
                 html = '<span class="text-message">' + scope.msg.content + '</span>';
             } else if (scope.msg.contentType == 1) {
-                //var style = { style: "normal", weight: "normal" };
                 if (getUserID()) {
                     var style = scope.appContent.font === "" || scope.appContent.font === undefined ? {
                         style: 'normal',
@@ -169,18 +168,43 @@
             } else if (scope.msg.contentType == 3) {
                 var content = JSON.parse(scope.msg.content);
                 console.log(content);
-                if (content.status == 2)
+                if (content.status == 2 && content.way !== 1)
                     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">' +
-                    '<span class="transinfo"><span style="color:green;" class="glyphicon glyphicon-ok"></span><span>传输完成</span></span>' +
-                    '<a class="text-primary" role="button"><span ng-click="OpenFile(msg.content)">打开</span></a>&nbsp&nbsp' +
+                    '<span class="transinfo"><span style="color:green;" class="glyphicon glyphicon-ok"></span><span>在线传输</span></span>' +
+                    '<a class="text-primary" role="button"><span ng-click="OpenFile(msg.content)">打开</span></a>&nbsp&nbsp&nbsp' +
                     '<a class="text-primary" role="button"><span ng-click="OpenDirectory(msg.content)">打开文件夹</span></a>' +
                     '</div>' +
                     '</div>';
-                else if (ifSelf(content) && content.way == 0 && content.status == 0) {
+                else if (content.status == 2 && content.way == 1) {
+                    if (getUserID())
+                        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">' +
+                        '<span class="transinfo"><span style="color:green;" class="glyphicon glyphicon-ok"></span><span>离线传输</span></span>' +
+                        '<a class="text-primary" role="button"><span ng-click="OpenFile(msg.content)">打开</span></a>&nbsp&nbsp&nbsp' +
+                        '<a class="text-primary" role="button"><span ng-click="OpenDirectory(msg.content)">打开文件夹</span></a>&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp' +
+                        '<a class="text-primary" role="button"><span ng-click="OpenDirectory(msg.content)">短信提醒</span></a>' +
+                        '</div>' +
+                        '</div>';
+                    else
+                        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">' +
+                        '<span class="transinfo"><span style="color:green;" class="glyphicon glyphicon-ok"></span><span>离线传输</span></span>' +
+                        '<a class="text-primary" role="button"><span ng-click="OpenFile(msg.content)">打开</span></a>&nbsp&nbsp&nbsp' +
+                        '<a class="text-primary" role="button"><span ng-click="OpenDirectory(msg.content)">打开文件夹</span></a>&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp' +
+                        '<a class="text-primary" role="button"><span ng-click="OpenDirectory(msg.content)">重新下载</span></a>' +
+                        '</div>' +
+                        '</div>';
+                } else if (ifSelf(content) && content.way == 0 && content.status == 0) {
                     if (getUserID())
                         html = '<div class="well m-l-xs m-t-xs fit-content" id="file-error"><span class="glyphicon glyphicon-remove-sign"></span><span>' + getFileInfo(content)[0] + '</span></div>';
                     else

talkview/src/js/directive/historymessages.js

@@ -99,21 +99,21 @@
                     var g = (/((((http|ftp|https|HTTP|FTP|HTTPS):\/\/)[\w\-_]+)(\.[\w\-_]+)+([\w\-\.,@?^=%:/~\+#]*[\w\-\@?^=%/~\+#\r\n]))/ig).exec(m[i]);
                     if (getUserID()) {
                         if (g == null)
-                            html = '<a style="color:white;text-decoration:underline;" target="_blank" href="http://' + m[i] + '">' +
+                            html = '<a style="color:white;text-decoration:underline;cursor:pointer;" ng-click="openLink(\'http://' + m[i] + '\')">' +
                             m[i] +
                             '</a>';
                         else
-                            html = '<a style="color:white;text-decoration:underline;" target="_blank" href="' + m[i] + '">' +
+                            html = '<a style="color:white;text-decoration:underline;cursor:pointer;" ng-click="openLink(\'' + m[i] + '\')">' +
                             m[i] +
                             '</a>';
                         i = i + 1;
                     } else {
                         if (g == null)
-                            html = '<a style="text-decoration:underline;" target="_blank" href="http://' + m[i] + '">' +
+                            html = '<a style="text-decoration:underline;cursor:pointer;" ng-click="openLink(\'http://' + m[i] + '\')">' +
                             m[i] +
                             '</a>';
                         else
-                            html = '<a style="text-decoration:underline;" target="_blank" href="' + m[i] + '">' +
+                            html = '<a style="text-decoration:underline;cursor:pointer;" ng-click="openLink(\'' + m[i] + '\')">' +
                             m[i] +
                             '</a>';
                         i = i + 1;
@@ -132,7 +132,6 @@
             if (scope.appContent === undefined || scope.appContent.faceConfig === undefined || scope.appContent.faceConfig.sys === undefined) {
                 html = '<span class="text-message">' + scope.msg.content + '</span>';
             } else if (scope.msg.contentType == 1) {
-                //var style = { style: "normal", weight: "normal" };
                 if (getUserID()) {
                     var style = scope.appContent.font === "" || scope.appContent.font === undefined ? {
                         style: 'normal',
@@ -175,18 +174,42 @@
             } else if (scope.msg.contentType == 3) {
                 var content = JSON.parse(scope.msg.content);
                 console.log(content);
-                if (content.status == 2)
+                if (content.status == 2 && content.way !== 1)
                     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">' +
-                    '<span class="transinfo"><span style="color:green;" class="glyphicon glyphicon-ok"></span><span>传输完成</span></span>' +
-                    '<a class="text-primary" role="button"><span ng-click="OpenFile(msg.content)">打开</span></a>&nbsp&nbsp' +
+                    '<span class="transinfo"><span style="color:green;" class="glyphicon glyphicon-ok"></span><span>在线传输</span></span>' +
+                    '<a class="text-primary" role="button"><span ng-click="OpenFile(msg.content)">打开</span></a>&nbsp&nbsp&nbsp' +
                     '<a class="text-primary" role="button"><span ng-click="OpenDirectory(msg.content)">打开文件夹</span></a>' +
                     '</div>' +
                     '</div>';
-                else if (ifSelf(content) && content.way == 0 && content.status == 0) {
+                else if (content.status == 2 && content.way == 1) {
+                    if (getUserID())
+                        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">' +
+                        '<span class="transinfo"><span style="color:green;" class="glyphicon glyphicon-ok"></span><span>离线传输</span></span>' +
+                        '<a class="text-primary" role="button"><span ng-click="OpenFile(msg.content)">打开</span></a>&nbsp&nbsp&nbsp' +
+                        '<a class="text-primary" role="button"><span ng-click="OpenDirectory(msg.content)">打开文件夹</span></a>' +
+                        '</div>' +
+                        '</div>';
+                    else
+                        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">' +
+                        '<span class="transinfo"><span style="color:green;" class="glyphicon glyphicon-ok"></span><span>离线传输</span></span>' +
+                        '<a class="text-primary" role="button"><span ng-click="OpenFile(msg.content)">打开</span></a>&nbsp&nbsp&nbsp' +
+                        '<a class="text-primary" role="button"><span ng-click="OpenDirectory(msg.content)">打开文件夹</span></a>&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp' +
+                        '<a class="text-primary" role="button"><span ng-click="OpenDirectory(msg.content)">重新下载</span></a>' +
+                        '</div>' +
+                        '</div>';
+                } else if (ifSelf(content) && content.way == 0 && content.status == 0) {
                     if (getUserID())
                         html = '<div class="well m-l-xs m-t-xs fit-content" id="file-error"><span class="glyphicon glyphicon-remove-sign"></span><span>' + getFileInfo(content)[0] + '</span></div>';
                     else
@@ -277,6 +300,11 @@
             return lxtalkClient.Invoke('{15180DEF-D508-45F7-BAEB-6486CD8752C8}', 'OpenDirectory', JSON.stringify(file), $scope);
         };
 
+        $scope.openLink = function(md5) {
+            var link = { fileName: md5 };
+            return lxtalkClient.Invoke('{15180DEF-D508-45F7-BAEB-6486CD8752C8}', 'OpenUrl', JSON.stringify(link), $scope);
+        };
+
         $scope.showImage = function(md5) {
             var imgSrc = $scope.appContent.directory.received + md5 + ".JPG";
             var img = { fileName: imgSrc };