更新StickyListHeadersListView，修复崩溃问题

jpush · May 23, 2019 · 926e16e · 926e16e
1 parent 7862161
commit 926e16e
Show file tree

Hide file tree

Showing 29 changed files with 30 additions and 1,191 deletions.
diff --git a/chatapp/build.gradle b/chatapp/build.gradle
@@ -72,5 +72,6 @@ dependencies {
     implementation 'cn.jiguang.sdk:jmessage:2.9.0'  // 此处以J
     implementation 'cn.jiguang.sdk:jcore:2.0.0'
     implementation 'org.greenrobot:eventbus:3.1.1'
-    implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0-alpha-25'
+    implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0-alpha-26'
+    implementation 'com.github.mtotschnig:StickyListHeaders:2.7.1'
 }
diff --git a/chatapp/src/main/java/jiguang/chat/activity/ChooseAtMemberActivity.java b/chatapp/src/main/java/jiguang/chat/activity/ChooseAtMemberActivity.java
@@ -23,7 +23,7 @@
 import jiguang.chat.utils.keyboard.widget.EmoticonsEditText;
 import jiguang.chat.utils.pinyin.UserComparator;
 import jiguang.chat.utils.sidebar.SideBar;
-import jiguang.chat.view.listview.StickyListHeadersListView;
+import se.emilsjolander.stickylistheaders.StickyListHeadersListView;
 
 
 /**

diff --git a/chatapp/src/main/java/jiguang/chat/activity/CreateGroupActivity.java b/chatapp/src/main/java/jiguang/chat/activity/CreateGroupActivity.java
@@ -30,7 +30,7 @@
 import jiguang.chat.utils.keyboard.utils.EmoticonsKeyboardUtils;
 import jiguang.chat.utils.pinyin.PinyinComparator;
 import jiguang.chat.utils.sidebar.SideBar;
-import jiguang.chat.view.listview.StickyListHeadersListView;
+import se.emilsjolander.stickylistheaders.StickyListHeadersListView;
 
 
 /**

diff --git a/chatapp/src/main/java/jiguang/chat/activity/FriendListActivity.java b/chatapp/src/main/java/jiguang/chat/activity/FriendListActivity.java
@@ -32,7 +32,7 @@
 import jiguang.chat.utils.SharePreferenceManager;
 import jiguang.chat.utils.pinyin.PinyinComparator;
 import jiguang.chat.utils.sidebar.SideBar;
-import jiguang.chat.view.listview.StickyListHeadersListView;
+import se.emilsjolander.stickylistheaders.StickyListHeadersListView;
 
 /**
  * Created by ${chenyn} on 2017/9/21.

diff --git a/chatapp/src/main/java/jiguang/chat/activity/GroupMemberListActivity.java b/chatapp/src/main/java/jiguang/chat/activity/GroupMemberListActivity.java
@@ -21,7 +21,7 @@
 import jiguang.chat.application.JGApplication;
 import jiguang.chat.utils.GroupMemberListComparator;
 import jiguang.chat.utils.sidebar.SideBar;
-import jiguang.chat.view.listview.StickyListHeadersListView;
+import se.emilsjolander.stickylistheaders.StickyListHeadersListView;
 
 /**
  * Created by ${chenyn} on 2017/11/3.

diff --git a/chatapp/src/main/java/jiguang/chat/activity/historyfile/adapter/AudioFileAdapter.java b/chatapp/src/main/java/jiguang/chat/activity/historyfile/adapter/AudioFileAdapter.java
@@ -21,13 +21,13 @@
 import cn.jpush.im.android.api.content.FileContent;
 import jiguang.chat.R;
 import jiguang.chat.activity.DownLoadActivity;
-import jiguang.chat.adapter.StickyListHeadersAdapter;
 import jiguang.chat.entity.FileItem;
 import jiguang.chat.entity.SelectedHistoryFileListener;
 import jiguang.chat.utils.FileHelper;
 import jiguang.chat.utils.SharePreferenceManager;
 import jiguang.chat.utils.ViewHolder;
 import jiguang.chat.view.MyImageView;
+import se.emilsjolander.stickylistheaders.StickyListHeadersAdapter;
 
 /**
  * Created by ${chenyn} on 2017/8/29.

diff --git a/chatapp/src/main/java/jiguang/chat/activity/historyfile/adapter/DocumentFileAdapter.java b/chatapp/src/main/java/jiguang/chat/activity/historyfile/adapter/DocumentFileAdapter.java
@@ -21,12 +21,12 @@
 import cn.jpush.im.android.api.content.FileContent;
 import jiguang.chat.R;
 import jiguang.chat.activity.DownLoadActivity;
-import jiguang.chat.adapter.StickyListHeadersAdapter;
 import jiguang.chat.entity.FileItem;
 import jiguang.chat.entity.SelectedHistoryFileListener;
 import jiguang.chat.utils.FileHelper;
 import jiguang.chat.utils.SharePreferenceManager;
 import jiguang.chat.utils.ViewHolder;
+import se.emilsjolander.stickylistheaders.StickyListHeadersAdapter;
 
 /**
  * Created by ${chenyn} on 2017/8/29.

diff --git a/chatapp/src/main/java/jiguang/chat/activity/historyfile/adapter/OtherFileAdapter.java b/chatapp/src/main/java/jiguang/chat/activity/historyfile/adapter/OtherFileAdapter.java
@@ -21,13 +21,13 @@
 import cn.jpush.im.android.api.content.FileContent;
 import jiguang.chat.R;
 import jiguang.chat.activity.DownLoadActivity;
-import jiguang.chat.adapter.StickyListHeadersAdapter;
 import jiguang.chat.entity.FileItem;
 import jiguang.chat.entity.SelectedHistoryFileListener;
 import jiguang.chat.utils.FileHelper;
 import jiguang.chat.utils.SharePreferenceManager;
 import jiguang.chat.utils.ViewHolder;
 import jiguang.chat.view.MyImageView;
+import se.emilsjolander.stickylistheaders.StickyListHeadersAdapter;
 
 /**
  * Created by ${chenyn} on 2017/8/29.

diff --git a/chatapp/src/main/java/jiguang/chat/activity/historyfile/adapter/VideoFileAdapter.java b/chatapp/src/main/java/jiguang/chat/activity/historyfile/adapter/VideoFileAdapter.java
@@ -21,13 +21,13 @@
 import cn.jpush.im.android.api.content.FileContent;
 import jiguang.chat.R;
 import jiguang.chat.activity.DownLoadActivity;
-import jiguang.chat.adapter.StickyListHeadersAdapter;
 import jiguang.chat.entity.FileItem;
 import jiguang.chat.entity.SelectedHistoryFileListener;
 import jiguang.chat.utils.FileHelper;
 import jiguang.chat.utils.SharePreferenceManager;
 import jiguang.chat.utils.ViewHolder;
 import jiguang.chat.view.MyImageView;
+import se.emilsjolander.stickylistheaders.StickyListHeadersAdapter;
 
 /**
  * Created by ${chenyn} on 2017/8/29.

diff --git a/chatapp/src/main/java/jiguang/chat/activity/historyfile/fragment/AudioFileFragment.java b/chatapp/src/main/java/jiguang/chat/activity/historyfile/fragment/AudioFileFragment.java
@@ -26,7 +26,7 @@
 import jiguang.chat.activity.historyfile.adapter.AudioFileAdapter;
 import jiguang.chat.activity.historyfile.controller.HistoryFileController;
 import jiguang.chat.entity.FileItem;
-import jiguang.chat.view.listview.StickyListHeadersListView;
+import se.emilsjolander.stickylistheaders.StickyListHeadersListView;
 
 /**
  * Created by ${chenyn} on 2017/8/23.

diff --git a/chatapp/src/main/java/jiguang/chat/activity/historyfile/fragment/DocumentFileFragment.java b/chatapp/src/main/java/jiguang/chat/activity/historyfile/fragment/DocumentFileFragment.java
@@ -26,7 +26,7 @@
 import jiguang.chat.activity.historyfile.adapter.DocumentFileAdapter;
 import jiguang.chat.activity.historyfile.controller.HistoryFileController;
 import jiguang.chat.entity.FileItem;
-import jiguang.chat.view.listview.StickyListHeadersListView;
+import se.emilsjolander.stickylistheaders.StickyListHeadersListView;
 
 /**
  * Created by ${chenyn} on 2017/8/23.

diff --git a/chatapp/src/main/java/jiguang/chat/activity/historyfile/fragment/OtherFileFragment.java b/chatapp/src/main/java/jiguang/chat/activity/historyfile/fragment/OtherFileFragment.java
@@ -26,7 +26,7 @@
 import jiguang.chat.activity.historyfile.adapter.OtherFileAdapter;
 import jiguang.chat.activity.historyfile.controller.HistoryFileController;
 import jiguang.chat.entity.FileItem;
-import jiguang.chat.view.listview.StickyListHeadersListView;
+import se.emilsjolander.stickylistheaders.StickyListHeadersListView;
 
 /**
  * Created by ${chenyn} on 2017/8/23.

diff --git a/chatapp/src/main/java/jiguang/chat/activity/historyfile/fragment/VideoFileFragment.java b/chatapp/src/main/java/jiguang/chat/activity/historyfile/fragment/VideoFileFragment.java
@@ -26,7 +26,7 @@
 import jiguang.chat.activity.historyfile.adapter.VideoFileAdapter;
 import jiguang.chat.activity.historyfile.controller.HistoryFileController;
 import jiguang.chat.entity.FileItem;
-import jiguang.chat.view.listview.StickyListHeadersListView;
+import se.emilsjolander.stickylistheaders.StickyListHeadersListView;
 
 /**
  * Created by ${chenyn} on 2017/8/23.

diff --git a/chatapp/src/main/java/jiguang/chat/adapter/AtMemberAdapter.java b/chatapp/src/main/java/jiguang/chat/adapter/AtMemberAdapter.java
@@ -19,6 +19,7 @@
 import jiguang.chat.R;
 import jiguang.chat.utils.ViewHolder;
 import jiguang.chat.utils.pinyin.HanziToPinyin;
+import se.emilsjolander.stickylistheaders.StickyListHeadersAdapter;
 
 public class AtMemberAdapter extends BaseAdapter implements StickyListHeadersAdapter, SectionIndexer {
 

diff --git a/chatapp/src/main/java/jiguang/chat/adapter/FriendListAdapter.java b/chatapp/src/main/java/jiguang/chat/adapter/FriendListAdapter.java
@@ -20,6 +20,7 @@
 import cn.jpush.im.android.api.model.UserInfo;
 import jiguang.chat.R;
 import jiguang.chat.database.FriendEntry;
+import se.emilsjolander.stickylistheaders.StickyListHeadersAdapter;
 
 /**
  * Created by ${chenyn} on 2017/9/21.

diff --git a/chatapp/src/main/java/jiguang/chat/adapter/GroupMemberListAdapter.java b/chatapp/src/main/java/jiguang/chat/adapter/GroupMemberListAdapter.java
@@ -22,6 +22,7 @@
 import jiguang.chat.R;
 import jiguang.chat.activity.GroupMemberListActivity;
 import jiguang.chat.utils.pinyin.HanziToPinyin;
+import se.emilsjolander.stickylistheaders.StickyListHeadersAdapter;
 
 /**
  * Created by ${chenyn} on 2017/11/3.

diff --git a/chatapp/src/main/java/jiguang/chat/adapter/StickyListAdapter.java b/chatapp/src/main/java/jiguang/chat/adapter/StickyListAdapter.java
@@ -43,6 +43,7 @@
 import jiguang.chat.application.JGApplication;
 import jiguang.chat.database.FriendEntry;
 import jiguang.chat.utils.photochoose.SelectableRoundedImageView;
+import se.emilsjolander.stickylistheaders.StickyListHeadersAdapter;
 
 /**
  * Created by ${chenyn} on 2017/3/16.

diff --git a/chatapp/src/main/java/jiguang/chat/adapter/StickyListHeadersAdapter.java b/chatapp/src/main/java/jiguang/chat/adapter/StickyListHeadersAdapter.java
diff --git a/chatapp/src/main/java/jiguang/chat/view/ContactsView.java b/chatapp/src/main/java/jiguang/chat/view/ContactsView.java
@@ -18,7 +18,7 @@
 import jiguang.chat.controller.ContactsController;
 import jiguang.chat.utils.SharePreferenceManager;
 import jiguang.chat.utils.sidebar.SideBar;
-import jiguang.chat.view.listview.StickyListHeadersListView;
+import se.emilsjolander.stickylistheaders.StickyListHeadersListView;
 
 
 /**

diff --git a/chatapp/src/main/java/jiguang/chat/view/SelectFriendView.java b/chatapp/src/main/java/jiguang/chat/view/SelectFriendView.java
@@ -11,7 +11,7 @@
 import jiguang.chat.R;
 import jiguang.chat.adapter.StickyListAdapter;
 import jiguang.chat.utils.sidebar.SideBar;
-import jiguang.chat.view.listview.StickyListHeadersListView;
+import se.emilsjolander.stickylistheaders.StickyListHeadersListView;
 
 
 public class SelectFriendView extends LinearLayout {

diff --git a/chatapp/src/main/java/jiguang/chat/view/listview/AdapterWrapper.java b/chatapp/src/main/java/jiguang/chat/view/listview/AdapterWrapper.java
@@ -12,8 +12,9 @@
 
 import java.util.LinkedList;
 import java.util.List;
+
 import jiguang.chat.view.CheckableWrapperView;
-import jiguang.chat.adapter.StickyListHeadersAdapter;
+import se.emilsjolander.stickylistheaders.StickyListHeadersAdapter;
 
 
 /**

diff --git a/chatapp/src/main/java/jiguang/chat/view/listview/SectionIndexerAdapterWrapper.java b/chatapp/src/main/java/jiguang/chat/view/listview/SectionIndexerAdapterWrapper.java
@@ -3,7 +3,7 @@
 import android.content.Context;
 import android.widget.SectionIndexer;
 
-import jiguang.chat.adapter.StickyListHeadersAdapter;
+import se.emilsjolander.stickylistheaders.StickyListHeadersAdapter;
 
 
 class SectionIndexerAdapterWrapper extends