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

WeiChat/src/main/java/com/xzjmyk/pm/activity/db/dao/ChatMessageDao.java

@@ -96,7 +96,7 @@ public class ChatMessageDao {
 
     public boolean deleteSingleChatMessage(String ownerId, String friendId, ArrayList<ChatMessage> messages) {
         Dao<ChatMessage, Integer> dao = getDao(ownerId, friendId);
-        if (dao == null) {
+        if (dao == null || messages == null || messages.size() == 0) {
             return false;
         }
         try {

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

@@ -330,7 +330,6 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
                 // mFindRb.setChecked(true);
                 MainActivity.this.finish();
                 removeNeedUserFragment(false);
-
             } else if (action.equals(LoginHelper.ACTION_CONFLICT)) {
                 // 改变用户状态
                 MyApplication.getInstance().mUserStatus = LoginHelper.STATUS_USER_TOKEN_CHANGE;
@@ -346,7 +345,6 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
                 }
 
             } else if (action.equals(LoginHelper.ACTION_TOKEN)) {  //TOKEN异常
-                // TODO  token异常
                 // 改变用户状态
                 MyApplication.getInstance().mUserStatus = LoginHelper.STATUS_USER_TOKEN_CHANGE;
                 mCoreService.logout();

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

@@ -304,7 +304,6 @@ public class LinksManFragment extends XutilsFragment implements View.OnClickList
         my_friend_rl.setOnClickListener(this);
         my_friends_rl.setOnClickListener(this);
         chat_manage_rl.setOnClickListener(this);
-
         mTextDialog = (TextView) findViewById(R.id.text_dialog);
         mSideBar = (SideBar) findViewById(R.id.sidebar);
         mSideBar.setTextView(mTextDialog);

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

@@ -8,7 +8,6 @@ import android.content.IntentFilter;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.provider.Settings;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
@@ -28,11 +27,6 @@ import com.handmark.pulltorefresh.library.PullToRefreshBase.OnRefreshListener;
 import com.roamer.slidelistview.SlideBaseAdapter;
 import com.roamer.slidelistview.SlideListView;
 import com.roamer.slidelistview.SlideListView.SlideMode;
-import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
-import com.xzjmyk.pm.activity.ui.erp.util.ObjectUtils;
-import com.xzjmyk.pm.activity.util.SystemUtil;
-import com.xzjmyk.pm.activity.view.PullToRefreshSlideListView;
-import com.xzjmyk.pm.activity.volley.StringJsonArrayRequest;
 import com.xzjmyk.pm.activity.AppConstant;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
@@ -59,9 +53,11 @@ import com.xzjmyk.pm.activity.ui.erp.activity.TaskActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.AllProcess;
 import com.xzjmyk.pm.activity.ui.erp.model.NewsEntity;
 import com.xzjmyk.pm.activity.ui.erp.model.NoticeEntity;
+import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.FlexJsonUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.ObjectUtils;
 import com.xzjmyk.pm.activity.util.HtmlUtils;
 import com.xzjmyk.pm.activity.util.ProgressDialogUtil;
 import com.xzjmyk.pm.activity.util.StringUtils;
@@ -69,9 +65,11 @@ import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.util.ViewHolder;
 import com.xzjmyk.pm.activity.view.ClearEditText;
+import com.xzjmyk.pm.activity.view.PullToRefreshSlideListView;
 import com.xzjmyk.pm.activity.volley.ArrayResult;
 import com.xzjmyk.pm.activity.volley.ObjectResult;
 import com.xzjmyk.pm.activity.volley.Result;
+import com.xzjmyk.pm.activity.volley.StringJsonArrayRequest;
 import com.xzjmyk.pm.activity.volley.StringJsonObjectRequest;
 import com.xzjmyk.pm.activity.xmpp.listener.ChatMessageListener;
 
@@ -88,11 +86,8 @@ import java.util.UUID;
  */
 public class MessageFragment extends EasyFragment {
     private boolean mNeedUpdate = true;
-
     private ClearEditText mClearEditText;
-
     private PullToRefreshSlideListView mPullToRefreshListView;
-
     private List<BaseSortModel<Friend>> mFriendList;// 筛选后的朋友数据
     private List<BaseSortModel<Friend>> mOriginalFriendList;// 原始的朋友数据，也就是从数据库查询出来，没有筛选的
     private NearlyMessageAdapter mAdapter;

WeiChat/src/main/java/com/xzjmyk/pm/activity/view/ChatContentView.java

@@ -93,6 +93,7 @@ public class ChatContentView extends PullDownListView implements OnMediaStateCha
     private static final String HASHCODE = "HASHCODE";
     private Context mContext;
     private ArrayList<Integer> ints;
+    private ArrayList<Integer> deleInts;
     /* 根据mLoginUserId和mToUserId 唯一确定一张表 */
     private String mLoginUserId;
     private String mToUserId;
@@ -132,6 +133,10 @@ public class ChatContentView extends PullDownListView implements OnMediaStateCha
 
     public ArrayList<Integer> getInts() {
         isShowCB = false;
+        if (deleInts != null && deleInts.size() > 0) {
+            Log.i("gongpengming", deleInts.toString());
+            ints.removeAll(deleInts);
+        }
         return ints;
     }
 
@@ -539,6 +544,8 @@ public class ChatContentView extends PullDownListView implements OnMediaStateCha
                     public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
                         if (b) {
                             ints.add(position);
+                        } else {
+                            deleInts.add(position);
                         }
                     }
                 });
@@ -1249,6 +1256,11 @@ public class ChatContentView extends PullDownListView implements OnMediaStateCha
                     if (ints == null) {
                         ints = new ArrayList<>();
                     }
+                    if (deleInts == null) {
+                        deleInts = new ArrayList<>();
+
+                    }
+                    deleInts.clear();
                     ints.clear();
                     if (mChatContentAdapter != null) {
                         isShowCB = true;

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

@@ -182,9 +182,11 @@
             android:layout_alignParentBottom="true"
             android:background="@color/item_line" />
     </RelativeLayout>
+
     <RelativeLayout
         android:id="@+id/my_tingyue_rl"
-        style="@style/IMTbleLine_UP">
+        style="@style/IMTbleLine_UP"
+        android:visibility="gone">
 
         <ImageView
             android:id="@+id/tingyue_avatar_img"
@@ -193,6 +195,7 @@
             android:layout_centerVertical="true"
             android:contentDescription="@string/app_name"
             android:src="@drawable/tingyue" />
+
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"