Merge branch 'dev' of http://git.wswin.cn/lqq/LxtalkUIView into dev

talkview/src/js/controller/messageController.js

@@ -3,6 +3,10 @@ angular.module('appMessage').controller('MessageController', ['$scope', '$filter
         $scope.glued = true;
         $scope.count = true;
         $scope.appContent = {};
+        $scope.sendMark = 0;
+        $scope.receiveMark = 0;
+        $scope.sMessage = [];
+        $scope.rMessage = [];
         $scope.sendmessages = [];
         $scope.historymessages = [];
 
@@ -40,13 +44,66 @@ angular.module('appMessage').controller('MessageController', ['$scope', '$filter
         };
 
         $scope.getTime = function(item) {
+            var arr = $scope.appContent.directory.user.split("\\");
+            var userself = arr[arr.length - 2];
+            var getUserID = item.sender.indexOf(userself);
             var myDate = new Date();
             var nowDate = $filter("date")(myDate.getTime(), "yyyy-MM-dd");
             var messageDate = $filter("date")(item.ts, "yyyy-MM-dd");
-            if (messageDate == nowDate)
-                return $filter("date")(item.ts, "HH:mm:ss");
-            else
-                return $filter("date")(item.ts, "yyyy-MM-dd HH:mm:ss");
+            if (getUserID !== -1) {
+                $scope.sMessage[$scope.sendMark] = item.ts;
+                $scope.sendMark = $scope.sendMark + 1;
+                $scope.receiveMark = 0;
+                $scope.rMessage = [];
+            } else {
+                $scope.rMessage[$scope.receiveMark] = item.ts;
+                $scope.receiveMark = $scope.receiveMark + 1;
+                $scope.sendMark = 0;
+                $scope.sMessage = [];
+            }
+            if (messageDate == nowDate) {
+                if ($scope.sendMark == 1 || $scope.receiveMark == 1) {
+                    console.log("111");
+                    return $filter("date")(item.ts, "HH:mm:ss");
+                } else if ($scope.sendMark > 1 && Math.abs($scope.sMessage[$scope.sendMark - 1] - $scope.sMessage[0]) < 60000) {
+                    console.log("222");
+                    return '';
+                } else if ($scope.receiveMark > 1 && Math.abs($scope.rMessage[$scope.receiveMark - 1] - $scope.rMessage[0]) < 60000) {
+                    console.log("333");
+                    return '';
+                } else if ($scope.sendMark > 1 && Math.abs($scope.sMessage[$scope.sendMark - 1] - $scope.sMessage[0]) > 60000) {
+                    console.log("444");
+                    $scope.sendMark = 0;
+                    $scope.sMessage = [];
+                    return $filter("date")(item.ts, "HH:mm:ss");
+                } else if ($scope.receiveMark > 1 && Math.abs($scope.rMessage[$scope.receiveMark - 1] - $scope.rMessage[0]) > 60000) {
+                    console.log("555");
+                    $scope.receiveMark = 0;
+                    $scope.rMessage = [];
+                    return $filter("date")(item.ts, "HH:mm:ss");
+                }
+            } else {
+                if ($scope.sendMark == 1 || $scope.receiveMark == 1) {
+                    console.log("111");
+                    return $filter("date")(item.ts, "yyyy HH:mm:ss");
+                } else if ($scope.sendMark > 1 && Math.abs($scope.sMessage[$scope.sendMark - 1] - $scope.sMessage[0]) < 60000) {
+                    console.log("222");
+                    return $filter("date")(item.ts, "yyyy HH");
+                } else if ($scope.receiveMark > 1 && Math.abs($scope.rMessage[$scope.receiveMark - 1] - $scope.rMessage[0]) < 60000) {
+                    console.log("333");
+                    return $filter("date")(item.ts, "yyyy HH:mm");
+                } else if ($scope.sendMark > 1 && Math.abs($scope.sMessage[$scope.sendMark - 1] - $scope.sMessage[0]) > 60000) {
+                    console.log("444");
+                    $scope.sendMark = 0;
+                    $scope.sMessage = [];
+                    return $filter("date")(item.ts, "MM HH:mm:ss");
+                } else if ($scope.receiveMark > 1 && Math.abs($scope.rMessage[$scope.receiveMark - 1] - $scope.rMessage[0]) > 60000) {
+                    console.log("555");
+                    $scope.receiveMark = 0;
+                    $scope.rMessage = [];
+                    return $filter("date")(item.ts, "dd HH:mm:ss");
+                }
+            }
         };
 
         $scope.getMore = function() {

talkview/src/less/app.main.less

@@ -31,7 +31,6 @@
         text-align: center;
         font-family: "微软雅黑","宋体";
         font-size: 12px;
-        margin-bottom: -5px;
     }
 }
 
@@ -294,7 +293,7 @@ body {
 }
 #details-right {
     min-width: 220px;
-    height: 480px;
+    height: 450px;
     margin: auto;
     overflow: hidden;
     text-align: center;
@@ -413,7 +412,7 @@ body {
             height: 200px;
             .glyphicon {
                 float: right;
-                margin-top: 75px;
+                margin-top: 77px;
                 color: #fff;
                 font-size: 36px;
                 position:relative;
@@ -438,7 +437,7 @@ body {
             height: 25px;
             width: 70px;
             padding: 0px;
-            margin: 15px 8px;
+            margin: 20px 8px;
         }
     }
 }