添加表情

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/ChatActivity.java

@@ -509,6 +509,7 @@ public class ChatActivity extends ActionBackActivity
             }
         } else {
             Log.d("roamer", "sendChatMessage");
+
             mService.sendChatMessage(mFriend.getUserId(), message);
             //进行百度推送
             sendPushTask(mLoginUserId, mFriend.getUserId(), message.getContent());

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/nearby/UserSearchActivity.java

@@ -19,7 +19,6 @@ import com.xzjmyk.pm.activity.R;
 
 /**
  * 搜索职位筛选界面
- *
  * @author Dean Tao
  */
 public class UserSearchActivity extends ActionBackActivity implements View.OnClickListener {
@@ -28,7 +27,6 @@ public class UserSearchActivity extends ActionBackActivity implements View.OnCli
     private int mMinAge;
     private int mMaxAge;
     private int mShowTime;
-
     private EditText mKeyWordEdit;
     private TextView mSexTv;
     private EditText mMinAgeEdit;
@@ -48,7 +46,6 @@ public class UserSearchActivity extends ActionBackActivity implements View.OnCli
         mMinAgeEdit = (EditText) findViewById(R.id.min_age_edit);
         mMaxAgeEdit = (EditText) findViewById(R.id.max_age_edit);
         mShowTimeTv = (TextView) findViewById(R.id.show_time_tv);
-
         findViewById(R.id.sex_rl).setOnClickListener(this);
         findViewById(R.id.show_time_rl).setOnClickListener(this);
         findViewById(R.id.search_btn).setOnClickListener(this);
@@ -66,7 +63,6 @@ public class UserSearchActivity extends ActionBackActivity implements View.OnCli
         mMaxAgeEdit.setText(String.valueOf(mMaxAge));
         mShowTimeTv.setText(R.string.all_date);
     }
-
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.menu_user_search, menu);
@@ -80,7 +76,6 @@ public class UserSearchActivity extends ActionBackActivity implements View.OnCli
         }
         return super.onOptionsItemSelected(item);
     }
-
     @Override
     public void onClick(View v) {
         switch (v.getId()) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/SmileyParser.java

@@ -76,16 +76,31 @@ public class SmileyParser {
 
 
         private static final int[][] IDS = {
-                {R.drawable.emoji_019, R.drawable.emoji_020, R.drawable.f_static_000, R.drawable.f_static_001,
-                        R.drawable.f_static_002, R.drawable.f_static_003, R.drawable.f_static_004, R.drawable.f_static_005, R.drawable.f_static_006, R.drawable.f_static_007,
-                        R.drawable.f_static_008, R.drawable.f_static_009, R.drawable.f_static_010, R.drawable.f_static_011, R.drawable.f_static_012, R.drawable.f_static_013,
-                        R.drawable.f_static_014, R.drawable.f_static_015}
-
+                {R.drawable.f_static_000, R.drawable.f_static_001, R.drawable.f_static_002, R.drawable.f_static_003, R.drawable.f_static_004,
+                        R.drawable.f_static_005, R.drawable.f_static_006, R.drawable.f_static_007, R.drawable.f_static_008, R.drawable.f_static_009,
+                        R.drawable.f_static_010, R.drawable.f_static_011, R.drawable.f_static_012, R.drawable.f_static_013, R.drawable.f_static_014,
+                        R.drawable.f_static_015, R.drawable.f_static_016, R.drawable.f_static_017},
+
+
+                {R.drawable.f_static_018, R.drawable.f_static_019, R.drawable.f_static_020, R.drawable.f_static_021, R.drawable.f_static_022,
+                        R.drawable.f_static_023, R.drawable.f_static_024, R.drawable.f_static_025, R.drawable.f_static_026,
+                        R.drawable.f_static_027, R.drawable.f_static_028, R.drawable.f_static_029, R.drawable.f_static_030,
+                        R.drawable.f_static_031, R.drawable.f_static_032, R.drawable.f_static_033, R.drawable.f_static_034, R.drawable.f_static_035}
+                , {
+                R.drawable.f_static_036, R.drawable.f_static_037, R.drawable.f_static_038
+        }
         };
 
-        private static final String[][] TEXTS = {{"[龇牙笑]", "[顽皮]", "[流汗]", "[汗]", "[奸笑]", "[惊呆了]", "[开心]", "[哭]", "[呕吐]", "[亲亲]", "[色眯眯]", "[生病]",
-                "[生气]", "[爽]", "[委屈]", "[严肃]", "[疑问]", "[晕]"}, {"[微笑]", "[得意]", "[害羞]", "[汗]", "[奸笑]", "[惊呆了]", "[开心]", "[哭]", "[呕吐]", "[亲亲]", "[色眯眯]", "[生病]",
-                "[生气]", "[爽]", "[委屈]", "[严肃]", "[疑问]", "[晕]"}};
+        private static final String[][] TEXTS = {
+                {"[龇牙笑]", "[顽皮]", "[流汗]", "[偷笑]", "[拜拜]",
+                        "[敲头]", "[擦汗]", "[我晕]", "[鄙视]", "[大哭]",
+                        "[笑哭]", "[嘘嘘]", "[酷]", "[狂笑]", "[委屈]",
+                        "[便便]", "[可怜]", "[砍人]"},
+                {"[可爱]", "[色]", "[害羞]", "[得意]", "[呕吐]",
+                        "[微笑]", "[抱抱]", "[尴尬]", "[惊恐]", "[抽烟]",
+                        "[坏笑]", "[嘴唇]", "[白眼]", "[傲慢]", "[奋斗]",
+                        "[吃惊]", "[疑问]", "[睡觉]"},
+                {"[邪恶]", "[哈哈]", "[吓]"}};
 
         private static final Map<String, Integer> MAPS = new HashMap<String, Integer>();
 

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.0'
+        classpath 'com.android.tools.build:gradle:2.0.0'
     }
 }