voice works
This commit is contained in:
ppwwyyxx
+2
-2
@@ -1,6 +1,6 @@
|
||||
#!/bin/bash -e
|
||||
# File: decrypt_db.sh
|
||||
# Date: Fri Nov 21 13:07:33 2014 +0800
|
||||
# Date: Sun Nov 23 16:46:51 2014 +0800
|
||||
# Author: Yuxin Wu <[email protected]>
|
||||
|
||||
MMSGDB=$1
|
||||
@@ -18,6 +18,6 @@ LD_LIBRARY_PATH=./lib ./lib/sqlcipher $MMSGDB << EOF
|
||||
PRAGMA key='$KEY';
|
||||
PRAGMA cipher_use_hmac = off;
|
||||
ATTACH DATABASE "decoded_database.db" AS decoded_database KEY "";
|
||||
SELECT sqlcipher_export("decoded_database");
|
||||
SELECT sqlcipher_export("decoded_db");
|
||||
DETACH DATABASE decoded_database;
|
||||
EOF
|
||||
|
||||
+26
-7
@@ -1,10 +1,11 @@
|
||||
#!/usr/bin/env python2
|
||||
# -*- coding: UTF-8 -*-
|
||||
# File: render.py
|
||||
# Date: Sun Nov 23 16:28:28 2014 +0800
|
||||
# Date: Sun Nov 23 17:52:08 2014 +0800
|
||||
# Author: Yuxin Wu <[email protected]>
|
||||
|
||||
import os
|
||||
import base64
|
||||
LIB_PATH = os.path.dirname(os.path.abspath(__file__))
|
||||
CSS_FILE = os.path.join(LIB_PATH, 'static/wx.css')
|
||||
HTML_FILE = os.path.join(LIB_PATH, 'static/template.html')
|
||||
@@ -17,7 +18,7 @@ except:
|
||||
from .msg import *
|
||||
from .utils import ensure_unicode
|
||||
|
||||
TEMPLATES_FILES = {TYPE_MSG: "TP_MSG"}
|
||||
TEMPLATES_FILES = {TYPE_MSG: "TP_MSG", TYPE_SPEAK: "TP_SPEAK"}
|
||||
TEMPLATES = dict([(k, open(os.path.join(
|
||||
LIB_PATH, 'static/{}.html'.format(v))).read())
|
||||
for k, v in TEMPLATES_FILES.iteritems()])
|
||||
@@ -30,20 +31,38 @@ class HTMLRender(object):
|
||||
self.res = res
|
||||
|
||||
def get_avatar_pair(self, username):
|
||||
""" return base64 string pair of two avatars"""
|
||||
if self.res is None:
|
||||
return ("", "")
|
||||
avt1 = self.res.get_avatar(self.parser.username)
|
||||
avt2 = self.res.get_avatar(username)
|
||||
return (avt1, avt2)
|
||||
|
||||
def get_voice_mp3(self, imgpath):
|
||||
""" return base64 string"""
|
||||
if self.res is None:
|
||||
return ""
|
||||
amr_fpath = self.res.speak_data[imgpath]
|
||||
mp3_file = os.path.join('/tmp', os.path.basename(amr_fpath)[:-4] + '.mp3')
|
||||
os.system('sox {} {}'.format(amr_fpath, mp3_file))
|
||||
mp3_string = open(mp3_file, 'rb').read()
|
||||
os.unlink(mp3_file)
|
||||
return base64.b64encode(mp3_string)
|
||||
|
||||
def render_msg(self, msg):
|
||||
""" render a message, return the block"""
|
||||
# TODO
|
||||
#template = ensure_unicode(TEMPLATES[msg.type])
|
||||
template = ensure_unicode(TEMPLATES[1])
|
||||
if False:
|
||||
return ""
|
||||
else:
|
||||
try:
|
||||
template = ensure_unicode(TEMPLATES[msg.type])
|
||||
if msg.type == TYPE_SPEAK:
|
||||
audio_str = self.get_voice_mp3(msg.imgPath)
|
||||
return template.format(sender_label='you' if not msg.isSend else 'me',
|
||||
voice_duration=10,
|
||||
voice_str=audio_str)
|
||||
else:
|
||||
raise
|
||||
except:
|
||||
template = ensure_unicode(TEMPLATES[1])
|
||||
return template.format(sender_label='you' if not msg.isSend else 'me',
|
||||
content=msg.msg_str())
|
||||
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
<div class="chatItem {sender_label}">
|
||||
<div class="chatItemContent">
|
||||
<img class="avatar" src="">
|
||||
<div class="cloud cloudVoice" onclick="playVoice(event)" style="width:80px">
|
||||
<div class="cloudPannel" style="">
|
||||
<div class="sendStatus">
|
||||
<span class="second">{voice_duration}"</span>
|
||||
</div>
|
||||
<div class="cloudBody">
|
||||
<div class="cloudContent">
|
||||
<span class="icoVoice"></span>
|
||||
<audio>
|
||||
<source src="data:audio/mp3;base64,{voice_str}" />
|
||||
</audio>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -37,6 +37,14 @@
|
||||
var avt = chats[k].getElementsByClassName('avatar')[0];
|
||||
avt.src = "data:image/jpg;base64,{avatar_you}";
|
||||
}}
|
||||
|
||||
var playVoice = function(event) {{
|
||||
var target = event.target;
|
||||
while (!target.classList.contains('cloud'))
|
||||
target = target.parentElement;
|
||||
var audio = target.getElementsByTagName('audio')[0];
|
||||
audio.play();
|
||||
}};
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
+2
-2
@@ -5466,7 +5466,7 @@ a.btnBlue:active .btnBluePanel {
|
||||
width: 25px;
|
||||
width: 25px\9;
|
||||
height: 20px;
|
||||
background: url(../images/icon_sound_new1dbc46.png) no-repeat 0 -1px;
|
||||
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2ZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo2NDNDQzNGRjA4RENFMzExODlENTg2M0UxQjZFMDkyQyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDpFRDhENzczMkRDMEUxMUUzQTkzNEQ5MDhCQjY4MjRDNiIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpFRDhENzczMURDMEUxMUUzQTkzNEQ5MDhCQjY4MjRDNiIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M2IChXaW5kb3dzKSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjY0M0NDM0ZGMDhEQ0UzMTE4OUQ1ODYzRTFCNkUwOTJDIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjY0M0NDM0ZGMDhEQ0UzMTE4OUQ1ODYzRTFCNkUwOTJDIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+FPaLpgAAA0lJREFUeNrsWH9k1GEYv90xxjHGsX86IiLisilxGUfZ7EQsToplaZWlXMoyxiaaxfRHpkZGvzSms5hO02waEUeMY4zTZYxjHOOIuT4Pn5fH12Rz73vFvi8fz/s+9z3f5/k8P973+zZUq9XAQR4NPgH7IODN+9kOiHHg2uVUz6oro+4/P9QI8QIoAQ+f3Pi14+pdwX04n4D4DJwElrA+7tD5D0CvLIFplxkQ3IPjcaAJ02XgJdUtwBz0YQc2PQK6OV8HRklMnOTUjwA4OATxFfgENCPtb0FO8efDwFPL0ZcSS3O5CZxB+q9DP0g7ljBvrQsBjG6Myw5GPAR5F8hT38e+YMP5EOs+RNVVOL8J/RXMHyvSo04JgEOdgEQ8gohfhJzhT3FgCLoK5G31l7QlWy4ARzl/B+ezcF4cnqROGuIpIAf9CDBpoySCHufPMt072egiEgmgwEcGpB+AhEXMzS7QDV2LJQLMeGbeB5g+0w9Siiy7YeAm8NYqAXBsgdHdYaqNM+ITfCSiDM1QSsq2WSAgYSINR7+xJHqpy0OXYY8YoE5s7bdeAnBY2H/NZQ/lonrEOJtXumM11r9E2TQ3k1lHuNvIyFJeotwGUiBly1UTzFGGkd6t3I7MMIbqlzfVaIcuoZLKNjOKqgmajNhy0gQ5TDOSUih7DCzv4vTvGu3YVvPmv+gMOVFbZ4LddoGYqr159oC4euQHpT4JFmoxgtEse8hfAypqBwqoHUmycMQ6AXA+yuNumAY98Gx1Eul5T9eWLPluwZYVk+aIbhtIqajaT0AXg+6jev8gdGmrBCDaUmvnaEwS6zWeBk/zkSnoNvgdYJrhgugsEJBR8z7KMRIsO8I0HJayS/FZ+UiacPo1CEeHVapJIzzBtPzC06GMFAiYsXASFOd+svlJprXDwVU59HDfDzDTktCX6vUxJNvfBrtwFxyVxnRHOS/9YNaGIUz5e1xKg3tFUkbVtpz17D7u7wN4GpTTXxHz6zyvB5gJ7dDnLX8QzUGcV32hC+Rssy/k/tmFCJxvZOrH6XySR2Lb9wHN6t6hzJRf+V9uhEKsx2UXzntIkJunMThfCDgc/p2gT4BPgE+AT4BPgE+AT4BPgE/AAR1/BBgA8iNe2jzu2vcAAAAASUVORK5CYII=) no-repeat 0 -1px;
|
||||
cursor: pointer;
|
||||
margin-left: 0px\9;
|
||||
}
|
||||
@@ -5694,7 +5694,7 @@ a.btnBlue:active .btnBluePanel {
|
||||
float: right;
|
||||
width: 25px;
|
||||
height: 20px;
|
||||
background: url(../images/icon_sound_new1dbc46.png) no-repeat -24px -1px;
|
||||
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2ZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo2NDNDQzNGRjA4RENFMzExODlENTg2M0UxQjZFMDkyQyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDpFRDhENzczMkRDMEUxMUUzQTkzNEQ5MDhCQjY4MjRDNiIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpFRDhENzczMURDMEUxMUUzQTkzNEQ5MDhCQjY4MjRDNiIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M2IChXaW5kb3dzKSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjY0M0NDM0ZGMDhEQ0UzMTE4OUQ1ODYzRTFCNkUwOTJDIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjY0M0NDM0ZGMDhEQ0UzMTE4OUQ1ODYzRTFCNkUwOTJDIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+FPaLpgAAA0lJREFUeNrsWH9k1GEYv90xxjHGsX86IiLisilxGUfZ7EQsToplaZWlXMoyxiaaxfRHpkZGvzSms5hO02waEUeMY4zTZYxjHOOIuT4Pn5fH12Rz73vFvi8fz/s+9z3f5/k8P973+zZUq9XAQR4NPgH7IODN+9kOiHHg2uVUz6oro+4/P9QI8QIoAQ+f3Pi14+pdwX04n4D4DJwElrA+7tD5D0CvLIFplxkQ3IPjcaAJ02XgJdUtwBz0YQc2PQK6OV8HRklMnOTUjwA4OATxFfgENCPtb0FO8efDwFPL0ZcSS3O5CZxB+q9DP0g7ljBvrQsBjG6Myw5GPAR5F8hT38e+YMP5EOs+RNVVOL8J/RXMHyvSo04JgEOdgEQ8gohfhJzhT3FgCLoK5G31l7QlWy4ARzl/B+ezcF4cnqROGuIpIAf9CDBpoySCHufPMt072egiEgmgwEcGpB+AhEXMzS7QDV2LJQLMeGbeB5g+0w9Siiy7YeAm8NYqAXBsgdHdYaqNM+ITfCSiDM1QSsq2WSAgYSINR7+xJHqpy0OXYY8YoE5s7bdeAnBY2H/NZQ/lonrEOJtXumM11r9E2TQ3k1lHuNvIyFJeotwGUiBly1UTzFGGkd6t3I7MMIbqlzfVaIcuoZLKNjOKqgmajNhy0gQ5TDOSUih7DCzv4vTvGu3YVvPmv+gMOVFbZ4LddoGYqr159oC4euQHpT4JFmoxgtEse8hfAypqBwqoHUmycMQ6AXA+yuNumAY98Gx1Eul5T9eWLPluwZYVk+aIbhtIqajaT0AXg+6jev8gdGmrBCDaUmvnaEwS6zWeBk/zkSnoNvgdYJrhgugsEJBR8z7KMRIsO8I0HJayS/FZ+UiacPo1CEeHVapJIzzBtPzC06GMFAiYsXASFOd+svlJprXDwVU59HDfDzDTktCX6vUxJNvfBrtwFxyVxnRHOS/9YNaGIUz5e1xKg3tFUkbVtpz17D7u7wN4GpTTXxHz6zyvB5gJ7dDnLX8QzUGcV32hC+Rssy/k/tmFCJxvZOrH6XySR2Lb9wHN6t6hzJRf+V9uhEKsx2UXzntIkJunMThfCDgc/p2gT4BPgE+AT4BPgE+AT4BPgE/AAR1/BBgA8iNe2jzu2vcAAAAASUVORK5CYII=) no-repeat -24px -1px;
|
||||
cursor: pointer;
|
||||
}
|
||||
.me .cloudVoice .icoVoicePlaying {
|
||||
|
||||
Reference in New Issue
Block a user