优化emoji显示

Z-P-J · Feb 15, 2020 · e905744 · e905744
1 parent 5de7220
commit e905744
Show file tree

Hide file tree

Showing 442 changed files with 4,841 additions and 1,789 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser
diff --git a/app/build.gradle b/app/build.gradle
@@ -54,6 +54,7 @@ dependencies {
     implementation project(':richeditor')
     implementation project(':richeditor2')
     implementation project(':zmarkdown')
+    implementation project(':emojilib')
 
 
 
@@ -75,6 +76,8 @@ dependencies {
     implementation 'com.lxj:xpopup:1.8.10'
     implementation 'com.hoko:hoko-blur:1.3.4'
     implementation 'com.lzy.widget:imagepicker:0.5.5'
+    implementation 'com.rockerhieu.emojicon:library:1.3.1'
+//    implementation 'com.lqr.emoji:library:1.0.2'
 
     annotationProcessor "com.github.Raizlabs.DBFlow:dbflow-processor:4.2.4"
     implementation "com.github.Raizlabs.DBFlow:dbflow-core:4.2.4"

diff --git a/app/src/main/assets/sticker/ajmd.png b/app/src/main/assets/sticker/ajmd.png
diff --git a/app/src/main/assets/sticker/ajmd/ajmd001.png b/app/src/main/assets/sticker/ajmd/ajmd001.png
diff --git a/app/src/main/assets/sticker/ajmd/ajmd002.png b/app/src/main/assets/sticker/ajmd/ajmd002.png
diff --git a/app/src/main/assets/sticker/ajmd/ajmd003.png b/app/src/main/assets/sticker/ajmd/ajmd003.png
diff --git a/app/src/main/assets/sticker/ajmd/ajmd004.png b/app/src/main/assets/sticker/ajmd/ajmd004.png
diff --git a/app/src/main/assets/sticker/ajmd/ajmd005.png b/app/src/main/assets/sticker/ajmd/ajmd005.png
diff --git a/app/src/main/assets/sticker/ajmd/ajmd006.png b/app/src/main/assets/sticker/ajmd/ajmd006.png
diff --git a/app/src/main/assets/sticker/ajmd/ajmd007.png b/app/src/main/assets/sticker/ajmd/ajmd007.png
diff --git a/app/src/main/assets/sticker/ajmd/ajmd008.png b/app/src/main/assets/sticker/ajmd/ajmd008.png
diff --git a/app/src/main/assets/sticker/ajmd/ajmd009.png b/app/src/main/assets/sticker/ajmd/ajmd009.png
diff --git a/app/src/main/assets/sticker/ajmd/ajmd010.png b/app/src/main/assets/sticker/ajmd/ajmd010.png
diff --git a/app/src/main/assets/sticker/ajmd/ajmd011.png b/app/src/main/assets/sticker/ajmd/ajmd011.png
diff --git a/app/src/main/assets/sticker/ajmd/ajmd012.png b/app/src/main/assets/sticker/ajmd/ajmd012.png
diff --git a/app/src/main/assets/sticker/ajmd/ajmd013.png b/app/src/main/assets/sticker/ajmd/ajmd013.png
diff --git a/app/src/main/assets/sticker/ajmd/ajmd014.png b/app/src/main/assets/sticker/ajmd/ajmd014.png
diff --git a/app/src/main/assets/sticker/ajmd/ajmd015.png b/app/src/main/assets/sticker/ajmd/ajmd015.png
diff --git a/app/src/main/assets/sticker/ajmd/ajmd016.png b/app/src/main/assets/sticker/ajmd/ajmd016.png
diff --git a/app/src/main/assets/sticker/ajmd/ajmd017.png b/app/src/main/assets/sticker/ajmd/ajmd017.png
diff --git a/app/src/main/assets/sticker/ajmd/ajmd018.png b/app/src/main/assets/sticker/ajmd/ajmd018.png
diff --git a/app/src/main/assets/sticker/ajmd/ajmd019.png b/app/src/main/assets/sticker/ajmd/ajmd019.png
diff --git a/app/src/main/assets/sticker/ajmd/ajmd020.png b/app/src/main/assets/sticker/ajmd/ajmd020.png
diff --git a/app/src/main/assets/sticker/ajmd/ajmd021.png b/app/src/main/assets/sticker/ajmd/ajmd021.png
diff --git a/app/src/main/assets/sticker/ajmd/ajmd022.png b/app/src/main/assets/sticker/ajmd/ajmd022.png
diff --git a/app/src/main/assets/sticker/ajmd/ajmd023.png b/app/src/main/assets/sticker/ajmd/ajmd023.png
diff --git a/app/src/main/assets/sticker/ajmd/ajmd024.png b/app/src/main/assets/sticker/ajmd/ajmd024.png
diff --git a/app/src/main/assets/sticker/ajmd/ajmd025.png b/app/src/main/assets/sticker/ajmd/ajmd025.png
diff --git a/app/src/main/assets/sticker/ajmd/ajmd026.png b/app/src/main/assets/sticker/ajmd/ajmd026.png
diff --git a/app/src/main/assets/sticker/ajmd/ajmd027.png b/app/src/main/assets/sticker/ajmd/ajmd027.png
diff --git a/app/src/main/assets/sticker/ajmd/ajmd028.png b/app/src/main/assets/sticker/ajmd/ajmd028.png
diff --git a/app/src/main/assets/sticker/ajmd/ajmd029.png b/app/src/main/assets/sticker/ajmd/ajmd029.png
diff --git a/app/src/main/assets/sticker/ajmd/ajmd030.png b/app/src/main/assets/sticker/ajmd/ajmd030.png
diff --git a/app/src/main/assets/sticker/ajmd/ajmd031.png b/app/src/main/assets/sticker/ajmd/ajmd031.png
diff --git a/app/src/main/assets/sticker/ajmd/ajmd032.png b/app/src/main/assets/sticker/ajmd/ajmd032.png
diff --git a/app/src/main/assets/sticker/ajmd/ajmd033.png b/app/src/main/assets/sticker/ajmd/ajmd033.png
diff --git a/app/src/main/assets/sticker/ajmd/ajmd034.png b/app/src/main/assets/sticker/ajmd/ajmd034.png
diff --git a/app/src/main/assets/sticker/ajmd/ajmd035.png b/app/src/main/assets/sticker/ajmd/ajmd035.png
diff --git a/app/src/main/assets/sticker/ajmd/ajmd036.png b/app/src/main/assets/sticker/ajmd/ajmd036.png
diff --git a/app/src/main/assets/sticker/ajmd/ajmd037.png b/app/src/main/assets/sticker/ajmd/ajmd037.png
diff --git a/app/src/main/assets/sticker/ajmd/ajmd038.png b/app/src/main/assets/sticker/ajmd/ajmd038.png
diff --git a/app/src/main/assets/sticker/ajmd/ajmd039.png b/app/src/main/assets/sticker/ajmd/ajmd039.png
diff --git a/app/src/main/assets/sticker/ajmd/ajmd040.png b/app/src/main/assets/sticker/ajmd/ajmd040.png
diff --git a/app/src/main/assets/sticker/ajmd/ajmd041.png b/app/src/main/assets/sticker/ajmd/ajmd041.png
diff --git a/app/src/main/assets/sticker/ajmd/ajmd042.png b/app/src/main/assets/sticker/ajmd/ajmd042.png
diff --git a/app/src/main/assets/sticker/ajmd/ajmd043.png b/app/src/main/assets/sticker/ajmd/ajmd043.png
diff --git a/app/src/main/assets/sticker/ajmd/ajmd044.png b/app/src/main/assets/sticker/ajmd/ajmd044.png
diff --git a/app/src/main/assets/sticker/ajmd/ajmd045.png b/app/src/main/assets/sticker/ajmd/ajmd045.png
diff --git a/app/src/main/assets/sticker/ajmd/ajmd046.png b/app/src/main/assets/sticker/ajmd/ajmd046.png
diff --git a/app/src/main/assets/sticker/ajmd/ajmd047.png b/app/src/main/assets/sticker/ajmd/ajmd047.png
diff --git a/app/src/main/assets/sticker/ajmd/ajmd048.png b/app/src/main/assets/sticker/ajmd/ajmd048.png
diff --git a/app/src/main/assets/sticker/lt.png b/app/src/main/assets/sticker/lt.png
diff --git a/app/src/main/assets/sticker/lt/lt001.png b/app/src/main/assets/sticker/lt/lt001.png
diff --git a/app/src/main/assets/sticker/lt/lt002.png b/app/src/main/assets/sticker/lt/lt002.png
diff --git a/app/src/main/assets/sticker/lt/lt003.png b/app/src/main/assets/sticker/lt/lt003.png
diff --git a/app/src/main/assets/sticker/lt/lt004.png b/app/src/main/assets/sticker/lt/lt004.png
diff --git a/app/src/main/assets/sticker/lt/lt005.png b/app/src/main/assets/sticker/lt/lt005.png
diff --git a/app/src/main/assets/sticker/lt/lt006.png b/app/src/main/assets/sticker/lt/lt006.png
diff --git a/app/src/main/assets/sticker/lt/lt007.png b/app/src/main/assets/sticker/lt/lt007.png
diff --git a/app/src/main/assets/sticker/lt/lt008.png b/app/src/main/assets/sticker/lt/lt008.png
diff --git a/app/src/main/assets/sticker/lt/lt009.png b/app/src/main/assets/sticker/lt/lt009.png
diff --git a/app/src/main/assets/sticker/lt/lt010.png b/app/src/main/assets/sticker/lt/lt010.png
diff --git a/app/src/main/assets/sticker/lt/lt011.png b/app/src/main/assets/sticker/lt/lt011.png
diff --git a/app/src/main/assets/sticker/lt/lt012.png b/app/src/main/assets/sticker/lt/lt012.png
diff --git a/app/src/main/assets/sticker/lt/lt013.png b/app/src/main/assets/sticker/lt/lt013.png
diff --git a/app/src/main/assets/sticker/lt/lt014.png b/app/src/main/assets/sticker/lt/lt014.png
diff --git a/app/src/main/assets/sticker/lt/lt015.png b/app/src/main/assets/sticker/lt/lt015.png
diff --git a/app/src/main/assets/sticker/lt/lt016.png b/app/src/main/assets/sticker/lt/lt016.png
diff --git a/app/src/main/assets/sticker/lt/lt017.png b/app/src/main/assets/sticker/lt/lt017.png
diff --git a/app/src/main/assets/sticker/lt/lt018.png b/app/src/main/assets/sticker/lt/lt018.png
diff --git a/app/src/main/assets/sticker/lt/lt019.png b/app/src/main/assets/sticker/lt/lt019.png
diff --git a/app/src/main/assets/sticker/lt/lt020.png b/app/src/main/assets/sticker/lt/lt020.png
diff --git a/app/src/main/assets/sticker/tsj.png b/app/src/main/assets/sticker/tsj.png
diff --git a/app/src/main/assets/sticker/tsj/tsj_00.gif b/app/src/main/assets/sticker/tsj/tsj_00.gif
diff --git a/app/src/main/assets/sticker/tsj/tsj_01.gif b/app/src/main/assets/sticker/tsj/tsj_01.gif
diff --git a/app/src/main/assets/sticker/tsj/tsj_02.gif b/app/src/main/assets/sticker/tsj/tsj_02.gif
diff --git a/app/src/main/assets/sticker/tsj/tsj_03.gif b/app/src/main/assets/sticker/tsj/tsj_03.gif
diff --git a/app/src/main/assets/sticker/tsj/tsj_04.gif b/app/src/main/assets/sticker/tsj/tsj_04.gif
diff --git a/app/src/main/assets/sticker/tsj/tsj_05.gif b/app/src/main/assets/sticker/tsj/tsj_05.gif
diff --git a/app/src/main/assets/sticker/tsj/tsj_06.gif b/app/src/main/assets/sticker/tsj/tsj_06.gif
diff --git a/app/src/main/assets/sticker/tsj/tsj_07.gif b/app/src/main/assets/sticker/tsj/tsj_07.gif
diff --git a/app/src/main/assets/sticker/tsj/tsj_08.gif b/app/src/main/assets/sticker/tsj/tsj_08.gif
diff --git a/app/src/main/assets/sticker/tsj/tsj_09.gif b/app/src/main/assets/sticker/tsj/tsj_09.gif
diff --git a/app/src/main/assets/sticker/tsj/tsj_10.gif b/app/src/main/assets/sticker/tsj/tsj_10.gif
diff --git a/app/src/main/assets/sticker/tsj/tsj_11.gif b/app/src/main/assets/sticker/tsj/tsj_11.gif
diff --git a/app/src/main/assets/sticker/tsj/tsj_12.gif b/app/src/main/assets/sticker/tsj/tsj_12.gif
diff --git a/app/src/main/assets/sticker/tsj/tsj_13.gif b/app/src/main/assets/sticker/tsj/tsj_13.gif
diff --git a/app/src/main/assets/sticker/tsj/tsj_14.gif b/app/src/main/assets/sticker/tsj/tsj_14.gif
diff --git a/app/src/main/assets/sticker/tsj/tsj_15.gif b/app/src/main/assets/sticker/tsj/tsj_15.gif
diff --git a/app/src/main/assets/sticker/xxy.png b/app/src/main/assets/sticker/xxy.png
diff --git a/app/src/main/assets/sticker/xxy/xxy001.png b/app/src/main/assets/sticker/xxy/xxy001.png
diff --git a/app/src/main/assets/sticker/xxy/xxy002.png b/app/src/main/assets/sticker/xxy/xxy002.png
diff --git a/app/src/main/assets/sticker/xxy/xxy003.png b/app/src/main/assets/sticker/xxy/xxy003.png
diff --git a/app/src/main/assets/sticker/xxy/xxy004.png b/app/src/main/assets/sticker/xxy/xxy004.png
diff --git a/app/src/main/assets/sticker/xxy/xxy005.png b/app/src/main/assets/sticker/xxy/xxy005.png
diff --git a/app/src/main/assets/sticker/xxy/xxy006.png b/app/src/main/assets/sticker/xxy/xxy006.png
diff --git a/app/src/main/assets/sticker/xxy/xxy007.png b/app/src/main/assets/sticker/xxy/xxy007.png
diff --git a/app/src/main/assets/sticker/xxy/xxy008.png b/app/src/main/assets/sticker/xxy/xxy008.png
diff --git a/app/src/main/assets/sticker/xxy/xxy009.png b/app/src/main/assets/sticker/xxy/xxy009.png
diff --git a/app/src/main/assets/sticker/xxy/xxy010.png b/app/src/main/assets/sticker/xxy/xxy010.png
diff --git a/app/src/main/assets/sticker/xxy/xxy011.png b/app/src/main/assets/sticker/xxy/xxy011.png
diff --git a/app/src/main/assets/sticker/xxy/xxy012.png b/app/src/main/assets/sticker/xxy/xxy012.png
diff --git a/app/src/main/assets/sticker/xxy/xxy013.png b/app/src/main/assets/sticker/xxy/xxy013.png
diff --git a/app/src/main/assets/sticker/xxy/xxy014.png b/app/src/main/assets/sticker/xxy/xxy014.png
diff --git a/app/src/main/assets/sticker/xxy/xxy015.png b/app/src/main/assets/sticker/xxy/xxy015.png
diff --git a/app/src/main/assets/sticker/xxy/xxy016.png b/app/src/main/assets/sticker/xxy/xxy016.png
diff --git a/app/src/main/assets/sticker/xxy/xxy017.png b/app/src/main/assets/sticker/xxy/xxy017.png
diff --git a/app/src/main/assets/sticker/xxy/xxy018.png b/app/src/main/assets/sticker/xxy/xxy018.png
diff --git a/app/src/main/assets/sticker/xxy/xxy019.png b/app/src/main/assets/sticker/xxy/xxy019.png
diff --git a/app/src/main/assets/sticker/xxy/xxy020.png b/app/src/main/assets/sticker/xxy/xxy020.png
diff --git a/app/src/main/assets/sticker/xxy/xxy021.png b/app/src/main/assets/sticker/xxy/xxy021.png
diff --git a/app/src/main/assets/sticker/xxy/xxy022.png b/app/src/main/assets/sticker/xxy/xxy022.png
diff --git a/app/src/main/assets/sticker/xxy/xxy023.png b/app/src/main/assets/sticker/xxy/xxy023.png
diff --git a/app/src/main/assets/sticker/xxy/xxy024.png b/app/src/main/assets/sticker/xxy/xxy024.png
diff --git a/app/src/main/assets/sticker/xxy/xxy025.png b/app/src/main/assets/sticker/xxy/xxy025.png
diff --git a/app/src/main/assets/sticker/xxy/xxy026.png b/app/src/main/assets/sticker/xxy/xxy026.png
diff --git a/app/src/main/assets/sticker/xxy/xxy027.png b/app/src/main/assets/sticker/xxy/xxy027.png
diff --git a/app/src/main/assets/sticker/xxy/xxy028.png b/app/src/main/assets/sticker/xxy/xxy028.png
diff --git a/app/src/main/assets/sticker/xxy/xxy029.png b/app/src/main/assets/sticker/xxy/xxy029.png
diff --git a/app/src/main/assets/sticker/xxy/xxy030.png b/app/src/main/assets/sticker/xxy/xxy030.png
diff --git a/app/src/main/assets/sticker/xxy/xxy031.png b/app/src/main/assets/sticker/xxy/xxy031.png
diff --git a/app/src/main/assets/sticker/xxy/xxy032.png b/app/src/main/assets/sticker/xxy/xxy032.png
diff --git a/app/src/main/assets/sticker/xxy/xxy033.png b/app/src/main/assets/sticker/xxy/xxy033.png
diff --git a/app/src/main/assets/sticker/xxy/xxy034.png b/app/src/main/assets/sticker/xxy/xxy034.png
diff --git a/app/src/main/assets/sticker/xxy/xxy035.png b/app/src/main/assets/sticker/xxy/xxy035.png
diff --git a/app/src/main/assets/sticker/xxy/xxy036.png b/app/src/main/assets/sticker/xxy/xxy036.png
diff --git a/app/src/main/assets/sticker/xxy/xxy037.png b/app/src/main/assets/sticker/xxy/xxy037.png
diff --git a/app/src/main/assets/sticker/xxy/xxy038.png b/app/src/main/assets/sticker/xxy/xxy038.png
diff --git a/app/src/main/assets/sticker/xxy/xxy039.png b/app/src/main/assets/sticker/xxy/xxy039.png
diff --git a/app/src/main/assets/sticker/xxy/xxy040.png b/app/src/main/assets/sticker/xxy/xxy040.png
diff --git a/app/src/main/java/com/zpj/shouji/market/App.java b/app/src/main/java/com/zpj/shouji/market/App.java
@@ -1,9 +1,15 @@
 package com.zpj.shouji.market;
 
 import android.app.Application;
+import android.content.Context;
+import android.widget.ImageView;
 
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.request.target.ViewTarget;
 import com.felix.atoast.library.AToast;
+import com.lqr.emoji.IImageLoader;
+import com.lqr.emoji.LQREmotionKit;
 import com.raizlabs.android.dbflow.config.FlowManager;
 import com.zpj.downloader.ZDownloader;
 
@@ -16,6 +22,12 @@ public void onCreate() {
         AToast.onInit(this);
         ZDownloader.init(this);
         ViewTarget.setTagId(R.id.glide_tag_id);
+        LQREmotionKit.init(this, new IImageLoader() {
+            @Override
+            public void displayImage(Context context, String path, ImageView imageView) {
+                Glide.with(context).load(path).centerCrop().into(imageView);
+            }
+        });
     }
 
 }
diff --git a/app/src/main/java/com/zpj/shouji/market/ui/adapter/DiscoverBinder.java b/app/src/main/java/com/zpj/shouji/market/ui/adapter/DiscoverBinder.java
@@ -18,8 +18,8 @@
 import com.zpj.recyclerview.IEasy;
 import com.zpj.shouji.market.R;
 import com.zpj.shouji.market.model.DiscoverInfo;
-import com.zpj.shouji.market.utils.ImageLoader;
-import com.zpj.shouji.market.ui.widget.BottomListPopupMenu;
+import com.zpj.shouji.market.utils.PopupImageLoader;
+import com.zpj.shouji.market.ui.widget.popup.BottomListPopupMenu;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -58,7 +58,7 @@ public void onSrcViewUpdate(ImageViewerPopupView popupView, int position) {
                                 ImageView view = (ImageView) nineGridImageView.getChildAt(position);
                                 popupView.updateSrcView(view);
                             }
-                        }, new ImageLoader())
+                        }, new PopupImageLoader())
                         .show();
 
 //                ImageTrans.with(context)

diff --git a/app/src/main/java/com/zpj/shouji/market/ui/adapter/ImgAdapter.java b/app/src/main/java/com/zpj/shouji/market/ui/adapter/ImgAdapter.java
@@ -18,7 +18,7 @@
 import com.lxj.xpopup.core.ImageViewerPopupView;
 import com.lxj.xpopup.interfaces.OnSrcViewUpdateListener;
 import com.zpj.shouji.market.R;
-import com.zpj.shouji.market.utils.ImageLoader;
+import com.zpj.shouji.market.utils.PopupImageLoader;
 import com.zpj.utils.ScreenUtil;
 
 import java.util.ArrayList;
@@ -99,7 +99,7 @@ public void onSrcViewUpdate(ImageViewerPopupView popupView, int pos) {
                             }
                             popupView.updateSrcView(imageView);
                         }
-                    }, new ImageLoader())
+                    }, new PopupImageLoader())
                     .show();
         });
     }

diff --git a/app/src/main/java/com/zpj/shouji/market/ui/adapter/NineGridImageAdapter.java b/app/src/main/java/com/zpj/shouji/market/ui/adapter/NineGridImageAdapter.java
@@ -24,11 +24,11 @@ public class NineGridImageAdapter extends NineGridImageViewAdapter<String> {
     @Override
     protected void onDisplayImage(Context context, ImageView imageView, String s) {
         if (s.toLowerCase().endsWith(".gif")) {
-            Log.d("ImageLoader", "gif");
+            Log.d("PopupImageLoader", "gif");
             GlideApp.with(context).asGif().load(s)
                     .apply(new RequestOptions().centerCrop().placeholder(R.drawable.bga_pp_ic_holder_light).error(R.drawable.bga_pp_ic_holder_light).override(Target.SIZE_ORIGINAL)).into(imageView);
         } else {
-            Log.d("ImageLoader", "png");
+            Log.d("PopupImageLoader", "png");
             Glide.with(context).load(s).apply(new RequestOptions().centerCrop().placeholder(R.drawable.bga_pp_ic_holder_light).error(R.drawable.bga_pp_ic_holder_light).override(Target.SIZE_ORIGINAL).dontAnimate()).into(imageView);
         }
     }

diff --git a/app/src/main/java/com/zpj/shouji/market/ui/fragment/ArticleDetailFragment.java b/app/src/main/java/com/zpj/shouji/market/ui/fragment/ArticleDetailFragment.java
@@ -26,7 +26,7 @@
 import com.lxj.xpopup.XPopup;
 import com.zpj.popupmenuview.popup.EverywherePopup;
 import com.zpj.shouji.market.R;
-import com.zpj.shouji.market.utils.ImageLoader;
+import com.zpj.shouji.market.utils.PopupImageLoader;
 import com.zpj.shouji.market.model.AppInfo;
 import com.zpj.shouji.market.model.article.ArticleDetailInfo;
 import com.zpj.shouji.market.model.article.ArticleInfo;
@@ -223,7 +223,7 @@ public void onClick(View v) {
                             .asImageViewer(ivImage,
                                     0,
                                     objects, (popupView, position) -> popupView.updateSrcView(ivImage),
-                                    new ImageLoader())
+                                    new PopupImageLoader())
                             .show();
                 });
                 contentWrapper.addView(view);

diff --git a/app/src/main/java/com/zpj/shouji/market/ui/fragment/ImageListFragment.java b/app/src/main/java/com/zpj/shouji/market/ui/fragment/ImageListFragment.java
@@ -25,9 +25,9 @@
 import com.zpj.shouji.market.R;
 import com.zpj.shouji.market.model.WallpaperInfo;
 import com.zpj.shouji.market.model.WallpaperTag;
-import com.zpj.shouji.market.utils.ImageLoader;
+import com.zpj.shouji.market.utils.PopupImageLoader;
 import com.zpj.shouji.market.ui.fragment.base.NextUrlFragment;
-import com.zpj.shouji.market.ui.widget.RecyclerPopup;
+import com.zpj.shouji.market.ui.widget.popup.RecyclerPopup;
 import com.zpj.utils.ScreenUtil;
 
 import java.util.ArrayList;
@@ -125,7 +125,7 @@ public void onClick(EasyViewHolder holder, View view, WallpaperInfo data) {
                     public void onSrcViewUpdate(ImageViewerPopupView popupView, int position) {
                         popupView.updateSrcView(wallpaper);
                     }
-                }, new ImageLoader())
+                }, new PopupImageLoader())
                 .show();
     }
 

diff --git a/app/src/main/java/com/zpj/shouji/market/ui/fragment/MainFragment.java b/app/src/main/java/com/zpj/shouji/market/ui/fragment/MainFragment.java
@@ -10,11 +10,10 @@
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.zpj.markdown.MarkdownEditorFragment;
 import com.zpj.shouji.market.R;
 import com.zpj.shouji.market.ui.adapter.FragmentsPagerAdapter;
 import com.zpj.shouji.market.ui.fragment.base.BaseFragment;
-import com.zpj.shouji.market.ui.fragment.chat.ChatFragment;
+import com.zpj.shouji.market.ui.fragment.chat.ChatFragment2;
 import com.zpj.shouji.market.ui.fragment.homepage.HomeFragment;
 import com.zpj.shouji.market.ui.fragment.profile.MeFragment;
 import com.zpj.shouji.market.ui.fragment.recommond.GameRecommendFragment;
@@ -193,6 +192,6 @@ public void onWallpaperItemClick() {
 
     @Override
     public void onChatWithFriendItemClick() {
-        _mActivity.start(new ChatFragment());
+        _mActivity.start(new ChatFragment2());
     }
 }
diff --git a/app/src/main/java/com/zpj/shouji/market/ui/fragment/RichEditorFragment.java b/app/src/main/java/com/zpj/shouji/market/ui/fragment/RichEditorFragment.java
@@ -136,7 +136,7 @@ public void onClick(View v) {
     }
 
     /**
-     * ImageLoader for insert Image
+     * PopupImageLoader for insert Image
      */
     private void initImageLoader() {
         ImagePicker imagePicker = ImagePicker.getInstance();

diff --git a/app/src/main/java/com/zpj/shouji/market/ui/fragment/chat/ChatConst.java b/app/src/main/java/com/zpj/shouji/market/ui/fragment/chat/ChatConst.java
@@ -10,8 +10,7 @@
  */
 
 public class ChatConst {
-    public static final String LISTVIEW_DATABASE_NAME = "listview.db";
-    public static final String RECYCLER_DATABASE_NAME = "recycler.db";
+
     public static final int SENDING = 0;
     public static final int COMPLETED = 1;
     public static final int SENDERROR = 2;