聊天界面

talkview/src/js/controller/messageController.js

@@ -131,7 +131,7 @@ angular.module('appMessage').controller('MessageController', ['$scope', '$filter
 
         $scope.getMore = function() {
             if ($scope.count) {
-                $scope.height = document.body.scrollHeight;
+                $scope.height = document.body.scrollHeight + 200;
                 lxtalkClient.Invoke('{15180DEF-D508-45F7-BAEB-6486CD8752C8}', 'LoadHistoryMessages', '', $scope);
                 $scope.count = false;
             } else {
@@ -145,7 +145,7 @@ angular.module('appMessage').controller('MessageController', ['$scope', '$filter
 
         $scope.scrollWheel = function() {
             if (document.body.scrollTop == 0) {
-                $scope.height = document.body.scrollHeight;
+                $scope.height = document.body.scrollHeight + 200;
                 lxtalkClient.Invoke('{15180DEF-D508-45F7-BAEB-6486CD8752C8}', 'LoadHistoryMessages', '', $scope);
                 $scope.count = false;
             }

talkview/src/js/directive/currentmessage.js

@@ -239,18 +239,15 @@
 
             if (scope.msg.contentType == 3 && content.status !== 2) {
                 var html_g = html;
+                $(element[0].previousElementSibling).remove();
             } else {
                 if (getUserID()) {
-                    var html_g = '<div onSelectStart="return false"><p><strong>' +
-                        scope.msg.senderDisplayName +
-                        '</strong><small class="text-muted"></small></p></div>' +
+                    var html_g =
                         '<div class="wellself m-l-xs m-t-xs fit-content" >' +
                         '<div class="text-point"></div>' + html +
                         '</div>';
                 } else {
-                    var html_g = '<div onSelectStart="return false"><p><strong>' +
-                        scope.msg.senderDisplayName +
-                        '</strong><small class="text-muted"></small></p></div>' +
+                    var html_g =
                         '<div class="well m-l-xs m-t-xs fit-content" >' +
                         '<div class="text-point"></div>' + html +
                         '</div>';

talkview/src/js/directive/historymessages.js

@@ -245,6 +245,7 @@
 
             if (scope.msg.contentType == 3 && content.status !== 2) {
                 var html_g = html;
+                $(element[0].previousElementSibling).remove();
             } else {
                 if (getUserID()) {
                     var html_g =
@@ -267,6 +268,7 @@
             //angular.element("#loadmore").prepend($dom);
             var newElement = angular.element($dom);
             element.prepend(newElement);
+            console.log(element);
             if (scope.count) {
                 gotoBottom();
             } else {

talkview/src/less/app.main.less

@@ -38,10 +38,9 @@
 }
 
 .media-body {
+    width: 1200px;
     font-family: "微软雅黑","宋体";
     font-size: 13px;
-    width: 0px;
-    max-width: 1000px;
     vertical-align: top;
     zoom: 1;
     p{
@@ -78,13 +77,17 @@
     float: left;
 }
 .user-head-rt {
+    margin-right: 3px;
     float: right;
 }
 
 .feed-element {
+    width: 100%;
     padding-bottom: 4px;
     overflow: hidden;
     .well {
+        float: left;
+        max-width: 800px;
         word-wrap:break-word;
         word-break:break-all;
         background-color: #EEEEEE;
@@ -93,18 +96,18 @@
         border: none;
         box-shadow: none;
         outline: none;
-        margin-left: 10px;
-        margin-top: 10px;
+        margin-left: 8px;
+        margin-top: 12px;
         margin-bottom: 0px;
         margin-right: 20px;
         padding: 7px 12px 7px 12px;
         font-size: 12px;
         line-height: 16px;
-        .text-point {
+        /*.text-point {
             z-index: 99;
             position:absolute;
-            top:50px;
-            left:50px;
+            top:10px;
+            left:60px;
             width:0;
             height:0;
             font-size:0;
@@ -113,12 +116,12 @@
             border-right: solid 10px;
             border-left: solid 10px;
             border-color:transparent #000 transparent transparent;
-        }
+        }*/
     }
 }
 .wellself {
-    position: absolute;
-    right:5px; 
+    float: right; 
+    max-width: 800px;
     word-wrap:break-word;
     word-break:break-all;
     background-color: #009EE0;
@@ -128,14 +131,14 @@
     box-shadow: none;
     outline: none;
     margin-left: 20px;
-    margin-top: 10px;
+    margin-top: 11px;
     margin-bottom: 0px;
-    margin-right: 50px;
+    margin-right: 8px;
     padding: 7px 12px 7px 12px;
     font-size: 12px;
     line-height: 16px;
-    .text-point {
-        z-index: -99;
+    /*.text-point {
+        z-index: 99;
         position:absolute;
         top:7px;
         left:97px;
@@ -147,7 +150,7 @@
         border-right: solid 10px;
         border-left: solid 10px;
         border-color:transparent transparent transparent #009EE0;
-    }
+    }*/
 }
 .fit-content {
     width: fit-content;
@@ -230,7 +233,7 @@
 }
 
 #file-error {
-    margin: 5px 10px 2px 10px;
+    margin: 5px 50px 2px 50px;
     padding: 3px 5px 3px 7px;
     color: #555;
     .glyphicon {
@@ -239,7 +242,7 @@
     }
 }
 #file-info {
-    margin: 5px 10px 2px 10px;
+    margin: 5px 50px 2px 50px;
     padding: 3px 5px 3px 7px;
     color: #555;
     .glyphicon {

talkview/src/templates/messages.html

@@ -3,10 +3,10 @@
     <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 ng-class="getUserhead(item)">
+            <div ng-class="getUserhead(item)" onSelectStart="return false">
                 <a><img src="../img/头像.png"></a>
             </div>
-            <div class="media-body" ng-history-msg="item" ng-app-content="appContent" ng-count="count" ng-height="height">
+            <div class="media-body m-l-xs m-t-xs" 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>
                 </p>
@@ -19,6 +19,9 @@
     <div class="feed-activity-list p-l-xs p-t-xs p-r-xs sendmessage" ng-cloak>
         <div class="feed-element animate" ng-repeat="item in sendmessages track by $index">
             <div class="curTime"><small class="text-muted">{{getCurTime(item)}}</small></div>
+            <div ng-class="getUserhead(item)" onSelectStart="return false">
+                <a><img src="../img/头像.png"></a>
+            </div>
             <div class="media-body" ng-current-msg="item" ng-app-content="appContent">
                 <!--<p>
                     <strong>{{item.senderDisplayName === undefined || item.senderDisplayName == ''? item.sender : item.senderDisplayName}}</strong><small class="text-muted">-{{getTime(item)}}</small>
@@ -220,7 +223,7 @@
             </div>-->
 
         <!-- 语音 -->
-        <!--<div class="feed-element">
+        <div class="feed-element">
             <div class="user-head user-head-lf">
                 <a><img src="../img/头像.png"></a>
             </div>
@@ -271,7 +274,7 @@
 					</span>
                 </div>
             </div>
-        </div>-->
+        </div>
     </div>
     <div>
         <p></p>