联系人信息详情修改

WeiChat/src/main/java/com/xzjmyk/pm/activity/AppConstant.java

@@ -18,6 +18,7 @@ public class AppConstant {
 	// 用户信息参数，很多地方需要
 	public static final String EXTRA_USER_ID = "userId";// userId
 	public static final String EXTRA_NICK_NAME = "nickName";// nickName
+	public static final String EXTRA_NICK_CODE= "usercode";// nickName
 	public static final String EXTRA_IS_GROUP_CHAT = "isGroupChat";// 是否是群聊
 
 	// BusinessCircleActivity需要的

WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/Friend.java

@@ -112,6 +112,17 @@ public class Friend implements Serializable {
     @DatabaseField
     private int roomTalkTime;// wi在这个房间的禁言时间
 
+
+    private String emCode;
+
+    public String getEmCode() {
+        return emCode;
+    }
+
+    public void setEmCode(String emCode) {
+        this.emCode = emCode;
+    }
+
     public String getRoomId() {
         return roomId;
     }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/BasicInfoActivity.java

@@ -35,6 +35,8 @@ import com.xzjmyk.pm.activity.bean.message.NewFriendMessage;
 import com.xzjmyk.pm.activity.broadcast.CardcastUiUpdateUtil;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
 import com.xzjmyk.pm.activity.db.dao.NewFriendDao;
+import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
+import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
 import com.xzjmyk.pm.activity.util.ProgressDialogUtil;
 import com.xzjmyk.pm.activity.util.StringUtils;
 import com.xzjmyk.pm.activity.xmpp.CoreService;
@@ -63,6 +65,7 @@ import com.xzjmyk.pm.activity.volley.Result;
 import com.xzjmyk.pm.activity.volley.StringJsonObjectRequest;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -71,292 +74,325 @@ import java.util.regex.Pattern;
  * 聊天点头像查看个人基本资料
  *
  * @author Dean Tao
- *
  */
 public class BasicInfoActivity extends BaseActivity implements NewFriendListener {
 
-	private ImageView mAvatarImg;
-	private RelativeLayout tel_rl;
-	private TextView mNameTv;
-	private TextView mSexTv;
-	private TextView mBirthdayTv;
-	private TextView mCityTv;
-	private TextView tel_text;
-	private Button mNextStepBtn;
-	private Button mLookLocationBtn;
-	private DataLoadView mDataLoadView;
-
-	private String mUserId;
-	private String mUserReName;
-	private User mUser;
-	private Friend mFriend;// 如果这个用户是当前登陆者的好友或者关注着，那么该值有意义
-	private ProgressDialog mProgressDialog;
-	private boolean mBind;
-	private CoreService mXmppService;
-
-	private String mLoginUserId;
-	private boolean isMyInfo = false;// 快捷判断
-	private boolean showMenu = false;
-	private ServiceConnection mServiceConnection = new ServiceConnection() {
-		@Override
-		public void onServiceDisconnected(ComponentName name) {
-			mXmppService = null;
-		}
-
-		@Override
-		public void onServiceConnected(ComponentName name, IBinder service) {
-			mXmppService = ((CoreService.CoreServiceBinder) service).getService();
-		}
-	};
-
-	@TargetApi(Build.VERSION_CODES.HONEYCOMB)
-	@SuppressLint("NewApi")
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		this.getWindow().invalidatePanelMenu(Window.FEATURE_OPTIONS_PANEL);
-		if (getIntent() != null) {
-			mUserId = getIntent().getStringExtra(AppConstant.EXTRA_USER_ID);
-			mUserReName= getIntent().getStringExtra(AppConstant.EXTRA_NICK_NAME);
-		}
-		mLoginUserId = MyApplication.getInstance().mLoginUser.getUserId();
-
-		if (TextUtils.isEmpty(mUserId)) {
-			mUserId = mLoginUserId;
-		}
-		setContentView(R.layout.activity_basic_info);
-		mProgressDialog = ProgressDialogUtil.init(this, null, getString(R.string.please_wait));
-		initView();
-		if (mLoginUserId.equals(mUserId) || TextUtils.isEmpty(mUserId)) {// 显示我的资料
-			mUserId = mLoginUserId;// 让mUserId变为和登陆者一样，当做是查看登陆者自己的个人资料
-			isMyInfo = true;
-			loadMyInfoFromDb();
-		} else {// 显示其他用户的资料
-			isMyInfo = false;
-			loadOthersInfoFromNet();
-		}
-		ListenerManager.getInstance().addNewFriendListener(this);
-		mBind = bindService(CoreService.getIntent(), mServiceConnection, BIND_AUTO_CREATE);
-	}
-
-	@Override
-	public boolean onPrepareOptionsMenu(Menu menu) {
-		if (showMenu && mFriend != null) {
-			menu.clear();//将之前的clear掉,防止重复
-			if (mFriend.getStatus() != Friend.STATUS_BLACKLIST && mFriend.getStatus() == Friend.STATUS_ATTENTION
-					&& mFriend.getStatus() == Friend.STATUS_FRIEND) {
-			} else {
-				getMenuInflater().inflate(R.menu.menu_basic_info, menu);
-				if (mFriend.getStatus() == Friend.STATUS_BLACKLIST) {// 在黑名单中,显示“设置备注名”、“移除黑名单”,"取消关注"，“彻底删除”
-					menu.findItem(R.id.add_blacklist).setVisible(false);
-				} else {
-					menu.findItem(R.id.remove_blacklist).setVisible(false);
-				}
-			}
-		}
-		return super.onPrepareOptionsMenu(menu);
-	}
-
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
-		if (showMenu && mFriend != null) {
-			if (mFriend.getStatus() != Friend.STATUS_BLACKLIST && mFriend.getStatus() == Friend.STATUS_ATTENTION
-					&& mFriend.getStatus() == Friend.STATUS_FRIEND) {
-			} else {
-				getMenuInflater().inflate(R.menu.menu_basic_info, menu);
-				if (mFriend.getStatus() == Friend.STATUS_BLACKLIST) {// 在黑名单中,显示“设置备注名”、“移除黑名单”,"取消关注"，“彻底删除”
-					menu.findItem(R.id.add_blacklist).setVisible(false);
-				} else {
-					menu.findItem(R.id.remove_blacklist).setVisible(false);
-				}
-			}
-		}
-		return super.onCreateOptionsMenu(menu);
-	}
-
-	@Override
-	public void onBackPressed() {
-		super.onBackPressed();
-		finish();
-	}
-
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item) {
-		if (mFriend == null) {
-			return super.onOptionsItemSelected(item);
-		}
-
-		if (mFriend.getStatus() != Friend.STATUS_BLACKLIST && mFriend.getStatus() == Friend.STATUS_ATTENTION
-				&& mFriend.getStatus() == Friend.STATUS_FRIEND) {
-			return super.onOptionsItemSelected(item);
-		}
-		CharSequence[] items = new CharSequence[4];
-		items[0] = getString(R.string.set_remark_name);// 设置备注名
-		if (mFriend.getStatus() == Friend.STATUS_BLACKLIST) {// 在黑名单中,显示“设置备注名”、“移除黑名单”,"取消关注"，“彻底删除”
-			items[1] = getString(R.string.remove_blacklist);
-		} else {
-			items[1] = getString(R.string.add_blacklist);
-		}
-
-		items[2] = getString(R.string.cancel_attention);
-		items[3] = getString(R.string.delete_all);
-		int itemId = item.getItemId();
-		switch (itemId) {
-		case R.id.set_remark_name:// 设置备注名
-			showRemarkDialog(mFriend);
-			break;
-		case R.id.remove_blacklist:// 加入黑名单，或者移除黑名单
-			showBlacklistDialog(mFriend);
-			break;
-		case R.id.add_blacklist:// 加入黑名单，或者移除黑名单
-			showBlacklistDialog(mFriend);
-			break;
-		case R.id.cancel_attention:// 设置备注名
-			showCancelAttentionDialog(mFriend);
-			break;
-		case R.id.delete_all:// 设置备注名
-			showDeleteAllDialog(mFriend);
-			break;
-		default:
-			break;
-		}
-
-		return super.onOptionsItemSelected(item);
-	}
-
-	/**
-	 * 懒得判断操作的用户到底属于好友、企业、还是公司，直接发广播，让所有的名片盒页面都更新
-	 */
-	private void updateAllCardcastUi() {
-		CardcastUiUpdateUtil.broadcastUpdateUi(this);
-	}
-
-	private void loadMyInfoFromDb() {
-		mDataLoadView.showSuccess();
-		mUser = MyApplication.getInstance().mLoginUser;
-		updateUI();
-	}
-
-	private void loadOthersInfoFromNet() {
-		mDataLoadView.showLoading();
-		Map<String, String> params = new HashMap<String, String>();
-		params.put("access_token", MyApplication.getInstance().mAccessToken);
-		params.put("userId", mUserId);
-		Log.i("LoginInfo", "发送网络数据：userid=" + mUserId);
-		StringJsonObjectRequest<User> request = new StringJsonObjectRequest<User>(mConfig.USER_GET_URL,
-				new Response.ErrorListener() {
-					@Override
-					public void onErrorResponse(VolleyError arg0) {
-						ToastUtil.showErrorNet(mContext);
-						mDataLoadView.showFailed();
-					}
-				}, new StringJsonObjectRequest.Listener<User>() {
-
-					@Override
-					public void onResponse(ObjectResult<User> result) {
-
-						boolean success = Result.defaultParser(mContext, result, true);
-						if (success && result.getData() != null) {
-							mUser = result.getData();
-							// 如果本地的好友状态不正确，那么就更新本地好友状态
-							AttentionUser attentionUser = mUser.getFriends();// 服务器的状态
-							Log.i("LoginInfo", "接收网络数据：昵称=" + mUser.getNickName());
-							Log.i("LoginInfo", "接收网络数据：id=" + mUser.getUserId());
-							Log.i("LoginInfo", "接收网络数据：phone=" + mUser.getTelephone());
-							boolean changed = FriendHelper.updateFriendRelationship(mLoginUserId, mUser.getUserId(),
-									attentionUser);
-							if (changed) {
-								//Log.i("LoginInfo","更新本页面所以信息....");
-								updateAllCardcastUi();
-							}
-
-							mDataLoadView.showSuccess();
-							updateUI();
-						} else {
-							mDataLoadView.showFailed();
-						}
-					}
-				}, User.class, params);
-		addDefaultRequest(request);
-	}
-
-	private void updateUI() {
-		if (mUser == null) {
-			return;
-		}
-		if (isMyInfo) {
-			getSupportActionBar().setTitle(R.string.my_data);
-			showMenu = false;
-		} else {
-			getSupportActionBar().setTitle(R.string.basic_info);
-			// 在这里查询出本地好友的状态
-			initFriendMoreAction();
-		}
-
-		// 设置头像
-		AvatarHelper.getInstance().displayAvatar(mUser.getUserId(), mAvatarImg, false);
-		// 判断是否有备注名,有就显示
-		if(mFriend!=null){
-			if (StringUtils.isEmpty(mUserReName)){
-			if(mFriend.getRemarkName()!=null){
-				mNameTv.setText(mFriend.getRemarkName());
-			}else{
-				mNameTv.setText(mUser.getNickName());
-
-			}
-			}else{
-				mNameTv.setText(mUserReName);
-			}
-         mFriend.setRemarkName(mUserReName);
-		}else {
-			Log.i("LoginInfo", "设置当前用户的名字");
-			//mNameTv.setText(MyApplication.getInstance().mLoginUser.getNickName());
-			if (StringUtils.isEmpty(mUserReName)){
-			     mNameTv.setText(mUser.getNickName());//陌生人也显示正确名字
-			 }else{
-				mNameTv.setText(mUserReName);
-			}
-		}
-
-		mSexTv.setText(mUser.getSex() == 0 ? R.string.sex_woman : R.string.sex_man);
-		if(mUser.getSex()==-1)mSexTv.setText("未填写");
-		mBirthdayTv.setText(TimeUtils.sk_time_s_long_2_str(mUser.getBirthday()));
-		mCityTv.setText(Area.getProvinceCityString(mUser.getProvinceId(), mUser.getCityId()));
+    private ImageView mAvatarImg;
+    private RelativeLayout tel_rl;
+    private TextView mNameTv;
+    private TextView mSexTv;
+    private TextView mBirthdayTv;
+    private TextView mCityTv;
+    private TextView tel_text;
+    private Button mNextStepBtn;
+    private Button mLookLocationBtn;
+    private DataLoadView mDataLoadView;
+    private User mUser;
+    private Friend mFriend;// 如果这个用户是当前登陆者的好友或者关注着，那么该值有意义
+    private ProgressDialog mProgressDialog;
+    private boolean mBind;
+    private CoreService mXmppService;
+
+    private String mLoginUserId;
+    private boolean isMyInfo = false;// 快捷判断
+    private boolean showMenu = false;
+    private ServiceConnection mServiceConnection = new ServiceConnection() {
+        @Override
+        public void onServiceDisconnected(ComponentName name) {
+            mXmppService = null;
+        }
+
+        @Override
+        public void onServiceConnected(ComponentName name, IBinder service) {
+            mXmppService = ((CoreService.CoreServiceBinder) service).getService();
+        }
+    };
+    private String userId;
+    private String userName;
+
+    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
+    @SuppressLint("NewApi")
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        this.getWindow().invalidatePanelMenu(Window.FEATURE_OPTIONS_PANEL);
+        if (getIntent() != null) {
+            userId = getIntent().getStringExtra(AppConstant.EXTRA_USER_ID);
+            userName = getIntent().getStringExtra(AppConstant.EXTRA_NICK_NAME);
+        }
+        mLoginUserId = MyApplication.getInstance().mLoginUser.getUserId();
+        setContentView(R.layout.activity_basic_info);
+        mProgressDialog = ProgressDialogUtil.init(this, null, getString(R.string.please_wait));
+        initView();
+
+        if ( userId.equals("0")) {            //当imid不存在时候
+            isMyInfo = false;
+            loadOthersInfoFromDB();
+        } else {
+            if (mLoginUserId.equals(userId)) {  //当点击的是自己的时候
+                isMyInfo = true;
+                loadMyInfoFromDb();
+            } else {
+                isMyInfo = false;
+                loadOthersInfoFromNet();
+            }
+        }
+        ListenerManager.getInstance().addNewFriendListener(this);
+        mBind = bindService(CoreService.getIntent(), mServiceConnection, BIND_AUTO_CREATE);
+    }
+    @Override
+    public boolean onPrepareOptionsMenu(Menu menu) {
+        if (showMenu && mFriend != null) {
+            menu.clear();//将之前的clear掉,防止重复
+            if (mFriend.getStatus() != Friend.STATUS_BLACKLIST && mFriend.getStatus() == Friend.STATUS_ATTENTION
+                    && mFriend.getStatus() == Friend.STATUS_FRIEND) {
+            } else {
+                getMenuInflater().inflate(R.menu.menu_basic_info, menu);
+                if (mFriend.getStatus() == Friend.STATUS_BLACKLIST) {// 在黑名单中,显示“设置备注名”、“移除黑名单”,"取消关注"，“彻底删除”
+                    menu.findItem(R.id.add_blacklist).setVisible(false);
+                } else {
+                    menu.findItem(R.id.remove_blacklist).setVisible(false);
+                }
+            }
+        }
+        return super.onPrepareOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        if (showMenu && mFriend != null) {
+            if (mFriend.getStatus() != Friend.STATUS_BLACKLIST && mFriend.getStatus() == Friend.STATUS_ATTENTION
+                    && mFriend.getStatus() == Friend.STATUS_FRIEND) {
+            } else {
+                getMenuInflater().inflate(R.menu.menu_basic_info, menu);
+                if (mFriend.getStatus() == Friend.STATUS_BLACKLIST) {// 在黑名单中,显示“设置备注名”、“移除黑名单”,"取消关注"，“彻底删除”
+                    menu.findItem(R.id.add_blacklist).setVisible(false);
+                } else {
+                    menu.findItem(R.id.remove_blacklist).setVisible(false);
+                }
+            }
+        }
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public void onBackPressed() {
+        super.onBackPressed();
+        finish();
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (mFriend == null) {
+            return super.onOptionsItemSelected(item);
+        }
+
+        if (mFriend.getStatus() != Friend.STATUS_BLACKLIST && mFriend.getStatus() == Friend.STATUS_ATTENTION
+                && mFriend.getStatus() == Friend.STATUS_FRIEND) {
+            return super.onOptionsItemSelected(item);
+        }
+        CharSequence[] items = new CharSequence[4];
+        items[0] = getString(R.string.set_remark_name);// 设置备注名
+        if (mFriend.getStatus() == Friend.STATUS_BLACKLIST) {// 在黑名单中,显示“设置备注名”、“移除黑名单”,"取消关注"，“彻底删除”
+            items[1] = getString(R.string.remove_blacklist);
+        } else {
+            items[1] = getString(R.string.add_blacklist);
+        }
+
+        items[2] = getString(R.string.cancel_attention);
+        items[3] = getString(R.string.delete_all);
+        int itemId = item.getItemId();
+        switch (itemId) {
+            case R.id.set_remark_name:// 设置备注名
+                showRemarkDialog(mFriend);
+                break;
+            case R.id.remove_blacklist:// 加入黑名单，或者移除黑名单
+                showBlacklistDialog(mFriend);
+                break;
+            case R.id.add_blacklist:// 加入黑名单，或者移除黑名单
+                showBlacklistDialog(mFriend);
+                break;
+            case R.id.cancel_attention:// 设置备注名
+                showCancelAttentionDialog(mFriend);
+                break;
+            case R.id.delete_all:// 设置备注名
+                showDeleteAllDialog(mFriend);
+                break;
+            default:
+                break;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    /**
+     * 懒得判断操作的用户到底属于好友、企业、还是公司，直接发广播，让所有的名片盒页面都更新
+     */
+    private void updateAllCardcastUi() {
+        CardcastUiUpdateUtil.broadcastUpdateUi(this);
+    }
+
+    private void loadMyInfoFromDb() {
+        mDataLoadView.showSuccess();
+        mUser = MyApplication.getInstance().mLoginUser;
+        updateUI();
+    }
+
+    private void loadOthersInfoFromDB() {
+        Log.i("gongpengming", "进入from db");
+        String code = null;
+        if (getIntent() != null) {
+            code = getIntent().getStringExtra(AppConstant.EXTRA_NICK_CODE);
+        }
+        DBManager manager = new DBManager(this);
+        String[] whereArg = {code};
+        String where = "em_code=?";
+        EmployeesEntity employees = manager.selectForEmployee(whereArg, where);
+        if (employees == null) {
+            //TODO 查询为空，可能出现异常
+        } else {
+            mNameTv.setText(employees.getEM_NAME());
+            mNameTv.setText("");
+            tel_text.setText(employees.getEM_MOBILE());
+            mNextStepBtn.setText("该用户暂未开通app");
+            mNextStepBtn.setClickable(false);
+            mLookLocationBtn.setVisibility(View.GONE);
+        }
+//        mFriend.getNickName();
+//        //名字
+//        mNameTv.setText(mFriend.getRemarkName());
+//                //性别
+//                mSexTv.setText(friend.);
+//        //生日
+//        mBirthdayTv
+//                //地址
+//                mCityTv
+//        //电话
+//        tel_text
+//                //聊天
+//                mNextStepBtn
+//        //发送任务
+//        mLookLocationBtn
+    }
+
+    private void loadOthersInfoFromNet() {
+        mDataLoadView.showLoading();
+        Map<String, String> params = new HashMap<String, String>();
+        params.put("access_token", MyApplication.getInstance().mAccessToken);
+        params.put("userId", userId);
+        StringJsonObjectRequest<User> request = new StringJsonObjectRequest<User>(mConfig.USER_GET_URL,
+                new Response.ErrorListener() {
+                    @Override
+                    public void onErrorResponse(VolleyError arg0) {
+                        ToastUtil.showErrorNet(mContext);
+                        mDataLoadView.showFailed();
+                    }
+                }, new StringJsonObjectRequest.Listener<User>() {
+
+            @Override
+            public void onResponse(ObjectResult<User> result) {
+
+                boolean success = Result.defaultParser(mContext, result, true);
+                if (success && result.getData() != null) {
+                    mUser = result.getData();
+                    // 如果本地的好友状态不正确，那么就更新本地好友状态
+                    AttentionUser attentionUser = mUser.getFriends();// 服务器的状态
+                    Log.i("LoginInfo", "接收网络数据：昵称=" + mUser.getNickName());
+                    Log.i("LoginInfo", "接收网络数据：id=" + mUser.getUserId());
+                    Log.i("LoginInfo", "接收网络数据：phone=" + mUser.getTelephone());
+                    boolean changed = FriendHelper.updateFriendRelationship(mLoginUserId, mUser.getUserId(),
+                            attentionUser);
+                    if (changed) {
+                        //Log.i("LoginInfo","更新本页面所以信息....");
+                        updateAllCardcastUi();
+                    }
+
+                    mDataLoadView.showSuccess();
+                    updateUI();
+                } else {
+                    mDataLoadView.showFailed();
+                }
+            }
+        }, User.class, params);
+        addDefaultRequest(request);
+    }
+
+    private void updateUI() {
+        if (mUser == null) {
+            return;
+        }
+        if (isMyInfo) {
+            getSupportActionBar().setTitle(R.string.my_data);
+            showMenu = false;
+        } else {
+            getSupportActionBar().setTitle(R.string.basic_info);
+            // 在这里查询出本地好友的状态
+            initFriendMoreAction();
+        }
+
+        // 设置头像
+        AvatarHelper.getInstance().displayAvatar(mUser.getUserId(), mAvatarImg, false);
+        // 判断是否有备注名,有就显示
+        if (mFriend != null) {
+            if (StringUtils.isEmpty(userName)) {
+                if (mFriend.getRemarkName() != null) {
+                    mNameTv.setText(mFriend.getRemarkName());
+                } else {
+                    mNameTv.setText(mUser.getNickName());
+
+                }
+            } else {
+                mNameTv.setText(userName);
+            }
+            mFriend.setRemarkName(userName);
+        } else {
+            Log.i("LoginInfo", "设置当前用户的名字");
+            //mNameTv.setText(MyApplication.getInstance().mLoginUser.getNickName());
+            if (StringUtils.isEmpty(userName)) {
+                mNameTv.setText(mUser.getNickName());//陌生人也显示正确名字
+            } else {
+                mNameTv.setText(userName);
+            }
+        }
+
+        mSexTv.setText(mUser.getSex() == 0 ? R.string.sex_woman : R.string.sex_man);
+        if (mUser.getSex() == -1) mSexTv.setText("未填写");
+        mBirthdayTv.setText(TimeUtils.sk_time_s_long_2_str(mUser.getBirthday()));
+        mCityTv.setText(Area.getProvinceCityString(mUser.getProvinceId(), mUser.getCityId()));
         tel_text.setText(mUser.getTelephone());
-		// ActionBtn 的初始化
-		if (isMyInfo) {// 如果是我自己，不显示ActionBtn
-			mNextStepBtn.setVisibility(View.GONE);
-			mLookLocationBtn.setVisibility(View.GONE);
-		} else {
-			mNextStepBtn.setVisibility(View.VISIBLE);
-			if (mFriend == null) {
-				mNextStepBtn.setText(R.string.add_attention);
-				mNextStepBtn.setOnClickListener(new AddAttentionListener());
-			} else {
-				switch (mFriend.getStatus()) {
-				case Friend.STATUS_BLACKLIST:// 在黑名单中，显示移除黑名单
-					mNextStepBtn.setText(R.string.remove_blacklist);
-					mNextStepBtn.setOnClickListener(new RemoveBlacklistListener());
-					break;
-				case Friend.STATUS_ATTENTION:// 已经是关注了，显示打招呼
-					mNextStepBtn.setText(R.string.say_hello);
-					mNextStepBtn.setOnClickListener(new SayHelloListener());
-					break;
-				case Friend.STATUS_FRIEND:// 已经是朋友了，显示发消息
-					mNextStepBtn.setText(R.string.send_msg);
-					mNextStepBtn.setOnClickListener(new SendMsgListener());
-					break;
-				default:// 其他（理论上不可能的哈，容错）
-					mNextStepBtn.setText(R.string.add_attention);
-					mNextStepBtn.setOnClickListener(new AddAttentionListener());
-					break;
-				}
-			}
-
-			mLookLocationBtn.setVisibility(View.VISIBLE);
-			mLookLocationBtn.setOnClickListener(new View.OnClickListener() {
-				@Override
-				public void onClick(View v) {
+        // ActionBtn 的初始化
+        if (isMyInfo) {// 如果是我自己，不显示ActionBtn
+            mNextStepBtn.setVisibility(View.GONE);
+            mLookLocationBtn.setVisibility(View.GONE);
+        } else {
+            mNextStepBtn.setVisibility(View.VISIBLE);
+            if (mFriend == null) {
+                mNextStepBtn.setText(R.string.add_attention);
+                mNextStepBtn.setOnClickListener(new AddAttentionListener());
+            } else {
+                switch (mFriend.getStatus()) {
+                    case Friend.STATUS_BLACKLIST:// 在黑名单中，显示移除黑名单
+                        mNextStepBtn.setText(R.string.remove_blacklist);
+                        mNextStepBtn.setOnClickListener(new RemoveBlacklistListener());
+                        break;
+                    case Friend.STATUS_ATTENTION:// 已经是关注了，显示打招呼
+                        mNextStepBtn.setText(R.string.say_hello);
+                        mNextStepBtn.setOnClickListener(new SayHelloListener());
+                        break;
+                    case Friend.STATUS_FRIEND:// 已经是朋友了，显示发消息
+                        mNextStepBtn.setText(R.string.send_msg);
+                        mNextStepBtn.setOnClickListener(new SendMsgListener());
+                        break;
+                    default:// 其他（理论上不可能的哈，容错）
+                        mNextStepBtn.setText(R.string.add_attention);
+                        mNextStepBtn.setOnClickListener(new AddAttentionListener());
+                        break;
+                }
+            }
+
+            mLookLocationBtn.setVisibility(View.VISIBLE);
+            mLookLocationBtn.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
 //					double latitude = 0;
 //					double longitude = 0;
 //					if (mUser != null && mUser.getLoginLog() != null) {
@@ -373,562 +409,559 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
 //					intent.putExtra("latitude", latitude);
 //					intent.putExtra("longitude", longitude);
 //					startActivity(intent);
-					Intent mIntent = new Intent(BasicInfoActivity.this, AddTaskActivity.class);
-					mIntent.putExtra("people", mNameTv.getText().toString());
-					startActivity(mIntent);
-				}
-			});
-		}
-		invalidateOptionsMenu();
-	}
-
-	private void initFriendMoreAction() {
-		mFriend = FriendDao.getInstance().getFriend(mLoginUserId, mUser.getUserId());// 更新好友的状态
-		showMenu = mFriend != null;
-	}
-
-	protected void onDestroy() {
-		super.onDestroy();
-		ListenerManager.getInstance().removeNewFriendListener(this);
-		if (mBind) {
-			unbindService(mServiceConnection);
-		}
-	}
-
-	private void initView() {
-		getSupportActionBar().setTitle(R.string.basic_info);
-		mAvatarImg = (ImageView) findViewById(R.id.avatar_img);
-		mNameTv = (TextView) findViewById(R.id.name_tv);
-		mSexTv = (TextView) findViewById(R.id.sex_tv);
-		mBirthdayTv = (TextView) findViewById(R.id.birthday_tv);
-		mCityTv = (TextView) findViewById(R.id.city_tv);
-		tel_text= (TextView) findViewById(R.id.tel_tv);
-		tel_rl=(RelativeLayout)findViewById(R.id.tel_rl);
-		tel_rl.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-                 if (!com.xzjmyk.pm.activity.ui.erp.util.StringUtils.isEmpty(tel_text.getText().toString())){
-					 String check = "^((13[0-9])|(15[^4,\\D])|(18[0,5-9]))\\d{8}$";
-					 Pattern regex = Pattern.compile(check);
-					 Matcher matcher = regex.matcher(tel_text.getText().toString());
-					 boolean isMatched = matcher.matches();
-					 if (isMatched){
-					  phoneAction(tel_text.getText().toString());
-					 }else{
-						 ViewUtil.ShowMessageTitle(BasicInfoActivity.this, "手机格式不正确！");
-					 }
-
-				 }
-			}
-		});
-		mDataLoadView = (DataLoadView) findViewById(R.id.data_load_view);
-		mDataLoadView.setLoadingEvent(new DataLoadView.LoadingEvent() {
-			@Override
-			public void load() {
-				loadOthersInfoFromNet();
-			}
-		});
-		mAvatarImg.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				// Intent intent = new Intent(PersonalInfoActivity.this,
-				// BusinessCircleActivity.class);
-				// intent.putExtra(Constant.EXTRA_CIRCLE_TYPE,
-				// Constant.CIRCLE_TYPE_PERSONAL_SPACE);
-				// intent.putExtra(Constant.EXTRA_USER_ID, mUser.getUserId());
-				// intent.putExtra(Constant.EXTRA_NICK_NAME,
-				// mUser.getNickName());
-				// startActivity(intent);
-			}
-		});
-		mNextStepBtn = (Button) findViewById(R.id.next_step_btn);
-		mLookLocationBtn = (Button) findViewById(R.id.look_location_btn);
-	}
-
-	public void phoneAction(final String phone) {
-		MaterialDialog dialog = new MaterialDialog.Builder(this).title("确认是否拨打电话").content("手机号码：" + phone)
-				.positiveText("拨打").negativeText("取消").autoDismiss(false).callback(new MaterialDialog.ButtonCallback() {
-					@Override
-					public void onPositive(MaterialDialog dialog) {
-						// 用intent启动拨打电话
-						Intent intent = new Intent(Intent.ACTION_CALL, Uri.parse("tel:" + phone));
-						startActivity(intent);
-					}
-
-					@Override
-					public void onNegative(MaterialDialog dialog) {
-						super.onNegative(dialog);
-						dialog.dismiss();
-					}
-				}).build();
-
-		dialog.show();
-	}
-
-	public void doSayHello() {
-		final EditText editText = new EditText(this);
-		editText.setMaxLines(2);
-		editText.setLines(2);
-		editText.setHint(R.string.say_hello_dialog_hint);
-		editText.setFilters(new InputFilter[] { new InputFilter.LengthFilter(20) });
-		editText.setLayoutParams(
-				new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
-		AlertDialog.Builder builder = new AlertDialog.Builder(this).setTitle(R.string.say_hello_dialog_title)
-				.setView(editText).setPositiveButton(getString(R.string.sure), new DialogInterface.OnClickListener() {
-					@Override
-					public void onClick(DialogInterface dialog, int which) {
-						final String text = editText.getText().toString().trim();
-						doSayHello(text);
-					}
-				}).setNegativeButton(getString(R.string.cancel), null);
-		builder.create().show();
-	}
-
-	private void doSayHello(String text) {
-		if (TextUtils.isEmpty(text)) {
-			text = getString(R.string.say_hello_default);
-		}
-		NewFriendMessage message = NewFriendMessage.createWillSendMessage(MyApplication.getInstance().mLoginUser,
-				XmppMessage.TYPE_SAYHELLO, text, mUser);
-		NewFriendDao.getInstance().createOrUpdateNewFriend(message);
-		mXmppService.sendNewFriendMessage(mUser.getUserId(), message);
-		// 提示打招呼成功
-		ToastUtil.showToast(this, R.string.say_hello_succ);
-	}
-
-	/**
-	 * @desc:添加关注
-	 * @author：Administrator on 2016/3/22 20:00
-	 */
-	private void doAddAttention() {
-		if (mUser == null) {
-			return;
-		}
-		ProgressDialogUtil.show(mProgressDialog);
-		HashMap<String, String> params = new HashMap<String, String>();
-		params.put("access_token", MyApplication.getInstance().mAccessToken);
-		params.put("toUserId", mUser.getUserId());
-
-		StringJsonObjectRequest<AddAttentionResult> request = new StringJsonObjectRequest<AddAttentionResult>(
-				mConfig.FRIENDS_ATTENTION_ADD, new ErrorListener() {
-					@Override
-					public void onErrorResponse(VolleyError arg0) {
-						ProgressDialogUtil.dismiss(mProgressDialog);
-						ToastUtil.showErrorNet(mContext);
-					}
-				}, new StringJsonObjectRequest.Listener<AddAttentionResult>() {
-					@Override
-					public void onResponse(ObjectResult<AddAttentionResult> result) {
-						boolean success = Result.defaultParser(mContext, result, true);
-						if (success && result.getData() != null) {// 接口加关注成功
-							if (result.getData().getType() == 1 || result.getData().getType() == 3) {// 单方关注成功或已经是关注的
-								// 发送推送消息
-								NewFriendMessage message = NewFriendMessage.createWillSendMessage(
-										MyApplication.getInstance().mLoginUser, XmppMessage.TYPE_NEWSEE, null, mUser);
-								mXmppService.sendNewFriendMessage(mUser.getUserId(), message);
-								// 添加为关注
-								NewFriendDao.getInstance().ascensionNewFriend(message, Friend.STATUS_ATTENTION);
-								FriendHelper.addAttentionExtraOperation(mLoginUserId, mUser.getUserId());
-
-								// 提示加关注成功
-								ToastUtil.showToast(mContext, R.string.add_attention_succ);
-								// 更新界面
-								mNextStepBtn.setText(R.string.say_hello);
-								mNextStepBtn.setOnClickListener(new SayHelloListener());
-								// 由陌生关系变为关注了,那么右上角更多操作可以显示了
-								initFriendMoreAction();
-								// 更新名片盒
-								updateAllCardcastUi();
-								invalidateOptionsMenu();
-							} else if (result.getData().getType() == 2 || result.getData().getType() == 4) {// 已经是好友了
-								// 发送推送的消息
-								NewFriendMessage message = NewFriendMessage.createWillSendMessage(
-										MyApplication.getInstance().mLoginUser, XmppMessage.TYPE_FRIEND, null, mUser);
-								mXmppService.sendNewFriendMessage(mUser.getUserId(), message);
-
-								// 添加为好友
-								NewFriendDao.getInstance().ascensionNewFriend(message, Friend.STATUS_FRIEND);
-								FriendHelper.addFriendExtraOperation(mLoginUserId, mUser.getUserId());
-
-								// 提示加好友成功
-								ToastUtil.showToast(mContext, R.string.add_friend_succ);
-								// 更新界面
-								mNextStepBtn.setText(R.string.send_msg);
-								mNextStepBtn.setOnClickListener(new SendMsgListener());
-								// 由陌生或者关注变为好友了,那么右上角更多操作可以显示了
-								initFriendMoreAction();
-								// 更新名片盒
-								updateAllCardcastUi();
-								invalidateOptionsMenu();
-							} else if (result.getData().getType() == 5) {
-								ToastUtil.showToast(mContext, R.string.add_attention_failed);
-							}
-						}
-						ProgressDialogUtil.dismiss(mProgressDialog);
-					}
-				}, AddAttentionResult.class, params);
-		addDefaultRequest(request);
-	}
-
-	@Override
-	public void onNewFriendSendStateChange(String toUserId, NewFriendMessage message, int messageState) {
-	}
-
-	@Override
-	public boolean onNewFriend(NewFriendMessage message) {
-		return false;
-	}
-
-	private void showRemarkDialog(final Friend friend) {
-		final EditText editText = new EditText(this);
-		editText.setMaxLines(2);
-		editText.setLines(2);
-		editText.setText(friend.getShowName());
-		editText.setFilters(new InputFilter[]{new InputFilter.LengthFilter(20)});
-		editText.setLayoutParams(
-				new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
-
-		AlertDialog.Builder builder = new AlertDialog.Builder(this);
-		builder.setTitle(R.string.set_remark_name).setView(editText)
-				.setPositiveButton(getString(R.string.sure), new DialogInterface.OnClickListener() {
-					@Override
-					public void onClick(DialogInterface dialog, int which) {
-						String input = editText.getText().toString().trim();
-						if (input.equals(friend.getShowName())) {// 备注名没变
-							return;
-						}
-						if (!StringUtils.isNickName(input)) {// 不符合昵称
-							if (input.length() != 0) {
-								ToastUtil.showToast(mContext, R.string.remark_name_format_error);
-								return;
-							} else {// 不符合昵称，因为长度为0，但是可以做备注名操作，操作就是清除备注名
-									// 判断之前有没有备注名
-								if (TextUtils.isEmpty(friend.getRemarkName())) {// 如果没有备注名，就不需要清除
-									return;
-								}
-							}
-						}
-						remarkFriend(friend, input);
-					}
-				}).setNegativeButton(getString(R.string.cancel), null);
-		builder.create().show();
-	}
-
-	private void remarkFriend(final Friend friend, final String remarkName) {
-		HashMap<String, String> params = new HashMap<String, String>();
-		params.put("access_token", MyApplication.getInstance().mAccessToken);
-		params.put("toUserId", friend.getUserId());
-		params.put("remarkName", remarkName);
-
-		ProgressDialogUtil.show(mProgressDialog);
-		StringJsonObjectRequest<Void> request = new StringJsonObjectRequest<Void>(mConfig.FRIENDS_REMARK,
-				new ErrorListener() {
-					@Override
-					public void onErrorResponse(VolleyError arg0) {
-						ProgressDialogUtil.dismiss(mProgressDialog);
-						ToastUtil.showErrorNet(mContext);
-					}
-				}, new StringJsonObjectRequest.Listener<Void>() {
-					@Override
-					public void onResponse(ObjectResult<Void> result) {
-						boolean success = Result.defaultParser(mContext, result, true);
-						if (success) {
-							friend.setRemarkName(remarkName);
-							// 更新到数据库
-							FriendDao.getInstance().setRemarkName(MyApplication.getInstance().mLoginUser.getUserId(),
-									friend.getUserId(), remarkName);
-
-							// 更新界面显示
-							// TODO
-							// if (TextUtils.isEmpty(remarkName)) {// 清除了备注名
-							// mRemarkNamell.setVisibility(View.GONE);
-							// } else {
-							// mRemarkNamell.setVisibility(View.VISIBLE);
-							// mRemarkNameTv.setText(remarkName);
-							// }
-
-							updateAllCardcastUi();
-							// 改了昵称，通知消息界面更新
-							MsgBroadcast.broadcastMsgUiUpdate(mContext);
-						}
-						ProgressDialogUtil.dismiss(mProgressDialog);
-						updateUI();
-					}
-				}, Void.class, params);
-		addDefaultRequest(request);
-
-	}
-
-	/**
-	 * 取消关注
-	 *
-	 * @param friend
-	 */
-	private void showCancelAttentionDialog(final Friend friend) {
-		if (friend.getStatus() == Friend.STATUS_UNKNOW) {
-			return;
-		}
-		AlertDialog.Builder builder = new AlertDialog.Builder(this).setTitle(R.string.prompt_title)
-				.setMessage(R.string.cancel_attention_prompt)
-				.setPositiveButton(getString(R.string.sure), new DialogInterface.OnClickListener() {
-					@Override
-					public void onClick(DialogInterface dialog, int which) {
-						deleteFriend(friend, 0);
-					}
-				}).setNegativeButton(getString(R.string.cancel), null);
-		builder.create().show();
-	}
-
-	private void showDeleteAllDialog(final Friend friend) {
-		if (friend.getStatus() == Friend.STATUS_UNKNOW) {
-			return;
-		}
-		AlertDialog.Builder builder = new AlertDialog.Builder(this).setTitle(R.string.prompt_title)
-				.setMessage(R.string.delete_all_prompt)
-				.setPositiveButton(getString(R.string.sure), new DialogInterface.OnClickListener() {
-					@Override
-					public void onClick(DialogInterface dialog, int which) {
-						deleteFriend(friend, 1);
-					}
-				}).setNegativeButton(getString(R.string.cancel), null);
-		builder.create().show();
-	}
-
-	/**
-	 *
-	 * @param friend
-	 * @param type
-	 *            0 取消关注 <br/>
-	 *            1、彻底删除<br/>
-	 */
-	private void deleteFriend(final Friend friend, final int type) {
-		HashMap<String, String> params = new HashMap<String, String>();
-		params.put("access_token", MyApplication.getInstance().mAccessToken);
-		params.put("toUserId", friend.getUserId());
-
-		String url = null;
-		if (type == 0) {
-			url = mConfig.FRIENDS_ATTENTION_DELETE;// 取消关注
-		} else {
-			url = mConfig.FRIENDS_DELETE;// 删除好友
-		}
-
-		ProgressDialogUtil.show(mProgressDialog);
-		StringJsonObjectRequest<Void> request = new StringJsonObjectRequest<Void>(url, new ErrorListener() {
-			@Override
-			public void onErrorResponse(VolleyError arg0) {
-				ProgressDialogUtil.dismiss(mProgressDialog);
-				ToastUtil.showErrorNet(mContext);
-			}
-		}, new StringJsonObjectRequest.Listener<Void>() {
-			@Override
-			public void onResponse(ObjectResult<Void> result) {
-				boolean success = Result.defaultParser(mContext, result, true);
-				if (success) {
-					if (type == 0) {
-						ToastUtil.showToast(mContext, R.string.cancel_attention_succ);
-						NewFriendMessage message = NewFriendMessage.createWillSendMessage(
-								MyApplication.getInstance().mLoginUser, XmppMessage.TYPE_DELSEE, null, friend);
-						mXmppService.sendNewFriendMessage(mUser.getUserId(), message);// 解除关注
-					} else {
-						ToastUtil.showToast(mContext, R.string.delete_all_succ);
-						NewFriendMessage message = NewFriendMessage.createWillSendMessage(
-								MyApplication.getInstance().mLoginUser, XmppMessage.TYPE_DELALL, null, friend);
-						mXmppService.sendNewFriendMessage(mUser.getUserId(), message);// 解除好友
-					}
-
-					FriendHelper.removeAttentionOrFriend(mLoginUserId, friend.getUserId());
-					updateAllCardcastUi();
-					/* 更新本界面 */
-					// 1、备注名没有了//TODO
-					// mRemarkNamell.setVisibility(View.GONE);
-					// 2、mFriend设置为null
-					mFriend = null;
-					// 右上角没有更多操作
-					showMenu = false;
-					invalidateOptionsMenu();
-					// Action Btn设置为打招呼
-					mNextStepBtn.setText(R.string.add_attention);
-					mNextStepBtn.setOnClickListener(new AddAttentionListener());
-				}
-				ProgressDialogUtil.dismiss(mProgressDialog);
-			}
-		}, Void.class, params);
-		addDefaultRequest(request);
-
-	}
-
-	/* 显示加入黑名单的对话框 */
-	private void showBlacklistDialog(final Friend friend) {
-		int messageId = 0;
-		if (friend.getStatus() == Friend.STATUS_BLACKLIST) {// 已经在黑名单，那就是移出黑名单
-			messageId = R.string.remove_blacklist_prompt;
-		} else if (friend.getStatus() == Friend.STATUS_ATTENTION || friend.getStatus() == Friend.STATUS_FRIEND) {
-			messageId = R.string.add_blacklist_prompt;
-		} else {// 其他关系（错误的状态）
-			return;
-		}
-		AlertDialog.Builder builder = new AlertDialog.Builder(this).setTitle(R.string.prompt_title)
-				.setMessage(messageId)
-				.setPositiveButton(getString(R.string.sure), new DialogInterface.OnClickListener() {
-					@Override
-					public void onClick(DialogInterface dialog, int which) {
-						if (friend.getStatus() == Friend.STATUS_BLACKLIST) {// 已经在黑名单，那就是移出黑名单
-							removeBlacklist(friend);
-						} else if (friend.getStatus() == Friend.STATUS_ATTENTION
-								|| friend.getStatus() == Friend.STATUS_FRIEND) {
-							addBlacklist(friend);
-						}
-
-					}
-				}).setNegativeButton(getString(R.string.cancel), null);
-		builder.create().show();
-	}
-
-	private void addBlacklist(final Friend friend) {
-		HashMap<String, String> params = new HashMap<String, String>();
-		params.put("access_token", MyApplication.getInstance().mAccessToken);
-		params.put("toUserId", friend.getUserId());
-
-		ProgressDialogUtil.show(mProgressDialog);
-		StringJsonObjectRequest<Void> request = new StringJsonObjectRequest<Void>(mConfig.FRIENDS_BLACKLIST_ADD,
-				new ErrorListener() {
-					@Override
-					public void onErrorResponse(VolleyError arg0) {
-						ProgressDialogUtil.dismiss(mProgressDialog);
-						ToastUtil.showErrorNet(mContext);
-					}
-				}, new StringJsonObjectRequest.Listener<Void>() {
-					@Override
-					public void onResponse(ObjectResult<Void> result) {
-						boolean success = Result.defaultParser(mContext, result, true);
-						if (success) {
-							FriendDao.getInstance().updateFriendStatus(friend.getOwnerId(), friend.getUserId(),
-									Friend.STATUS_BLACKLIST);
-							FriendHelper.addBlacklistExtraOperation(mLoginUserId, friend.getUserId());
-
-							updateAllCardcastUi();
-
-							// Action Btn设置为打招呼
-							mNextStepBtn.setText(R.string.remove_blacklist);
-							mNextStepBtn.setOnClickListener(new RemoveBlacklistListener());
+                    Intent mIntent = new Intent(BasicInfoActivity.this, AddTaskActivity.class);
+                    mIntent.putExtra("people", mNameTv.getText().toString());
+                    startActivity(mIntent);
+                }
+            });
+        }
+        invalidateOptionsMenu();
+    }
+
+    private void initFriendMoreAction() {
+        mFriend = FriendDao.getInstance().getFriend(mLoginUserId, mUser.getUserId());// 更新好友的状态
+        showMenu = mFriend != null;
+    }
+
+    protected void onDestroy() {
+        super.onDestroy();
+        ListenerManager.getInstance().removeNewFriendListener(this);
+        if (mBind) {
+            unbindService(mServiceConnection);
+        }
+    }
+
+    private void initView() {
+        getSupportActionBar().setTitle(R.string.basic_info);
+        mAvatarImg = (ImageView) findViewById(R.id.avatar_img);
+        mNameTv = (TextView) findViewById(R.id.name_tv);
+        mSexTv = (TextView) findViewById(R.id.sex_tv);
+        mBirthdayTv = (TextView) findViewById(R.id.birthday_tv);
+        mCityTv = (TextView) findViewById(R.id.city_tv);
+        tel_text = (TextView) findViewById(R.id.tel_tv);
+        tel_rl = (RelativeLayout) findViewById(R.id.tel_rl);
+        tel_rl.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (!com.xzjmyk.pm.activity.ui.erp.util.StringUtils.isEmpty(tel_text.getText().toString())) {
+                    String check = "^((13[0-9])|(15[^4,\\D])|(18[0,5-9]))\\d{8}$";
+                    Pattern regex = Pattern.compile(check);
+                    Matcher matcher = regex.matcher(tel_text.getText().toString());
+                    boolean isMatched = matcher.matches();
+                    if (isMatched) {
+                        phoneAction(tel_text.getText().toString());
+                    } else {
+                        ViewUtil.ShowMessageTitle(BasicInfoActivity.this, "手机格式不正确！");
+                    }
+
+                }
+            }
+        });
+        mDataLoadView = (DataLoadView) findViewById(R.id.data_load_view);
+        mDataLoadView.setLoadingEvent(new DataLoadView.LoadingEvent() {
+            @Override
+            public void load() {
+                loadOthersInfoFromNet();
+            }
+        });
+        mAvatarImg.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                // Intent intent = new Intent(PersonalInfoActivity.this,
+                // BusinessCircleActivity.class);
+                // intent.putExtra(Constant.EXTRA_CIRCLE_TYPE,
+                // Constant.CIRCLE_TYPE_PERSONAL_SPACE);
+                // intent.putExtra(Constant.EXTRA_USER_ID, mUser.getUserId());
+                // intent.putExtra(Constant.EXTRA_NICK_NAME,
+                // mUser.getNickName());
+                // startActivity(intent);
+            }
+        });
+        mNextStepBtn = (Button) findViewById(R.id.next_step_btn);
+        mLookLocationBtn = (Button) findViewById(R.id.look_location_btn);
+    }
+
+    public void phoneAction(final String phone) {
+        MaterialDialog dialog = new MaterialDialog.Builder(this).title("确认是否拨打电话").content("手机号码：" + phone)
+                .positiveText("拨打").negativeText("取消").autoDismiss(false).callback(new MaterialDialog.ButtonCallback() {
+                    @Override
+                    public void onPositive(MaterialDialog dialog) {
+                        // 用intent启动拨打电话
+                        Intent intent = new Intent(Intent.ACTION_CALL, Uri.parse("tel:" + phone));
+                        startActivity(intent);
+                    }
+
+                    @Override
+                    public void onNegative(MaterialDialog dialog) {
+                        super.onNegative(dialog);
+                        dialog.dismiss();
+                    }
+                }).build();
+
+        dialog.show();
+    }
+
+    public void doSayHello() {
+        final EditText editText = new EditText(this);
+        editText.setMaxLines(2);
+        editText.setLines(2);
+        editText.setHint(R.string.say_hello_dialog_hint);
+        editText.setFilters(new InputFilter[]{new InputFilter.LengthFilter(20)});
+        editText.setLayoutParams(
+                new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
+        AlertDialog.Builder builder = new AlertDialog.Builder(this).setTitle(R.string.say_hello_dialog_title)
+                .setView(editText).setPositiveButton(getString(R.string.sure), new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        final String text = editText.getText().toString().trim();
+                        doSayHello(text);
+                    }
+                }).setNegativeButton(getString(R.string.cancel), null);
+        builder.create().show();
+    }
+
+    private void doSayHello(String text) {
+        if (TextUtils.isEmpty(text)) {
+            text = getString(R.string.say_hello_default);
+        }
+        NewFriendMessage message = NewFriendMessage.createWillSendMessage(MyApplication.getInstance().mLoginUser,
+                XmppMessage.TYPE_SAYHELLO, text, mUser);
+        NewFriendDao.getInstance().createOrUpdateNewFriend(message);
+        mXmppService.sendNewFriendMessage(mUser.getUserId(), message);
+        // 提示打招呼成功
+        ToastUtil.showToast(this, R.string.say_hello_succ);
+    }
+
+    /**
+     * @desc:添加关注
+     * @author：Administrator on 2016/3/22 20:00
+     */
+    private void doAddAttention() {
+        if (mUser == null) {
+            return;
+        }
+        ProgressDialogUtil.show(mProgressDialog);
+        HashMap<String, String> params = new HashMap<String, String>();
+        params.put("access_token", MyApplication.getInstance().mAccessToken);
+        params.put("toUserId", mUser.getUserId());
+
+        StringJsonObjectRequest<AddAttentionResult> request = new StringJsonObjectRequest<AddAttentionResult>(
+                mConfig.FRIENDS_ATTENTION_ADD, new ErrorListener() {
+            @Override
+            public void onErrorResponse(VolleyError arg0) {
+                ProgressDialogUtil.dismiss(mProgressDialog);
+                ToastUtil.showErrorNet(mContext);
+            }
+        }, new StringJsonObjectRequest.Listener<AddAttentionResult>() {
+            @Override
+            public void onResponse(ObjectResult<AddAttentionResult> result) {
+                boolean success = Result.defaultParser(mContext, result, true);
+                if (success && result.getData() != null) {// 接口加关注成功
+                    if (result.getData().getType() == 1 || result.getData().getType() == 3) {// 单方关注成功或已经是关注的
+                        // 发送推送消息
+                        NewFriendMessage message = NewFriendMessage.createWillSendMessage(
+                                MyApplication.getInstance().mLoginUser, XmppMessage.TYPE_NEWSEE, null, mUser);
+                        mXmppService.sendNewFriendMessage(mUser.getUserId(), message);
+                        // 添加为关注
+                        NewFriendDao.getInstance().ascensionNewFriend(message, Friend.STATUS_ATTENTION);
+                        FriendHelper.addAttentionExtraOperation(mLoginUserId, mUser.getUserId());
+
+                        // 提示加关注成功
+                        ToastUtil.showToast(mContext, R.string.add_attention_succ);
+                        // 更新界面
+                        mNextStepBtn.setText(R.string.say_hello);
+                        mNextStepBtn.setOnClickListener(new SayHelloListener());
+                        // 由陌生关系变为关注了,那么右上角更多操作可以显示了
+                        initFriendMoreAction();
+                        // 更新名片盒
+                        updateAllCardcastUi();
+                        invalidateOptionsMenu();
+                    } else if (result.getData().getType() == 2 || result.getData().getType() == 4) {// 已经是好友了
+                        // 发送推送的消息
+                        NewFriendMessage message = NewFriendMessage.createWillSendMessage(
+                                MyApplication.getInstance().mLoginUser, XmppMessage.TYPE_FRIEND, null, mUser);
+                        mXmppService.sendNewFriendMessage(mUser.getUserId(), message);
+
+                        // 添加为好友
+                        NewFriendDao.getInstance().ascensionNewFriend(message, Friend.STATUS_FRIEND);
+                        FriendHelper.addFriendExtraOperation(mLoginUserId, mUser.getUserId());
+
+                        // 提示加好友成功
+                        ToastUtil.showToast(mContext, R.string.add_friend_succ);
+                        // 更新界面
+                        mNextStepBtn.setText(R.string.send_msg);
+                        mNextStepBtn.setOnClickListener(new SendMsgListener());
+                        // 由陌生或者关注变为好友了,那么右上角更多操作可以显示了
+                        initFriendMoreAction();
+                        // 更新名片盒
+                        updateAllCardcastUi();
+                        invalidateOptionsMenu();
+                    } else if (result.getData().getType() == 5) {
+                        ToastUtil.showToast(mContext, R.string.add_attention_failed);
+                    }
+                }
+                ProgressDialogUtil.dismiss(mProgressDialog);
+            }
+        }, AddAttentionResult.class, params);
+        addDefaultRequest(request);
+    }
+
+    @Override
+    public void onNewFriendSendStateChange(String toUserId, NewFriendMessage message, int messageState) {
+    }
+
+    @Override
+    public boolean onNewFriend(NewFriendMessage message) {
+        return false;
+    }
+
+    private void showRemarkDialog(final Friend friend) {
+        final EditText editText = new EditText(this);
+        editText.setMaxLines(2);
+        editText.setLines(2);
+        editText.setText(friend.getShowName());
+        editText.setFilters(new InputFilter[]{new InputFilter.LengthFilter(20)});
+        editText.setLayoutParams(
+                new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        builder.setTitle(R.string.set_remark_name).setView(editText)
+                .setPositiveButton(getString(R.string.sure), new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        String input = editText.getText().toString().trim();
+                        if (input.equals(friend.getShowName())) {// 备注名没变
+                            return;
+                        }
+                        if (!StringUtils.isNickName(input)) {// 不符合昵称
+                            if (input.length() != 0) {
+                                ToastUtil.showToast(mContext, R.string.remark_name_format_error);
+                                return;
+                            } else {// 不符合昵称，因为长度为0，但是可以做备注名操作，操作就是清除备注名
+                                // 判断之前有没有备注名
+                                if (TextUtils.isEmpty(friend.getRemarkName())) {// 如果没有备注名，就不需要清除
+                                    return;
+                                }
+                            }
+                        }
+                        remarkFriend(friend, input);
+                    }
+                }).setNegativeButton(getString(R.string.cancel), null);
+        builder.create().show();
+    }
+
+    private void remarkFriend(final Friend friend, final String remarkName) {
+        HashMap<String, String> params = new HashMap<String, String>();
+        params.put("access_token", MyApplication.getInstance().mAccessToken);
+        params.put("toUserId", friend.getUserId());
+        params.put("remarkName", remarkName);
+
+        ProgressDialogUtil.show(mProgressDialog);
+        StringJsonObjectRequest<Void> request = new StringJsonObjectRequest<Void>(mConfig.FRIENDS_REMARK,
+                new ErrorListener() {
+                    @Override
+                    public void onErrorResponse(VolleyError arg0) {
+                        ProgressDialogUtil.dismiss(mProgressDialog);
+                        ToastUtil.showErrorNet(mContext);
+                    }
+                }, new StringJsonObjectRequest.Listener<Void>() {
+            @Override
+            public void onResponse(ObjectResult<Void> result) {
+                boolean success = Result.defaultParser(mContext, result, true);
+                if (success) {
+                    friend.setRemarkName(remarkName);
+                    // 更新到数据库
+                    FriendDao.getInstance().setRemarkName(MyApplication.getInstance().mLoginUser.getUserId(),
+                            friend.getUserId(), remarkName);
+
+                    // 更新界面显示
+                    // TODO
+                    // if (TextUtils.isEmpty(remarkName)) {// 清除了备注名
+                    // mRemarkNamell.setVisibility(View.GONE);
+                    // } else {
+                    // mRemarkNamell.setVisibility(View.VISIBLE);
+                    // mRemarkNameTv.setText(remarkName);
+                    // }
+
+                    updateAllCardcastUi();
+                    // 改了昵称，通知消息界面更新
+                    MsgBroadcast.broadcastMsgUiUpdate(mContext);
+                }
+                ProgressDialogUtil.dismiss(mProgressDialog);
+                updateUI();
+            }
+        }, Void.class, params);
+        addDefaultRequest(request);
+
+    }
+
+    /**
+     * 取消关注
+     *
+     * @param friend
+     */
+    private void showCancelAttentionDialog(final Friend friend) {
+        if (friend.getStatus() == Friend.STATUS_UNKNOW) {
+            return;
+        }
+        AlertDialog.Builder builder = new AlertDialog.Builder(this).setTitle(R.string.prompt_title)
+                .setMessage(R.string.cancel_attention_prompt)
+                .setPositiveButton(getString(R.string.sure), new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        deleteFriend(friend, 0);
+                    }
+                }).setNegativeButton(getString(R.string.cancel), null);
+        builder.create().show();
+    }
+
+    private void showDeleteAllDialog(final Friend friend) {
+        if (friend.getStatus() == Friend.STATUS_UNKNOW) {
+            return;
+        }
+        AlertDialog.Builder builder = new AlertDialog.Builder(this).setTitle(R.string.prompt_title)
+                .setMessage(R.string.delete_all_prompt)
+                .setPositiveButton(getString(R.string.sure), new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        deleteFriend(friend, 1);
+                    }
+                }).setNegativeButton(getString(R.string.cancel), null);
+        builder.create().show();
+    }
+
+    /**
+     * @param friend
+     * @param type   0 取消关注 <br/>
+     *               1、彻底删除<br/>
+     */
+    private void deleteFriend(final Friend friend, final int type) {
+        HashMap<String, String> params = new HashMap<String, String>();
+        params.put("access_token", MyApplication.getInstance().mAccessToken);
+        params.put("toUserId", friend.getUserId());
+
+        String url = null;
+        if (type == 0) {
+            url = mConfig.FRIENDS_ATTENTION_DELETE;// 取消关注
+        } else {
+            url = mConfig.FRIENDS_DELETE;// 删除好友
+        }
+
+        ProgressDialogUtil.show(mProgressDialog);
+        StringJsonObjectRequest<Void> request = new StringJsonObjectRequest<Void>(url, new ErrorListener() {
+            @Override
+            public void onErrorResponse(VolleyError arg0) {
+                ProgressDialogUtil.dismiss(mProgressDialog);
+                ToastUtil.showErrorNet(mContext);
+            }
+        }, new StringJsonObjectRequest.Listener<Void>() {
+            @Override
+            public void onResponse(ObjectResult<Void> result) {
+                boolean success = Result.defaultParser(mContext, result, true);
+                if (success) {
+                    if (type == 0) {
+                        ToastUtil.showToast(mContext, R.string.cancel_attention_succ);
+                        NewFriendMessage message = NewFriendMessage.createWillSendMessage(
+                                MyApplication.getInstance().mLoginUser, XmppMessage.TYPE_DELSEE, null, friend);
+                        mXmppService.sendNewFriendMessage(mUser.getUserId(), message);// 解除关注
+                    } else {
+                        ToastUtil.showToast(mContext, R.string.delete_all_succ);
+                        NewFriendMessage message = NewFriendMessage.createWillSendMessage(
+                                MyApplication.getInstance().mLoginUser, XmppMessage.TYPE_DELALL, null, friend);
+                        mXmppService.sendNewFriendMessage(mUser.getUserId(), message);// 解除好友
+                    }
+
+                    FriendHelper.removeAttentionOrFriend(mLoginUserId, friend.getUserId());
+                    updateAllCardcastUi();
+                    /* 更新本界面 */
+                    // 1、备注名没有了//TODO
+                    // mRemarkNamell.setVisibility(View.GONE);
+                    // 2、mFriend设置为null
+                    mFriend = null;
+                    // 右上角没有更多操作
+                    showMenu = false;
+                    invalidateOptionsMenu();
+                    // Action Btn设置为打招呼
+                    mNextStepBtn.setText(R.string.add_attention);
+                    mNextStepBtn.setOnClickListener(new AddAttentionListener());
+                }
+                ProgressDialogUtil.dismiss(mProgressDialog);
+            }
+        }, Void.class, params);
+        addDefaultRequest(request);
+
+    }
+
+    /* 显示加入黑名单的对话框 */
+    private void showBlacklistDialog(final Friend friend) {
+        int messageId = 0;
+        if (friend.getStatus() == Friend.STATUS_BLACKLIST) {// 已经在黑名单，那就是移出黑名单
+            messageId = R.string.remove_blacklist_prompt;
+        } else if (friend.getStatus() == Friend.STATUS_ATTENTION || friend.getStatus() == Friend.STATUS_FRIEND) {
+            messageId = R.string.add_blacklist_prompt;
+        } else {// 其他关系（错误的状态）
+            return;
+        }
+        AlertDialog.Builder builder = new AlertDialog.Builder(this).setTitle(R.string.prompt_title)
+                .setMessage(messageId)
+                .setPositiveButton(getString(R.string.sure), new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        if (friend.getStatus() == Friend.STATUS_BLACKLIST) {// 已经在黑名单，那就是移出黑名单
+                            removeBlacklist(friend);
+                        } else if (friend.getStatus() == Friend.STATUS_ATTENTION
+                                || friend.getStatus() == Friend.STATUS_FRIEND) {
+                            addBlacklist(friend);
+                        }
+
+                    }
+                }).setNegativeButton(getString(R.string.cancel), null);
+        builder.create().show();
+    }
+
+    private void addBlacklist(final Friend friend) {
+        HashMap<String, String> params = new HashMap<String, String>();
+        params.put("access_token", MyApplication.getInstance().mAccessToken);
+        params.put("toUserId", friend.getUserId());
+
+        ProgressDialogUtil.show(mProgressDialog);
+        StringJsonObjectRequest<Void> request = new StringJsonObjectRequest<Void>(mConfig.FRIENDS_BLACKLIST_ADD,
+                new ErrorListener() {
+                    @Override
+                    public void onErrorResponse(VolleyError arg0) {
+                        ProgressDialogUtil.dismiss(mProgressDialog);
+                        ToastUtil.showErrorNet(mContext);
+                    }
+                }, new StringJsonObjectRequest.Listener<Void>() {
+            @Override
+            public void onResponse(ObjectResult<Void> result) {
+                boolean success = Result.defaultParser(mContext, result, true);
+                if (success) {
+                    FriendDao.getInstance().updateFriendStatus(friend.getOwnerId(), friend.getUserId(),
+                            Friend.STATUS_BLACKLIST);
+                    FriendHelper.addBlacklistExtraOperation(mLoginUserId, friend.getUserId());
+
+                    updateAllCardcastUi();
+
+                    // Action Btn设置为打招呼
+                    mNextStepBtn.setText(R.string.remove_blacklist);
+                    mNextStepBtn.setOnClickListener(new RemoveBlacklistListener());
 
 							/* 发送加入黑名单的通知 */
-							if (friend.getStatus() == Friend.STATUS_FRIEND) {// 之前是好友，需要发消息让那个人不能看我的商务圈
-								NewFriendMessage message = NewFriendMessage.createWillSendMessage(
-										MyApplication.getInstance().mLoginUser, XmppMessage.TYPE_BLACK, null, friend);
-								mXmppService.sendNewFriendMessage(friend.getUserId(), message);// 加入黑名单
-							}
-
-							friend.setStatus(Friend.STATUS_BLACKLIST);
-							ToastUtil.showToast(mContext, R.string.add_blacklist_succ);
-						}
-						ProgressDialogUtil.dismiss(mProgressDialog);
-					}
-				}, Void.class, params);
-		addDefaultRequest(request);
-
-	}
-
-	private void removeBlacklist(final Friend friend) {
-		HashMap<String, String> params = new HashMap<String, String>();
-		params.put("access_token", MyApplication.getInstance().mAccessToken);
-		params.put("toUserId", friend.getUserId());
-
-		ProgressDialogUtil.show(mProgressDialog);
-		StringJsonObjectRequest<AttentionUser> request = new StringJsonObjectRequest<AttentionUser>(
-				mConfig.FRIENDS_BLACKLIST_DELETE, new ErrorListener() {
-					@Override
-					public void onErrorResponse(VolleyError arg0) {
-						ProgressDialogUtil.dismiss(mProgressDialog);
-						ToastUtil.showErrorNet(mContext);
-					}
-				}, new StringJsonObjectRequest.Listener<AttentionUser>() {
-					@Override
-					public void onResponse(ObjectResult<AttentionUser> result) {
-						boolean success = Result.defaultParser(mContext, result, true);
-						if (success) {
-							int currentStatus = Friend.STATUS_UNKNOW;
-							if (result.getData() != null) {
-								currentStatus = result.getData().getStatus();
-							}
-							FriendDao.getInstance().updateFriendStatus(friend.getOwnerId(), friend.getUserId(),
-									currentStatus);
-							friend.setStatus(currentStatus);
-							updateAllCardcastUi();
-
-							switch (currentStatus) {
-							case Friend.STATUS_ATTENTION:
-								mNextStepBtn.setText(R.string.say_hello);
-								mNextStepBtn.setOnClickListener(new SayHelloListener());
-								NewFriendMessage message1 = NewFriendMessage.createWillSendMessage(
-										MyApplication.getInstance().mLoginUser, XmppMessage.TYPE_NEWSEE, null, friend);
-								mXmppService.sendNewFriendMessage(friend.getUserId(), message1);
-
-								FriendHelper.addAttentionExtraOperation(friend.getOwnerId(), friend.getUserId());
-								break;
-							case Friend.STATUS_FRIEND:
-								mNextStepBtn.setText(R.string.send_msg);
-								mNextStepBtn.setOnClickListener(new SendMsgListener());
-
-								NewFriendMessage message2 = NewFriendMessage.createWillSendMessage(
-										MyApplication.getInstance().mLoginUser, XmppMessage.TYPE_FRIEND, null, mUser);
-								mXmppService.sendNewFriendMessage(mUser.getUserId(), message2);
-								FriendHelper.addFriendExtraOperation(friend.getOwnerId(), friend.getUserId());
-								break;
-							default:// 其他，理论上不可能
-								mNextStepBtn.setText(R.string.add_attention);
-								mNextStepBtn.setOnClickListener(new AddAttentionListener());
-								break;
-							}
-
-							ToastUtil.showToast(mContext, R.string.remove_blacklist_succ);
-						}
-						ProgressDialogUtil.dismiss(mProgressDialog);
-					}
-				}, AttentionUser.class, params);
-		addDefaultRequest(request);
-	}
-
-	// 加关注
-	private class AddAttentionListener implements View.OnClickListener {
-		@Override
-		public void onClick(View v) {
-			doAddAttention();
-		}
-	}
-
-	// 打招呼
-	private class SayHelloListener implements View.OnClickListener {
-		@Override
-		public void onClick(View v) {
-			doSayHello();
-		}
-	}
-
-	// 发消息
-	private class SendMsgListener implements View.OnClickListener {
-		@Override
-		public void onClick(View v) {
-			MsgBroadcast.broadcastMsgUiUpdate(BasicInfoActivity.this);
-			MsgBroadcast.broadcastMsgNumReset(BasicInfoActivity.this);
-			Intent intent = new Intent(mContext, ChatActivity.class);
-			mFriend.setRemarkName(mUserReName);
-			intent.putExtra(ChatActivity.FRIEND, mFriend);
-			startActivity(intent);
-		}
-	}
-
-	// 移除黑名单
-	private class RemoveBlacklistListener implements View.OnClickListener {
-		@Override
-		public void onClick(View v) {
-			if (mFriend == null || mFriend.getStatus() != Friend.STATUS_BLACKLIST) {
-				return;
-			}
-			removeBlacklist(mFriend);
-			mFriend = FriendDao.getInstance().getFriend(mLoginUserId, mUser.getUserId());// 更新好友的状态
-		}
-	}
-
+                    if (friend.getStatus() == Friend.STATUS_FRIEND) {// 之前是好友，需要发消息让那个人不能看我的商务圈
+                        NewFriendMessage message = NewFriendMessage.createWillSendMessage(
+                                MyApplication.getInstance().mLoginUser, XmppMessage.TYPE_BLACK, null, friend);
+                        mXmppService.sendNewFriendMessage(friend.getUserId(), message);// 加入黑名单
+                    }
+
+                    friend.setStatus(Friend.STATUS_BLACKLIST);
+                    ToastUtil.showToast(mContext, R.string.add_blacklist_succ);
+                }
+                ProgressDialogUtil.dismiss(mProgressDialog);
+            }
+        }, Void.class, params);
+        addDefaultRequest(request);
+
+    }
+
+    private void removeBlacklist(final Friend friend) {
+        HashMap<String, String> params = new HashMap<String, String>();
+        params.put("access_token", MyApplication.getInstance().mAccessToken);
+        params.put("toUserId", friend.getUserId());
+
+        ProgressDialogUtil.show(mProgressDialog);
+        StringJsonObjectRequest<AttentionUser> request = new StringJsonObjectRequest<AttentionUser>(
+                mConfig.FRIENDS_BLACKLIST_DELETE, new ErrorListener() {
+            @Override
+            public void onErrorResponse(VolleyError arg0) {
+                ProgressDialogUtil.dismiss(mProgressDialog);
+                ToastUtil.showErrorNet(mContext);
+            }
+        }, new StringJsonObjectRequest.Listener<AttentionUser>() {
+            @Override
+            public void onResponse(ObjectResult<AttentionUser> result) {
+                boolean success = Result.defaultParser(mContext, result, true);
+                if (success) {
+                    int currentStatus = Friend.STATUS_UNKNOW;
+                    if (result.getData() != null) {
+                        currentStatus = result.getData().getStatus();
+                    }
+                    FriendDao.getInstance().updateFriendStatus(friend.getOwnerId(), friend.getUserId(),
+                            currentStatus);
+                    friend.setStatus(currentStatus);
+                    updateAllCardcastUi();
+
+                    switch (currentStatus) {
+                        case Friend.STATUS_ATTENTION:
+                            mNextStepBtn.setText(R.string.say_hello);
+                            mNextStepBtn.setOnClickListener(new SayHelloListener());
+                            NewFriendMessage message1 = NewFriendMessage.createWillSendMessage(
+                                    MyApplication.getInstance().mLoginUser, XmppMessage.TYPE_NEWSEE, null, friend);
+                            mXmppService.sendNewFriendMessage(friend.getUserId(), message1);
+
+                            FriendHelper.addAttentionExtraOperation(friend.getOwnerId(), friend.getUserId());
+                            break;
+                        case Friend.STATUS_FRIEND:
+                            mNextStepBtn.setText(R.string.send_msg);
+                            mNextStepBtn.setOnClickListener(new SendMsgListener());
+
+                            NewFriendMessage message2 = NewFriendMessage.createWillSendMessage(
+                                    MyApplication.getInstance().mLoginUser, XmppMessage.TYPE_FRIEND, null, mUser);
+                            mXmppService.sendNewFriendMessage(mUser.getUserId(), message2);
+                            FriendHelper.addFriendExtraOperation(friend.getOwnerId(), friend.getUserId());
+                            break;
+                        default:// 其他，理论上不可能
+                            mNextStepBtn.setText(R.string.add_attention);
+                            mNextStepBtn.setOnClickListener(new AddAttentionListener());
+                            break;
+                    }
+
+                    ToastUtil.showToast(mContext, R.string.remove_blacklist_succ);
+                }
+                ProgressDialogUtil.dismiss(mProgressDialog);
+            }
+        }, AttentionUser.class, params);
+        addDefaultRequest(request);
+    }
+
+    // 加关注
+    private class AddAttentionListener implements View.OnClickListener {
+        @Override
+        public void onClick(View v) {
+            doAddAttention();
+        }
+    }
+
+    // 打招呼
+    private class SayHelloListener implements View.OnClickListener {
+        @Override
+        public void onClick(View v) {
+            doSayHello();
+        }
+    }
+
+    // 发消息
+    private class SendMsgListener implements View.OnClickListener {
+        @Override
+        public void onClick(View v) {
+            MsgBroadcast.broadcastMsgUiUpdate(BasicInfoActivity.this);
+            MsgBroadcast.broadcastMsgNumReset(BasicInfoActivity.this);
+            Intent intent = new Intent(mContext, ChatActivity.class);
+            mFriend.setRemarkName(userName);
+            intent.putExtra(ChatActivity.FRIEND, mFriend);
+            startActivity(intent);
+        }
+    }
+
+    // 移除黑名单
+    private class RemoveBlacklistListener implements View.OnClickListener {
+        @Override
+        public void onClick(View v) {
+            if (mFriend == null || mFriend.getStatus() != Friend.STATUS_BLACKLIST) {
+                return;
+            }
+            removeBlacklist(mFriend);
+            mFriend = FriendDao.getInstance().getFriend(mLoginUserId, mUser.getUserId());// 更新好友的状态
+        }
+    }
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/BusinessCircleActivity.java

@@ -167,8 +167,17 @@ public class BusinessCircleActivity extends BaseActivity implements showCEView{
 		});
 		mPullToRefreshListView.getRefreshableView().addHeaderView(mMyCoverView, null, false);
 		mAdapter = new PublicMessageAdapter(this, mMessages);
+		if (isMySpace()){
+			mAdapter.setType(AppConstant.CIRCLE_TYPE_PERSONAL_SPACE);
+		}else{
+			mAdapter.setType(AppConstant.CIRCLE_TYPE_MY_BUSINESS);
+		}
+
 		setListenerAudio(mAdapter); //设置借口回调
 
+
+
+
 		mPullToRefreshListView.getRefreshableView().setAdapter(mAdapter);
 
 		mPullToRefreshListView.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener2<ListView>() {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/db/DBManager.java

@@ -351,6 +351,38 @@ public class DBManager {
         return entity;
     }
 
+    /**
+     * @author Administrator
+     * @功能:获取某员工的信息
+     */
+    public EmployeesEntity selectForEmployee(String[] selectionArgs, String selection) {
+        String table = "employees";
+        String groupBy = null;
+        String having = null;
+        String orderBy = null;
+        Cursor cursor = db.query(table, null, selection, selectionArgs, groupBy, having, orderBy);
+        EmployeesEntity model = null;
+        while (cursor.moveToLast()) {
+            model = new EmployeesEntity();
+            model.setEM_CODE(cursor.getString(cursor.getColumnIndex("em_code")));
+            model.setEm_defaultorid(cursor.getInt(cursor.getColumnIndex("em_defaultorid")));
+            model.setEM_DEFAULTORNAME(cursor.getString(cursor.getColumnIndex("em_defaultorname")));
+            model.setEM_DEPART(cursor.getString(cursor.getColumnIndex("em_depart")));
+            model.setFLAG(cursor.getString(cursor.getColumnIndex("em_flag")));
+            model.setEM_ID(cursor.getInt(cursor.getColumnIndex("em_id")));
+            model.setEM_MOBILE(cursor.getString(cursor.getColumnIndex("em_mobile")));
+            model.setEM_NAME(cursor.getString(cursor.getColumnIndex("em_name")));
+            model.setEM_POSITION(cursor.getString(cursor.getColumnIndex("em_position")));
+            model.setEM_UU(cursor.getString(cursor.getColumnIndex("em_uu")));
+            model.setWHICHSYS(cursor.getString(cursor.getColumnIndex("whichsys")));
+            model.setEm_IMID(Integer.valueOf(cursor.getString(
+                            cursor.getColumnIndex("em_imid")) == null ? "0" : cursor.getString(
+                            cursor.getColumnIndex("em_imid"))
+            ));
+        }
+        cursor.close();
+        return model;
+    }
 
     /**
      * close database

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

@@ -208,6 +208,7 @@ public class LinksManFragment extends XutilsFragment implements View.OnClickList
                         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)));
                     }
                 }
@@ -224,7 +225,8 @@ public class LinksManFragment extends XutilsFragment implements View.OnClickList
     private Friend EnterChatAction(EmployeesEntity employee) {
         Friend friend = new Friend();
         friend.setUserId(String.valueOf(employee.getEm_IMID()));
-
+        friend.setEmCode(employee.getEM_CODE());
+        employee.getEM_CODE();
         friend.setOwnerId(MyApplication.getInstance().mLoginUser.getUserId());
         friend.setRemarkName(employee.getEM_NAME());//备注
         friend.setNickName(employee.getEM_NAME());//昵称
@@ -392,8 +394,10 @@ public class LinksManFragment extends XutilsFragment implements View.OnClickList
                     intent.putExtra(ChatActivity.FRIEND, friend);
                 } else {
                     intent = new Intent(getActivity(), BasicInfoActivity.class);
+//                    intent.putExtra(AppConstant.EXTRA_FRIEND, friend);
+                    intent.putExtra(AppConstant.EXTRA_NICK_CODE, friend.getEmCode());
                     intent.putExtra(AppConstant.EXTRA_USER_ID, friend.getUserId());
-                    intent.putExtra(AppConstant.EXTRA_NICK_NAME, friend.getRemarkName());
+                    intent.putExtra(AppConstant.EXTRA_NICK_NAME, friend.getNickName());
                 }
                 startActivity(intent);
             }

WeiChat/src/main/res/layout/activity_basic_info.xml

@@ -179,7 +179,6 @@
 
         <com.xzjmyk.pm.activity.view.DataLoadView
             android:id="@+id/data_load_view"
-            android:visibility="gone"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
     </RelativeLayout>