代码冲突

Merge branch 'feature' of https://gitlab.com/Arisono/SkWeiChat-Baidu into developer

# Conflicts:
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MessageFragment.java
#	app_core/common/src/main/java/com/common/data/StringUtil.java

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/MeFragment.java

@@ -30,8 +30,6 @@ import com.common.system.PermissionUtil;
 import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUAS;
 import com.core.api.wxapi.ApiUtils;
-import com.core.app.AppConfig;
-import com.core.app.AppConstant;
 import com.core.app.AppConstant;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
@@ -41,6 +39,7 @@ import com.core.utils.FlexJsonUtil;
 import com.core.utils.ToastUtil;
 import com.core.utils.helper.AvatarHelper;
 import com.lidroid.xutils.view.annotation.ViewInject;
+import com.uas.appcontact.utils.ContactsUtils;
 import com.uas.appme.other.model.Master;
 import com.uas.appme.settings.activity.BaseInfoActivity;
 import com.uas.appme.settings.activity.SettingActivity;
@@ -274,6 +273,13 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
     private void initView() {
         LogUtil.d(TAG,"initView()");
         ct = getActivity();
+        
+       new Thread(new Runnable() {
+           @Override
+           public void run() {
+               ContactsUtils.testAddContact();
+           }
+       }).start();
         findViewById(R.id.my_data_rl).setOnClickListener(this);
         findViewById(R.id.my_friend_rl).setOnClickListener(this);
         findViewById(R.id.my_space_rl).setOnClickListener(this);
@@ -288,11 +294,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
         mAvatarImg = (ImageView) findViewById(R.id.avatar_img);
         mNickNameTv = (TextView) findViewById(R.id.nick_name_tv);
         mPhoneNumTv = (TextView) findViewById(R.id.phone_number_tv);
-         
         
-   
-
-
         IntentFilter loginFilter = new IntentFilter();
         loginFilter.addAction("com.app.home.update");
         LocalBroadcastManager.getInstance(ct).registerReceiver(updateLoginState, loginFilter);

app_modular/appcontact/src/main/java/com/uas/appcontact/utils/ContactsUtils.java

@@ -146,8 +146,7 @@ public class ContactsUtils {
 
 
     public static void testAddContact() {
-        for (int i = 0; i < 1500; i++) {
-
+        for (int i = 0; i < 5500; i++) {
             addContact("测试" + i, "123456783" + i, "");
             LogUtil.d("Test", "导入数据i=" + i);
         }