修改我的个人空间去除名字，修改提示账号异地登陆提示（待测试），修改好友资料时出现当目标没有imid时候显示异常状态前备份

WeiChat/build.gradle

@@ -2,12 +2,12 @@ apply plugin: 'com.android.application'
 
 android {
     signingConfigs {
-        发布版 {
-            keyPassword '13237658359'
-            storeFile file('C:/Users/Administrator/Desktop/我的文档/applicationsignname[20150409]')
-            storePassword '13237658359'
-            keyAlias 'jie-20150409'
-        }
+//        发布版 {
+//            keyPassword '13237658359'
+//            storeFile file('C:/Users/Administrator/Desktop/我的文档/applicationsignname[20150409]')
+//            storePassword '13237658359'
+//            keyAlias 'jie-20150409'
+//        }
     }
     compileSdkVersion 22
     buildToolsVersion "22.0.1"
@@ -30,7 +30,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
         debug {
-            signingConfig signingConfigs.发布版
+//            signingConfig signingConfigs.发布版
         }
     }
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/PublicMessageAdapter.java

@@ -83,7 +83,7 @@ public class PublicMessageAdapter extends BaseAdapter implements BusinessCircleA
     private String mLoginUserId;
     private String mLoginNickName;
     private ProgressDialog mProgressDialog;
-
+    private int type;
     // 播放音频的记录
     private ViewHolder mVoicePlayViewHolder;// 当前正在播放的VocieViewHolder
     private AudioPalyer mAudioPalyer;
@@ -98,6 +98,14 @@ public class PublicMessageAdapter extends BaseAdapter implements BusinessCircleA
         }
     }
 
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    public int getType() {
+        return type;
+    }
+
     public PublicMessageAdapter(Context context, List<PublicMessage> messages) {
         mContext = context;
         mMessages = messages;
@@ -337,9 +345,13 @@ public class PublicMessageAdapter extends BaseAdapter implements BusinessCircleA
         String showName = getShowName(userId, message.getNickName());
 
         UserClickableSpan.setClickableSpan(mContext, nickNamebuilder, showName, message.getUserId());
-        viewHolder.nick_name_tv.setText(nickNamebuilder);
-        viewHolder.nick_name_tv.setLinksClickable(true);
-        viewHolder.nick_name_tv.setMovementMethod(LinkMovementClickMethod.getInstance());
+        if (getType() == AppConstant.CIRCLE_TYPE_PERSONAL_SPACE) { //个人空间  移除用户名
+            viewHolder.nick_name_tv.setVisibility(View.GONE);
+        } else {//商务圈
+            viewHolder.nick_name_tv.setText(nickNamebuilder);
+            viewHolder.nick_name_tv.setLinksClickable(true);
+            viewHolder.nick_name_tv.setMovementMethod(LinkMovementClickMethod.getInstance());
+        }
         // 设置头像的点击事件
         viewHolder.avatar_img.setOnClickListener(new View.OnClickListener() {
             @Override

WeiChat/src/main/java/com/xzjmyk/pm/activity/helper/LoginHelper.java

@@ -256,6 +256,7 @@ public class LoginHelper {
 
 		if (status == STATUS_USER_TOKEN_CHANGE) {// Token已经变更，直接提示，不需要再检测Token是否变更
 			MyApplication.getInstance().mUserStatusChecked = true;
+			Log.i("gongpengming","另一个账号登录");
 			broadcastNeedUpdate(activity);
 			return;
 		}
@@ -298,8 +299,7 @@ public class LoginHelper {
 							MyApplication.getInstance().mUserStatusChecked = true;// 检测Token成功
 							int tokenExists = result.getData().getTokenExists();// 1=令牌存在、0=令牌不存在
 							int serialStatus = result.getData().getSerialStatus();// 1=没有设备号、2=设备号一致、3=设备号不一致
-							Log.d("wang","tokenExists"+tokenExists);
-							Log.d("wang","serialStatus"+serialStatus);
+							Log.d("gongpengming","serialStatus"+serialStatus);
 							if (serialStatus == 2) {// 设备号一致，说明没有切换过设备
 								if (tokenExists == 1) {// Token也存在，说明不用登陆了
 									if (status == STATUS_USER_FULL) {// 本地数据完整，那么就免登陆使用
@@ -315,7 +315,9 @@ public class LoginHelper {
 									}
 								}
 							} else {// 设备号不一致，那么就是切换过手机
-								MyApplication.getInstance().mUserStatus = STATUS_USER_TOKEN_CHANGE;
+//								MyApplication.getInstance().mUserStatus = STATUS_USER_TOKEN_CHANGE;
+								//TODO 可能存在异常提示账号在另一设备登陆情况
+
 							}
 
 							// 最后判断是否要跳转弹出对话框

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

@@ -331,7 +331,6 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
                 removeNeedUserFragment(false);
 
             } else if (action.equals(LoginHelper.ACTION_CONFLICT)) {
-
                 // 改变用户状态
                 MyApplication.getInstance().mUserStatus = LoginHelper.STATUS_USER_TOKEN_CHANGE;
                 mCoreService.logout();

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

@@ -60,8 +60,6 @@ public class UserCheckedActivity extends ActionBackActivity {
 			//TODO 下线通知
 			mTitleTv.setText(R.string.logout_title);
 			mDesTv.setText(R.string.logout_des);
-
-
 		} else {// 其他的状态，一般不会出现，为了容错，加个判断
 			loginAgain();
 			return;

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

@@ -120,8 +120,7 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
 			mUserReName= getIntent().getStringExtra(AppConstant.EXTRA_NICK_NAME);
 		}
 		mLoginUserId = MyApplication.getInstance().mLoginUser.getUserId();
-		Log.i("LoginInfo", "点击用户的id：" + mUserId);
-		Log.i("LoginInfo", "当前用户id：" + mLoginUserId);
+
 		if (TextUtils.isEmpty(mUserId)) {
 			mUserId = mLoginUserId;
 		}
@@ -304,7 +303,8 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
 			}else{
 				mNameTv.setText(mUser.getNickName());
 
-			}}else{
+			}
+			}else{
 				mNameTv.setText(mUserReName);
 			}
          mFriend.setRemarkName(mUserReName);

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

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

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

@@ -192,14 +192,12 @@ public class LinksManFragment extends XutilsFragment implements View.OnClickList
         for (int i = 0; i < emList.size(); i++) {//企业通讯人员
             // friends.add(EnterChatAction(emList.get(i)));
             if (mLoginUserId.equals((emList.get(i).getEm_IMID() + ""))) {
-                Log.i("gongpengming", "存在相同" + emList.get(i).getEM_NAME());
                 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() + ""))) {
-                        Log.i("gongpengming", "mLoginUserId存在相同" + emList.get(i).getEM_NAME());
                         friend.remove(j);
                         continue;
                     }

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

@@ -17,5 +17,5 @@
         android:divider="@null"
         android:fadingEdge="none"
         android:listSelector="#00000000"
-        android:scrollbars="none"></com.handmark.pulltorefresh.library.PullToRefreshListView>
+        android:scrollbars="none"/>
 </RelativeLayout>

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

@@ -179,6 +179,7 @@
 
         <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>