Browse Source

聊天界面

dgf 8 years ago
parent
commit
cdefae44b3

BIN
dist/img/222.mp3


BIN
dist/img/loader.gif


BIN
dist/img/loading.jpg


BIN
dist/img/yuyin-self.png


BIN
dist/img/yuyin.png


+ 1 - 1
talkview/src/js/controller/messageController.js

@@ -30,7 +30,7 @@ angular.module('appMessage').controller('MessageController', ['$scope', '$filter
                     $timeout(function() {
                         $($event.target).removeClass("app-voice-play");
                         $($event.target).addClass("app-voice-pause");
-                    }, 1000 * audio.duration);
+                    }, 10000 * audio.duration);
                     audio.play();
                 } else {
                     $($event.target).removeClass("app-voice-play");

+ 2 - 2
talkview/src/js/directive/historymessages.js

@@ -246,14 +246,14 @@
                 var html_g = html;
             } else {
                 if (getUserID()) {
-                    var html_g = '<div><p><strong>' +
+                    var html_g = '<div onSelectStart="return false"><p><strong>' +
                         scope.msg.senderDisplayName +
                         '</strong><small class="text-muted"></small></p></div>' +
                         '<div class="wellself m-l-xs m-t-xs fit-content" >' +
                         '<div class="text-point"></div>' + html +
                         '</div>';
                 } else {
-                    var html_g = '<div><p><strong>' +
+                    var html_g = '<div onSelectStart="return false"><p><strong>' +
                         scope.msg.senderDisplayName +
                         '</strong><small class="text-muted"></small></p></div>' +
                         '<div class="well m-l-xs m-t-xs fit-content" >' +

+ 9 - 6
talkview/src/less/app.main.less

@@ -22,12 +22,15 @@
         }
     }
     .loadmore {
+        cursor:default;
         margin-top: -5px;
     }
     .sendmessage {
+        cursor:default;
         margin-top: -10px;
     }
     .curTime {
+        cursor:default;
         text-align: center;
         font-family: "微软雅黑","宋体";
         font-size: 12px;
@@ -478,7 +481,7 @@ body {
     }
     .app-voice-pause{
         /*从未播放*/ 
-        background-position: -2px -5px;
+        background-position: -1.5px -5px;
     }
     .app-voice-unread {
        height:4px; width:4px; border-radius:4px; 
@@ -488,11 +491,11 @@ body {
 }
 .app-voice-you .app-voice-play {
   /*播放中(不需要过渡动画)*/
-  background-position: -2px -5px;
-  -webkit-animation: voiceplay 2s infinite step-start;
-  -moz-animation: voiceplay 2s infinite step-start;
-  -o-animation: voiceplay 2s infinite step-start;
-  animation: voiceplay 2s infinite step-start;
+  background-position: -1.5px -5px;
+  -webkit-animation: voiceplay 1.5s infinite step-start;
+  -moz-animation: voiceplay 1.5s infinite step-start;
+  -o-animation: voiceplay 1.5s infinite step-start;
+  animation: voiceplay 1.5s infinite step-start;
 }
 
 @keyframes voiceplay {