聊天界面

talkview/src/js/controller/messageController.js

@@ -71,11 +71,11 @@ angular.module('appMessage').controller('MessageController', ['$scope', '$filter
                 $scope.sendMark = 0;
                 $scope.sMessageTime = [];
             }
-            if ($scope.sendMark == 1 || $scope.receiveMark == 1) {
+            if ($scope.sendMark == 1 || $scope.receiveMark == 1 || Math.abs($scope.sMessageTime[$scope.sendMark - 1] - $scope.sMessageTime[0]) == 0 || Math.abs($scope.rMessageTime[$scope.receiveMark - 1] - $scope.rMessageTime[0]) == 0) {
                 return $filter("date")(item.ts, "HH:mm:ss");
-            } else if ($scope.sendMark > 1 && Math.abs($scope.sMessageTime[$scope.sendMark - 1] - $scope.sMessageTime[0]) < 60000) {
-                return $filter("date")(item.ts, "yyyy HH:mm:ss");
-            } else if ($scope.receiveMark > 1 && Math.abs($scope.rMessageTime[$scope.receiveMark - 1] - $scope.rMessageTime[0]) < 60000) {
+            } else if ($scope.sendMark > 1 && Math.abs($scope.sMessageTime[$scope.sendMark - 1] - $scope.sMessageTime[0]) <= 60000) {
+                return '';
+            } else if ($scope.receiveMark > 1 && Math.abs($scope.rMessageTime[$scope.receiveMark - 1] - $scope.rMessageTime[0]) <= 60000) {
                 return '';
             } else if ($scope.sendMark > 1 && Math.abs($scope.sMessageTime[$scope.sendMark - 1] - $scope.sMessageTime[0]) > 60000) {
                 $scope.sMessageTime[0] = $scope.sMessageTime[$scope.sendMark - 1];

talkview/src/templates/messages.html

@@ -2,7 +2,7 @@
     <div class="getMore"><a role="button" class="i-More"><small ng-click="getMore()">加载更多消息</small></a><small class="n-More hide">当前没有更多消息</small></div>
     <div class="feed-activity-list p-l-xs p-t-xs p-r-xs loadmore" ng-cloak>
         <div class="feed-element" ng-repeat="item in historymessages | orderBy:item.index:'desc'">
-            <div class="curTime"><small class="text-muted">{{getHisTime(item)}}</small></div>
+            <div class="curTime"><small class="text-muted">{{getCurTime(item)}}</small></div>
             <div class="media-body" ng-history-msg="item" ng-app-content="appContent" ng-count="count" ng-height="height">
                 <!--<p>
                     <strong>{{item.senderDisplayName === undefined || item.senderDisplayName == ''? item.sender : item.senderDisplayName}}</strong><small>-2017-2-6 15:57:17 {{item.ts}}</small>