聊天界面

talkview/src/js/controller/messageController.js

@@ -5,7 +5,8 @@ angular.module('appMessage').controller('MessageController', ['$scope', '$filter
         $scope.appContent = {};
         $scope.sendMark = 0;
         $scope.receiveMark = 0;
-        $scope.message = [];
+        $scope.sMessage = [];
+        $scope.rMessage = [];
         $scope.sendmessages = [];
         $scope.historymessages = [];
 
@@ -50,41 +51,57 @@ angular.module('appMessage').controller('MessageController', ['$scope', '$filter
             var nowDate = $filter("date")(myDate.getTime(), "yyyy-MM-dd");
             var messageDate = $filter("date")(item.ts, "yyyy-MM-dd");
             if (getUserID !== -1) {
-                $scope.message[$scope.sendMark] = item.ts;
+                $scope.sMessage[$scope.sendMark] = item.ts;
                 $scope.sendMark = $scope.sendMark + 1;
                 $scope.receiveMark = 0;
+                $scope.rMessage = [];
             } else {
-                $scope.message[$scope.receiveMark] = item.ts;
+                $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)
+                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.message[$scope.sendMark - 1] - $scope.message[0]) < 60000) {
+                } 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.message[$scope.sendMark - 1] - $scope.message[0]) < 60000) {
+                } 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.message[$scope.sendMark - 1] - $scope.message[0]) > 60000) {
+                } 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.message[$scope.sendMark - 1] - $scope.message[0]) > 60000) {
+                } 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)
-                    return $filter("date")(item.ts, "yyyy-MM-dd HH:mm:ss");
-                else if ($scope.sendMark > 1 && Math.abs($scope.message[$scope.sendMark - 1] - $scope.message[0]) < 60000) {
-                    return '';
-                } else if ($scope.receiveMark > 1 && Math.abs($scope.message[$scope.sendMark - 1] - $scope.message[0]) < 60000) {
-                    return '';
-                } else if ($scope.sendMark > 1 && Math.abs($scope.message[$scope.sendMark - 1] - $scope.message[0]) > 60000) {
+                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;
-                    return $filter("date")(item.ts, "yyyy-MM-dd HH:mm:ss");
-                } else if ($scope.receiveMark > 1 && Math.abs($scope.message[$scope.sendMark - 1] - $scope.message[0]) > 60000) {
+                    $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;
-                    return $filter("date")(item.ts, "yyyy-MM-dd HH:mm:ss");
+                    $scope.rMessage = [];
+                    return $filter("date")(item.ts, "dd HH:mm:ss");
                 }
             }
         };

talkview/src/less/app.main.less

@@ -293,7 +293,7 @@ body {
 }
 #details-right {
     min-width: 220px;
-    height: 480px;
+    height: 450px;
     margin: auto;
     overflow: hidden;
     text-align: center;
@@ -437,7 +437,7 @@ body {
             height: 25px;
             width: 70px;
             padding: 0px;
-            margin: 15px 8px;
+            margin: 20px 8px;
         }
     }
 }