some bug fix

android-interact.sh

@@ -1,6 +1,6 @@
 #!/bin/bash -e
 # File: android-interact.sh
-# Date: Thu Dec 25 23:26:56 2014 +0800
+# Date: Sat Dec 27 00:04:17 2014 +0800
 # Author: Yuxin Wu <[email protected]>
 
 # Please check that your path is the same, since this might be different among devices
@@ -41,14 +41,15 @@ elif [[ $1 == "db" || $1 == "res" ]]; then
 
 	if [[ $1 == "res" ]]; then
 		echo "Pulling resources... this might take a long time..."
-		mkdir resource
-		cd resource
+		mkdir resource; cd resource
 		for d in image2 voice2 emoji avatar; do
+			mkdir $d; cd $d
 			adb pull $RES_DIR/$chooseUser/$d
 			[[ -d $d ]] || {
 				echo "Failed to download resource directory: $RES_DIR/$chooseUser/$d"
 				exit 1
 			}
+			cd ..
 		done
 		cd ..
 		echo "Resource pulled at ./resource"

lib/res.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python2
 # -*- coding: UTF-8 -*-
 # File: res.py
-# Date: Thu Dec 25 23:19:32 2014 +0800
+# Date: Sat Dec 27 00:06:26 2014 +0800
 # Author: Yuxin Wu <[email protected]>
 
 import glob
@@ -54,7 +54,6 @@ class Resource(object):
                     "Error interpreting the protocol, this is a bug!"
                 self.speak_data[key] = full_path
 
-    @timing(total=True)
     def get_voice_mp3(self, imgpath):
         """ return base64 string, and voice duration"""
         amr_fpath = self.speak_data[imgpath]

lib/static/TP_EMOJI.html

@@ -6,7 +6,7 @@
         <div class="cloudBody">
           <div class="cloudContent">
             <span class="img_wrap">
-              <img class="zoomIn imageBorder" src="data:image/{emoji_format};base64,{emoji_img}"/>
+              <img class="emojiImg imageBorder" src="data:image/{emoji_format};base64,{emoji_img}"/>
             </span>
           </div>
         </div>

lib/static/parse_tencent_smiley.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python2
 # -*- coding: UTF-8 -*-
 # File: parse_tencent_smiley.py
-# Date: Sun Dec 21 23:35:36 2014 +0800
+# Date: Sat Dec 27 00:15:14 2014 +0800
 # Author: Yuxin Wu <[email protected]>
 
 import xml.etree.ElementTree as ET
@@ -23,6 +23,7 @@ for child in root:
         for idx, v in enumerate(lst):
             if type(v) == str:
                 # two code appears in the xml.. don't know why
+                v = v.strip('"')
                 v = v.replace('&lt;', '<')
                 v = v.replace('&amp;', '&')
                 v = v.decode('utf-8')

lib/static/wx.css

@@ -1626,6 +1626,10 @@ a.btnSecondary:active {
     max-width: 200px;
     max-height: 150px;
 }
+.cloudContent img.emojiImg {
+    max-width: 200px;
+    max-height: 120px;
+}
 .chatItem .cloudMesg .cloudMesgPanel .cloudMesgContent p {
   color: #1F252B;
   width: 100%;
@@ -5315,8 +5319,7 @@ a.btnBlue:active .btnBluePanel {
   cursor: pointer;
 }
 .you .cloudImg .cloudContent {
-  padding: 5px 13px\9;
-  padding: 6px;
+  padding: 3px;
   color: #030303;
 }
 .you .cloudImg .img_wrap{
@@ -5537,8 +5540,7 @@ a.btnBlue:active .btnBluePanel {
   _display: none;
 }
 .me .cloudImg .cloudContent {
-  padding: 7px;
-  padding: 5px\9;
+  padding: 3px;
   border: none;
   border-radius: 8px\9;
 }