屏蔽IM登陆，方便开发测试；

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -571,7 +571,7 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
         saveOfflineTime();
         MyApplication.getInstance().unregisterNetWorkObserver(this);
         ListenerManager.getInstance().removeAuthStateChangeListener(this);
-        if (mXmppBind) {
+        if (true) {
             unbindService(mXmppServiceConnection);
         }
         unregisterReceiver(mUpdateUnReadReceiver);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/LoginActivity.java

@@ -2,6 +2,7 @@ package com.xzjmyk.pm.activity.ui.account;
 
 import android.app.ProgressDialog;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -17,6 +18,7 @@ import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.LoginRegisterResult;
 import com.xzjmyk.pm.activity.helper.LoginHelper;
+import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
@@ -115,6 +117,11 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
             ToastMessage("密码不能为空");
             return;
         }
+        if (true) {
+            login_manage(phoneNumber, password);//登录管理平台
+            return;
+        }
+       
         // 加密之后的密码
         final String digestPwd = new String(Md5Util.toMD5(password));
         final String requestTag = "login";
@@ -174,6 +181,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
                 }
                 if (success) {// 登陆IM成功
                     login_manage(phoneNumber, password);//登录管理平台
+//                    startActivity(new Intent(ct, MainActivity.class));
                 } else {// 登录失败
                     Log.i("gongpengming", result.getResultMsg());
                     String message = TextUtils.isEmpty(result.getResultMsg()) ? getString(R.string.login_failed) : result.getResultMsg();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/LinksManFragment.java

@@ -201,33 +201,36 @@ public class LinksManFragment extends XutilsFragment implements View.OnClickList
                 new String[]{master},
                 "whichsys=?");
         List<Friend> friends = new ArrayList<>();
-        for (int i = 0; i < emList.size(); i++) {//企业通讯人员
-            // friends.add(EnterChatAction(emList.get(i)));
-            if (mLoginUserId.equals((emList.get(i).getEm_IMID() + ""))) {
-                continue;
-            }
-            String fId = String.valueOf(emList.get(i).getEm_IMID());
-            if (!ListUtils.isEmpty(friend)) {
-                for (int j = 0; j < friend.size(); j++) {//IM好友
-                    if (mLoginUserId.equals((friend.get(j).getUserId() + ""))) {
-                        friend.remove(j);
-                        continue;
-                    }
-                    if (fId.equals(friend.get(j).getUserId())) {  //当有重复
-                        //改昵称
-                        friend.get(j).setNickName(emList.get(i).getEM_NAME());
-                        friend.get(j).setRemarkName(emList.get(i).getEM_NAME());//备注
-                        FriendDao.getInstance().setRemarkName(mLoginUserId, friend.get(j).getUserId(), friend.get(j).getRemarkName());
-                        break;
-                    } else if ((j == (friend.size() - 1)) && !(fId.equals(friend.get(j).getUserId()))) {
-                        friends.add(EnterChatAction(emList.get(i)));
-                    }
-                }
-            } else {
-                friends.add(EnterChatAction(emList.get(i)));
-            }
-        }
+       if (emList.size()>0&&mLoginUserId!=null){
+           for (int i = 0; i < emList.size(); i++) {//企业通讯人员
+               // friends.add(EnterChatAction(emList.get(i)));
+               if (mLoginUserId.equals((emList.get(i).getEm_IMID() + ""))) {
+                   continue;
+               }
+               String fId = String.valueOf(emList.get(i).getEm_IMID());
+               if (!ListUtils.isEmpty(friend)) {
+                   for (int j = 0; j < friend.size(); j++) {//IM好友
+                       if (mLoginUserId.equals((friend.get(j).getUserId() + ""))) {
+                           friend.remove(j);
+                           continue;
+                       }
+                       if (fId.equals(friend.get(j).getUserId())) {  //当有重复
+                           //改昵称
+                           friend.get(j).setNickName(emList.get(i).getEM_NAME());
+                           friend.get(j).setRemarkName(emList.get(i).getEM_NAME());//备注
+                           FriendDao.getInstance().setRemarkName(mLoginUserId, friend.get(j).getUserId(), friend.get(j).getRemarkName());
+                           break;
+                       } else if ((j == (friend.size() - 1)) && !(fId.equals(friend.get(j).getUserId()))) {
+                           friends.add(EnterChatAction(emList.get(i)));
+                       }
+                   }
+               } else {
+                   friends.add(EnterChatAction(emList.get(i)));
+               }
+           }
+       }
         //下面两行待优化
+        if (friend==null)return; 
         for (int i = 0; i < friend.size(); i++) friend.get(i).setFriend(true);
         for (int i = 0; i < friends.size(); i++) friends.get(i).setFriend(false);
         friend.addAll(friends);
@@ -839,7 +842,7 @@ public class LinksManFragment extends XutilsFragment implements View.OnClickList
     public void onDestroy() {
 
         getActivity().unregisterReceiver(receiver);
-
+        mActivity.unbindService(mServiceConnection);
         super.onDestroy();
     }
 

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

@@ -375,6 +375,7 @@ public class MessageFragment extends EasyFragment {
 
     public void setFriendName(List<Friend> friends, String id) {
         List<Friend> f = FriendDao.getInstance().getFriends(id);
+        if (friends==null)return;
         for (int i = 0; i < friends.size(); i++) {
             for (int j = 0; j < f.size(); j++) {
                 if (friends.get(i).get_id() == f.get(j).get_id()) {