首页 发现 帮助
登录
lqq
/
LxtalkUIView
关注 2
点赞 1
派生 1
文件 工单管理 0 合并请求 0 Wiki
浏览代码

文件传输

lqq 8 年之前
父节点
61d2acff46
当前提交
860e6f38d4
共有 9 个文件被更改，包括 210 次插入 和 171 次删除
分列视图 显示文件统计
  1. 6 162
      talkview/src/html/index.html
  2. 4 2
      talkview/src/js/app.js
  3. 3 0
      talkview/src/js/controller/transmitterController.js
  4. 8 2
      talkview/src/js/directive/currentmessage.js
  5. 8 5
      talkview/src/js/directive/historymessages.js
  6. 19 0
      talkview/src/js/router.js
  7. 2 0
      talkview/src/js/templates.js
  8. 159 0
      talkview/src/templates/messages.html
  9. 1 0
      talkview/src/templates/transmitter.html

+ 6 - 162
talkview/src/html/index.html
查看文件 

@@ -10,174 +10,18 @@
 
 
     <!-- jQuery文件。务必在bootstrap.min.js 之前引入 -->
 
     <!--<script src="js/jquery.min.js"></script>-->
 
+    <script src="../bower_components/lodash/dist/lodash.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-ui-router/release/angular-ui-router.min.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.js"></script>
 
 </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 ng-app="appMessage" id="body" ng-click="scrollShow()">
 
+    <ui-view></ui-view>
 
+    
 
 </body>

+ 4 - 2
talkview/src/js/app.js
查看文件 

@@ -1,3 +1,5 @@
 
 'use strict';
 
-
 
-var appMessage = angular.module('appMessage', ['luegg.directives', 'ngAnimate']);
 
+var appMessage = angular.module('appMessage', [
 
+    'ui.router',
 
+    'templatescache',
 
+    'ngAnimate']);

+ 3 - 0
talkview/src/js/controller/transmitterController.js
查看文件 

@@ -0,0 +1,3 @@
 
+angular.module('appMessage').controller('TransmitterController', ['$scope', function($scope) {

+

+}]);

+ 8 - 2
talkview/src/js/directive/currentmessage.js
查看文件 

@@ -91,8 +91,14 @@
 
                 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) + '">' +
 
+                var style = util.extend({
 
+                    style: 'normal',
 
+                    weight: 'normal',
 
+                    size: 9,
 
+                    family: '微软雅黑',
 
+                    color: 0
 
+                }, JSON.parse(scope.msg.style));
 
+                html = '<span class="text-message"' + ' style="font:' + style.style + ' ' + style.weight + ' ' + style.size + 'pt' + ' ' + style.family + ';color:#' + _.padStart(style.color.toString(16), 6, '0')  + '">' +
 
                     replaceSystemFace(scope.msg.content) + '</span>';
 
             } else if (scope.msg.contentType == 2) {
 
                 html = '<span class="text-message">' +

+ 8 - 5
talkview/src/js/directive/historymessages.js
查看文件 

@@ -70,8 +70,14 @@
 
                 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) + '">' +
 
+                var style = util.extend({
 
+                    style: 'normal',
 
+                    weight: 'normal',
 
+                    size: 9,
 
+                    family: '微软雅黑',
 
+                    color: 0
 
+                }, JSON.parse(scope.msg.style));
 
+                html = '<span class="text-message"' + ' style="font:' + style.style + ' ' + style.weight + ' ' + style.size + 'pt' + ' ' + style.family + ';color:#' + _.padStart(style.color.toString(16), 6, '0') + '">' +
 
                     replaceSystemFace(scope.msg.content) + '</span>';
 
             } else if (scope.msg.contentType == 2) {
 
                 html = '<span class="text-message">' +
 
@@ -117,9 +123,6 @@
 
                 '</div></div></div>';
 
 
             angular.element("#loadmore").prepend(html_g);
 
-            $(function() {
 
-                $("img.lazy").lazyload();
 
-            });
 
             console.log(html_g);
 
         }
 
     }

+ 19 - 0
talkview/src/js/router.js
查看文件 

@@ -0,0 +1,19 @@
 
+angular.module('appMessage').run(['$rootScope', '$state', '$stateParams',

+    function($rootScope, $state, $stateParams) {

+        $rootScope.$state = $state;

+        $rootScope.$stateParams = $stateParams;

+    }

+]).config(['$stateProvider', '$urlRouterProvider',

+    function($stateProvider, $urlRouterProvider) {

+        $urlRouterProvider.otherwise('/messages'); //

+        $stateProvider.state('messages', {

+                url: '/messages',

+                templateUrl: 'templates/messages.html',

+                controller: 'MessageController'

+            })

+            .state('transmitter', {

+                url: '/transmitter',

+                templateUrl: 'templates/transmitter.html'

+            });

+    }

+]);

文件差异内容过多而无法显示
+ 2 - 0
talkview/src/js/templates.js


+ 159 - 0
talkview/src/templates/messages.html
查看文件 

@@ -0,0 +1,159 @@
 
+<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>

+ 1 - 0
talkview/src/templates/transmitter.html
查看文件 

@@ -0,0 +1 @@
 
+transmitter