8 years ago · c5e535eef1
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,9 @@
 
				 node_modules

			
 
				 bower_components

			
 
				-.vscode
			
 
				+.vscode

			
 
				+dist/groupsSms

			
 
				+dist/guideview

			
 
				+dist/settingview

			
 
				+dist/smsChart

			
 
				+dist/talkview

			
 
				+dist/userview

			
--- a/dist/groupsSms/app-2f14ba2a0e.js
+++ b/dist/groupsSms/app-2f14ba2a0e.js
--- a/dist/groupsSms/app-e4dfa1ca1c.css
+++ b/dist/groupsSms/app-e4dfa1ca1c.css
--- a/dist/groupsSms/index.html
+++ b/dist/groupsSms/index.html
@@ -1,26 +0,0 @@
 
				-<!DOCTYPE html>
			
 
				-<html>
			
 
				-
			
 
				-<head>
			
 
				-    <title>groupsSms</title>
			
 
				-    <meta charset="utf-8" />
			
 
				-    <!-- 新 Bootstrap 核心 CSS 文件 -->
			
 
				-    <link rel="stylesheet" href="../bower_components/bootstrap/dist/css/bootstrap.css">
			
 
				-    <link rel="stylesheet" href="../bower_components/bootstrap/dist/css/bootstrap.min.css">
			
 
				-    <link rel="stylesheet" href="../bower_components/zTree/css/zTreeStyle/zTreeStyle.css" />
			
 
				-    <link rel="stylesheet" href="app-e4dfa1ca1c.css">
			
 
				-    <!-- jQuery文件。务必在bootstrap.min.js 之前引入 -->
			
 
				-    <script src="../bower_components/jquery/dist/jquery.min.js"></script>
			
 
				-    <script src="../bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
			
 
				-    <script src="../bower_components/zTree/js/jquery.ztree.core.js"></script>
			
 
				-    <script src="../bower_components/zTree/js/jquery.ztree.excheck.js"></script>
			
 
				-</head>
			
 
				-
			
 
				-<body ng-app="app" class="full-client" onselectstart="return false">
			
 
				-    <ui-view></ui-view>
			
 
				-    <script src="../bower_components/angular/angular.min.js"></script>
			
 
				-    <script src="../bower_components/angular-ui-router/release/angular-ui-router.min.js"></script>
			
 
				-    <script src="app-2f14ba2a0e.js"></script>
			
 
				-</body>
			
 
				-
			
 
				-</html>
			
--- a/dist/guideview/app-86cd22d981.js
+++ b/dist/guideview/app-86cd22d981.js
--- a/dist/guideview/app-b160b47ae8.css
+++ b/dist/guideview/app-b160b47ae8.css
--- a/dist/guideview/index.html
+++ b/dist/guideview/index.html
@@ -1,24 +0,0 @@
 
				-<!DOCTYPE html>

			
 
				-<html>

			
 
				-

			
 
				-<head>

			
 
				-    <title>引导页</title>

			
 
				-    <meta charset="utf-8" />

			
 
				-    <!-- 新 Bootstrap 核心 CSS 文件 -->

			
 
				-    <link rel="stylesheet" href="../bower_components/bootstrap/dist/css/bootstrap.min.css">

			
 
				-    <link rel="stylesheet" href="../bower_components/animate.css/animate.min.css">

			
 
				-    <link rel="stylesheet" href="app-b160b47ae8.css">

			
 
				-    <!-- jQuery文件。务必在bootstrap.min.js 之前引入 -->

			
 
				-</head>

			
 
				-

			
 
				-<body ng-app="app" class="full-client" onselectstart="return false">

			
 
				-    <div data-ui-view=""></div>

			
 
				-    <script src="../bower_components/angular/angular.min.js"></script>

			
 
				-    <script src="../bower_components/angular-animate/angular-animate.min.js"></script>

			
 
				-    <script src="../bower_components/angular-ui-router/release/angular-ui-router.min.js"></script>

			
 
				-    <script src="app-86cd22d981.js"></script>

			
 
				-    <script src="../bower_components/angular-sanitize/angular-sanitize.min.js"></script>

			
 
				-    <script src="../bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>

			
 
				-</body>

			
 
				-

			
 
				-</html>
			
--- a/dist/settingview/app-350f68e0fe.css
+++ b/dist/settingview/app-350f68e0fe.css
--- a/dist/settingview/app-ec8eaf9e0f.js
+++ b/dist/settingview/app-ec8eaf9e0f.js
--- a/dist/settingview/index.html
+++ b/dist/settingview/index.html
@@ -1,38 +0,0 @@
 
				-<!DOCTYPE html>
			
 
				-<html>
			
 
				-
			
 
				-<head>
			
 
				-	<title>chat view</title>
			
 
				-	<meta charset="utf-8" />
			
 
				-	<!-- 新 Bootstrap 核心 CSS 文件 -->
			
 
				-	<link rel="stylesheet" href="../bower_components/bootstrap/dist/css/bootstrap.min.css">
			
 
				-	<link rel="stylesheet" href="app-350f68e0fe.css">
			
 
				-</head>
			
 
				-
			
 
				-<body ng-app="app" ng-controller="SettingController">
			
 
				-	<div class="container">
			
 
				-		<div class="row">
			
 
				-			<div class="col-xs-2 p-r-none p-l-none" style="border-right:1px solid #BADEEA; height:400px">
			
 
				-				<ul class="nav nav-pills nav-settings">
			
 
				-					<li><a href="{{user.shortL.length>=15?'#/setting-enterprise':'#/setting-user'}}" class="nav-settings-item">{{user.shortL.length >= 15? '企业名片':'个人名片'}}</a></li>
			
 
				-					<li><a href="#/setting-system" class="nav-settings-item">系统设置</a></li>
			
 
				-					<li><a href="#/setting-hotkey" class="nav-settings-item">热键设置</a></li>
			
 
				-					<li><a href="#/setting-sso" class="nav-settings-item">单点登录</a></li>
			
 
				-					<li><a href="#/setting-net" class="nav-settings-item">网络设置</a></li>
			
 
				-				</ul>
			
 
				-			</div>
			
 
				-			<div class="col-xs-10 p" style="background-color:#F0FFFF; font-size:12px; height:400px; overflow-y:auto;">
			
 
				-				<ui-view></ui-view>
			
 
				-				<div style="height:40px;"></div>
			
 
				-				<button type="button" class="btn btn-success btn-sm" style="position: fixed; bottom: 10px; right: 30px;" ng-show="userChanged||sysChanged||hotkeyChanged" ng-click="save()">保存</button>
			
 
				-			</div>
			
 
				-		</div>
			
 
				-	</div>
			
 
				-	<!-- jQuery文件。务必在bootstrap.min.js 之前引入 -->
			
 
				-	<!--<script src="js/jquery.min.js"></script>-->
			
 
				-	<script src="../bower_components/angular/angular.min.js"></script>
			
 
				-	<script src="../bower_components/angular-ui-router/release/angular-ui-router.min.js"></script>
			
 
				-	<script src="app-ec8eaf9e0f.js"></script>
			
 
				-</body>
			
 
				-
			
 
				-</html>
			
--- a/dist/smsChart/app-541142ac45.css
+++ b/dist/smsChart/app-541142ac45.css
--- a/dist/smsChart/app-94f9933053.js
+++ b/dist/smsChart/app-94f9933053.js
--- a/dist/smsChart/index.html
+++ b/dist/smsChart/index.html
@@ -1,24 +0,0 @@
 
				-<!DOCTYPE html>
			
 
				-<html>
			
 
				-
			
 
				-<head>
			
 
				-    <title>Chart</title>
			
 
				-    <meta charset="utf-8" />
			
 
				-    <!-- 新 Bootstrap 核心 CSS 文件 -->
			
 
				-    <link rel="stylesheet" href="../bower_components/bootstrap/dist/css/bootstrap.min.css">
			
 
				-    <link rel="stylesheet" href="app-541142ac45.css">
			
 
				-    <!-- jQuery文件。务必在bootstrap.min.js 之前引入 -->
			
 
				-</head>
			
 
				-
			
 
				-<body ng-app="app" class="full-client" onselectstart="return false">
			
 
				-    <div data-ui-view=""></div>
			
 
				-    <script src="../bower_components/jquery/dist/jquery.min.js"></script>
			
 
				-    <script src="../bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
			
 
				-    <script src="../bower_components/My97DatePicker/WdatePicker.js"></script>
			
 
				-    <script src="../bower_components/angular/angular.min.js"></script>
			
 
				-    <script src="../bower_components/angular-ui-router/release/angular-ui-router.min.js"></script>
			
 
				-    <script src="../bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
			
 
				-    <script src="app-94f9933053.js"></script>
			
 
				-</body>
			
 
				-
			
 
				-</html>
			
--- a/dist/talkview/app-2c6b56e97c.js
+++ b/dist/talkview/app-2c6b56e97c.js
@@ -1,168 +0,0 @@
 
				-
			
 
				-'use strict';

			
 
				-

			
 
				-var appMessage = angular.module('appMessage', ['luegg.directives']);

			
 
				-

			
 
				-

			
 
				-
			
 
				-(function () {
			
 
				-    'use strict';
			
 
				-
			
 
				-    angular
			
 
				-        .module('appMessage')
			
 
				-        .directive('ngMsg', Directive);
			
 
				-
			
 
				-    Directive.inject = [];
			
 
				-    function Directive() {
			
 
				-        var directive = {
			
 
				-            link: link,
			
 
				-            restrict: 'A',
			
 
				-            scope: {
			
 
				-                msg: '=ngMsg',
			
 
				-                appContent: '=ngAppContent'
			
 
				-            }
			
 
				-        };
			
 
				-        return directive;
			
 
				-
			
 
				-        function link(scope, element, attrs) {
			
 
				-            var replaceSystemFace = function(content){
			
 
				-                scope.appContent.faceConfig.sys.forEach(function(element) {
			
 
				-                    content = content.replace(element.shortcut,'<img src="local://' + scope.appContent.directory.base + element.image + '">');
			
 
				-                }, this);
			
 
				-                // var reg = /[(\w+)-src="(http://[\w\W]+?)"]/;
			
 
				-                // var reg = new RegExp('\\[(\\w+)\\-src=\\"(http://[\\w\\W]+?)\\"\\]', "i");
			
 
				-                var reg = new RegExp('\\[image\\-src=\\"([\\w\\W]+?)\\"\\]', "i");                
			
 
				-                var g = reg.exec(content);
			
 
				-                if (g === null)
			
 
				-                    return content;    
			
 
				-                console.log(JSON.stringify(g));
			
 
				-                for(var i = 0; i <= g.length - 1; i++){
			
 
				-                    console.log(g[i]); 
			
 
				-                }
			
 
				-                return content;
			
 
				-            };
			
 
				-            var replaceImage = function(content){
			
 
				-
			
 
				-            }
			
 
				-            var html = '';
			
 
				-            // 消息类型（[1，文本消息]，[2，图片消息]，[3，文件消息]，[4，语音消息], [5，位置消息]）
			
 
				-            if (scope.appContent === undefined || scope.appContent.faceConfig ===undefined || scope.appContent.faceConfig.sys === undefined){
			
 
				-                html = '<span class="text-message">' + scope.msg.content + '</span>';   
			
 
				-            } else if (scope.msg.contentType == 1) {
			
 
				-
			
 
				-                html = '<span class="text-message">' + replaceSystemFace(scope.msg.content) + '</span>';
			
 
				-            } else if (scope.msg.contentType == 2) {
			
 
				-                html = '<span class="text-message">' +
			
 
				-                    '<a href="#" class="thumbnail" style="width:300px;">' +
			
 
				-                    '<img src="' + scope.msg.content + '" alt="通用的占位符缩略图">' +
			
 
				-                    '</a>' +
			
 
				-                    '</span>';
			
 
				-            } else if (scope.msg.contentType == 3) {
			
 
				-                element.css({
			
 
				-                    width: '300px'
			
 
				-                });
			
 
				-                element.addClass('file-message');
			
 
				-                var reg = /\?[\W\w]*/;
			
 
				-                var fileName = decodeURIComponent(reg.exec(scope.msg.content).toString().substr(1));
			
 
				-
			
 
				-                html = '<img src="../img/file/unkown.png" onError=" this.src = \'../img/file/unkown.png\' "/>' +
			
 
				-                    '<span style="float:left; margin:5px 0px 0px 0px">文件名：' + fileName + '<br/>大小：' + scope.msg.length + '</span>' +
			
 
				-                    '<div class="p-t-sm text-right">' +
			
 
				-                    '<a class="text-primary" role="button">打开</a>' +
			
 
				-                    '<a class="text-primary" role="button">打开文件夹</a>' +
			
 
				-                    '</div>';
			
 
				-            } else if (scope.msg.contentType == 4) {
			
 
				-                html = '<span class="text-message">' +
			
 
				-                    '<iframe class="map" border=0 src="' + scope.msg.content + '" frameBorder=no></iframe>' +
			
 
				-                    '</span>';
			
 
				-            } else if (scope.msg.contentType == 5) {
			
 
				-                html = '<span class="text-message">' +
			
 
				-                    '<audio src="' + scope.msg.content + '" controls="controls">' +
			
 
				-                    '</audio>' +
			
 
				-                    '</span>';
			
 
				-            }
			
 
				-
			
 
				-            var newElement = angular.element(html);
			
 
				-            element.append(newElement);
			
 
				-        }
			
 
				-    }
			
 
				-})();
			
 
				-'use strict';
			
 
				-
			
 
				-angular.module('appMessage').controller('MessageController', ['$scope', function ($scope) {
			
 
				-
			
 
				-  lxtalkClient.Invoke('{15180DEF-D508-45F7-BAEB-6486CD8752C8}', '_Register', '', $scope);
			
 
				-  $scope.glued = true;
			
 
				-  $scope.items = [{
			
 
				-    "uid": "2636765",
			
 
				-    "senderDisplayName": "陆趣趣",
			
 
				-    "sender": "0578+002682BECE10-lqq",
			
 
				-    "msgType": 0,
			
 
				-    "networkType": 1,
			
 
				-    "isDes": false,
			
 
				-    "length": 0,
			
 
				-    "isReaded": false,
			
 
				-    "contentType": 1,
			
 
				-    "receiver": "0578+002682BECE10-lsws",
			
 
				-    "fromClient": 0,
			
 
				-    "ts": 1483494160000,
			
 
				-    "id": 0,
			
 
				-    "content": "111111",
			
 
				-    "style": ""
			
 
				-  }, {
			
 
				-    content: "消息内容",
			
 
				-    style: '字体',
			
 
				-    fromClient: 2, //消息来源([0：PC]，[1：iOS]，[2：Android]
			
 
				-    id: "616ebe69e1c04c2ea9740a14457aaca6",
			
 
				-    isDes: 0, //是否加密消息
			
 
				-    contentType: 1, // 消息类型（[1，文本消息]，[2，图片消息]，[3，文件消息]，[4，语音消息], [5，位置消息]）
			
 
				-    networkType: 1, //网络类型([1：wifi]，[2：2G]，[3：3G]，[4：4G])
			
 
				-    sender: "0578+0-ls_xxj1",
			
 
				-    senderDisplayName: "陆趣趣",
			
 
				-    length: 12312,
			
 
				-    ts: 12312312412 //时间搓
			
 
				-  }, {
			
 
				-    content: "http://202.107.249.133:8125/e/8/2/4/f/e824fa94cbacff419a0ad611926710f9.dat?下载文件.docx",
			
 
				-    fromClient: 2,
			
 
				-    id: "253db476c6d140f0a1b4d4af5fcf2016",
			
 
				-    isDes: 0,
			
 
				-    contentType: 3,
			
 
				-    networkType: 1,
			
 
				-    sender: "0578+0-ls_xxj1",
			
 
				-    senderDisplayName: "陆趣趣",
			
 
				-    length: 17359
			
 
				-  }, {
			
 
				-    content: "../img/DefaultHeadImage_96.png",
			
 
				-    fromClient: 2,
			
 
				-    id: "253db476c6d140f0a1b4d4af5fcf2016",
			
 
				-    isDes: 0,
			
 
				-    contentType: 2,
			
 
				-    networkType: 1,
			
 
				-    sender: "0578+0-ls_xxj1",
			
 
				-    senderDisplayName: "陆趣趣",
			
 
				-    length: 17359
			
 
				-  }];
			
 
				-
			
 
				-  $scope.appContent = {};
			
 
				-  // $scope.guid  = lxtalkClient.Invoke('register', 'talkview', $scope);
			
 
				-  $scope.addMessage = function () {
			
 
				-    scroll(0, document.body.scrollHeight);
			
 
				-  }
			
 
				-
			
 
				-
			
 
				-  $scope.showMessage = function (jsonStr) {
			
 
				-    console.log(jsonStr);
			
 
				-    var msg = JSON.parse(jsonStr);
			
 
				-    $scope.items.push(msg);
			
 
				-  }
			
 
				-
			
 
				-  $scope.showHistoryMessage = function (jsonStr) {
			
 
				-    var msg = JOSN.parse(jsonStr);
			
 
				-    $scope.items.unshift(msg);
			
 
				-  }
			
 
				-
			
 
				-  $scope.initAppContent = function(appContentJson){
			
 
				-    // console.log(appContentJson);
			
 
				-    $scope.appContent = JSON.parse(appContentJson);
			
 
				-  }
			
 
				-}]);
			
--- a/dist/talkview/app-4a8198a9a1.css
+++ b/dist/talkview/app-4a8198a9a1.css
@@ -1,761 +0,0 @@
 
				-* {
			
 
				-  -webkit-box-sizing: border-box;
			
 
				-  -moz-box-sizing: border-box;
			
 
				-  box-sizing: border-box;
			
 
				-}
			
 
				-/*定义滚动条高宽及背景 高宽分别对应横竖滚动条的尺寸*/
			
 
				-::-webkit-scrollbar {
			
 
				-  width: 8px;
			
 
				-  height: 8px;
			
 
				-  background-color: #F5F5F5;
			
 
				-}
			
 
				-/*定义滚动条轨道 内阴影+圆角*/
			
 
				-::-webkit-scrollbar-track {
			
 
				-  border-radius: 10px;
			
 
				-  background-color: #EFEFEF;
			
 
				-}
			
 
				-/*定义滑块 内阴影+圆角*/
			
 
				-::-webkit-scrollbar-thumb {
			
 
				-  border-radius: 10px;
			
 
				-  color: #BADEEA;
			
 
				-  background-color: #BADEEA;
			
 
				-}
			
 
				-.p-xxs {
			
 
				-  padding: 2px 4px;
			
 
				-}
			
 
				-.p-xs {
			
 
				-  padding: 5px;
			
 
				-}
			
 
				-.p-sm {
			
 
				-  padding: 10px;
			
 
				-}
			
 
				-.p {
			
 
				-  padding: 15px;
			
 
				-}
			
 
				-.p-md {
			
 
				-  padding: 20px;
			
 
				-}
			
 
				-.p-lg {
			
 
				-  padding: 30px;
			
 
				-}
			
 
				-.p-xl {
			
 
				-  padding: 50px;
			
 
				-}
			
 
				-.p-n {
			
 
				-  padding: 0 !important;
			
 
				-}
			
 
				-.p-l-none {
			
 
				-  padding-left: 0 !important;
			
 
				-}
			
 
				-.p-l-xs {
			
 
				-  padding-left: 5px;
			
 
				-}
			
 
				-.p-l-sm {
			
 
				-  padding-left: 10px;
			
 
				-}
			
 
				-.p-l {
			
 
				-  padding-left: 15px;
			
 
				-}
			
 
				-.p-l-md {
			
 
				-  padding-left: 20px;
			
 
				-}
			
 
				-.p-l-lg {
			
 
				-  padding-left: 30px;
			
 
				-}
			
 
				-.p-l-xl {
			
 
				-  padding-left: 40px;
			
 
				-}
			
 
				-.p-l-xxl {
			
 
				-  padding-left: 50px;
			
 
				-}
			
 
				-.p-l-n-xxs {
			
 
				-  padding-left: -1px;
			
 
				-}
			
 
				-.p-l-n-xs {
			
 
				-  padding-left: -5px;
			
 
				-}
			
 
				-.p-l-n-sm {
			
 
				-  padding-left: -10px;
			
 
				-}
			
 
				-.p-l-n {
			
 
				-  padding-left: -15px;
			
 
				-}
			
 
				-.p-l-n-md {
			
 
				-  padding-left: -20px;
			
 
				-}
			
 
				-.p-l-n-lg {
			
 
				-  padding-left: -30px;
			
 
				-}
			
 
				-.p-l-n-xl {
			
 
				-  padding-left: -40px;
			
 
				-}
			
 
				-.p-l-n-xxl {
			
 
				-  padding-left: -50px;
			
 
				-}
			
 
				-.p-t-none {
			
 
				-  padding-top: 0 !important;
			
 
				-}
			
 
				-.p-t-xxs {
			
 
				-  padding-top: 1px;
			
 
				-}
			
 
				-.p-t-xs {
			
 
				-  padding-top: 5px;
			
 
				-}
			
 
				-.p-t-sm {
			
 
				-  padding-top: 10px;
			
 
				-}
			
 
				-.p-t {
			
 
				-  padding-top: 15px;
			
 
				-}
			
 
				-.p-t-md {
			
 
				-  padding-top: 20px;
			
 
				-}
			
 
				-.p-t-lg {
			
 
				-  padding-top: 30px;
			
 
				-}
			
 
				-.p-t-xl {
			
 
				-  padding-top: 40px;
			
 
				-}
			
 
				-.p-t-xxl {
			
 
				-  padding-top: 50px;
			
 
				-}
			
 
				-.p-t-n-xxs {
			
 
				-  padding-top: -1px;
			
 
				-}
			
 
				-.p-t-n-xs {
			
 
				-  padding-top: -5px;
			
 
				-}
			
 
				-.p-t-n-sm {
			
 
				-  padding-top: -10px;
			
 
				-}
			
 
				-.p-t-n {
			
 
				-  padding-top: -15px;
			
 
				-}
			
 
				-.p-t-n-md {
			
 
				-  padding-top: -20px;
			
 
				-}
			
 
				-.p-t-n-lg {
			
 
				-  padding-top: -30px;
			
 
				-}
			
 
				-.p-t-n-xl {
			
 
				-  padding-top: -40px;
			
 
				-}
			
 
				-.p-t-n-xxl {
			
 
				-  padding-top: -50px;
			
 
				-}
			
 
				-.p-r-none {
			
 
				-  padding-right: 0 !important;
			
 
				-}
			
 
				-.p-r-xxs {
			
 
				-  padding-right: 1px;
			
 
				-}
			
 
				-.p-r-xs {
			
 
				-  padding-right: 5px;
			
 
				-}
			
 
				-.p-r-sm {
			
 
				-  padding-right: 10px;
			
 
				-}
			
 
				-.p-r {
			
 
				-  padding-right: 15px;
			
 
				-}
			
 
				-.p-r-md {
			
 
				-  padding-right: 20px;
			
 
				-}
			
 
				-.p-r-lg {
			
 
				-  padding-right: 30px;
			
 
				-}
			
 
				-.p-r-xl {
			
 
				-  padding-right: 40px;
			
 
				-}
			
 
				-.p-r-xxl {
			
 
				-  padding-right: 50px;
			
 
				-}
			
 
				-.p-r-n-xxs {
			
 
				-  padding-right: -1px;
			
 
				-}
			
 
				-.p-r-n-xs {
			
 
				-  padding-right: -5px;
			
 
				-}
			
 
				-.p-r-n-sm {
			
 
				-  padding-right: -10px;
			
 
				-}
			
 
				-.p-r-n {
			
 
				-  padding-right: -15px;
			
 
				-}
			
 
				-.p-r-n-md {
			
 
				-  padding-right: -20px;
			
 
				-}
			
 
				-.p-r-n-lg {
			
 
				-  padding-right: -30px;
			
 
				-}
			
 
				-.p-r-n-xl {
			
 
				-  padding-right: -40px;
			
 
				-}
			
 
				-.p-r-n-xxl {
			
 
				-  padding-right: -50px;
			
 
				-}
			
 
				-.p-b-none {
			
 
				-  padding-bottom: 0 !important;
			
 
				-}
			
 
				-.p-b-xxs {
			
 
				-  padding-bottom: 1px;
			
 
				-}
			
 
				-.p-b-xs {
			
 
				-  padding-bottom: 5px;
			
 
				-}
			
 
				-.p-b-sm {
			
 
				-  padding-bottom: 10px;
			
 
				-}
			
 
				-.p-b {
			
 
				-  padding-bottom: 15px;
			
 
				-}
			
 
				-.p-b-md {
			
 
				-  padding-bottom: 20px;
			
 
				-}
			
 
				-.p-b-lg {
			
 
				-  padding-bottom: 30px;
			
 
				-}
			
 
				-.p-b-xl {
			
 
				-  padding-bottom: 40px;
			
 
				-}
			
 
				-.p-b-xxl {
			
 
				-  padding-bottom: 50px;
			
 
				-}
			
 
				-.p-b-n-xxs {
			
 
				-  padding-bottom: -1px;
			
 
				-}
			
 
				-.p-b-n-xs {
			
 
				-  padding-bottom: -5px;
			
 
				-}
			
 
				-.p-b-n-sm {
			
 
				-  padding-bottom: -10px;
			
 
				-}
			
 
				-.p-b-n {
			
 
				-  padding-bottom: -15px;
			
 
				-}
			
 
				-.p-b-n-md {
			
 
				-  padding-bottom: -20px;
			
 
				-}
			
 
				-.p-b-n-lg {
			
 
				-  padding-bottom: -30px;
			
 
				-}
			
 
				-.p-b-n-xl {
			
 
				-  padding-bottom: -40px;
			
 
				-}
			
 
				-.p-b-n-xxl {
			
 
				-  padding-bottom: -50px;
			
 
				-}
			
 
				-.m-xxs {
			
 
				-  margin: 2px 4px;
			
 
				-}
			
 
				-.m-xs {
			
 
				-  margin: 5px;
			
 
				-}
			
 
				-.m-sm {
			
 
				-  margin: 10px;
			
 
				-}
			
 
				-.m {
			
 
				-  margin: 15px;
			
 
				-}
			
 
				-.m-md {
			
 
				-  margin: 20px;
			
 
				-}
			
 
				-.m-lg {
			
 
				-  margin: 30px;
			
 
				-}
			
 
				-.m-xl {
			
 
				-  margin: 50px;
			
 
				-}
			
 
				-.m-n {
			
 
				-  margin: 0 !important;
			
 
				-}
			
 
				-.m-l-none {
			
 
				-  margin-left: 0 !important;
			
 
				-}
			
 
				-.m-l-xs {
			
 
				-  margin-left: 5px;
			
 
				-}
			
 
				-.m-l-sm {
			
 
				-  margin-left: 10px;
			
 
				-}
			
 
				-.m-l {
			
 
				-  margin-left: 15px;
			
 
				-}
			
 
				-.m-l-md {
			
 
				-  margin-left: 20px;
			
 
				-}
			
 
				-.m-l-lg {
			
 
				-  margin-left: 30px;
			
 
				-}
			
 
				-.m-l-xl {
			
 
				-  margin-left: 40px;
			
 
				-}
			
 
				-.m-l-xxl {
			
 
				-  margin-left: 50px;
			
 
				-}
			
 
				-.m-l-n-xxs {
			
 
				-  margin-left: -1px;
			
 
				-}
			
 
				-.m-l-n-xs {
			
 
				-  margin-left: -5px;
			
 
				-}
			
 
				-.m-l-n-sm {
			
 
				-  margin-left: -10px;
			
 
				-}
			
 
				-.m-l-n {
			
 
				-  margin-left: -15px;
			
 
				-}
			
 
				-.m-l-n-md {
			
 
				-  margin-left: -20px;
			
 
				-}
			
 
				-.m-l-n-lg {
			
 
				-  margin-left: -30px;
			
 
				-}
			
 
				-.m-l-n-xl {
			
 
				-  margin-left: -40px;
			
 
				-}
			
 
				-.m-l-n-xxl {
			
 
				-  margin-left: -50px;
			
 
				-}
			
 
				-.m-t-none {
			
 
				-  margin-top: 0 !important;
			
 
				-}
			
 
				-.m-t-xxs {
			
 
				-  margin-top: 1px;
			
 
				-}
			
 
				-.m-t-xs {
			
 
				-  margin-top: 5px;
			
 
				-}
			
 
				-.m-t-sm {
			
 
				-  margin-top: 10px;
			
 
				-}
			
 
				-.m-t {
			
 
				-  margin-top: 15px;
			
 
				-}
			
 
				-.m-t-md {
			
 
				-  margin-top: 20px;
			
 
				-}
			
 
				-.m-t-lg {
			
 
				-  margin-top: 30px;
			
 
				-}
			
 
				-.m-t-xl {
			
 
				-  margin-top: 40px;
			
 
				-}
			
 
				-.m-t-xxl {
			
 
				-  margin-top: 50px;
			
 
				-}
			
 
				-.m-t-n-xxs {
			
 
				-  margin-top: -1px;
			
 
				-}
			
 
				-.m-t-n-xs {
			
 
				-  margin-top: -5px;
			
 
				-}
			
 
				-.m-t-n-sm {
			
 
				-  margin-top: -10px;
			
 
				-}
			
 
				-.m-t-n {
			
 
				-  margin-top: -15px;
			
 
				-}
			
 
				-.m-t-n-md {
			
 
				-  margin-top: -20px;
			
 
				-}
			
 
				-.m-t-n-lg {
			
 
				-  margin-top: -30px;
			
 
				-}
			
 
				-.m-t-n-xl {
			
 
				-  margin-top: -40px;
			
 
				-}
			
 
				-.m-t-n-xxl {
			
 
				-  margin-top: -50px;
			
 
				-}
			
 
				-.m-r-none {
			
 
				-  margin-right: 0 !important;
			
 
				-}
			
 
				-.m-r-xxs {
			
 
				-  margin-right: 1px;
			
 
				-}
			
 
				-.m-r-xs {
			
 
				-  margin-right: 5px;
			
 
				-}
			
 
				-.m-r-sm {
			
 
				-  margin-right: 10px;
			
 
				-}
			
 
				-.m-r {
			
 
				-  margin-right: 15px;
			
 
				-}
			
 
				-.m-r-md {
			
 
				-  margin-right: 20px;
			
 
				-}
			
 
				-.m-r-lg {
			
 
				-  margin-right: 30px;
			
 
				-}
			
 
				-.m-r-xl {
			
 
				-  margin-right: 40px;
			
 
				-}
			
 
				-.m-r-xxl {
			
 
				-  margin-right: 50px;
			
 
				-}
			
 
				-.m-r-n-xxs {
			
 
				-  margin-right: -1px;
			
 
				-}
			
 
				-.m-r-n-xs {
			
 
				-  margin-right: -5px;
			
 
				-}
			
 
				-.m-r-n-sm {
			
 
				-  margin-right: -10px;
			
 
				-}
			
 
				-.m-r-n {
			
 
				-  margin-right: -15px;
			
 
				-}
			
 
				-.m-r-n-md {
			
 
				-  margin-right: -20px;
			
 
				-}
			
 
				-.m-r-n-lg {
			
 
				-  margin-right: -30px;
			
 
				-}
			
 
				-.m-r-n-xl {
			
 
				-  margin-right: -40px;
			
 
				-}
			
 
				-.m-r-n-xxl {
			
 
				-  margin-right: -50px;
			
 
				-}
			
 
				-.m-b-none {
			
 
				-  margin-bottom: 0 !important;
			
 
				-}
			
 
				-.m-b-xxs {
			
 
				-  margin-bottom: 1px;
			
 
				-}
			
 
				-.m-b-xs {
			
 
				-  margin-bottom: 5px;
			
 
				-}
			
 
				-.m-b-sm {
			
 
				-  margin-bottom: 10px;
			
 
				-}
			
 
				-.m-b {
			
 
				-  margin-bottom: 15px;
			
 
				-}
			
 
				-.m-b-md {
			
 
				-  margin-bottom: 20px;
			
 
				-}
			
 
				-.m-b-lg {
			
 
				-  margin-bottom: 30px;
			
 
				-}
			
 
				-.m-b-xl {
			
 
				-  margin-bottom: 40px;
			
 
				-}
			
 
				-.m-b-xxl {
			
 
				-  margin-bottom: 50px;
			
 
				-}
			
 
				-.m-b-n-xxs {
			
 
				-  margin-bottom: -1px;
			
 
				-}
			
 
				-.m-b-n-xs {
			
 
				-  margin-bottom: -5px;
			
 
				-}
			
 
				-.m-b-n-sm {
			
 
				-  margin-bottom: -10px;
			
 
				-}
			
 
				-.m-b-n {
			
 
				-  margin-bottom: -15px;
			
 
				-}
			
 
				-.m-b-n-md {
			
 
				-  margin-bottom: -20px;
			
 
				-}
			
 
				-.m-b-n-lg {
			
 
				-  margin-bottom: -30px;
			
 
				-}
			
 
				-.m-b-n-xl {
			
 
				-  margin-bottom: -40px;
			
 
				-}
			
 
				-.m-b-n-xxl {
			
 
				-  margin-bottom: -50px;
			
 
				-}
			
 
				-.feed-element:first-child {
			
 
				-  margin-top: 5px;
			
 
				-}
			
 
				-.scrollGlue {
			
 
				-  overflow-y: hidden;
			
 
				-}
			
 
				-.full-client {
			
 
				-  width: 100%;
			
 
				-  height: 100%;
			
 
				-  border: 0px;
			
 
				-  margin: 0px 0px 0px 0px;
			
 
				-  padding: 0px 0px 0px 0px;
			
 
				-}
			
 
				-.full-client #getMore {
			
 
				-  text-align: center;
			
 
				-  font-family: "宋体";
			
 
				-  color: #009BDB;
			
 
				-  font-size: 14px;
			
 
				-}
			
 
				-.full-client #loadmore {
			
 
				-  margin-top: -5px;
			
 
				-}
			
 
				-.full-client #sendmessage {
			
 
				-  margin-top: -10px;
			
 
				-}
			
 
				-.media-body {
			
 
				-  font-family: "微软雅黑", "宋体";
			
 
				-  font-size: 13px;
			
 
				-  width: 0px;
			
 
				-  max-width: 700px;
			
 
				-  vertical-align: top;
			
 
				-  zoom: 1;
			
 
				-}
			
 
				-.media-body > p > strong {
			
 
				-  float: left;
			
 
				-  margin-left: 2px;
			
 
				-  color: #336699;
			
 
				-}
			
 
				-.media-body > p > small {
			
 
				-  margin-left: 4px;
			
 
				-  font-size: 10px;
			
 
				-  vertical-align: bottom;
			
 
				-}
			
 
				-.feed-element {
			
 
				-  padding-bottom: 4px;
			
 
				-  overflow: hidden;
			
 
				-}
			
 
				-.feed-element .well {
			
 
				-  position: relative;
			
 
				-  float: left;
			
 
				-  word-wrap: break-word;
			
 
				-  word-break: break-all;
			
 
				-  background-color: #DEDFDE;
			
 
				-  color: #000000;
			
 
				-  border-radius: 6px;
			
 
				-  border: none;
			
 
				-  box-shadow: none;
			
 
				-  outline: none;
			
 
				-  margin-left: 10px;
			
 
				-  margin-top: -2px;
			
 
				-  margin-bottom: 0px;
			
 
				-  margin-right: 25px;
			
 
				-  padding: 7px 14px 7px 12px;
			
 
				-  font-size: 12px;
			
 
				-  line-height: 16px;
			
 
				-}
			
 
				-.feed-element .well .text-point {
			
 
				-  z-index: -99;
			
 
				-  position: absolute;
			
 
				-  top: -18px;
			
 
				-  left: 8px;
			
 
				-  width: 0;
			
 
				-  height: 0;
			
 
				-  font-size: 0;
			
 
				-  border-top: solid 10px;
			
 
				-  border-bottom: solid 10px;
			
 
				-  border-right: solid 7px;
			
 
				-  border-left: solid 7px;
			
 
				-  border-color: transparent transparent #DEDFDE transparent;
			
 
				-}
			
 
				-.fit-content {
			
 
				-  width: fit-content;
			
 
				-}
			
 
				-.text-message {
			
 
				-  vertical-align: bottom;
			
 
				-}
			
 
				-.text-message .thumbnail {
			
 
				-  margin-top: 5px;
			
 
				-  margin-bottom: 5px;
			
 
				-  max-width: 300px;
			
 
				-  max-height: 300px;
			
 
				-}
			
 
				-.contact-box.center-version {
			
 
				-  display: block;
			
 
				-  background-color: #ffffff;
			
 
				-  padding-top: 10px;
			
 
				-  text-align: center;
			
 
				-  color: #676a6c;
			
 
				-  font-size: 13px;
			
 
				-}
			
 
				-.displayName {
			
 
				-  font-weight: 700;
			
 
				-  font-size: 16px;
			
 
				-}
			
 
				-.map {
			
 
				-  width: 370px;
			
 
				-  height: 170px;
			
 
				-  display: block;
			
 
				-}
			
 
				-.audio-message {
			
 
				-  display: block;
			
 
				-}
			
 
				-.file-message {
			
 
				-  background-color: #fff;
			
 
				-  padding: 8px;
			
 
				-  border-radius: 6px;
			
 
				-}
			
 
				-.file-message > img {
			
 
				-  margin: 5px 5px 5px 5px;
			
 
				-  width: 48px;
			
 
				-  height: 48px;
			
 
				-  float: left;
			
 
				-}
			
 
				-.file-message > div {
			
 
				-  clear: both;
			
 
				-  width: 100%;
			
 
				-  border-top: 1px solid #ccc;
			
 
				-  height: 30px;
			
 
				-  padding-top: 10px;
			
 
				-}
			
 
				-.file-message > a > span {
			
 
				-  margin-top: 10px;
			
 
				-  margin-right: 5px;
			
 
				-}
			
 
				-[scroll-glue-top],
			
 
				-[scroll-glue-bottom],
			
 
				-[scroll-glue] {
			
 
				-  overflow-y: scroll;
			
 
				-  height: 200px;
			
 
				-}
			
 
				-[scroll-glue-left],
			
 
				-[scroll-glue-right] {
			
 
				-  overflow-x: scroll;
			
 
				-}
			
 
				-
			
 
				-.feed-element:first-child {
			
 
				-  margin-top: 5px;
			
 
				-}
			
 
				-.scrollGlue {
			
 
				-  overflow-y: hidden;
			
 
				-}
			
 
				-.full-client {
			
 
				-  width: 100%;
			
 
				-  height: 100%;
			
 
				-  border: 0px;
			
 
				-  margin: 0px 0px 0px 0px;
			
 
				-  padding: 0px 0px 0px 0px;
			
 
				-}
			
 
				-.full-client #getMore {
			
 
				-  text-align: center;
			
 
				-  font-family: "宋体";
			
 
				-  color: #009BDB;
			
 
				-  font-size: 14px;
			
 
				-}
			
 
				-.full-client #loadmore {
			
 
				-  margin-top: -5px;
			
 
				-}
			
 
				-.full-client #sendmessage {
			
 
				-  margin-top: -10px;
			
 
				-}
			
 
				-.media-body {
			
 
				-  font-family: "微软雅黑", "宋体";
			
 
				-  font-size: 13px;
			
 
				-  width: 0px;
			
 
				-  max-width: 700px;
			
 
				-  vertical-align: top;
			
 
				-  zoom: 1;
			
 
				-}
			
 
				-.media-body > p > strong {
			
 
				-  float: left;
			
 
				-  margin-left: 2px;
			
 
				-  color: #336699;
			
 
				-}
			
 
				-.media-body > p > small {
			
 
				-  margin-left: 4px;
			
 
				-  font-size: 10px;
			
 
				-  vertical-align: bottom;
			
 
				-}
			
 
				-.feed-element {
			
 
				-  padding-bottom: 4px;
			
 
				-  overflow: hidden;
			
 
				-}
			
 
				-.feed-element .well {
			
 
				-  position: relative;
			
 
				-  float: left;
			
 
				-  word-wrap: break-word;
			
 
				-  word-break: break-all;
			
 
				-  background-color: #DEDFDE;
			
 
				-  color: #000000;
			
 
				-  border-radius: 6px;
			
 
				-  border: none;
			
 
				-  box-shadow: none;
			
 
				-  outline: none;
			
 
				-  margin-left: 10px;
			
 
				-  margin-top: -2px;
			
 
				-  margin-bottom: 0px;
			
 
				-  margin-right: 25px;
			
 
				-  padding: 7px 14px 7px 12px;
			
 
				-  font-size: 12px;
			
 
				-  line-height: 16px;
			
 
				-}
			
 
				-.feed-element .well .text-point {
			
 
				-  z-index: -99;
			
 
				-  position: absolute;
			
 
				-  top: -18px;
			
 
				-  left: 8px;
			
 
				-  width: 0;
			
 
				-  height: 0;
			
 
				-  font-size: 0;
			
 
				-  border-top: solid 10px;
			
 
				-  border-bottom: solid 10px;
			
 
				-  border-right: solid 7px;
			
 
				-  border-left: solid 7px;
			
 
				-  border-color: transparent transparent #DEDFDE transparent;
			
 
				-}
			
 
				-.fit-content {
			
 
				-  width: fit-content;
			
 
				-}
			
 
				-.text-message {
			
 
				-  vertical-align: bottom;
			
 
				-}
			
 
				-.text-message .thumbnail {
			
 
				-  margin-top: 5px;
			
 
				-  margin-bottom: 5px;
			
 
				-  max-width: 300px;
			
 
				-  max-height: 300px;
			
 
				-}
			
 
				-.contact-box.center-version {
			
 
				-  display: block;
			
 
				-  background-color: #ffffff;
			
 
				-  padding-top: 10px;
			
 
				-  text-align: center;
			
 
				-  color: #676a6c;
			
 
				-  font-size: 13px;
			
 
				-}
			
 
				-.displayName {
			
 
				-  font-weight: 700;
			
 
				-  font-size: 16px;
			
 
				-}
			
 
				-.map {
			
 
				-  width: 370px;
			
 
				-  height: 170px;
			
 
				-  display: block;
			
 
				-}
			
 
				-.audio-message {
			
 
				-  display: block;
			
 
				-}
			
 
				-.file-message {
			
 
				-  background-color: #fff;
			
 
				-  padding: 8px;
			
 
				-  border-radius: 6px;
			
 
				-}
			
 
				-.file-message > img {
			
 
				-  margin: 5px 5px 5px 5px;
			
 
				-  width: 48px;
			
 
				-  height: 48px;
			
 
				-  float: left;
			
 
				-}
			
 
				-.file-message > div {
			
 
				-  clear: both;
			
 
				-  width: 100%;
			
 
				-  border-top: 1px solid #ccc;
			
 
				-  height: 30px;
			
 
				-  padding-top: 10px;
			
 
				-}
			
 
				-.file-message > a > span {
			
 
				-  margin-top: 10px;
			
 
				-  margin-right: 5px;
			
 
				-}
			
 
				-[scroll-glue-top],
			
 
				-[scroll-glue-bottom],
			
 
				-[scroll-glue] {
			
 
				-  overflow-y: scroll;
			
 
				-  height: 200px;
			
 
				-}
			
 
				-[scroll-glue-left],
			
 
				-[scroll-glue-right] {
			
 
				-  overflow-x: scroll;
			
 
				-}
			
--- a/dist/talkview/app-a08eecc16b.js
+++ b/dist/talkview/app-a08eecc16b.js
@@ -1,446 +0,0 @@
 
				-
			
 
				-'use strict';
			
 
				-
			
 
				-var appMessage = angular.module('appMessage', ['luegg.directives', 'ngAnimate']);
			
 
				-'use strict';
			
 
				-
			
 
				-angular.module('appMessage').controller('MessageController', ['$scope', '$location', '$anchorScroll', function($scope, $location, $anchorScroll) {
			
 
				-
			
 
				-        lxtalkClient.Invoke('{15180DEF-D508-45F7-BAEB-6486CD8752C8}', '_Register', '', $scope);
			
 
				-        $scope.glued = true;
			
 
				-        $scope.items = [{
			
 
				-                "uid": "2636765",
			
 
				-                "senderDisplayName": "丽水市市委办公室",
			
 
				-                "sender": "0578+002682BECE10-lqq",
			
 
				-                "msgType": 0,
			
 
				-                "networkType": 1,
			
 
				-                "isDes": false,
			
 
				-                "length": 0,
			
 
				-                "isReaded": false,
			
 
				-                "contentType": 1,
			
 
				-                "receiver": "0578+002682BECE10-lsws",
			
 
				-                "fromClient": 0,
			
 
				-                "ts": "来自pc端",
			
 
				-                "id": 0,
			
 
				-                "content": "111111",
			
 
				-                "style": ""
			
 
				-            }, {
			
 
				-                content: "消息内容",
			
 
				-                style: '字体',
			
 
				-                fromClient: 2, //消息来源([0：PC]，[1：iOS]，[2：Android]
			
 
				-                id: "616ebe69e1c04c2ea9740a14457aaca6",
			
 
				-                isDes: 0, //是否加密消息
			
 
				-                contentType: 1, // 消息类型（[1，文本消息]，[2，图片消息]，[3，文件消息]，[4，语音消息], [5，位置消息]）
			
 
				-                networkType: 1, //网络类型([1：wifi]，[2：2G]，[3：3G]，[4：4G])
			
 
				-                sender: "0578+0-ls_xxj1",
			
 
				-                senderDisplayName: "陆趣趣",
			
 
				-                length: 12312,
			
 
				-                ts: 12312312412 //时间搓
			
 
				-            }, {
			
 
				-                content: "http://202.107.249.133:8125/e/8/2/4/f/e824fa94cbacff419a0ad611926710f9.dat?下载文件.docx",
			
 
				-                fromClient: 2,
			
 
				-                id: "253db476c6d140f0a1b4d4af5fcf2016",
			
 
				-                isDes: 0,
			
 
				-                contentType: 3,
			
 
				-                networkType: 1,
			
 
				-                sender: "0578+0-ls_xxj1",
			
 
				-                senderDisplayName: "陆趣趣",
			
 
				-                "ts": "来自pc端",
			
 
				-                length: 17359
			
 
				-            },
			
 
				-            {
			
 
				-                content: "../img/DefaultHeadImage_96.png",
			
 
				-                fromClient: 2,
			
 
				-                id: "253db476c6d140f0a1b4d4af5fcf2016",
			
 
				-                isDes: 0,
			
 
				-                contentType: 2,
			
 
				-                networkType: 1,
			
 
				-                sender: "0578+0-ls_xxj1",
			
 
				-                senderDisplayName: "陆趣趣",
			
 
				-                "ts": "来自pc端",
			
 
				-                length: 17359
			
 
				-            },
			
 
				-            {
			
 
				-                content: "../img/DefaultHeadImage_96.png",
			
 
				-                fromClient: 2,
			
 
				-                id: "253db476c6d140f0a1b4d4af5fcf2016",
			
 
				-                isDes: 0,
			
 
				-                contentType: 2,
			
 
				-                networkType: 1,
			
 
				-                sender: "0578+0-ls_xxj1",
			
 
				-                senderDisplayName: "陆趣趣",
			
 
				-                "ts": "来自pc端",
			
 
				-                length: 17359
			
 
				-            },
			
 
				-            {
			
 
				-                content: "../img/DefaultHeadImage_96.png",
			
 
				-                fromClient: 2,
			
 
				-                id: "253db476c6d140f0a1b4d4af5fcf2016",
			
 
				-                isDes: 0,
			
 
				-                contentType: 2,
			
 
				-                networkType: 1,
			
 
				-                sender: "0578+0-ls_xxj1",
			
 
				-                senderDisplayName: "陆趣趣",
			
 
				-                "ts": "来自pc端",
			
 
				-                length: 17359
			
 
				-            },
			
 
				-            {
			
 
				-                content: "http://202.107.249.133:8125/e/8/2/4/f/e824fa94cbacff419a0ad611926710f9.dat?下载文件.docx",
			
 
				-                fromClient: 2,
			
 
				-                id: "253db476c6d140f0a1b4d4af5fcf2016",
			
 
				-                isDes: 0,
			
 
				-                contentType: 3,
			
 
				-                networkType: 1,
			
 
				-                sender: "0578+0-ls_xxj1",
			
 
				-                senderDisplayName: "陆趣趣",
			
 
				-                "ts": "来自pc端",
			
 
				-                length: 17359
			
 
				-            },
			
 
				-            {
			
 
				-                content: "消息内容",
			
 
				-                style: { "family": "宋体", "size": 9, "color": 16711680 },
			
 
				-                fromClient: 2, //消息来源([0：PC]，[1：iOS]，[2：Android]
			
 
				-                id: "616ebe69e1c04c2ea9740a14457aaca6",
			
 
				-                isDes: 0, //是否加密消息
			
 
				-                contentType: 1, // 消息类型（[1，文本消息]，[2，图片消息]，[3，文件消息]，[4，语音消息], [5，位置消息]）
			
 
				-                networkType: 1, //网络类型([1：wifi]，[2：2G]，[3：3G]，[4：4G])
			
 
				-                sender: "0578+0-ls_xxj1",
			
 
				-                senderDisplayName: "陆趣趣",
			
 
				-                length: 12312,
			
 
				-                ts: 12312312412 //时间搓
			
 
				-            }
			
 
				-        ];
			
 
				-        $scope.appContent = {};
			
 
				-        // $scope.guid  = lxtalkClient.Invoke('register', 'talkview', $scope)
			
 
				-
			
 
				-        $scope.sendmessages = [];
			
 
				-        $scope.historyitems = [];
			
 
				-        $scope.historymessages = [];
			
 
				-        $scope.pageSize = 1;
			
 
				-        $scope.pageNumber = 2;
			
 
				-        $scope.historyitems.push($scope.items.slice($scope.pageNumber * ($scope.pageSize - 1), $scope.pageNumber * $scope.pageSize));
			
 
				-        for (var i = 0; i < $scope.pageNumber; i++) {
			
 
				-            if ($scope.historyitems[0][i] !== undefined) {
			
 
				-                $scope.historymessages.push($scope.historyitems[0][i]);
			
 
				-            }
			
 
				-        }
			
 
				-
			
 
				-        $scope.initAppContent = function(appContentJson) {
			
 
				-            $scope.appContent = JSON.parse(appContentJson);
			
 
				-        }
			
 
				-
			
 
				-        $scope.addMessage = function() {
			
 
				-            scroll(document.body);
			
 
				-        }
			
 
				-
			
 
				-        $scope.showMessage = function(jsonStr) {
			
 
				-            console.log(jsonStr);
			
 
				-            jsonStr = jsonStr.replace(/ /g, "&nbsp");
			
 
				-            jsonStr = jsonStr.replace(/\r\n/g, "<br>");
			
 
				-            jsonStr = jsonStr.replace(/\r/g, "\\r");
			
 
				-            jsonStr = jsonStr.replace(/\n/g, "\\n");
			
 
				-            jsonStr = jsonStr.replace(/\t/g, "\\t");
			
 
				-            jsonStr = jsonStr.replace(/\f/g, "\\f");
			
 
				-            var msg = JSON.parse(jsonStr);
			
 
				-            $scope.sendmessages.push(msg);
			
 
				-            $scope.scrollHide();
			
 
				-        }
			
 
				-
			
 
				-        $scope.showHistoryMessage = function(jsonStr) {
			
 
				-            var msg = JSON.parse(jsonStr);
			
 
				-            // $scope.items.unshift(msg);
			
 
				-            // console.log(msg);
			
 
				-        }
			
 
				-
			
 
				-        $scope.getMore = function() {
			
 
				-            $scope.historyitems = [];
			
 
				-            $scope.pageSize = $scope.pageSize + 1;
			
 
				-            $scope.historyitems.push($scope.items.slice($scope.pageNumber * ($scope.pageSize - 1), $scope.pageNumber * $scope.pageSize));
			
 
				-            for (var i = 0; i < $scope.pageNumber; i++) {
			
 
				-                if ($scope.historyitems[0][i] !== undefined) {
			
 
				-                    $scope.historymessages.push($scope.historyitems[0][i]);
			
 
				-                }
			
 
				-            }
			
 
				-        }
			
 
				-
			
 
				-        $scope.scrollHide = function() {
			
 
				-            angular.element("#body").addClass("scrollGlue");
			
 
				-        }
			
 
				-        $scope.scrollShow = function() {
			
 
				-            angular.element("#body").removeClass("scrollGlue");
			
 
				-        }
			
 
				-
			
 
				-    }])
			
 
				-    .animation(".animate", function() {
			
 
				-        return {
			
 
				-            enter: function(element, done) {
			
 
				-                var height = element.height();
			
 
				-                element.css({ position: 'relative', bottom: 0, opacity: 0 });
			
 
				-                element.animate({ bottom: 0, opacity: 1 }, 500, done);
			
 
				-            }
			
 
				-        };
			
 
				-    });
			
 
				-(function() {
			
 
				-    'use strict';
			
 
				-
			
 
				-    angular
			
 
				-        .module('appMessage')
			
 
				-        .directive('ngCurrentMsg', CurrentMsg);
			
 
				-
			
 
				-    CurrentMsg.inject = ['$location', '$anchorScroll', '$timeout'];
			
 
				-
			
 
				-    function CurrentMsg($location, $anchorScroll, $timeout) {
			
 
				-        var directive = {
			
 
				-            link: link,
			
 
				-            restrict: 'A',
			
 
				-            scope: {
			
 
				-                msg: '=ngCurrentMsg',
			
 
				-                appContent: '=ngAppContent'
			
 
				-            }
			
 
				-        };
			
 
				-        return directive;
			
 
				-
			
 
				-        function link(scope, element, attrs) {
			
 
				-
			
 
				-            var gotoBottom = function() {
			
 
				-                $location.hash("bottom");
			
 
				-                $anchorScroll();
			
 
				-            };
			
 
				-            var replaceSystemFace = function(content) {
			
 
				-                //匹配表情
			
 
				-                var g = (/\/\:([\w]+)/).exec(content);
			
 
				-                while (g !== null) {
			
 
				-                    scope.appContent.faceConfig.sys.forEach(function(element) {
			
 
				-                        content = content.replace(element.shortcut, '<img style="height:56px" src="local://' + scope.appContent.directory.base + element.image + '">');
			
 
				-                    }, this);
			
 
				-                    g = (/\/\:([\w]+)/).exec(content);
			
 
				-                }
			
 
				-                //匹配截图
			
 
				-                var g = (/\[image\-src=\"([\w\W]+?)\"\]/i).exec(content);
			
 
				-                while (g !== null) {
			
 
				-                    content = content.replace(g[0], function() {
			
 
				-                        var html = '<a href="#" class="thumbnail"' + '>' +
			
 
				-                            '<img style="max-width:270px;max-height:250px;" src="local://' + scope.appContent.directory.received + g[1] + '.JPG' + '" alt="" >' +
			
 
				-                            '</a>';
			
 
				-                        loadImg("local://" + scope.appContent.directory.received + g[1] + ".JPG", addImg);
			
 
				-
			
 
				-                        function loadImg(url, callback) {
			
 
				-                            var img = new Image();
			
 
				-                            img.onload = function() {
			
 
				-                                img.onload = null;
			
 
				-                                callback(img);
			
 
				-                            }
			
 
				-                            img.src = url;
			
 
				-                            //img.attr("defaulturl", "../images/img.png");
			
 
				-                        }
			
 
				-
			
 
				-                        function addImg(img) {
			
 
				-                            //$(img).appendTo($(".image"));
			
 
				-                            gotoBottom();
			
 
				-                        }
			
 
				-                        return html;
			
 
				-                    });
			
 
				-                    g = (/\[image\-src=\"([\w\W]+?)\"\]/i).exec(content);
			
 
				-                }
			
 
				-                //匹配网址
			
 
				-                var i = 0;
			
 
				-                var m = content.match(/(((((http|ftp|https|HTTP|FTP|HTTPS):\/\/)[\w\-_]+)|www|WWW|[0-9]+)(\.(?!gif|jpg|png|mp3)[\w\-_]+)+([\w\-\.,@?^=%:/~\+#]*[\w\-\@?^=%/~\+#\r\n]))/ig);
			
 
				-                console.log(m);
			
 
				-                if (m == null)
			
 
				-                    return content;
			
 
				-                content = content.replace(/(((((http|ftp|https|HTTP|FTP|HTTPS):\/\/)[\w\-_]+)|www|WWW|[0-9]+)(\.(?!gif|jpg|png|mp3)[\w\-_]+)+([\w\-\.,@?^=%:/~\+#]*[\w\-\@?^=%/~\+#\r\n]))/ig, function() {
			
 
				-                    var html = '';
			
 
				-                    var g = (/((((http|ftp|https|HTTP|FTP|HTTPS):\/\/)[\w\-_]+)(\.[\w\-_]+)+([\w\-\.,@?^=%:/~\+#]*[\w\-\@?^=%/~\+#\r\n]))/ig).exec(m[i]);
			
 
				-                    if (g == null)
			
 
				-                        html = '<a target="_blank" href="http://' + m[i] + '">' +
			
 
				-                        m[i] +
			
 
				-                        '</a>';
			
 
				-                    else
			
 
				-                        html = '<a target="_blank" href="' + m[i] + '">' +
			
 
				-                        m[i] +
			
 
				-                        '</a>';
			
 
				-                    i = i + 1;
			
 
				-                    return html;
			
 
				-                });
			
 
				-                return content;
			
 
				-            };
			
 
				-
			
 
				-            var replaceImage = function(content) {}
			
 
				-            var html = '';
			
 
				-            var message = document.getElementById("message");
			
 
				-            // 消息类型（[1，文本消息]，[2，图片消息]，[3，文件消息], [4，位置消息]，[5，语音消息]）
			
 
				-            if (scope.appContent === undefined || scope.appContent.faceConfig === undefined || scope.appContent.faceConfig.sys === undefined) {
			
 
				-                html = '<span class="text-message">' + scope.msg.content + '</span>';
			
 
				-            } else if (scope.msg.contentType == 1) {
			
 
				-                //var style = { style: "normal", weight: "normal" };
			
 
				-                var style = JSON.parse(scope.msg.style);
			
 
				-                html = '<span class="text-message"' + ' style="font:' + style.style + ' ' + style.weight + ' ' + style.size + 'pt' + ' ' + style.family + ';color:#' + style.color.toString(16) + '">' +
			
 
				-                    replaceSystemFace(scope.msg.content) + '</span>';
			
 
				-            } else if (scope.msg.contentType == 2) {
			
 
				-                html = '<span class="text-message">' +
			
 
				-                    '<a href="#" class="thumbnail" >' +
			
 
				-                    '<img src="' + scope.msg.content + '" alt="通用的占位符缩略图" >' +
			
 
				-                    '</a>' +
			
 
				-                    '</span>';
			
 
				-            } else if (scope.msg.contentType == 3) {
			
 
				-                element.css({
			
 
				-                    width: '275px'
			
 
				-                });
			
 
				-                //element.addClass('file-message');
			
 
				-                var reg = /\?[\W\w]*/;
			
 
				-                var fileName = decodeURIComponent(reg.exec(scope.msg.content).toString().substr(1));
			
 
				-
			
 
				-                html = '<div class="file-message">' +
			
 
				-                    '<img src="../img/unkown.png" onError= "this.src = \'../img/file/unkown.png\'">' +
			
 
				-                    '<span style="float:left; margin:5px 0px 0px 0px">文件名：' + fileName + '<br/>大小：' + scope.msg.length + '</span>' +
			
 
				-                    '<div class="p-t-sm text-right">' +
			
 
				-                    '<a class="text-primary" role="button"><span>打开</span></a>&nbsp&nbsp' +
			
 
				-                    '<a class="text-primary" role="button"><span>打开文件夹</span></a>' +
			
 
				-                    '</div>' +
			
 
				-                    '</div>';
			
 
				-            } else if (scope.msg.contentType == 4) {
			
 
				-                html = '<span class="text-message">' +
			
 
				-                    '<iframe class="map" border=0 src="' + scope.msg.content + '" frameBorder=no></iframe>' +
			
 
				-                    '</span>';
			
 
				-            } else if (scope.msg.contentType == 5) {
			
 
				-                html = '<span class="text-message">' +
			
 
				-                    '<audio src="' + scope.msg.content + '" controls="controls">' +
			
 
				-                    '</audio>' +
			
 
				-                    '</span>';
			
 
				-            }
			
 
				-            console.log(html);
			
 
				-            var newElement = angular.element(html);
			
 
				-            element.append(newElement);
			
 
				-            // $(function() {
			
 
				-            //     $("img.lazy").lazyload();
			
 
				-            // });
			
 
				-            message.addEventListener('load', gotoBottom());
			
 
				-        }
			
 
				-    }
			
 
				-})();
			
 
				-(function() {
			
 
				-    'use strict';
			
 
				-
			
 
				-    angular
			
 
				-        .module('appMessage')
			
 
				-        .directive('ngHistoryMsg', HistoryMsg);
			
 
				-
			
 
				-    HistoryMsg.inject = [];
			
 
				-
			
 
				-    function HistoryMsg() {
			
 
				-        var directive = {
			
 
				-            link: link,
			
 
				-            restrict: 'A',
			
 
				-            scope: {
			
 
				-                msg: '=ngHistoryMsg',
			
 
				-                appContent: '=ngAppContent'
			
 
				-            }
			
 
				-        };
			
 
				-        return directive;
			
 
				-
			
 
				-        function link(scope, element, attrs) {
			
 
				-
			
 
				-            var replaceSystemFace = function(content) {
			
 
				-                //匹配表情
			
 
				-                var g = (/\/\:([\w]+)/).exec(content);
			
 
				-                while (g !== null) {
			
 
				-                    scope.appContent.faceConfig.sys.forEach(function(element) {
			
 
				-                        content = content.replace(element.shortcut, '<img style="height:56px" src="local://' + scope.appContent.directory.base + element.image + '">');
			
 
				-                    }, this);
			
 
				-                    g = (/\/\:([\w]+)/).exec(content);
			
 
				-                }
			
 
				-                //匹配截图
			
 
				-                var g = (/\[image\-src=\"([\w\W]+?)\"\]/i).exec(content);
			
 
				-                while (g !== null) {
			
 
				-                    content = content.replace(g[0],
			
 
				-                        '<a href="#" class="thumbnail"' + '>' +
			
 
				-                        '<img class="lazy" style="max-width:270px;max-height:250px;" src="../img/loading.jpg" data-original="local://' + scope.appContent.directory.received + g[1] + '.JPG' + '" alt="" >' +
			
 
				-                        '</a>'
			
 
				-                    );
			
 
				-                    g = (/\[image\-src=\"([\w\W]+?)\"\]/i).exec(content);
			
 
				-                }
			
 
				-                //匹配网址
			
 
				-                var i = 0;
			
 
				-                var m = content.match(/(((((http|ftp|https|HTTP|FTP|HTTPS):\/\/)[\w\-_]+)|www|WWW|[0-9]+)(\.(?!gif|jpg|png|mp3)[\w\-_]+)+([\w\-\.,@?^=%:/~\+#]*[\w\-\@?^=%/~\+#\r\n]))/ig);
			
 
				-                console.log(m);
			
 
				-                if (m == null)
			
 
				-                    return content;
			
 
				-                content = content.replace(/(((((http|ftp|https|HTTP|FTP|HTTPS):\/\/)[\w\-_]+)|www|WWW|[0-9]+)(\.(?!gif|jpg|png|mp3)[\w\-_]+)+([\w\-\.,@?^=%:/~\+#]*[\w\-\@?^=%/~\+#\r\n]))/ig, function() {
			
 
				-                    var html = '';
			
 
				-                    var g = (/((((http|ftp|https|HTTP|FTP|HTTPS):\/\/)[\w\-_]+)(\.[\w\-_]+)+([\w\-\.,@?^=%:/~\+#]*[\w\-\@?^=%/~\+#\r\n]))/ig).exec(m[i]);
			
 
				-                    if (g == null)
			
 
				-                        html = '<a target="_blank" href="http://' + m[i] + '">' +
			
 
				-                        m[i] +
			
 
				-                        '</a>';
			
 
				-                    else
			
 
				-                        html = '<a target="_blank" href="' + m[i] + '">' +
			
 
				-                        m[i] +
			
 
				-                        '</a>';
			
 
				-                    i = i + 1;
			
 
				-                    return html;
			
 
				-                });
			
 
				-                return content;
			
 
				-            };
			
 
				-
			
 
				-            if (scope.msg.senderDisplayName === undefined || scope.msg.senderDisplayName == '')
			
 
				-                scope.msg.senderDisplayName = scope.msg.sender;
			
 
				-            var html = '';
			
 
				-            // 消息类型（[1，文本消息]，[2，图片消息]，[3，文件消息], [4，位置消息]，[5，语音消息]）
			
 
				-            if (scope.appContent === undefined || scope.appContent.faceConfig === undefined || scope.appContent.faceConfig.sys === undefined) {
			
 
				-                html = '<span class="text-message">' + scope.msg.content + '</span>';
			
 
				-            } else if (scope.msg.contentType == 1) {
			
 
				-                //var style = { style: "normal", weight: "normal" };
			
 
				-                var style = scope.msg.style;
			
 
				-                html = '<span class="text-message"' + ' style="font:' + style.style + ' ' + style.weight + ' ' + style.size + 'pt' + ' ' + style.family + ';color:#' + style.color.toString(16) + '">' +
			
 
				-                    replaceSystemFace(scope.msg.content) + '</span>';
			
 
				-            } else if (scope.msg.contentType == 2) {
			
 
				-                html = '<span class="text-message">' +
			
 
				-                    '<a href="#" class="thumbnail" >' +
			
 
				-                    '<img src="' + scope.msg.content + '" alt="通用的占位符缩略图" >' +
			
 
				-                    '</a>' +
			
 
				-                    '</span>';
			
 
				-            } else if (scope.msg.contentType == 3) {
			
 
				-                // element.css({
			
 
				-                //     width: '300px'
			
 
				-                // });
			
 
				-                //element.addClass('file-message');
			
 
				-                var reg = /\?[\W\w]*/;
			
 
				-                var fileName = decodeURIComponent(reg.exec(scope.msg.content).toString().substr(1));
			
 
				-
			
 
				-                html = '<div class="file-message" style="width:250px">' +
			
 
				-                    '<img src="../img/unkown.png" onError= "this.src = \'../img/file/unkown.png\'">' +
			
 
				-                    '<span style="float:left; margin:5px 0px 0px 0px">文件名：' + fileName + '<br/>大小：' + scope.msg.length + '</span>' +
			
 
				-                    '<div class="p-t-sm text-right">' +
			
 
				-                    '<a class="text-primary" role="button"><span>打开</span></a>&nbsp&nbsp' +
			
 
				-                    '<a class="text-primary" role="button"><span>打开文件夹</span></a>' +
			
 
				-                    '</div>' +
			
 
				-                    '</div>';
			
 
				-            } else if (scope.msg.contentType == 4) {
			
 
				-                html = '<span class="text-message">' +
			
 
				-                    '<iframe class="map" border=0 src="' + scope.msg.content + '" frameBorder=no></iframe>' +
			
 
				-                    '</span>';
			
 
				-            } else if (scope.msg.contentType == 5) {
			
 
				-                html = '<span class="text-message">' +
			
 
				-                    '<audio src="' + scope.msg.content + '" controls="controls">' +
			
 
				-                    '</audio>' +
			
 
				-                    '</span>';
			
 
				-            }
			
 
				-
			
 
				-            var html_g = '<div class="feed-element">' +
			
 
				-                '<div class="media-body" id="loadmore">' +
			
 
				-                '<p><strong>' +
			
 
				-                scope.msg.senderDisplayName +
			
 
				-                '</strong><small class="text-muted">-2017-2-6 15:57:17&nbsp' +
			
 
				-                scope.msg.ts + '</small></p>' +
			
 
				-                '<div class="well m-l-xs m-t-xs fit-content" >' +
			
 
				-                '<div class="text-point"></div>' + html +
			
 
				-                '</div></div></div>';
			
 
				-
			
 
				-            angular.element("#loadmore").prepend(html_g);
			
 
				-            $(function() {
			
 
				-                $("img.lazy").lazyload();
			
 
				-            });
			
 
				-            console.log(html_g);
			
 
				-        }
			
 
				-    }
			
 
				-})();
			
--- a/dist/talkview/index.html
+++ b/dist/talkview/index.html
@@ -1,198 +0,0 @@
 
				-<!DOCTYPE html>
			
 
				-<html>
			
 
				-
			
 
				-<head>
			
 
				-<<<<<<< HEAD
			
 
				-	<title>chat view</title>
			
 
				-	<meta charset="utf-8" />
			
 
				-	<!-- 新 Bootstrap 核心 CSS 文件 -->
			
 
				-	<link rel="stylesheet" href="../bower_components/bootstrap/dist/css/bootstrap.css">
			
 
				-	<link rel="stylesheet" href="app-a2ec78bfca.css">
			
 
				-
			
 
				-	<!-- jQuery文件。务必在bootstrap.min.js 之前引入 -->
			
 
				-	<!--<script src="js/jquery.min.js"></script>-->
			
 
				-	<script src="../bower_components/angular/angular.js"></script>
			
 
				-	<script src="../bower_components/angular-scroll-glue/src/scrollglue.js"></script>
			
 
				-	<script src="app-2c6b56e97c.js"></script>
			
 
				-=======
			
 
				-    <title>chat view</title>
			
 
				-    <meta charset="utf-8" />
			
 
				-    <!-- 新 Bootstrap 核心 CSS 文件 -->
			
 
				-    <link rel="stylesheet" href="../bower_components/bootstrap/dist/css/bootstrap.css">
			
 
				-    <link rel="stylesheet" href="app-4a8198a9a1.css">
			
 
				-
			
 
				-    <!-- jQuery文件。务必在bootstrap.min.js 之前引入 -->
			
 
				-    <!--<script src="js/jquery.min.js"></script>-->
			
 
				-    <script src="../bower_components/jquery/dist/jquery.min.js"></script>
			
 
				-    <script src="../bower_components/jquery-lazyload/jquery.lazyload.min.js"></script>
			
 
				-    <script src="../bower_components/angular/angular.js"></script>
			
 
				-    <script src="../bower_components/angular-animate/angular-animate.min.js"></script>
			
 
				-    <script src="../bower_components/angular-scroll-glue/src/scrollglue.js"></script>
			
 
				-    <script src="app-a08eecc16b.js"></script>
			
 
				->>>>>>> 631276b86f1dd9a332d236f40b67b04cdbc055fa
			
 
				-</head>
			
 
				-
			
 
				-<body ng-app="appMessage" ng-controller="MessageController" id="body" ng-click="scrollShow()">
			
 
				-    <div class="full-client">
			
 
				-        <div id="getMore"><a role="button"><small ng-click="getMore()">加载更多消息</small></a></div>
			
 
				-        <div class="feed-activity-list p-l-xs p-t-xs p-r-xs" id="loadmore" ng-repeat="item in historymessages track by $index" ng-history-msg="item" ng-app-content="appContent">
			
 
				-            <!--<div class="feed-element" ng-repeat="item in historymessages track by $index">
			
 
				-                <div class="media-body">
			
 
				-                    <p>
			
 
				-                        <strong>{{item.senderDisplayName === undefined || item.senderDisplayName == ''? item.sender : item.senderDisplayName}}</strong><small>-2017-2-6 15:57:17 {{item.ts}}</small>
			
 
				-                    </p>
			
 
				-                    <div class="well m-l-xs m-t-xs fit-content" ng-history-msg="item" ng-app-content="appContent">
			
 
				-                        <div class="text-point"></div>
			
 
				-                    </div>
			
 
				-                </div>
			
 
				-            </div>-->
			
 
				-        </div>
			
 
				-        <div class="feed-activity-list p-l-xs p-t-xs p-r-xs" id="sendmessage">
			
 
				-            <div class="feed-element animate" ng-repeat="item in sendmessages track by $index">
			
 
				-                <div class="media-body">
			
 
				-                    <p>
			
 
				-                        <strong>{{item.senderDisplayName === undefined || item.senderDisplayName == ''? item.sender : item.senderDisplayName}}</strong><small class="text-muted">-2017-2-6 15:57:17 {{item.ts}}</small>
			
 
				-                    </p>
			
 
				-                    <div class="well m-l-xs m-t-xs fit-content" ng-current-msg="item" ng-app-content="appContent" id="message">
			
 
				-                        <div class="text-point"></div>
			
 
				-                    </div>
			
 
				-                </div>
			
 
				-            </div>
			
 
				-            <!--<a role="button" ng-click="addClick({name:'web', time:'2016-06-24 15:55', message:'hello world'})">test</a>-->
			
 
				-
			
 
				-            <!-- 普通消息 -->
			
 
				-            <!--<div class="feed-element">
			
 
				-				<div class="media-body ">
			
 
				-					<strong>陆趣趣</strong>
			
 
				-					<small class="text-muted">Today 2:10 pm - 12.06.2014</small>
			
 
				-
			
 
				-					<div class="well m-l-xs m-t-xs fit-content">
			
 
				-						<span class="text-message">手动建开发技术的发是打发是否阿萨德发按时大家阿萨德发 圣诞节法律考试及地方akjsdklfajs 按时大奖是离开的房间阿萨德发是对方可爱上了对方快递费阿斯顿发阿萨德发啊阿萨德f</span>
			
 
				-					</div>
			
 
				-				</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" style="width: 275px;">
			
 
				-                        <div id="text-point"></div>
			
 
				-                        <div class="file-message">
			
 
				-                            <img src="../img/unkown.png" onError=" this.src = '../img/unkown.png' " />
			
 
				-                            <span style="float:left; margin:5px 0px 0px 0px">文件名：办公助手文件<br/>大小：5M</span>
			
 
				-                            <div class="p-t-sm text-right">
			
 
				-                                <a class="text-primary" role="button"><span>打开</span></a>&nbsp
			
 
				-                                <a class="text-primary" role="button"><span>打开文件夹</span></a>
			
 
				-                            </div>
			
 
				-                        </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">
			
 
				-								<a href="#" class="thumbnail" style="max-width:125px;">
			
 
				-									<img src="local://E:/LxtalkUIView/dist/img/loading.jpg" alt="通用的占位符缩略图">
			
 
				-								</a>
			
 
				-								
			
 
				-						</span>
			
 
				-                    </div>
			
 
				-                </div>
			
 
				-            </div>-->
			
 
				-
			
 
				-            <!-- 只有截图 -->
			
 
				-            <!--<div class="feed-element">
			
 
				-				<div class="media-body">
			
 
				-					<strong>陆趣趣</strong>
			
 
				-					<small class="text-muted">Today 2:10 pm - 12.06.2014</small>
			
 
				-					<div class="well m-l-xs m-t-xs fit-content">
			
 
				-						<span class="text-message">
			
 
				-								<a href="#" class="thumbnail" style="width:300px;">
			
 
				-									<img src="Lighthouse.jpg" alt="通用的占位符缩略图">
			
 
				-								</a>
			
 
				-							</span>
			
 
				-					</div>
			
 
				-				</div>
			
 
				-			</div>-->
			
 
				-
			
 
				-            <!-- 带表情 -->
			
 
				-            <!--<div class="feed-element">
			
 
				-				<div class="media-body">
			
 
				-					<strong>陆趣趣</strong>
			
 
				-					<small class="text-muted">Today 2:10 pm - 12.06.2014</small>
			
 
				-					<div class="well m-l-xs m-t-xs fit-content">
			
 
				-						<span class="text-message">
			
 
				-											萨德发按时大家阿萨德<img src="../../Images/Faces/em_009.gif">kjsdklfajs 按时大奖是离开的房间阿萨德
			
 
				-							</span>
			
 
				-					</div>
			
 
				-				</div>
			
 
				-			</div>-->
			
 
				-
			
 
				-            <!-- 只有表情 -->
			
 
				-            <!--<div class="feed-element">
			
 
				-				<div class="media-body">
			
 
				-					<strong>陆趣趣</strong>
			
 
				-					<small class="text-muted">Today 2:10 pm - 12.06.2014</small>
			
 
				-					<div class="well m-l-xs m-t-xs fit-content">
			
 
				-						<img src="../../Images/Faces/em_009.gif">
			
 
				-					</div>
			
 
				-				</div>
			
 
				-			</div>-->
			
 
				-
			
 
				-            <!-- 地图 -->
			
 
				-            <!--<div class="feed-element" ng-repeat="map in maps track by $index">
			
 
				-                <div class="media-body">
			
 
				-                    <p>
			
 
				-                        <strong>陆趣趣</strong><small class="text-muted">-Today 2:10 pm - 12.06.2014</small>
			
 
				-                    </p>
			
 
				-                    <div class="well m-l-xs m-t-xs fit-content">
			
 
				-                        <div class="text-point"></div>
			
 
				-                        <span class="text-message">
			
 
				-							<iframe class="map" border=0 src="{{map.url}}" frameBorder=no>
			
 
				-                                您的浏览器不支持 iframe 标签。
			
 
				-                            </iframe>
			
 
				-						</span>
			
 
				-                    </div>
			
 
				-                </div>
			
 
				-            </div>-->
			
 
				-
			
 
				-            <!-- 语音 -->
			
 
				-            <!--<div class="feed-element">
			
 
				-                <div class="media-body">
			
 
				-                    <p>
			
 
				-                        <strong>陆趣趣</strong><small class="text-muted">-Today 2:10 pm - 12.06.2014</small>
			
 
				-                    </p>
			
 
				-                    <div class="well m-l-xs m-t-xs fit-content">
			
 
				-                        <div class="text-point"></div>
			
 
				-                        <span class="text-message">
			
 
				-                                <audio controls>
			
 
				-                                    <source src="local://E:/LxtalkUIView/dist/img/111.mp3">
			
 
				-                                    <source src="local://E:/LxtalkUIView/dist/img/111.ogg">
			
 
				-                                    您的浏览器不支持 audio 元素。
			
 
				-                                </audio>
			
 
				-						</span>
			
 
				-                    </div>
			
 
				-                </div>
			
 
				-            </div>-->
			
 
				-        </div>
			
 
				-        <div>
			
 
				-            <p></p>
			
 
				-            <span id="bottom"><span>
			
 
				-        </div>
			
 
				-
			
 
				-    </div>
			
 
				-
			
 
				-</body>
			
 
				-
			
 
				-</html>
			
--- a/dist/userview/app-2918c7809b.js
+++ b/dist/userview/app-2918c7809b.js
--- a/dist/userview/app-4d7425a888.css
+++ b/dist/userview/app-4d7425a888.css
--- a/dist/userview/index.html
+++ b/dist/userview/index.html
@@ -1,24 +0,0 @@
 
				-<!DOCTYPE html>

			
 
				-<html>

			
 
				-

			
 
				-<head>

			
 
				-    <title>chat view</title>

			
 
				-    <meta charset="utf-8" />

			
 
				-    <!-- 新 Bootstrap 核心 CSS 文件 -->

			
 
				-    <link rel="stylesheet" href="../bower_components/bootstrap/dist/css/bootstrap.min.css">

			
 
				-    <link rel="stylesheet" href="../bower_components/animate.css/animate.min.css">

			
 
				-    <link rel="stylesheet" href="app-4d7425a888.css">

			
 
				-</head>

			
 
				-

			
 
				-<body ng-app="app" ng-controller="UserController" class="full-client" onselectstart="return false">

			
 
				-    <ui-view></ui-view>

			
 
				-    <!-- jQuery文件。务必在bootstrap.min.js 之前引入 -->

			
 
				-    <script src="../bower_components/jquery/dist/jquery.min.js"></script>

			
 
				-    <script src="../bower_components/jquery-qrcode/jquery.qrcode.min.js"></script>

			
 
				-    <script src="../bower_components/angular/angular.min.js"></script>

			
 
				-    <script src="../bower_components/angular-ui-router/release/angular-ui-router.min.js"></script>

			
 
				-    <script src="../bower_components/angular-animate/angular-animate.min.js"></script>

			
 
				-    <script src="app-2918c7809b.js"></script>

			
 
				-</body>

			
 
				-

			
 
				-</html>
			
--- a/talkview/src/js/controller/messageController.js
+++ b/talkview/src/js/controller/messageController.js
@@ -1,125 +1,9 @@
 
				-'use strict';
			
 
				-
			
 
				 angular.module('appMessage').controller('MessageController', ['$scope', '$location', '$anchorScroll', function($scope, $location, $anchorScroll) {
			
 
				-
			
 
				         lxtalkClient.Invoke('{15180DEF-D508-45F7-BAEB-6486CD8752C8}', '_Register', '', $scope);
			
 
				         $scope.glued = true;
			
 
				-        $scope.items = [{
			
 
				-                "uid": "2636765",
			
 
				-                "senderDisplayName": "丽水市市委办公室",
			
 
				-                "sender": "0578+002682BECE10-lqq",
			
 
				-                "msgType": 0,
			
 
				-                "networkType": 1,
			
 
				-                "isDes": false,
			
 
				-                "length": 0,
			
 
				-                "isReaded": false,
			
 
				-                "contentType": 1,
			
 
				-                "receiver": "0578+002682BECE10-lsws",
			
 
				-                "fromClient": 0,
			
 
				-                "ts": "来自pc端",
			
 
				-                "id": 0,
			
 
				-                "content": "111111",
			
 
				-                "style": ""
			
 
				-            }, {
			
 
				-                content: "消息内容",
			
 
				-                style: '字体',
			
 
				-                fromClient: 2, //消息来源([0：PC]，[1：iOS]，[2：Android]
			
 
				-                id: "616ebe69e1c04c2ea9740a14457aaca6",
			
 
				-                isDes: 0, //是否加密消息
			
 
				-                contentType: 1, // 消息类型（[1，文本消息]，[2，图片消息]，[3，文件消息]，[4，语音消息], [5，位置消息]）
			
 
				-                networkType: 1, //网络类型([1：wifi]，[2：2G]，[3：3G]，[4：4G])
			
 
				-                sender: "0578+0-ls_xxj1",
			
 
				-                senderDisplayName: "陆趣趣",
			
 
				-                length: 12312,
			
 
				-                ts: 12312312412 //时间搓
			
 
				-            }, {
			
 
				-                content: "http://202.107.249.133:8125/e/8/2/4/f/e824fa94cbacff419a0ad611926710f9.dat?下载文件.docx",
			
 
				-                fromClient: 2,
			
 
				-                id: "253db476c6d140f0a1b4d4af5fcf2016",
			
 
				-                isDes: 0,
			
 
				-                contentType: 3,
			
 
				-                networkType: 1,
			
 
				-                sender: "0578+0-ls_xxj1",
			
 
				-                senderDisplayName: "陆趣趣",
			
 
				-                "ts": "来自pc端",
			
 
				-                length: 17359
			
 
				-            },
			
 
				-            {
			
 
				-                content: "../img/DefaultHeadImage_96.png",
			
 
				-                fromClient: 2,
			
 
				-                id: "253db476c6d140f0a1b4d4af5fcf2016",
			
 
				-                isDes: 0,
			
 
				-                contentType: 2,
			
 
				-                networkType: 1,
			
 
				-                sender: "0578+0-ls_xxj1",
			
 
				-                senderDisplayName: "陆趣趣",
			
 
				-                "ts": "来自pc端",
			
 
				-                length: 17359
			
 
				-            },
			
 
				-            {
			
 
				-                content: "../img/DefaultHeadImage_96.png",
			
 
				-                fromClient: 2,
			
 
				-                id: "253db476c6d140f0a1b4d4af5fcf2016",
			
 
				-                isDes: 0,
			
 
				-                contentType: 2,
			
 
				-                networkType: 1,
			
 
				-                sender: "0578+0-ls_xxj1",
			
 
				-                senderDisplayName: "陆趣趣",
			
 
				-                "ts": "来自pc端",
			
 
				-                length: 17359
			
 
				-            },
			
 
				-            {
			
 
				-                content: "../img/DefaultHeadImage_96.png",
			
 
				-                fromClient: 2,
			
 
				-                id: "253db476c6d140f0a1b4d4af5fcf2016",
			
 
				-                isDes: 0,
			
 
				-                contentType: 2,
			
 
				-                networkType: 1,
			
 
				-                sender: "0578+0-ls_xxj1",
			
 
				-                senderDisplayName: "陆趣趣",
			
 
				-                "ts": "来自pc端",
			
 
				-                length: 17359
			
 
				-            },
			
 
				-            {
			
 
				-                content: "http://202.107.249.133:8125/e/8/2/4/f/e824fa94cbacff419a0ad611926710f9.dat?下载文件.docx",
			
 
				-                fromClient: 2,
			
 
				-                id: "253db476c6d140f0a1b4d4af5fcf2016",
			
 
				-                isDes: 0,
			
 
				-                contentType: 3,
			
 
				-                networkType: 1,
			
 
				-                sender: "0578+0-ls_xxj1",
			
 
				-                senderDisplayName: "陆趣趣",
			
 
				-                "ts": "来自pc端",
			
 
				-                length: 17359
			
 
				-            },
			
 
				-            {
			
 
				-                content: "消息内容",
			
 
				-                style: { "family": "宋体", "size": 9, "color": 16711680 },
			
 
				-                fromClient: 2, //消息来源([0：PC]，[1：iOS]，[2：Android]
			
 
				-                id: "616ebe69e1c04c2ea9740a14457aaca6",
			
 
				-                isDes: 0, //是否加密消息
			
 
				-                contentType: 1, // 消息类型（[1，文本消息]，[2，图片消息]，[3，文件消息]，[4，语音消息], [5，位置消息]）
			
 
				-                networkType: 1, //网络类型([1：wifi]，[2：2G]，[3：3G]，[4：4G])
			
 
				-                sender: "0578+0-ls_xxj1",
			
 
				-                senderDisplayName: "陆趣趣",
			
 
				-                length: 12312,
			
 
				-                ts: 12312312412 //时间搓
			
 
				-            }
			
 
				-        ];
			
 
				         $scope.appContent = {};
			
 
				-        // $scope.guid  = lxtalkClient.Invoke('register', 'talkview', $scope)
			
 
				-
			
 
				         $scope.sendmessages = [];
			
 
				-        $scope.historyitems = [];
			
 
				         $scope.historymessages = [];
			
 
				-        $scope.pageSize = 1;
			
 
				-        $scope.pageNumber = 2;
			
 
				-        $scope.historyitems.push($scope.items.slice($scope.pageNumber * ($scope.pageSize - 1), $scope.pageNumber * $scope.pageSize));
			
 
				-        for (var i = 0; i < $scope.pageNumber; i++) {
			
 
				-            if ($scope.historyitems[0][i] !== undefined) {
			
 
				-                $scope.historymessages.push($scope.historyitems[0][i]);
			
 
				-            }
			
 
				-        }
			
 
				 
			
 
				         $scope.initAppContent = function(appContentJson) {
			
 
				             $scope.appContent = JSON.parse(appContentJson);
			
@@ -130,7 +14,6 @@ angular.module('appMessage').controller('MessageController', ['$scope', '$locati
 
				         }
			
 
				 
			
 
				         $scope.showMessage = function(jsonStr) {
			
 
				-            console.log(jsonStr);
			
 
				             jsonStr = jsonStr.replace(/ /g, "&nbsp");
			
 
				             jsonStr = jsonStr.replace(/\r\n/g, "<br>");
			
 
				             jsonStr = jsonStr.replace(/\r/g, "\\r");
			
@@ -143,20 +26,18 @@ angular.module('appMessage').controller('MessageController', ['$scope', '$locati
 
				         }
			
 
				 
			
 
				         $scope.showHistoryMessage = function(jsonStr) {
			
 
				+            jsonStr = jsonStr.replace(/ /g, "&nbsp");
			
 
				+            jsonStr = jsonStr.replace(/\r\n/g, "<br>");
			
 
				+            jsonStr = jsonStr.replace(/\r/g, "\\r");
			
 
				+            jsonStr = jsonStr.replace(/\n/g, "\\n");
			
 
				+            jsonStr = jsonStr.replace(/\t/g, "\\t");
			
 
				+            jsonStr = jsonStr.replace(/\f/g, "\\f");
			
 
				             var msg = JSON.parse(jsonStr);
			
 
				-            // $scope.items.unshift(msg);
			
 
				-            // console.log(msg);
			
 
				+            $scope.historymessages.push(msg);
			
 
				         }
			
 
				 
			
 
				         $scope.getMore = function() {
			
 
				-            $scope.historyitems = [];
			
 
				-            $scope.pageSize = $scope.pageSize + 1;
			
 
				-            $scope.historyitems.push($scope.items.slice($scope.pageNumber * ($scope.pageSize - 1), $scope.pageNumber * $scope.pageSize));
			
 
				-            for (var i = 0; i < $scope.pageNumber; i++) {
			
 
				-                if ($scope.historyitems[0][i] !== undefined) {
			
 
				-                    $scope.historymessages.push($scope.historyitems[0][i]);
			
 
				-                }
			
 
				-            }
			
 
				+            lxtalkClient.Invoke('{15180DEF-D508-45F7-BAEB-6486CD8752C8}', 'LoadHistoryMessages', '', $scope);
			
 
				         }
			
 
				 
			
 
				         $scope.scrollHide = function() {
			
--- a/talkview/src/js/directive/message.js
+++ b/talkview/src/js/directive/message.js
@@ -1,82 +0,0 @@
 
				-(function () {
			
 
				-    'use strict';
			
 
				-
			
 
				-    angular
			
 
				-        .module('appMessage')
			
 
				-        .directive('ngMsg', Directive);
			
 
				-
			
 
				-    Directive.inject = [];
			
 
				-    function Directive() {
			
 
				-        var directive = {
			
 
				-            link: link,
			
 
				-            restrict: 'A',
			
 
				-            scope: {
			
 
				-                msg: '=ngMsg',
			
 
				-                appContent: '=ngAppContent'
			
 
				-            }
			
 
				-        };
			
 
				-        return directive;
			
 
				-
			
 
				-        function link(scope, element, attrs) {
			
 
				-            var replaceSystemFace = function(content){
			
 
				-                scope.appContent.faceConfig.sys.forEach(function(element) {
			
 
				-                    content = content.replace(element.shortcut,'<img src="local://' + scope.appContent.directory.base + element.image + '">');
			
 
				-                }, this);
			
 
				-                // var reg = /[(\w+)-src="(http://[\w\W]+?)"]/;
			
 
				-                // var reg = new RegExp('\\[(\\w+)\\-src=\\"(http://[\\w\\W]+?)\\"\\]', "i");
			
 
				-                var reg = new RegExp('\\[image\\-src=\\"([\\w\\W]+?)\\"\\]', "i");                
			
 
				-                var g = reg.exec(content);
			
 
				-                if (g === null)
			
 
				-                    return content;    
			
 
				-                console.log(JSON.stringify(g));
			
 
				-                for(var i = 0; i <= g.length - 1; i++){
			
 
				-                    console.log(g[i]); 
			
 
				-                }
			
 
				-                return content;
			
 
				-            };
			
 
				-            var replaceImage = function(content){
			
 
				-
			
 
				-            }
			
 
				-            var html = '';
			
 
				-            // 消息类型（[1，文本消息]，[2，图片消息]，[3，文件消息]，[4，语音消息], [5，位置消息]）
			
 
				-            if (scope.appContent === undefined || scope.appContent.faceConfig ===undefined || scope.appContent.faceConfig.sys === undefined){
			
 
				-                html = '<span class="text-message">' + scope.msg.content + '</span>';   
			
 
				-            } else if (scope.msg.contentType == 1) {
			
 
				-
			
 
				-                html = '<span class="text-message">' + replaceSystemFace(scope.msg.content) + '</span>';
			
 
				-            } else if (scope.msg.contentType == 2) {
			
 
				-                html = '<span class="text-message">' +
			
 
				-                    '<a href="#" class="thumbnail" style="width:300px;">' +
			
 
				-                    '<img src="' + scope.msg.content + '" alt="通用的占位符缩略图">' +
			
 
				-                    '</a>' +
			
 
				-                    '</span>';
			
 
				-            } else if (scope.msg.contentType == 3) {
			
 
				-                element.css({
			
 
				-                    width: '300px'
			
 
				-                });
			
 
				-                element.addClass('file-message');
			
 
				-                var reg = /\?[\W\w]*/;
			
 
				-                var fileName = decodeURIComponent(reg.exec(scope.msg.content).toString().substr(1));
			
 
				-
			
 
				-                html = '<img src="../img/file/unkown.png" onError=" this.src = \'../img/file/unkown.png\' "/>' +
			
 
				-                    '<span style="float:left; margin:5px 0px 0px 0px">文件名：' + fileName + '<br/>大小：' + scope.msg.length + '</span>' +
			
 
				-                    '<div class="p-t-sm text-right">' +
			
 
				-                    '<a class="text-primary" role="button">打开</a>' +
			
 
				-                    '<a class="text-primary" role="button">打开文件夹</a>' +
			
 
				-                    '</div>';
			
 
				-            } else if (scope.msg.contentType == 4) {
			
 
				-                html = '<span class="text-message">' +
			
 
				-                    '<iframe class="map" border=0 src="' + scope.msg.content + '" frameBorder=no></iframe>' +
			
 
				-                    '</span>';
			
 
				-            } else if (scope.msg.contentType == 5) {
			
 
				-                html = '<span class="text-message">' +
			
 
				-                    '<audio src="' + scope.msg.content + '" controls="controls">' +
			
 
				-                    '</audio>' +
			
 
				-                    '</span>';
			
 
				-            }
			
 
				-
			
 
				-            var newElement = angular.element(html);
			
 
				-            element.append(newElement);
			
 
				-        }
			
 
				-    }
			
 
				-})();