Browse Source

短信界面

dgf 8 years ago
parent
commit
ad87098755

BIN
dist/img/对方头像.png


dist/img/头像.png → dist/img/自己头像.png


+ 8 - 0
talkview/src/js/controller/messageController.js

@@ -83,6 +83,14 @@ angular.module('appMessage').controller('MessageController', ['$scope', '$filter
             else
                 return 'user-head user-head-lf';
         };
+        $scope.getUserheadImg = function(item) {
+            var arr = $scope.appContent.directory.user.split("\\");
+            var userself = arr[arr.length - 2];
+            if (item.sender.indexOf(userself) !== -1)
+                return '../img/自己头像.png';
+            else
+                return '../img/对方头像.png';
+        };
 
         $scope.getHisTime = function(item) {
             var myDate = new Date();

+ 14 - 6
talkview/src/js/controller/smsController.js

@@ -41,16 +41,21 @@ angular.module('appMessage').controller('SmsController', ['$scope', '$state', '$
         console.log(sendmsg);
         console.log(keycode);
         console.log($scope.inputMob);
+        if (msg.length !== 0)
+            sendmsg[0].nextElementSibling.firstElementChild.textContent = "已输入" + msg.length * 2 + "个字符,本次将产生" + (Math.floor(msg.length / 70) + 1) + "条短信";
+        else if (msg.length == 0)
+            sendmsg[0].nextElementSibling.firstElementChild.textContent = "每条短信上限140字符(70个汉字)";
         if ($scope.inputMob) {
             if (!$scope.checkId)
                 for (var i = 0; i < $scope.inputMob.length; i++) {
                     var html = '<div class="feed-element"><div class="media-body "><p><span class="glyphicon glyphicon-menu-right"><span>' + $scope.inputMob[i] + '</span>' + dateTime + '</span><span class="glyphicon glyphicon-ok"></span></p>' +
                         '<div class = "well m-l-xs m-t-xs fit-content" >' +
-                        '<span class = "text-message">' + msg + '</span> </div></div></div>';
+                        '<span class = "text-message">' + msg + '&nbsp&nbsp--丽水市人民政府办公室</span> </div></div></div>';
                     if (msg.length !== 0 && $scope.activeData == '按Enter键发送消息') {
                         if (!e.ctrlKey && e.which == 13) {
                             mediamsg.append(html);
                             sendmsg[0].textContent = "";
+                            sendmsg[0].nextElementSibling.firstElementChild.textContent = "每条短信上限140字符(70个汉字)";
                         } else if (e.ctrlKey && e.which == 13) {
                             sendmsg.append('<br>');
                             e.keyCode = 13;
@@ -64,13 +69,14 @@ angular.module('appMessage').controller('SmsController', ['$scope', '$state', '$
                 }
             else if ($scope.checkId && ts2 > ts1)
                 for (var i = 0; i < $scope.inputMob.length; i++) {
-                    var html = '<div class="feed-element"><div class="media-body "><p><span class="glyphicon glyphicon-menu-right"><span>' + $scope.inputMob[i] + '</span>' + dateTime + '</span><span class="glyphicon glyphicon-time"><span>(定时于' + $scope.selectDate + '发送)</span></span></p>' +
+                    var html = '<div class="feed-element"><div class="media-body "><p><span class="glyphicon glyphicon-menu-right"><span>' + $scope.inputMob[i] + '</span>' + dateTime + '</span><span class="glyphicon glyphicon-time"><span>( 定时于' + $scope.selectDate + '发送 )</span></span></p>' +
                         '<div class = "well m-l-xs m-t-xs fit-content" >' +
-                        '<span class = "text-message">' + msg + '</span> </div></div></div>';
+                        '<span class = "text-message">' + msg + '&nbsp&nbsp--丽水市人民政府办公室</span> </div></div></div>';
                     if (msg.length !== 0 && $scope.activeData == '按Enter键发送消息') {
                         if (!e.ctrlKey && e.which == 13) {
                             mediamsg.append(html);
                             sendmsg[0].textContent = "";
+                            sendmsg[0].nextElementSibling.firstElementChild.textContent = "每条短信上限140字符(70个汉字)";
                         } else if (e.ctrlKey && e.which == 13) {
                             sendmsg.append('<br>');
                             e.keyCode = 13;
@@ -101,20 +107,22 @@ angular.module('appMessage').controller('SmsController', ['$scope', '$state', '$
             for (var i = 0; i < $scope.inputMob.length; i++) {
                 var html = '<div class="feed-element"><div class="media-body "><p><span class="glyphicon glyphicon-menu-right"><span>' + $scope.inputMob[i] + '</span>' + dateTime + '</span><span class="glyphicon glyphicon-ok"></span></p>' +
                     '<div class = "well m-l-xs m-t-xs fit-content" >' +
-                    '<span class = "text-message">' + msg + '</span> </div></div></div>';
+                    '<span class = "text-message">' + msg + '&nbsp&nbsp--丽水市人民政府办公室</span> </div></div></div>';
                 if (msg.length !== 0) {
                     mediamsg.append(html);
                     sendmsg[0].textContent = "";
+                    sendmsg[0].nextElementSibling.firstElementChild.textContent = "每条短信上限140字符(70个汉字)";
                 }
             }
         else if ($scope.checkId && ts2 > ts1)
             for (var i = 0; i < $scope.inputMob.length; i++) {
-                var html = '<div class="feed-element"><div class="media-body "><p><span class="glyphicon glyphicon-menu-right"><span>' + $scope.inputMob[i] + '</span>' + dateTime + '</span><span class="glyphicon glyphicon-time"><span>(定时于' + $scope.selectDate + '发送)</span></span></p>' +
+                var html = '<div class="feed-element"><div class="media-body "><p><span class="glyphicon glyphicon-menu-right"><span>' + $scope.inputMob[i] + '</span>' + dateTime + '</span><span class="glyphicon glyphicon-time"><span>( 定时于' + $scope.selectDate + '发送 )</span></span></p>' +
                     '<div class = "well m-l-xs m-t-xs fit-content" >' +
-                    '<span class = "text-message">' + msg + '</span> </div></div></div>';
+                    '<span class = "text-message">' + msg + '&nbsp&nbsp--丽水市人民政府办公室</span> </div></div></div>';
                 if (msg.length !== 0) {
                     mediamsg.append(html);
                     sendmsg[0].textContent = "";
+                    sendmsg[0].nextElementSibling.firstElementChild.textContent = "每条短信上限140字符(70个汉字)";
                 }
             }
     };

+ 1 - 1
talkview/src/js/router.js

@@ -7,7 +7,7 @@ angular.module('appMessage').run(['$rootScope', '$state', '$stateParams',
     function($stateProvider, $urlRouterProvider, $compileProvider) {
         $compileProvider.aHrefSanitizationWhitelist(/^\s*(https?|local):/);
         $compileProvider.imgSrcSanitizationWhitelist(/^\s*(https?|local):/);
-        $urlRouterProvider.otherwise('/messages'); //
+        $urlRouterProvider.otherwise('/smsSend'); //
         $stateProvider.state('messages', {
                 url: '/messages',
                 templateUrl: 'templates/messages.html',

+ 31 - 18
talkview/src/less/app.main.less

@@ -47,33 +47,39 @@
         cursor:default;
         margin-bottom: -5px;
         .glyphicon-ok {
+            font-size: 13px;
             color: green;
             margin-left: 10px;
             margin-top: 1px;
         }
         .glyphicon-remove {
+            font-size: 13px;
             color: #E35850;
             margin-left: 10px;
             margin-top: 2px;
         }
         .glyphicon-time {
+            font-size: 13px;
             color: #4EA9E9;
             margin-left: 10px;
             margin-top: 1px;
             span {
                 font-weight: normal;
-                color: #888;
-                font-size: 10px;
-                margin-left: 0px;
+                color: #777;
+                font-family: "微软雅黑","宋体";
+                font-size: 11px;
+                margin-left: 2px;
             }
         }
     }
     p>span {
-        margin-top: 1px;
+        font-size: 11px;
+        font-weight: 500;
+        margin-top: 2px;
         margin-left: 5px;
         color: #007FE0;
         >span {
-            font-weight: 600;
+            font-family: "微软雅黑","宋体";
             margin: 0px 7px 0px 3px;
         }
     }
@@ -170,7 +176,7 @@
         border-color:transparent transparent transparent #009EE0;
     }
 }
-//
+
 .fit-content {
     width: fit-content;
 }
@@ -585,11 +591,10 @@ body {
 }
 
 .smsView {
-    width: 550px;
-    height: 450px;
-    margin: 100px auto;
+    width:100%;
+    height: 100%;
+    margin: auto;
     background: #F5FAFE;
-    border: 1px solid #ccc;
     font-size: 12px;
     font-family: "微软雅黑","宋体";
     #sms-set {
@@ -601,7 +606,7 @@ body {
             float: right;
             .form-control {
                 margin-top: 5px;
-                margin-left: -12px;
+                margin-left: -20px;
                 height: 25px;
                 font-size: 12px;
                 padding-left: 10px;
@@ -613,7 +618,7 @@ body {
                 z-index: 99;
                 position: absolute;
                 top: 7px;
-                left: 505px;
+                left: 485px;
                 font-size: 16px;
             }
         }
@@ -621,7 +626,7 @@ body {
             width: 80px;
             position: absolute;
             top: 0px;
-            left: 270px;
+            left: 250px;
             input {
                 margin-top: 3px;
             }
@@ -678,19 +683,20 @@ body {
     #sms-media {
         height: 200px;
         border: 1px solid #ccc;
-        border-radius: 5px;
+        border-bottom: none;
+        border-radius: 5px 5px 0px 0px;
         margin: 0px 10px;
         background: #fff;
         overflow-y: auto;
     }
     #sms-inbox {
-        height: 125px;
+        height: 130px;
         border: 1px solid #ccc;
-        border-radius: 5px;
-        margin: 10px;
+        border-radius: 0px 0px 5px 5px;
+        margin: 0px 10px;
         background: #fff;
         #sms-input {
-            height: 80px;
+            height: 85px;
             padding: 5px 25px 5px 5px;
             margin-right: -20px;
             overflow-y: auto;
@@ -702,6 +708,13 @@ body {
         #sms-button {
             float: right;
             padding:  0px 10px 10px 0px;
+            position: relative;
+            .smsInfo {
+                position: absolute;
+                left: -415px;
+                top: 14px;
+                color: #888;
+            }
             >button {
                 height: 35px;
                 width: 75px;

+ 1 - 1
talkview/src/templates/details-right.html

@@ -1,7 +1,7 @@
 <div id="details-right">
     <div id="userHead">
         <div id="icoImg">
-            <a><img src="../img/头像.png"></a>
+            <a><img src="../img/自己头像.png"></a>
         </div>
         <div id="watch">
             <span class="displayname"> <input type="text" readonly="readonly" value="{{user.name}}"></span>

+ 4 - 4
talkview/src/templates/messages.html

@@ -4,7 +4,7 @@
         <div class="feed-element" ng-repeat="item in historymessages | orderBy:item.index:'desc'">
             <div class="curTime"><small class="text-muted">{{getHisTime(item)}}</small></div>
             <div ng-class="getUserhead(item)" onSelectStart="return false">
-                <a><img src="../img/头像.png"></a>
+                <a><img ng-src="{{getUserheadImg(item)}}"></a>
             </div>
             <div class="media-body m-l-xs m-t-xs" ng-history-msg="item" ng-app-content="appContent" ng-count="count" ng-height="height">
                 <!--<p>
@@ -20,7 +20,7 @@
         <div class="feed-element animate" ng-repeat="item in sendmessages track by $index">
             <div class="curTime"><small class="text-muted">{{getCurTime(item)}}</small></div>
             <div ng-class="getUserhead(item)" onSelectStart="return false">
-                <a><img src="../img/头像.png"></a>
+                <a><img ng-src="{{getUserheadImg(item)}}"></a>
             </div>
             <div class="media-body" ng-current-msg="item" ng-app-content="appContent">
                 <!--<p>
@@ -225,7 +225,7 @@
         <!-- 语音 -->
         <div class="feed-element">
             <div class="user-head user-head-lf">
-                <a><img src="../img/头像.png"></a>
+                <a><img src="../img/对方头像.png"></a>
             </div>
             <div class="media-body">
                 <div class="well m-l-xs m-t-xs fit-content">
@@ -251,7 +251,7 @@
         </div>
         <div class="feed-element">
             <div class="user-head user-head-rt">
-                <a><img src="../img/头像.png"></a>
+                <a><img src="../img/自己头像.png"></a>
             </div>
             <div class="media-body">
                 <div class="wellself m-l-xs m-t-xs fit-content">

+ 1 - 0
talkview/src/templates/smsSend.html

@@ -49,6 +49,7 @@
     <div id="sms-inbox">
         <div id="sms-input" contenteditable="plaintext-only" ng-keyup="sendKeyup($event)"></div>
         <div id="sms-button">
+            <span class="smsInfo">每条短信上限140字符(70个汉字)</span>
             <button type="button" class="btn btn-success" ng-click="sendMsg($event)">发送</button>
             <div class="btn-group">
                 <button type="button" class="btn btn-success dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">