add new smile

luhg · Jun 19, 2015 · 18f4311 · 18f4311
1 parent 3f2830f
commit 18f4311
Show file tree

Hide file tree

Showing 17 changed files with 85 additions and 27 deletions.
diff --git a/WeChat/res/drawable-xhdpi/f_static_039.png b/WeChat/res/drawable-xhdpi/f_static_039.png
diff --git a/WeChat/res/drawable-xhdpi/f_static_047.png b/WeChat/res/drawable-xhdpi/f_static_047.png
diff --git a/WeChat/res/drawable-xhdpi/f_static_051.png b/WeChat/res/drawable-xhdpi/f_static_051.png
diff --git a/WeChat/res/drawable-xhdpi/f_static_053.png b/WeChat/res/drawable-xhdpi/f_static_053.png
diff --git a/WeChat/res/drawable-xhdpi/f_static_057.png b/WeChat/res/drawable-xhdpi/f_static_057.png
diff --git a/WeChat/res/drawable-xhdpi/f_static_058.png b/WeChat/res/drawable-xhdpi/f_static_058.png
diff --git a/WeChat/res/drawable-xhdpi/f_static_059.png b/WeChat/res/drawable-xhdpi/f_static_059.png
diff --git a/WeChat/res/drawable-xhdpi/f_static_060.png b/WeChat/res/drawable-xhdpi/f_static_060.png
diff --git a/WeChat/res/drawable-xhdpi/f_static_061.png b/WeChat/res/drawable-xhdpi/f_static_061.png
diff --git a/WeChat/res/drawable-xhdpi/f_static_062.png b/WeChat/res/drawable-xhdpi/f_static_062.png
diff --git a/WeChat/res/layout-xhdpi/row_received_message.xml b/WeChat/res/layout-xhdpi/row_received_message.xml
@@ -44,15 +44,11 @@
             android:layout_below="@+id/tv_userid"
             android:autoLink="web"
             android:clickable="true"
-            android:focusable="true"
-            android:paddingTop="3dp"
-            android:paddingBottom="3dp"
-            android:paddingLeft="15dp"
-            android:paddingRight="15dp"
-            android:gravity="center|left"
+            android:focusable="true" 
+            android:padding="12dp"
+            android:gravity="center"
             android:lineSpacingExtra="2dp"
-            android:minHeight="50dp"
-            android:textColor="#ff000000"
+            android:textColor="#252424"
             android:textSize="15sp" />
 
     </RelativeLayout>

diff --git a/WeChat/res/layout-xhdpi/row_received_voice.xml b/WeChat/res/layout-xhdpi/row_received_voice.xml
@@ -27,11 +27,20 @@
             android:background="@drawable/head"
             android:scaleType="fitXY" />
 
+           <TextView
+            android:id="@+id/tv_userid"
+              android:layout_marginLeft="15dp" 
+            android:layout_toRightOf="@id/iv_userhead"
+            style="@style/chat_text_name_style"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"    />
+
         <ImageView
             android:id="@+id/iv_voice"
             android:layout_width="wrap_content"
-            android:layout_height="50dp"
+            android:layout_height="45dp"
             android:layout_marginLeft="10dp"
+            android:layout_below="@+id/tv_userid"
             android:layout_toRightOf="@id/iv_userhead"
             android:background="@drawable/chatfrom_bg"
             android:clickable="true"
@@ -46,6 +55,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="10dp"
             android:layout_toRightOf="@id/iv_voice"
+            android:layout_below="@+id/tv_userid"
             android:gravity="center"
             android:text="3&apos;&apos;" />
 
@@ -54,6 +64,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="10dp"
+            android:layout_below="@+id/tv_userid"
             android:layout_toRightOf="@id/tv_length"
             android:src="@drawable/voice_unread" />
 
@@ -69,14 +80,7 @@
             android:layout_marginTop="5dp"
             android:visibility="invisible" />
 
-        <TextView
-            android:id="@+id/tv_userid"
-            style="@style/chat_text_name_style"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            android:layout_below="@id/iv_userhead"
-            android:layout_toLeftOf="@id/iv_voice" />
+
     </RelativeLayout>
 
 </LinearLayout>
diff --git a/WeChat/src/com/juns/wechat/App.java b/WeChat/src/com/juns/wechat/App.java
@@ -40,8 +40,8 @@ public void onCreate() {
 		EMChat.getInstance().setAutoLogin(true);
 		EMChatManager.getInstance().getChatOptions().setUseRoster(true);
 		FrontiaApplication.initFrontiaApplication(this);
-		CrashHandler crashHandler = CrashHandler.getInstance();// 全局异常捕捉
-		crashHandler.init(_context);
+		// CrashHandler crashHandler = CrashHandler.getInstance();// 全局异常捕捉
+		// crashHandler.init(_context);
 	}
 
 	private void initEMChat() {

diff --git a/WeChat/src/com/juns/wechat/chat/ChatActivity.java b/WeChat/src/com/juns/wechat/chat/ChatActivity.java
@@ -236,13 +236,15 @@ protected void initView() {
 		edittext_layout.setBackgroundResource(R.drawable.input_bar_bg_normal);
 
 		// 表情list
-		reslist = getExpressionRes(35);
+		reslist = getExpressionRes(62);
 		// 初始化表情viewpager
 		List<View> views = new ArrayList<View>();
 		View gv1 = getGridChildView(1);
 		View gv2 = getGridChildView(2);
+		View gv3 = getGridChildView(3);
 		views.add(gv1);
 		views.add(gv2);
+		views.add(gv3);
 		expressionViewpager.setAdapter(new ExpressionPagerAdapter(views));
 		edittext_layout.requestFocus();
 		voiceRecorder = new VoiceRecorder(micImageHandler);
@@ -1279,6 +1281,8 @@ private View getGridChildView(int i) {
 			list.addAll(list1);
 		} else if (i == 2) {
 			list.addAll(reslist.subList(21, reslist.size()));
+		} else if (i == 3) {
+			list.addAll(reslist.subList(42, reslist.size()));
 		}
 		list.add("delete_expression");
 		final ExpressionAdapter expressionAdapter = new ExpressionAdapter(this,

diff --git a/WeChat/src/com/juns/wechat/chat/adpter/MessageAdapter.java b/WeChat/src/com/juns/wechat/chat/adpter/MessageAdapter.java
@@ -48,9 +48,7 @@
 import com.easemob.util.FileUtils;
 import com.easemob.util.LatLng;
 import com.easemob.util.TextFormater;
-import com.juns.wechat.GloableParams;
 import com.juns.wechat.R;
-import com.juns.wechat.bean.User;
 import com.juns.wechat.chat.AlertDialog;
 import com.juns.wechat.chat.BaiduMapActivity;
 import com.juns.wechat.chat.ChatActivity;
@@ -371,8 +369,8 @@ public View getView(final int position, View convertView, ViewGroup parent) {
 		if (chatType == ChatType.GroupChat
 				&& message.direct == EMMessage.Direct.RECEIVE) {
 			// juns 好友名字
-			User user = GloableParams.Users.get(message.getFrom());
-			holder.tv_userId.setText(user.getUserName());
+			// User user = GloableParams.Users.get(message.getFrom());
+			// holder.tv_userId.setText(user.getUserName());
 		}
 		// 如果是发送的消息并且不是群聊消息，显示已读textview
 		if (message.direct == EMMessage.Direct.SEND

diff --git a/WeChat/src/com/juns/wechat/chat/utils/SmileUtils.java b/WeChat/src/com/juns/wechat/chat/utils/SmileUtils.java
@@ -16,7 +16,7 @@
 
 //表情
 public class SmileUtils {
-	public static final String f_static_00 = "[):]";
+	public static final String f_static_00 = "[):0]";
 	public static final String f_static_01 = "[):]";
 	public static final String f_static_02 = "[:D]";
 	public static final String f_static_03 = "[;)]";
@@ -53,6 +53,34 @@ public class SmileUtils {
 	public static final String f_static_034 = "[(W)]";
 	public static final String f_static_035 = "[(D)]";
 
+	public static final String f_static_036 = "[(D1)]";
+	public static final String f_static_037 = "[(D2)]";
+	public static final String f_static_038 = "[(D3)]";
+	public static final String f_static_039 = "[(D4)]";
+	public static final String f_static_040 = "[(D5)]";
+	public static final String f_static_041 = "[(D6)]";
+	public static final String f_static_042 = "[(D7)]";
+	public static final String f_static_043 = "[(D8)]";
+	public static final String f_static_044 = "[(D9)]";
+	public static final String f_static_045 = "[(D10)]";
+	public static final String f_static_046 = "[(D11)]";
+	public static final String f_static_047 = "[(D12)]";
+	public static final String f_static_048 = "[(D13)]";
+	public static final String f_static_049 = "[(D14)]";
+	public static final String f_static_050 = "[(D15)]";
+	public static final String f_static_051 = "[(D16)]";
+	public static final String f_static_052 = "[(D17)]";
+	public static final String f_static_053 = "[(D18)]";
+	public static final String f_static_054 = "[(D19)]";
+	public static final String f_static_055 = "[(D20)]";
+	public static final String f_static_056 = "[(D21)]";
+	public static final String f_static_057 = "[(D22)]";
+	public static final String f_static_058 = "[(D23)]";
+	public static final String f_static_059 = "[(D24)]";
+	public static final String f_static_060 = "[(D25)]";
+	public static final String f_static_061 = "[(D26)]";
+	public static final String f_static_062 = "[(D27)]";
+
 	private static final Factory spannableFactory = Spannable.Factory
 			.getInstance();
 
@@ -95,6 +123,35 @@ public class SmileUtils {
 		addPattern(emoticons, f_static_033, R.drawable.f_static_033);
 		addPattern(emoticons, f_static_034, R.drawable.f_static_034);
 		addPattern(emoticons, f_static_035, R.drawable.f_static_035);
+
+		addPattern(emoticons, f_static_036, R.drawable.f_static_036);
+		addPattern(emoticons, f_static_037, R.drawable.f_static_037);
+		addPattern(emoticons, f_static_038, R.drawable.f_static_038);
+		addPattern(emoticons, f_static_039, R.drawable.f_static_039);
+		addPattern(emoticons, f_static_040, R.drawable.f_static_040);
+		addPattern(emoticons, f_static_041, R.drawable.f_static_041);
+		addPattern(emoticons, f_static_042, R.drawable.f_static_042);
+		addPattern(emoticons, f_static_043, R.drawable.f_static_043);
+		addPattern(emoticons, f_static_044, R.drawable.f_static_044);
+		addPattern(emoticons, f_static_045, R.drawable.f_static_045);
+		addPattern(emoticons, f_static_046, R.drawable.f_static_046);
+		addPattern(emoticons, f_static_047, R.drawable.f_static_047);
+		addPattern(emoticons, f_static_048, R.drawable.f_static_048);
+		addPattern(emoticons, f_static_049, R.drawable.f_static_049);
+		addPattern(emoticons, f_static_050, R.drawable.f_static_050);
+		addPattern(emoticons, f_static_051, R.drawable.f_static_051);
+		addPattern(emoticons, f_static_052, R.drawable.f_static_052);
+		addPattern(emoticons, f_static_053, R.drawable.f_static_053);
+		addPattern(emoticons, f_static_054, R.drawable.f_static_054);
+		addPattern(emoticons, f_static_055, R.drawable.f_static_055);
+		addPattern(emoticons, f_static_056, R.drawable.f_static_056);
+
+		addPattern(emoticons, f_static_057, R.drawable.f_static_057);
+		addPattern(emoticons, f_static_058, R.drawable.f_static_058);
+		addPattern(emoticons, f_static_059, R.drawable.f_static_059);
+		addPattern(emoticons, f_static_060, R.drawable.f_static_060);
+		addPattern(emoticons, f_static_061, R.drawable.f_static_060);
+		addPattern(emoticons, f_static_062, R.drawable.f_static_062);
 	}
 
 	private static void addPattern(Map<Pattern, Integer> map, String smile,

diff --git a/WeChat/src/com/juns/wechat/common/UserUtils.java b/WeChat/src/com/juns/wechat/common/UserUtils.java
@@ -2,7 +2,6 @@
 
 import android.content.Context;
 import android.text.TextUtils;
-import android.util.Log;
 
 import com.alibaba.fastjson.JSON;
 import com.easemob.chat.EMChatManager;
@@ -20,7 +19,7 @@ public class UserUtils {
 	public static User getUserModel(Context context) {
 		User user = null;
 		String jsondata = Utils.getValue(context, Constants.UserInfo);
-		Log.e("", jsondata);
+		// Log.e("", jsondata);
 		if (!TextUtils.isEmpty(jsondata))
 			user = JSON.parseObject(jsondata, User.class);
 		return user;