代码冲突

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

@@ -39,7 +39,6 @@ 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,12 +273,12 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
         LogUtil.d(TAG,"initView()");
         ct = getActivity();
         
-       new Thread(new Runnable() {
-           @Override
-           public void run() {
-               ContactsUtils.testAddContact();
-           }
-       }).start();
+//       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);