diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/SearchActivity.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/SearchActivity.java
index 5cb16e80..03607d72 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/SearchActivity.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/SearchActivity.java
@@ -93,20 +93,7 @@ public class SearchActivity extends BaseMvpActivity<SearchPresenter, ActivitySea
 
             @Override
             public void afterTextChanged(Editable s) {
-                keyWord = mBinding.editQuery.getText().toString();
-                MvpPre.saveSearchHistory(keyWord);
-                if (StringUtils.isEmpty(keyWord)) {
-                    mBinding.ivClose.setImageLevel(1);
-                    mBinding.ivClose.performClick();
-                } else {
-                    mSearchUserResultAdapter.setKeyWord(keyWord);
-                    mSearchRecordAdapter.setKeyWord(keyWord);
-                    mBinding.ivClose.setImageLevel(2);
-                    mBinding.llHistory.setVisibility(View.GONE);
-                    MvpPre.getSearchHistory();
-                    MvpPre.fuzzyQuery(keyWord);
-                    MvpPre.search(keyWord);
-                }
+
             }
         });
         MvpPre.getSearchHistory();
@@ -143,7 +130,7 @@ public class SearchActivity extends BaseMvpActivity<SearchPresenter, ActivitySea
             public void onGnsClick(UserResultResp item) {
                 if (item.getRoom_id() != null && !item.getRoom_id().isEmpty() && !"0".equals(item.getRoom_id())) {
 
-                    RoomManager.getInstance().fetchRoomDataAndEnter(SearchActivity.this, item.getRoom_id(), "",null);
+                    RoomManager.getInstance().fetchRoomDataAndEnter(SearchActivity.this, item.getRoom_id(), "", null);
 
                 } else {
                     ChatLauncher.getInstance().launchC2CChat(SearchActivity.this, item.getUser_id());
@@ -160,7 +147,7 @@ public class SearchActivity extends BaseMvpActivity<SearchPresenter, ActivitySea
         mSearchRoomResultAdapter.setOnItemClickListener((adapter, view, position) -> {
             RoomSearchResp item = mSearchRoomResultAdapter.getItem(position);
             if (item != null) {
-                RoomManager.getInstance().fetchRoomDataAndEnter(getApplicationContext(), item.getRoom_id(), "",null);
+                RoomManager.getInstance().fetchRoomDataAndEnter(getApplicationContext(), item.getRoom_id(), "", null);
             }
         });
         mBinding.ivDelete.setOnClickListener(v -> {
@@ -184,7 +171,23 @@ public class SearchActivity extends BaseMvpActivity<SearchPresenter, ActivitySea
             mBinding.rlUser.setVisibility(View.GONE);
             mBinding.recycleViewUser.setVisibility(View.GONE);
         });
-        mBinding.tvCancel.setOnClickListener(v -> finish());
+        mBinding.tvCancel.setOnClickListener(v -> {
+                    keyWord = mBinding.editQuery.getText().toString();
+                    MvpPre.saveSearchHistory(keyWord);
+                    if (StringUtils.isEmpty(keyWord)) {
+                        mBinding.ivClose.setImageLevel(1);
+                        mBinding.ivClose.performClick();
+                    } else {
+                        mSearchUserResultAdapter.setKeyWord(keyWord);
+                        mSearchRecordAdapter.setKeyWord(keyWord);
+                        mBinding.ivClose.setImageLevel(2);
+                        mBinding.llHistory.setVisibility(View.GONE);
+                        MvpPre.getSearchHistory();
+                        MvpPre.fuzzyQuery(keyWord);
+                        MvpPre.search(keyWord);
+                    }
+                }
+        );
         mBinding.editQuery.requestFocus();
     }
 
@@ -220,7 +223,7 @@ public class SearchActivity extends BaseMvpActivity<SearchPresenter, ActivitySea
         } else {
             mBinding.rlNull.setVisibility(View.GONE);
             mBinding.nestedscrollview.setVisibility(View.VISIBLE);
-            if (data.getRooms()==null) {
+            if (data.getRooms() == null) {
                 mBinding.recycleViewRoom.setVisibility(View.GONE);
                 mBinding.rlRoom.setVisibility(View.GONE);
             } else {
@@ -229,7 +232,7 @@ public class SearchActivity extends BaseMvpActivity<SearchPresenter, ActivitySea
 //                if (data.getRooms().size() > 2) {
 //                    mSearchRoomResultAdapter.setNewData(data.getRooms().subList(0, 2));
 //                } else {
-                    mSearchRoomResultAdapter.setNewData(data.getRooms());
+                mSearchRoomResultAdapter.setNewData(data.getRooms());
 //                }
                 mBinding.tvRoomCount.setText("全部  " + data.getRooms().size());
             }
@@ -274,6 +277,7 @@ public class SearchActivity extends BaseMvpActivity<SearchPresenter, ActivitySea
     public void onLeftClick() {
 
     }
+
     @Override
     public void onRightClick() {
         MvpPre.deleteSearchHistory();
diff --git a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomSettingFragment.java b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomSettingFragment.java
index c4bd2270..d5fbe8eb 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomSettingFragment.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomSettingFragment.java
@@ -758,7 +758,7 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
                     }
                 }else if (giftBagId == 61) {
                     if (status == 1) {
-                        moreChildren.add(new RoomSettingBean("爱豆计划", "love", null, null, QXRoomSettingTypeRoomBusinessLOVE, read, isSelected, true, redSound));
+                        moreChildren.add(new RoomSettingBean("潘多拉魔盒", "love", null, null, QXRoomSettingTypeRoomBusinessLOVE, read, isSelected, true, redSound));
                     }
                 }
 //                else {
diff --git a/MainModule/src/main/res/layout/activity_search.xml b/MainModule/src/main/res/layout/activity_search.xml
index 6c546014..d2d94cb7 100644
--- a/MainModule/src/main/res/layout/activity_search.xml
+++ b/MainModule/src/main/res/layout/activity_search.xml
@@ -68,7 +68,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:paddingRight="@dimen/dp_20"
-                    android:text="取消"
+                    android:text="确定"
                     android:textColor="@color/color_FF333333"
                     android:textSize="@dimen/sp_14" />
             </LinearLayout>