diff --git a/app/build.gradle b/app/build.gradle
index c4159fbe7..2a6968e82 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,8 +12,8 @@ android {
         applicationId "ceui.lisa.pixiv"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 95
-        versionName "1.9.5"
+        versionCode 96
+        versionName "1.9.6"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
diff --git a/app/src/main/java/ceui/lisa/activities/BaseActivity.java b/app/src/main/java/ceui/lisa/activities/BaseActivity.java
index 21e670637..431d776cb 100644
--- a/app/src/main/java/ceui/lisa/activities/BaseActivity.java
+++ b/app/src/main/java/ceui/lisa/activities/BaseActivity.java
@@ -35,6 +35,14 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         mContext = this;
         mActivity = this;
 
+        Intent intent = getIntent();
+        if (intent != null) {
+            Bundle bundle = intent.getExtras();
+            if (bundle != null) {
+                initBundle(bundle);
+            }
+        }
+
         if (hideStatusBar()) {
             getWindow().setStatusBarColor(Color.TRANSPARENT);
             getWindow().getDecorView().setSystemUiVisibility(
@@ -45,14 +53,6 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         baseBind = DataBindingUtil.setContentView(mActivity, mLayoutID);
         BarUtils.setNavBarColor(mActivity, getResources().getColor(R.color.trans));
 
-        Intent intent = getIntent();
-        if (intent != null) {
-            Bundle bundle = intent.getExtras();
-            if (bundle != null) {
-                initBundle(bundle);
-            }
-        }
-
 
         initView();
         initData();
diff --git a/app/src/main/java/ceui/lisa/activities/MainActivity.java b/app/src/main/java/ceui/lisa/activities/MainActivity.java
index 71fad6b66..0f881ffeb 100644
--- a/app/src/main/java/ceui/lisa/activities/MainActivity.java
+++ b/app/src/main/java/ceui/lisa/activities/MainActivity.java
@@ -32,6 +32,7 @@
 import com.blankj.utilcode.util.RomUtils;
 import com.bumptech.glide.Glide;
 import com.google.android.material.navigation.NavigationView;
+import com.tbruyelle.rxpermissions2.RxPermissions;
 
 import java.io.File;
 
@@ -49,6 +50,7 @@
 import ceui.lisa.utils.Params;
 import ceui.lisa.utils.ReverseImage;
 import ceui.lisa.utils.ReverseWebviewCallback;
+import io.reactivex.disposables.Disposable;
 
 import static ceui.lisa.activities.Shaft.sUserModel;
 
@@ -114,11 +116,20 @@ public int getCount() {
 
     @Override
     protected void initData() {
-        Common.showLog(className + DeviceUtils.getSDKVersionName());
-        Common.showLog(className + DeviceUtils.getModel());
-        Common.showLog(className + DeviceUtils.getManufacturer());
         if (sUserModel != null && sUserModel.getResponse().getUser().isIs_login()) {
-            initFragment();
+            final RxPermissions rxPermissions = new RxPermissions(mActivity);
+            Disposable disposable = rxPermissions
+                    .requestEachCombined(
+                            Manifest.permission.WRITE_EXTERNAL_STORAGE
+                    )
+                    .subscribe(permission -> {
+                        if (permission.granted) {
+                            initFragment();
+                        } else {
+                            Common.showToast(mActivity.getString(R.string.access_denied));
+                            finish();
+                        }
+                    });
         } else {
             Intent intent = new Intent(mContext, TemplateActivity.class);
             intent.putExtra(TemplateActivity.EXTRA_FRAGMENT, "登录注册");
diff --git a/app/src/main/java/ceui/lisa/activities/TemplateActivity.java b/app/src/main/java/ceui/lisa/activities/TemplateActivity.java
index 7b4242b10..d9fb63386 100644
--- a/app/src/main/java/ceui/lisa/activities/TemplateActivity.java
+++ b/app/src/main/java/ceui/lisa/activities/TemplateActivity.java
@@ -1,6 +1,7 @@
 package ceui.lisa.activities;
 
 import android.content.Intent;
+import android.os.Bundle;
 import android.view.KeyEvent;
 import android.view.Window;
 import android.view.WindowManager;
@@ -59,6 +60,7 @@
 import ceui.lisa.fragments.FragmentWhoFollowThisUser;
 import ceui.lisa.models.IllustsBean;
 import ceui.lisa.models.NovelBean;
+import ceui.lisa.utils.Common;
 import ceui.lisa.utils.Dev;
 import ceui.lisa.utils.Params;
 import ceui.lisa.utils.ReverseResult;
@@ -68,11 +70,15 @@ public class TemplateActivity extends BaseActivity<ActivityFragmentBinding> {
     public static final String EXTRA_FRAGMENT = "dataType";
     public static final String EXTRA_KEYWORD = "keyword";
     protected Fragment childFragment;
+    private String dataType;
+
+    @Override
+    protected void initBundle(Bundle bundle) {
+        dataType = bundle.getString(EXTRA_FRAGMENT);
+    }
 
     protected Fragment createNewFragment() {
         Intent intent = getIntent();
-        String dataType = intent.getStringExtra(EXTRA_FRAGMENT);
-
         if (dataType != null) {
             switch (dataType) {
                 case "登录注册":
@@ -239,6 +245,12 @@ protected void onActivityResult(int requestCode, int resultCode, @Nullable Inten
 
     @Override
     public boolean hideStatusBar() {
-        return getIntent().getBooleanExtra("hideStatusBar", true);
+        if ("相关评论".equals(dataType) || "关于软件".equals(dataType)) {
+            Common.showLog(className + "不隐藏状态栏");
+            return false;
+        } else {
+            Common.showLog(className + "隐藏状态栏");
+            return getIntent().getBooleanExtra("hideStatusBar", true);
+        }
     }
 }
diff --git a/app/src/main/java/ceui/lisa/download/IllustDownload.java b/app/src/main/java/ceui/lisa/download/IllustDownload.java
index 1222ca8f4..d45b0a247 100644
--- a/app/src/main/java/ceui/lisa/download/IllustDownload.java
+++ b/app/src/main/java/ceui/lisa/download/IllustDownload.java
@@ -28,104 +28,136 @@ public class IllustDownload {
     public static final String IMAGE_REFERER = "https://app-api.pixiv.net/";
 
     public static void downloadIllust(FragmentActivity activity, IllustsBean illustsBean) {
-        checkPermission(activity, new Callback<Object>() {
-            @Override
-            public void doSomething(Object t) {
-                if (illustsBean == null) {
-                    Common.showToast(Shaft.getContext().getString(R.string.cannot_download));
-                    return;
-                }
+        if (illustsBean == null) {
+            Common.showToast(Shaft.getContext().getString(R.string.cannot_download));
+            return;
+        }
+
+        if (illustsBean.getPage_count() != 1) {
+            Common.showToast(Shaft.getContext().getString(R.string.cannot_download));
+            return;
+        }
+
+        File file = FileCreator.createIllustFile(illustsBean);
+        if (file.exists()) {
+            Common.showToast(Shaft.getContext().getString(R.string.image_alredy_exist));
+            return;
+        }
+
+
+        Common.showLog("Task url " + illustsBean.getMeta_single_page().getOriginal_image_url());
+        DownloadTask.Builder builder = new DownloadTask.Builder(illustsBean.getMeta_single_page().getOriginal_image_url(),
+                file.getParentFile())
+                .setFilename(file.getName())
+                .setMinIntervalMillisCallbackProcess(30)
+                .setPassIfAlreadyCompleted(false);
+        builder.addHeader(MAP_KEY, IMAGE_REFERER);
+        DownloadTask task = builder.build();
+        IllustTask illustTask = new IllustTask();
+        illustTask.setIllustsBean(illustsBean);
+        illustTask.setDownloadTask(task);
+        TaskQueue.get().addTask(illustTask);
+        task.enqueue(new DListener());
+        Common.showToast(Shaft.getContext().getString(R.string.one_item_added));
+    }
 
-                if (illustsBean.getPage_count() != 1) {
-                    Common.showToast(Shaft.getContext().getString(R.string.cannot_download));
-                    return;
-                }
 
-                File file = FileCreator.createIllustFile(illustsBean);
-                if (file.exists()) {
-                    Common.showToast(Shaft.getContext().getString(R.string.image_alredy_exist));
-                    return;
-                }
+    public static void downloadIllust(FragmentActivity activity, IllustsBean illustsBean, int index) {
+        if (illustsBean == null) {
+            Common.showToast(Shaft.getContext().getString(R.string.cannot_download));
+            return;
+        }
+
+        File file = FileCreator.createIllustFile(illustsBean, index);
+        if (file.exists()) {
+            Common.showToast(Shaft.getContext().getString(R.string.image_alredy_exist));
+            return;
+        }
+
+        if (illustsBean.getPage_count() == 1) {
+            downloadIllust(activity, illustsBean);
+        } else {
+            DownloadTask.Builder builder = new DownloadTask.Builder(
+                    illustsBean.getMeta_pages().get(index).getImage_urls().getOriginal(),
+                    file.getParentFile())
+                    .setFilename(file.getName())
+                    .setMinIntervalMillisCallbackProcess(30)
+                    .setPassIfAlreadyCompleted(false);
+            builder.addHeader(MAP_KEY, IMAGE_REFERER);
+            DownloadTask task = builder.build();
+            IllustTask illustTask = new IllustTask();
+            illustTask.setIllustsBean(illustsBean);
+            illustTask.setDownloadTask(task);
+            TaskQueue.get().addTask(illustTask);
+            task.enqueue(new DListener());
+            Common.showToast(Shaft.getContext().getString(R.string.one_item_added));
+        }
+    }
+
 
+    public static void downloadAllIllust(FragmentActivity activity, IllustsBean illustsBean) {
+        if (illustsBean == null) {
+            Common.showToast(Shaft.getContext().getString(R.string.cannot_download));
+            return;
+        }
+
+        if (illustsBean.getPage_count() <= 1) {
+            downloadIllust(activity, illustsBean);
+            return;
+        }
+
+
+        List<DownloadTask> tempList = new ArrayList<>();
 
-                Common.showLog("Task url " + illustsBean.getMeta_single_page().getOriginal_image_url());
-                DownloadTask.Builder builder = new DownloadTask.Builder(illustsBean.getMeta_single_page().getOriginal_image_url(),
+        for (int i = 0; i < illustsBean.getPage_count(); i++) {
+            File file = FileCreator.createIllustFile(illustsBean, i);
+            if (!file.exists()) {
+                DownloadTask.Builder builder = new DownloadTask.Builder(illustsBean.getMeta_pages().get(i).getImage_urls().getOriginal(),
                         file.getParentFile())
                         .setFilename(file.getName())
                         .setMinIntervalMillisCallbackProcess(30)
                         .setPassIfAlreadyCompleted(false);
                 builder.addHeader(MAP_KEY, IMAGE_REFERER);
-                DownloadTask task = builder.build();
+                final DownloadTask task = builder.build();
+                tempList.add(task);
+
                 IllustTask illustTask = new IllustTask();
                 illustTask.setIllustsBean(illustsBean);
                 illustTask.setDownloadTask(task);
                 TaskQueue.get().addTask(illustTask);
-                task.enqueue(new DListener());
-                Common.showToast(Shaft.getContext().getString(R.string.one_item_added));
             }
-        });
-    }
-
+        }
 
-    public static void downloadIllust(FragmentActivity activity, IllustsBean illustsBean, int index) {
-        checkPermission(activity, new Callback<Object>() {
-            @Override
-            public void doSomething(Object t) {
-                if (illustsBean == null) {
-                    Common.showToast(Shaft.getContext().getString(R.string.cannot_download));
-                    return;
-                }
+        DownloadTask[] taskArray = new DownloadTask[tempList.size()];
+        DownloadTask.enqueue(tempList.toArray(taskArray), new DListener());
+        Common.showToast(tempList.size() + Shaft.getContext().getString(R.string.has_been_added));
+    }
 
-                File file = FileCreator.createIllustFile(illustsBean, index);
-                if (file.exists()) {
-                    Common.showToast(Shaft.getContext().getString(R.string.image_alredy_exist));
-                    return;
-                }
 
-                if (illustsBean.getPage_count() == 1) {
-                    downloadIllust(activity, illustsBean);
-                } else {
-                    DownloadTask.Builder builder = new DownloadTask.Builder(
-                            illustsBean.getMeta_pages().get(index).getImage_urls().getOriginal(),
-                            file.getParentFile())
-                            .setFilename(file.getName())
-                            .setMinIntervalMillisCallbackProcess(30)
-                            .setPassIfAlreadyCompleted(false);
-                    builder.addHeader(MAP_KEY, IMAGE_REFERER);
-                    DownloadTask task = builder.build();
-                    IllustTask illustTask = new IllustTask();
-                    illustTask.setIllustsBean(illustsBean);
-                    illustTask.setDownloadTask(task);
-                    TaskQueue.get().addTask(illustTask);
-                    task.enqueue(new DListener());
-                    Common.showToast(Shaft.getContext().getString(R.string.one_item_added));
-                }
-            }
-        });
-    }
+    public static void downloadAllIllust(FragmentActivity activity, List<IllustsBean> beans) {
+        if (beans == null || beans.size() <= 0) {
+            Common.showToast(Shaft.getContext().getString(R.string.cannot_download));
+            return;
+        }
 
+        if (beans.size() == 1) {
+            downloadAllIllust(activity, beans.get(0));
+            return;
+        }
 
-    public static void downloadAllIllust(FragmentActivity activity, IllustsBean illustsBean) {
-        checkPermission(activity, new Callback<Object>() {
-            @Override
-            public void doSomething(Object t) {
-                if (illustsBean == null) {
-                    Common.showToast(Shaft.getContext().getString(R.string.cannot_download));
-                    return;
-                }
 
-                if (illustsBean.getPage_count() <= 1) {
-                    downloadIllust(activity, illustsBean);
-                    return;
-                }
+        List<DownloadTask> tempList = new ArrayList<>();
 
+        for (int i = 0; i < beans.size(); i++) {
+            if (beans.get(i).isChecked()) {
+                final IllustsBean currentIllust = beans.get(i);
 
-                List<DownloadTask> tempList = new ArrayList<>();
+                if (currentIllust.getPage_count() == 1) {
 
-                for (int i = 0; i < illustsBean.getPage_count(); i++) {
-                    File file = FileCreator.createIllustFile(illustsBean, i);
+                    File file = FileCreator.createIllustFile(currentIllust);
                     if (!file.exists()) {
-                        DownloadTask.Builder builder = new DownloadTask.Builder(illustsBean.getMeta_pages().get(i).getImage_urls().getOriginal(),
+                        DownloadTask.Builder builder = new DownloadTask.Builder(
+                                currentIllust.getMeta_single_page().getOriginal_image_url(),
                                 file.getParentFile())
                                 .setFilename(file.getName())
                                 .setMinIntervalMillisCallbackProcess(30)
@@ -135,133 +167,61 @@ public void doSomething(Object t) {
                         tempList.add(task);
 
                         IllustTask illustTask = new IllustTask();
-                        illustTask.setIllustsBean(illustsBean);
+                        illustTask.setIllustsBean(currentIllust);
                         illustTask.setDownloadTask(task);
                         TaskQueue.get().addTask(illustTask);
                     }
-                }
-
-                DownloadTask[] taskArray = new DownloadTask[tempList.size()];
-                DownloadTask.enqueue(tempList.toArray(taskArray), new DListener());
-                Common.showToast(tempList.size() + Shaft.getContext().getString(R.string.has_been_added));
-            }
-        });
-    }
-
-
-    public static void downloadAllIllust(FragmentActivity activity, List<IllustsBean> beans) {
-        checkPermission(activity, new Callback<Object>() {
-            @Override
-            public void doSomething(Object t) {
-                if (beans == null || beans.size() <= 0) {
-                    Common.showToast(Shaft.getContext().getString(R.string.cannot_download));
-                    return;
-                }
-
-                if (beans.size() == 1) {
-                    downloadAllIllust(activity, beans.get(0));
-                    return;
-                }
-
-
-                List<DownloadTask> tempList = new ArrayList<>();
-
-                for (int i = 0; i < beans.size(); i++) {
-                    if (beans.get(i).isChecked()) {
-                        final IllustsBean currentIllust = beans.get(i);
-
-                        if (currentIllust.getPage_count() == 1) {
-
-                            File file = FileCreator.createIllustFile(currentIllust);
-                            if (!file.exists()) {
-                                DownloadTask.Builder builder = new DownloadTask.Builder(
-                                        currentIllust.getMeta_single_page().getOriginal_image_url(),
-                                        file.getParentFile())
-                                        .setFilename(file.getName())
-                                        .setMinIntervalMillisCallbackProcess(30)
-                                        .setPassIfAlreadyCompleted(false);
-                                builder.addHeader(MAP_KEY, IMAGE_REFERER);
-                                final DownloadTask task = builder.build();
-                                tempList.add(task);
-
-                                IllustTask illustTask = new IllustTask();
-                                illustTask.setIllustsBean(currentIllust);
-                                illustTask.setDownloadTask(task);
-                                TaskQueue.get().addTask(illustTask);
-                            }
-                        } else {
-                            for (int j = 0; j < currentIllust.getPage_count(); j++) {
-
-                                File file = FileCreator.createIllustFile(currentIllust, j);
-                                if (!file.exists()) {
-                                    DownloadTask.Builder builder = new DownloadTask.Builder(
-                                            currentIllust.getMeta_pages().get(j).getImage_urls().getOriginal(),
-                                            file.getParentFile())
-                                            .setFilename(file.getName())
-                                            .setMinIntervalMillisCallbackProcess(30)
-                                            .setPassIfAlreadyCompleted(false);
-                                    builder.addHeader(MAP_KEY, IMAGE_REFERER);
-                                    final DownloadTask task = builder.build();
-                                    tempList.add(task);
-
-                                    IllustTask illustTask = new IllustTask();
-                                    illustTask.setIllustsBean(currentIllust);
-                                    illustTask.setDownloadTask(task);
-                                    TaskQueue.get().addTask(illustTask);
-                                }
-                            }
+                } else {
+                    for (int j = 0; j < currentIllust.getPage_count(); j++) {
+
+                        File file = FileCreator.createIllustFile(currentIllust, j);
+                        if (!file.exists()) {
+                            DownloadTask.Builder builder = new DownloadTask.Builder(
+                                    currentIllust.getMeta_pages().get(j).getImage_urls().getOriginal(),
+                                    file.getParentFile())
+                                    .setFilename(file.getName())
+                                    .setMinIntervalMillisCallbackProcess(30)
+                                    .setPassIfAlreadyCompleted(false);
+                            builder.addHeader(MAP_KEY, IMAGE_REFERER);
+                            final DownloadTask task = builder.build();
+                            tempList.add(task);
+
+                            IllustTask illustTask = new IllustTask();
+                            illustTask.setIllustsBean(currentIllust);
+                            illustTask.setDownloadTask(task);
+                            TaskQueue.get().addTask(illustTask);
                         }
                     }
                 }
+            }
+        }
 
-                if (tempList.size() == 0) {
-                    return;
-                }
+        if (tempList.size() == 0) {
+            return;
+        }
 
 
-                DownloadTask[] taskArray = new DownloadTask[tempList.size()];
-                DownloadTask.enqueue(tempList.toArray(taskArray), new DListener());
-                Common.showToast(tempList.size() + Shaft.getContext().getString(R.string.has_been_added));
-            }
-        });
+        DownloadTask[] taskArray = new DownloadTask[tempList.size()];
+        DownloadTask.enqueue(tempList.toArray(taskArray), new DListener());
+        Common.showToast(tempList.size() + Shaft.getContext().getString(R.string.has_been_added));
     }
 
     public static void downloadGif(FragmentActivity activity, GifResponse response, IllustsBean allIllust, GifListener gifListener) {
-        checkPermission(activity, new Callback<Object>() {
-            @Override
-            public void doSomething(Object t) {
-                File file = FileCreator.createGifZipFile(allIllust);
-                DownloadTask.Builder builder = new DownloadTask.Builder(
-                        response.getUgoira_metadata().getZip_urls().getMedium(),
-                        file.getParentFile())
-                        .setFilename(file.getName())
-                        .setMinIntervalMillisCallbackProcess(30)
-                        .setPassIfAlreadyCompleted(true);
-                builder.addHeader(MAP_KEY, IMAGE_REFERER);
-                DownloadTask task = builder.build();
-
-                IllustTask illustTask = new IllustTask();
-                illustTask.setDownloadTask(task);
-                illustTask.setIllustsBean(allIllust);
-                GifQueue.get().addTask(illustTask);
-                task.enqueue(gifListener);
-                Common.showToast("图组ZIP已加入下载队列");
-            }
-        });
-    }
-
-    private static void checkPermission(FragmentActivity mActivity, Callback<?> callback) {
-        final RxPermissions rxPermissions = new RxPermissions(mActivity);
-        Disposable disposable = rxPermissions
-                .requestEachCombined(
-                        Manifest.permission.WRITE_EXTERNAL_STORAGE
-                )
-                .subscribe(permission -> {
-                    if (permission.granted) {
-                        callback.doSomething(null);
-                    } else {
-                        Common.showToast(mActivity.getString(R.string.access_denied));
-                    }
-                });
+        File file = FileCreator.createGifZipFile(allIllust);
+        DownloadTask.Builder builder = new DownloadTask.Builder(
+                response.getUgoira_metadata().getZip_urls().getMedium(),
+                file.getParentFile())
+                .setFilename(file.getName())
+                .setMinIntervalMillisCallbackProcess(30)
+                .setPassIfAlreadyCompleted(true);
+        builder.addHeader(MAP_KEY, IMAGE_REFERER);
+        DownloadTask task = builder.build();
+
+        IllustTask illustTask = new IllustTask();
+        illustTask.setDownloadTask(task);
+        illustTask.setIllustsBean(allIllust);
+        GifQueue.get().addTask(illustTask);
+        task.enqueue(gifListener);
+        Common.showToast("图组ZIP已加入下载队列");
     }
 }
diff --git a/app/src/main/java/ceui/lisa/fragments/FragmentComment.java b/app/src/main/java/ceui/lisa/fragments/FragmentComment.java
index aeda97105..6004d9121 100644
--- a/app/src/main/java/ceui/lisa/fragments/FragmentComment.java
+++ b/app/src/main/java/ceui/lisa/fragments/FragmentComment.java
@@ -8,7 +8,11 @@
 import android.view.View;
 
 import androidx.appcompat.app.AlertDialog;
+import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.effective.android.panel.PanelSwitchHelper;
 
 import java.util.List;
 
@@ -17,18 +21,22 @@
 import ceui.lisa.activities.UserActivity;
 import ceui.lisa.adapters.BaseAdapter;
 import ceui.lisa.adapters.CommentAdapter;
+import ceui.lisa.adapters.EmojiAdapter;
 import ceui.lisa.core.RemoteRepo;
 import ceui.lisa.databinding.FragmentCommentBinding;
 import ceui.lisa.databinding.RecyCommentListBinding;
 import ceui.lisa.dialogs.SoftKeyboardStateHelper;
 import ceui.lisa.http.NullCtrl;
 import ceui.lisa.http.Retro;
+import ceui.lisa.interfaces.OnItemClickListener;
+import ceui.lisa.model.EmojiItem;
 import ceui.lisa.model.ListComment;
 import ceui.lisa.models.CommentHolder;
 import ceui.lisa.models.CommentsBean;
 import ceui.lisa.utils.Common;
 import ceui.lisa.utils.Emoji;
 import ceui.lisa.utils.Params;
+import ceui.lisa.view.EditTextWithSelection;
 import io.reactivex.Observable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.Disposable;
@@ -43,6 +51,8 @@ public class FragmentComment extends NetListFragment<FragmentCommentBinding,
     private int illustID;
     private String title;
     private int parentCommentID;
+    private PanelSwitchHelper mHelper;
+    private int selection = 0;
 
     public static FragmentComment newInstance(int id, String title) {
         Bundle args = new Bundle();
@@ -64,6 +74,18 @@ public void initLayout() {
         mLayoutID = R.layout.fragment_comment;
     }
 
+    @Override
+    public void onStart() {
+        super.onStart();
+        if (mHelper == null) {
+            mHelper = new PanelSwitchHelper.Builder(this)
+                    .contentCanScrollOutside(false)    //可选模式，默认true，当面板实现时内容区域是否往上滑动
+                    .logTrack(true)
+                    //可选，默认false，是否开启log信息输出
+                    .build(false);              //可选，默认false，是否默认打开输入法
+        }
+    }
+
     @Override
     public RemoteRepo<ListComment> repository() {
         return new RemoteRepo<ListComment>() {
@@ -219,6 +241,7 @@ public void initView(View view) {
                 @Override
                 public void onSubscribe(Disposable d) {
                     Common.hideKeyboard(mActivity);
+                    mHelper.resetState();
                     baseBind.inputBox.setHint("请输入评论内容");
                     baseBind.inputBox.setText("");
                     baseBind.progress.setVisibility(View.VISIBLE);
@@ -231,7 +254,13 @@ public void success(CommentHolder commentHolder) {
                         noData.setVisibility(View.INVISIBLE);
                     }
 
-                    allItems.add(0, commentHolder.getComment());
+                    if (Emoji.hasEmoji(commentHolder.getComment().getComment())) {
+                        commentHolder.getComment().setComment(
+                                Emoji.transform(commentHolder.getComment().getComment()));
+                        allItems.add(0, commentHolder.getComment());
+                    } else {
+                        allItems.add(0, commentHolder.getComment());
+                    }
                     mAdapter.notifyItemInserted(0);
                     baseBind.recyclerView.scrollToPosition(0);
                 }
@@ -266,17 +295,40 @@ public void must(boolean isSuccess) {
             }
         });
 
-        //让rootview scroll一下，避免软键盘遮挡底部的输入框
-        SoftKeyboardStateHelper softKeyboardStateHelper = new SoftKeyboardStateHelper(parentView);
-        softKeyboardStateHelper.addSoftKeyboardStateListener(new SoftKeyboardStateHelper.SoftKeyboardStateListener() {
+        RecyclerView recyclerView = view.findViewById(R.id.recy_list);
+        GridLayoutManager layoutManager = new GridLayoutManager(getContext(), 6);
+        recyclerView.setLayoutManager(layoutManager);
+        EmojiAdapter adapter = new EmojiAdapter(Emoji.getEmojis(), getContext());
+        adapter.setOnItemClickListener(new OnItemClickListener() {
             @Override
-            public void onSoftKeyboardOpened(int keyboardHeightInPx) {
-                baseBind.fuckingRoot.scrollTo(0, keyboardHeightInPx);
-            }
+            public void onItemClick(View v, int position, int viewType) {
+                final EmojiItem item = adapter.getItemAt(position);
 
+                String name = item.getName();
+                String show = baseBind.inputBox.getText().toString();
+                if (selection < show.length()) {
+                    String left = show.substring(0, selection);
+                    String right = show.substring(selection);
+
+                    baseBind.inputBox.setText(left + name + right);
+                    baseBind.inputBox.setSelection(selection + name.length());
+                } else {
+                    String result = show + name;
+
+                    baseBind.inputBox.setText(result);
+                    baseBind.inputBox.setSelection(result.length());
+                }
+                Common.showLog(className + selection);
+
+            }
+        });
+        recyclerView.setAdapter(adapter);
+        baseBind.inputBox.setOnSelectionChange(new EditTextWithSelection.OnSelectionChange() {
             @Override
-            public void onSoftKeyboardClosed() {
-                baseBind.fuckingRoot.scrollTo(0, 0);
+            public void onChange(int start, int end) {
+                if (start != 0) {
+                    selection = start;
+                }
             }
         });
     }
diff --git a/app/src/main/res/layout/fragment_coming.xml b/app/src/main/res/layout/fragment_coming.xml
index 07e90083c..8c2ceb72f 100644
--- a/app/src/main/res/layout/fragment_coming.xml
+++ b/app/src/main/res/layout/fragment_coming.xml
@@ -11,29 +11,26 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <!-- 不需要被框架处理的布局，可自由布置 -->
-        <RelativeLayout
-            android:id="@+id/cus_title_bar"
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:background="@color/colorPrimary">
 
-            <TextView
-                android:id="@+id/title"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:gravity="left|center_vertical"
-                android:paddingLeft="20dp"
-                android:text="自定义标题栏"
-                android:textColor="@android:color/white"
-                android:textSize="20sp"
-                android:textStyle="bold" />
-        </RelativeLayout>
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/colorPrimary"
+            android:elevation="@dimen/six_dp"
+            android:theme="@style/AppTheme.AppBarOverlay"
+            app:popupTheme="@style/AppTheme.PopupOverlay"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:navigationIcon="@drawable/ic_arrow_back_black_24dp"
+            app:title=" "
+            app:titleTextColor="@android:color/white">
+
+        </androidx.appcompat.widget.Toolbar>
 
         <com.effective.android.panel.view.PanelSwitchLayout
             android:id="@+id/panel_switch_layout"
             android:layout_width="match_parent"
-            app:animationSpeed="standard"
             android:layout_height="match_parent"
             android:orientation="vertical">
 
diff --git a/app/src/main/res/layout/fragment_comment.xml b/app/src/main/res/layout/fragment_comment.xml
index e887536db..980ce9480 100644
--- a/app/src/main/res/layout/fragment_comment.xml
+++ b/app/src/main/res/layout/fragment_comment.xml
@@ -6,12 +6,11 @@
 
     </data>
 
-    <RelativeLayout
-        android:orientation="vertical"
-        android:background="@color/white"
-        android:id="@+id/fucking_root"
+
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
 
         <androidx.appcompat.widget.Toolbar
@@ -20,7 +19,6 @@
             android:layout_height="wrap_content"
             android:background="@color/colorPrimary"
             android:elevation="@dimen/six_dp"
-            android:fitsSystemWindows="true"
             android:theme="@style/AppTheme.AppBarOverlay"
             app:popupTheme="@style/AppTheme.PopupOverlay"
             app:layout_constraintStart_toStartOf="parent"
@@ -31,111 +29,159 @@
 
         </androidx.appcompat.widget.Toolbar>
 
-        <com.scwang.smartrefresh.layout.SmartRefreshLayout
+        <com.effective.android.panel.view.PanelSwitchLayout
+            android:id="@+id/panel_switch_layout"
             android:layout_width="match_parent"
-            android:id="@+id/refreshLayout"
-            android:background="@color/white"
-            android:layout_above="@+id/bottom_rela"
-            android:layout_below="@+id/toolbar"
-            android:layout_height="match_parent">
-
-            <androidx.recyclerview.widget.RecyclerView
+            app:animationSpeed="standard"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <!-- 内容区域 -->
+            <!-- linear_edit_view 指定一个 EditText 用于输入 ，必须项-->
+            <!-- linear_auto_reset_enable 指定是否
+            LinearContentContainer 是否能够接受
+            Touch 事件自动隐藏面板-->
+            <!-- linear_auto_reset_area 指定是否
+            LinearContentContainer 只接受某个 View 区域的 Touch 事件来自定隐藏面板-->
+            <com.effective.android.panel.view.content.RelativeContentContainer
+                android:id="@+id/content_view"
                 android:layout_width="match_parent"
-                android:background="@color/white"
-                android:id="@+id/recyclerView"
-                android:layout_height="match_parent">
+                app:relative_auto_reset_enable="true"
+                android:layout_height="match_parent"
+                app:relative_edit_view="@id/input_box">
 
-            </androidx.recyclerview.widget.RecyclerView>
 
-        </com.scwang.smartrefresh.layout.SmartRefreshLayout>
-
-        <androidx.cardview.widget.CardView
-            android:layout_width="match_parent"
-            android:id="@+id/bottom_rela"
-            android:layout_alignParentBottom="true"
-            app:cardBackgroundColor="@color/white"
-            app:cardElevation="@dimen/four_dp"
-            app:cardCornerRadius="0dp"
-            android:layout_height="50dp">
-
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
 
-                <EditText
+                <com.scwang.smartrefresh.layout.SmartRefreshLayout
                     android:layout_width="match_parent"
-                    android:id="@+id/input_box"
-                    android:hint="留下你的评论吧"
-                    android:textSize="14sp"
-                    android:textColor="@color/rank_text_color"
-                    android:layout_marginEnd="@dimen/eight_dp"
-                    android:layout_marginStart="@dimen/sixteen_dp"
-                    android:layout_toStartOf="@+id/post"
+                    android:id="@+id/refreshLayout"
                     android:background="@color/white"
+                    android:layout_above="@+id/bottom_rela"
                     android:layout_height="match_parent">
 
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:layout_width="match_parent"
+                        android:background="@color/white"
+                        android:id="@+id/recyclerView"
+                        android:layout_height="match_parent">
 
-                </EditText>
+                    </androidx.recyclerview.widget.RecyclerView>
 
+                </com.scwang.smartrefresh.layout.SmartRefreshLayout>
 
-                <ImageView
-                    android:layout_width="30dp"
-                    android:id="@+id/post"
-                    android:src="@drawable/ic_send_black_24dp"
-                    android:tint="@color/colorPrimary"
-                    android:layout_centerVertical="true"
-                    android:layout_alignParentEnd="true"
-                    android:layout_marginEnd="@dimen/sixteen_dp"
-                    android:layout_height="30dp">
-                </ImageView>
+
+                <androidx.cardview.widget.CardView
+                    android:layout_width="match_parent"
+                    android:id="@+id/bottom_rela"
+                    android:layout_alignParentBottom="true"
+                    app:cardBackgroundColor="@color/white"
+                    app:cardElevation="@dimen/four_dp"
+                    app:cardCornerRadius="0dp"
+                    android:layout_height="50dp">
+
+                    <RelativeLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent">
+
+                        <ceui.lisa.view.EditTextWithSelection
+                            android:layout_width="match_parent"
+                            android:id="@+id/input_box"
+                            android:hint="留下你的评论吧"
+                            android:textSize="14sp"
+                            android:textColor="@color/rank_text_color"
+                            android:layout_marginEnd="@dimen/eight_dp"
+                            android:layout_marginStart="@dimen/sixteen_dp"
+                            android:layout_toStartOf="@+id/post"
+                            android:background="@color/white"
+                            android:layout_height="match_parent">
+
+
+                        </ceui.lisa.view.EditTextWithSelection>
+
+
+                        <ImageView
+                            android:layout_width="30dp"
+                            android:id="@+id/post"
+                            android:src="@drawable/ic_send_black_24dp"
+                            android:layout_centerVertical="true"
+                            android:layout_alignParentEnd="true"
+                            android:layout_marginEnd="@dimen/sixteen_dp"
+                            android:layout_height="30dp"
+                            app:tint="@color/colorPrimary">
+                        </ImageView>
+
+                        <ImageView
+                            android:layout_width="30dp"
+                            android:padding="@dimen/four_dp"
+                            android:id="@+id/clear"
+                            android:src="@drawable/ic_cancel_black_24dp"
+                            android:layout_centerVertical="true"
+                            android:layout_toStartOf="@+id/post"
+                            android:layout_marginEnd="@dimen/four_dp"
+                            android:layout_height="30dp">
+
+                        </ImageView>
+
+                        <ImageView
+                            android:id="@+id/show_emoji"
+                            android:layout_width="30dp"
+                            android:layout_height="30dp"
+                            android:layout_centerVertical="true"
+                            android:layout_toStartOf="@+id/clear"
+                            android:layout_marginEnd="@dimen/four_dp"
+                            android:padding="@dimen/four_dp"
+                            android:src="@drawable/ic_emoji">
+
+                        </ImageView>
+
+
+                    </RelativeLayout>
+
+                </androidx.cardview.widget.CardView>
+
+                <ProgressBar
+                    android:layout_width="wrap_content"
+                    android:id="@+id/progress"
+                    android:visibility="gone"
+                    android:layout_centerInParent="true"
+                    android:layout_height="wrap_content">
+
+                </ProgressBar>
 
                 <ImageView
-                    android:layout_width="30dp"
-                    android:padding="@dimen/four_dp"
-                    android:id="@+id/clear"
-                    android:src="@drawable/ic_cancel_black_24dp"
-                    android:layout_centerVertical="true"
-                    android:layout_toStartOf="@+id/post"
-                    android:layout_marginEnd="@dimen/four_dp"
-                    android:layout_height="30dp">
+                    android:layout_width="wrap_content"
+                    android:id="@+id/no_data"
+                    android:visibility="invisible"
+                    android:src="@mipmap/no_data_line"
+                    android:layout_centerInParent="true"
+                    android:scaleType="centerCrop"
+                    android:layout_height="wrap_content"
+                    app:tint="@color/colorPrimary" />
 
-                </ImageView>
+            </com.effective.android.panel.view.content.RelativeContentContainer>
 
-                <ImageView
-                    android:id="@+id/show_emoji"
-                    android:layout_width="30dp"
-                    android:layout_height="30dp"
-                    android:layout_centerVertical="true"
-                    android:layout_toStartOf="@+id/clear"
-                    android:layout_marginEnd="@dimen/four_dp"
-                    android:padding="@dimen/four_dp"
-                    android:src="@drawable/ic_emoji">
-
-                </ImageView>
-
-
-            </RelativeLayout>
-
-        </androidx.cardview.widget.CardView>
-
-        <ProgressBar
-            android:layout_width="wrap_content"
-            android:id="@+id/progress"
-            android:visibility="gone"
-            android:layout_centerInParent="true"
-            android:layout_height="wrap_content">
-
-        </ProgressBar>
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:id="@+id/no_data"
-            android:visibility="invisible"
-            android:src="@mipmap/no_data_line"
-            android:tint="@color/colorPrimary"
-            android:layout_centerInParent="true"
-            android:scaleType="centerCrop"
-            android:layout_height="wrap_content" />
-
-    </RelativeLayout>
+
+            <com.effective.android.panel.view.panel.PanelContainer
+                android:id="@+id/panel_container"
+                android:layout_width="match_parent"
+                android:background="@color/panel_bg"
+                android:layout_height="wrap_content">
+
+                <!-- 每一项面板 -->
+                <!-- panel_layout 用于指定面板该 ID 对应的布局 ，必须项-->
+                <!-- panel_trigger 用于用户点击该 ID 对应的 View 时切换到该面板 -->
+                <!-- panel_toggle  用于当该面板显示时 ，用户再次点击 panel_trigger 对应的 View 时是否回切输入法-->
+                <com.effective.android.panel.view.panel.PanelView
+                    android:id="@+id/panel_emotion"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    app:panel_layout="@layout/panel_emotion_layout"
+                    app:panel_trigger="@id/show_emoji" />
+
+
+            </com.effective.android.panel.view.panel.PanelContainer>
+
+        </com.effective.android.panel.view.PanelSwitchLayout>
+
+    </LinearLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/recy_comment_list.xml b/app/src/main/res/layout/recy_comment_list.xml
index 915b4ba8b..406a186f3 100644
--- a/app/src/main/res/layout/recy_comment_list.xml
+++ b/app/src/main/res/layout/recy_comment_list.xml
@@ -69,6 +69,7 @@
             android:layout_width="wrap_content"
             android:lineSpacingExtra="@dimen/four_dp"
             android:layout_height="wrap_content"
+            android:clickable="false"
             android:layout_below="@+id/user_head"
             android:layout_alignStart="@+id/user_name"
             android:layout_marginTop="@dimen/eight_dp"
@@ -94,6 +95,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:lineSpacingExtra="@dimen/four_dp"
+                android:clickable="false"
                 android:paddingStart="@dimen/six_dp"
                 android:paddingTop="@dimen/six_dp"
                 android:paddingEnd="@dimen/six_dp"