修改图片

talkview/src/js/directive/currentmessage.js

@@ -65,8 +65,6 @@
                 var g = (/\[image\-src=\"([\w\W]+?)\"\]/i).exec(content);
                 while (g !== null) {
                     content = content.replace(g[0], function() {
-                        scope.imgWidth = 715;
-                        scope.imgHeight = 395;
                         var html = '<a class="thumbnail"' + '>' +
                             // '<img img-load="gotoBottom()" img-error="errorImg()" onclick="javascript:window.open(this.src,\'\',\'height=' + scope.imgHeight + ',width=' + scope.imgWidth + ',top=200,left=200\')" style="max-width:270px;max-height:250px;" src="local://' + scope.appContent.directory.received + g[1] + '.JPG' + '" onError= "this.src = \'../img/loading.gif\'" alt="截图缩略图" >' +
                             '<img ng-load="gotoBottom()" ng-error="gotoBottom()" onclick="javascript:window.open(this.src,\'\',\'height=600,width=800,top=200,left=200\')" class="lazy" style="max-width:300px;max-height:250px;" src="../img/loading.gif" data-original="local://' + scope.appContent.directory.received + g[1] + '.JPG' + '" alt="截图缩略图" >' +
@@ -248,7 +246,6 @@
 
         };
         $scope.gotoBottom = function() {
-            console.log("11111111111111");
             // $scope.$apply();
             $location.hash("bottom");
             $anchorScroll();

talkview/src/less/app.main.less

@@ -200,6 +200,24 @@
     padding-top: 10px;
 }
 
+#file-error {
+    margin: 10px 10px 5px 10px;
+    padding: 5px 7px;
+    color: #555;
+    .glyphicon {
+        margin-right: 3px;
+        color: #E35850;
+    }
+}
+#file-info {
+    margin: 10px 10px 5px 10px;
+    padding: 5px 7px;
+    color: #555;
+    .glyphicon {
+        margin-right: 3px;
+        color: #4EA9E9;
+    }
+}
 [scroll-glue-top],
 [scroll-glue-bottom],
 [scroll-glue]{

talkview/src/templates/messages.html

@@ -58,23 +58,108 @@
                 </div>
             </div>-->
 
+        <!-- 文件提醒消息 -->
+        <div class="feed-element">
+            <div class="media-body">
+                <!--<p>
+                        <strong>陆趣趣</strong><small class="text-muted">-2017-2-6 15:57:17 来自pc端</small>
+                    </p>-->
+                <div class="well m-l-xs m-t-xs fit-content" id="file-error">
+                    <div>
+                        <span class="glyphicon glyphicon-remove-sign"></span><span>您取消了“办公微助引导页.rar”(22.72MB)的发送，文件传输失败。</span>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="feed-element">
+            <div class="media-body">
+                <div class="well m-l-xs m-t-xs fit-content" id="file-error">
+                    <div>
+                        <span class="glyphicon glyphicon-remove-sign"></span><span>您取消接收“办公微助引导页.rar”(22.72MB)，文件传输失败。</span>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="feed-element">
+            <div class="media-body">
+                <div class="well m-l-xs m-t-xs fit-content" id="file-error">
+                    <div>
+                        <span class="glyphicon glyphicon-remove-sign"></span><span>对方取消了“办公微助引导页.rar”(22.72MB)的发送。</span>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="feed-element">
+            <div class="media-body">
+                <div class="well m-l-xs m-t-xs fit-content" id="file-error">
+                    <div>
+                        <span class="glyphicon glyphicon-remove-sign"></span><span>对方取消接收“办公微助引导页.rar”(22.72MB)，文件发送失败。</span>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="feed-element">
+            <div class="media-body">
+                <div class="well m-l-xs m-t-xs fit-content" id="file-error">
+                    <div>
+                        <span class="glyphicon glyphicon-remove-sign"></span><span>您终止了“2003office.1195979292.zip”(519.69MB)的发送。</span>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="feed-element">
+            <div class="media-body">
+                <div class="well m-l-xs m-t-xs fit-content" id="file-error">
+                    <div>
+                        <span class="glyphicon glyphicon-remove-sign"></span><span>您终止了“2003office.1195979292.tmp”(519.69MB)的接收。</span>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="feed-element">
+            <div class="media-body">
+                <div class="well m-l-xs m-t-xs fit-content" id="file-error">
+                    <div>
+                        <span class="glyphicon glyphicon-remove-sign"></span><span>对方中断了“2003office.1195979292.zip”(519.69MB)的发送。</span>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="feed-element">
+            <div class="media-body">
+                <div class="well m-l-xs m-t-xs fit-content" id="file-error">
+                    <div>
+                        <span class="glyphicon glyphicon-remove-sign"></span><span>对方中断了“2003office.1195979292.zip”(519.69MB)的接收。</span>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="feed-element">
+            <div class="media-body">
+                <div class="well m-l-xs m-t-xs fit-content" id="file-info">
+                    <div>
+                        <span class="glyphicon glyphicon-info-sign"></span><span>对方取消在线传输，转为发送离线文件“办公微助引导页.rar”(22.72MB)。</span>
+                    </div>
+                </div>
+            </div>
+        </div>
         <!-- 带截图 -->
         <!--<div class="feed-element">
-                <div class="media-body">
-                    <p>
-                        <strong>陆趣趣</strong><small>-2017-2-6 15:57:17 来自pc端</small>
-                    </p>
-                    <div class="well m-l-xs m-t-xs fit-content">
-                        <div id="text-point"></div>
-                        <span class="text-message">
+            <div class="media-body">
+                <p>
+                    <strong>陆趣趣</strong><small>-2017-2-6 15:57:17 来自pc端</small>
+                </p>
+                <div class="well m-l-xs m-t-xs fit-content">
+                    <div id="text-point"></div>
+                    <span class="text-message">
 								<a href="#" class="thumbnail" style="max-width:125px;">
 									<img src="local://E:/LxtalkUIView/dist/img/loading.jpg" alt="通用的占位符缩略图">
 								</a>
 								
 						</span>
-                    </div>
                 </div>
-            </div>-->
+            </div>
+        </div>-->
 
         <!-- 只有截图 -->
         <!--<div class="feed-element">