8000 add new smile · onesimplecoder/wechat@18f4311 · GitHub
[go: up one dir, main page]
Skip to content

Commit 18f4311

Browse files
motianhuomotianhuo
committed
add new smile
1 parent 3f2830f commit 18f4311

17 files changed

+85
-27
lines changed

‎WeChat/res/drawable-xhdpi/f_static_039.png

2.63 KB
Loading

‎WeChat/res/drawable-xhdpi/f_static_047.png

2.91 KB
Loading

‎WeChat/res/drawable-xhdpi/f_static_051.png

-1.46 KB
Loading

‎WeChat/res/drawable-xhdpi/f_static_053.png

52 Bytes
Loading

‎WeChat/res/drawable-xhdpi/f_static_057.png

2.66 KB
Loading

‎WeChat/res/drawable-xhdpi/f_static_058.png

2.55 KB
Loading

‎WeChat/res/drawable-xhdpi/f_static_059.png

2.41 KB
Loading

‎WeChat/res/drawable-xhdpi/f_static_060.png

1.52 KB
Loading

‎WeChat/res/drawable-xhdpi/f_static_061.png

2.13 KB
Loading

‎WeChat/res/drawable-xhdpi/f_static_062.png

1.83 KB
Loading

‎WeChat/res/layout-xhdpi/row_received_message.xml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,11 @@
4444
android:layout_below="@+id/tv_userid"
4545
android:autoLink="web"
4646
android:clickable="true"
47-
android:focusable="true"
48-
android:paddingTop="3dp"
49-
android:paddingBottom="3dp"
50-
android:paddingLeft="15dp"
51-
android:paddingRight="15dp"
52-
android:gravity="center|left"
47+
android:focusable="true"
48+
android:padding="12dp"
49+
android:gravity="center"
5350
android:lineSpacingExtra="2dp"
54-
android:minHeight="50dp"
55-
android:textColor="#ff000000"
51+
android:textColor="#252424"
5652
android:textSize="15sp" />
5753

5854
</RelativeLayout>

‎WeChat/res/layout-xhdpi/row_received_voice.xml

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,20 @@
2727
android:background="@drawable/head"
2828
android:scaleType="fitXY" />
2929

30+
<TextView
31+
android:id="@+id/tv_userid"
32+
android:layout_marginLeft="15dp"
33+
android:layout_toRightOf="@id/iv_userhead"
34+
style="@style/chat_text_name_style"
35+
android:layout_width="wrap_content"
36+
android:layout_height="wrap_content" />
37+
3038
<ImageView
3139
android:id="@+id/iv_voice"
3240
android:layout_width="wrap_content"
33-
android:layout_height="50dp"
41+
android:layout_height="45dp"
3442
android:layout_marginLeft="10dp"
43+
android:layout_below="@+id/tv_userid"
3544
android:layout_toRightOf="@id/iv_userhead"
3645
android:background="@drawable/chatfrom_bg"
3746
android:clickable="true"
@@ -46,6 +55,7 @@
4655
android:layout_height="wrap_content"
4756
android:layout_marginLeft="10dp"
4857
android:layout_toRightOf="@id/iv_voice"
58+
android:layout_below="@+id/tv_userid"
4959
android:gravity="center"
5060
android:text="3&apos;&apos;" />
5161

@@ -54,6 +64,7 @@
5464
android:layout_width="wrap_content"
5565
android:layout_height="wrap_content"
5666
android:layout_marginLeft="10dp"
67+
android:layout_below="@+id/tv_userid"
5768
android:layout_toRightOf="@id/tv_length"
5869
android:src="@drawable/voice_unread" />
5970

@@ -69,14 +80,7 @@
6980
android:layout_marginTop="5dp"
7081
android:visibility="invisible" />
7182

72-
<TextView
73-
android:id="@+id/tv_userid"
74-
style="@style/chat_text_name_style"
75-
android:layout_width="wrap_content"
76-
android:layout_height="wrap_content"
77-
android:layout_alignParentLeft="true"
78-
android:layout_below="@id/iv_userhead"
79-
android:layout_toLeftOf="@id/iv_voice" />
83+
8084
</RelativeLayout>
8185

8286
</LinearLayout>

‎WeChat/src/com/juns/wechat/App.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ public void onCreate() {
4040
EMChat.getInstance().setAutoLogin(true);
4141
EMChatManager.getInstance().getChatOptions().setUseRoster(true);
4242
FrontiaApplication.initFrontiaApplication(this);
43-
CrashHandler crashHandler = CrashHandler.getInstance();// 全局异常捕捉
44-
crashHandler.init(_context);
43+
// CrashHandler crashHandler = CrashHandler.getInstance();// 全局异常捕捉
44+
// crashHandler.init(_context);
4545
}
4646

4747
private void initEMChat() {

‎WeChat/src/com/juns/wechat/chat/ChatActivity.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,13 +236,15 @@ protected void initView() {
236236
edittext_layout.setBackgroundResource(R.drawable.input_bar_bg_normal);
237237

238238
// 表情list
239-
reslist = getExpressionRes(35);
239+
reslist = getExpressionRes(62);
240240
// 初始化表情viewpager
241241
List<View> views = new ArrayList<View>();
242242
View gv1 = getGridChildView(1);
243243
View gv2 = getGridChildView(2);
244+
View gv3 = getGridChildView(3);
244245
views.add(gv1);
245246
views.add(gv2);
247+
views.add(gv3);
246248
expressionViewpager.setAdapter(new ExpressionPagerAdapter(views));
247249
edittext_layout.requestFocus();
248250
voiceRecorder = new VoiceRecorder(micImageHandler);
@@ -1279,6 +1281,8 @@ private View getGridChildView(int i) {
12791281
list.addAll(list1);
12801282
} else if (i == 2) {
12811283
list.addAll(reslist.subList(21, reslist.size()));
1284+
} else if (i == 3) {
1285+
list.addAll(reslist.subList(42, reslist.size()));
12821286
}
12831287
list.add("delete_expression");
12841288
final ExpressionAdapter expressionAdapter = new ExpressionAdapter(this,

‎WeChat/src/com/juns/wechat/chat/adpter/MessageAdapter.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,7 @@
4848
import com.easemob.util.FileUtils;
4949
import com.easemob.util.LatLng;
5050
import com.easemob.util.TextFormater;
51-
import com.juns.wechat.GloableParams;
5251
import com.juns.wechat.R;
53-
import com.juns.wechat.bean.User;
5452
import com.juns.wechat.chat.AlertDialog;
5553
import com.juns.wechat.chat.BaiduMapActivity;
5654
import com.juns.wechat.chat.ChatActivity;
@@ -371,8 +369,8 @@ public View getView(final int position, View convertView, ViewGroup parent) {
371369
if (chatType == ChatType.GroupChat
372370
&& message.direct == EMMessage.Direct.RECEIVE) {
373371
// juns 好友名字
374-
User user = GloableParams.Users.get(message.getFrom());
375-
holder.tv_userId.setText(user.getUserName());
372+
// User user = GloableParams.Users.get(message.getFrom());
373+
// holder.tv_userId.setText(user.getUserName());
376374
}
377375
// 如果是发送的消息并且不是群聊消息，显示已读textview
378376
if (message.direct == EMMessage.Direct.SEND

‎WeChat/src/com/juns/wechat/chat/utils/SmileUtils.java

Lines changed: 58 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
//表情
1818
public class SmileUtils {
19-
public static final String f_static_00 = "[):]";
19+
public static final String f_static_00 = "[):0]";
2020
public static final String f_static_01 = "[):]";
2121
public static final String f_static_02 = "[:D]";
2222
public static final String f_static_03 = "[;)]";
@@ -53,6 +53,34 @@ public class SmileUtils {
5353
public static final String f_static_034 = "[(W)]";
5454
public static final String f_static_035 = "[(D)]";
5555

56+
public static final String f_static_036 = "[(D1)]";
57+
public static final String f_static_037 = "[(D2)]";
58+
public static final String f_static_038 = "[(D3)]";
59+
public static final String f_static_039 = "[(D4)]";
60+
public static final String f_static_040 = "[(D5)]";
61+
public static final String f_static_041 = "[(D6)]";
62+
public static final String f_static_042 = "[(D7)]";
63+
public static final String f_static_043 = "[(D8)]";
64+
public static final String f_static_044 = "[(D9)]";
65+
public static final String f_static_045 = "[(D10)]";
66+
public static final String f_static_046 = "[(D11)]";
67+
public static final String f_static_047 = "[(D12)]";
68+
public static final String f_static_048 = "[(D13)]";
69+
public static final String f_static_049 = "[(D14)]";
70+
public static final String f_static_050 = "[(D15)]";
71+
public static final String f_static_051 = "[(D16)]";
72+
public static final String f_static_052 = "[(D17)]";
73+
public static final String f_static_053 = "[(D18)]";
74+
public static final String f_static_054 = "[(D19)]";
75+
public static final String f_static_055 = "[(D20)]";
76+
public static final String f_static_056 = "[(D21)]";
77+
public static final String f_static_057 = "[(D22)]";
78+
public static final String f_static_058 = "[(D23)]";
79+
public static final String f_static_059 = "[(D24)]";
80+
public static final String f_static_060 = "[(D25)]";
81+
public static final String f_static_061 = "[(D26)]";
82+
public static final String f_static_062 = "[(D27)]";
83+
5684
private static final Factory spannableFactory = Spannable.Factory
5785
.getInstance();
5886

@@ -95,6 +123,35 @@ public class SmileUtils {
95123
addPattern(emoticons, f_static_033, R.drawable.f_static_033);
96124
addPattern(emoticons, f_static_034, R.drawable.f_static_034);
97125
addPattern(emoticons, f_static_035, R.drawable.f_static_035);
126+
127+
addPattern(emoticons, f_static_036, R.drawable.f_static_036);
128+
addPattern(emoticons, f_static_037, R.drawable.f_static_037);
129+
addPattern(emoticons, f_static_038, R.drawable.f_static_038);
130+
addPattern(emoticons, f_static_039, R.drawable.f_static_039);
131+
addPattern(emoticons, f_static_040, R.drawable.f_static_040);
132+
addPattern(emoticons, f_static_041, R.drawable.f_static_041);
133+
addPattern(emoticons, f_static_042, R.drawable.f_static_042);
134+
addPattern(emoticons, f_static_043, R.drawable.f_static_043);
135+
addPattern(emoticons, f_static_044, R.drawable.f_static_044);
136+
addPattern(emoticons, f_static_045, R.drawable.f_static_045);
137+
addPattern(emoticons, f_static_046, R.drawable.f_static_046);
138+
addPattern(emoticons, f_static_047, R.drawable.f_static_047);
139+
addPattern(emoticons, f_static_048, R.drawable.f_static_048);
140+
addPattern(emoticons, f_static_049, R.drawable.f_static_049);
141+
addPattern(emoticons, f_static_050, R.drawable.f_static_050);
142+
addPattern(emoticons, f_static_051, R.drawable.f_static_051);
143+
addPattern(emoticons, f_static_052, R.drawable.f_static_052);
144+
addPattern(emoticons, f_static_053, R.drawable.f_static_053);
145+
addPattern(emoticons, f_static_054, R.drawable.f_static_054);
146+
addPattern(emoticons, f_static_055, R.drawable.f_static_055);
147+
addPattern(emoticons, f_static_056, R.drawable.f_static_056);
148+
149+
addPattern(emoticons, f_static_057, R.drawable.f_static_057);
150+
addPattern(emoticons, f_static_058, R.drawable.f_static_058);
151+
addPattern(emoticons, f_static_059, R.drawable.f_static_059);
152+
addPattern(emoticons, f_static_060, R.drawable.f_static_060);
153+
addPattern(emoticons, f_static_061, R.drawable.f_static_060);
154+
addPattern(emoticons, f_static_062, R.drawable.f_static_062);
98155
}
99156

100157
private static void addPattern(Map<Pattern, Integer> map, String smile,

‎WeChat/src/com/juns/wechat/common/UserUtils.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import android.content.Context;
44
import android.text.TextUtils;
5-
import android.util.Log;
65

76
import com.alibaba.fastjson.JSON;
87
import com.easemob.chat.EMChatManager;
@@ -20,7 +19,7 @@ public class UserUtils {
2019
public static User getUserModel(Context context) {
2120
User user = null;
2221
String jsondata = Utils.getValue(context, Constants.UserInfo);
23-
Log.e("", jsondata);
22+
// Log.e("", jsondata);
2423
if (!TextUtils.isEmpty(jsondata))
2524
user = JSON.parseObject(jsondata, User.class);
2625
return user;

0 commit comments

Comments
 (0)
0