修复组卡搜索结果添加卡片时弹出卡片信息窗口的问题

修复卡查可以滑出加入卡组按钮的问题

build.gradle

@@ -9,7 +9,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.3'
+        classpath 'com.android.tools.build:gradle:7.0.4'
         classpath 'com.android.tools.build:gradle-experimental:0.11.1'
         //classpath 'me.tatarka:gradle-retrolambda:3.2.5'
     }

mobile/src/main/java/cn/garymb/ygomobile/ui/adapters/CardListAdapter.java

@@ -42,7 +42,6 @@ public class CardListAdapter extends BaseRecyclerAdapterPlus<Card, BaseViewHolde
         super(context,R.layout.item_search_card_swipe);
         this.imageLoader = imageLoader;
         mStringManager = DataManager.get().getStringManager();
-
     }
 
     @Override
@@ -225,16 +224,17 @@ public class CardListAdapter extends BaseRecyclerAdapterPlus<Card, BaseViewHolde
            holder.getView(R.id.btn_add_main).setOnClickListener((v) -> {
                 mShowMenuView = holder.itemView;
                 EventBus.getDefault().post(new CardInfoEvent(position, true));
-//                holder.mMenuLayout.smoothCloseMenu();
+               ((SwipeHorizontalMenuLayout) holder.getView(R.id.swipe_layout)).smoothCloseMenu();
             });
 //        }
 //        if (holder.btnSide != null) {
             holder.getView(R.id.btn_add_side).setOnClickListener((v) -> {
                 mShowMenuView = holder.itemView;
                 EventBus.getDefault().post(new CardInfoEvent(position, false));
-//                holder.mMenuLayout.smoothCloseMenu();
+                ((SwipeHorizontalMenuLayout) holder.getView(R.id.swipe_layout)).smoothCloseMenu();
             });
 //        }
+        ((SwipeHorizontalMenuLayout) holder.getView(R.id.swipe_layout)).setSwipeEnable(mEnableSwipe);
     }
 
     private View mShowMenuView;

mobile/src/main/java/cn/garymb/ygomobile/ui/cards/BaseCardsActivity.java

@@ -22,6 +22,9 @@ import com.app.hubert.guide.NewbieGuide;
 import com.app.hubert.guide.model.GuidePage;
 import com.app.hubert.guide.model.HighLight;
 import com.app.hubert.guide.model.HighlightOptions;
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.listener.OnItemClickListener;
+import com.chad.library.adapter.base.listener.OnItemLongClickListener;
 
 import java.util.List;
 
@@ -157,22 +160,30 @@ public abstract class BaseCardsActivity extends BaseActivity implements CardLoad
     }
 
     protected void setListeners() {
-        mListView.addOnItemTouchListener(new RecyclerViewItemListener(mListView, new RecyclerViewItemListener.OnItemListener() {
-            @Override
-            public void onItemClick(View view, int pos) {
-                onCardClick(view, mCardListAdapter.getItem(pos), pos);
-            }
-
-            @Override
-            public void onItemLongClick(View view, int pos) {
-                onCardLongClick(view, mCardListAdapter.getItem(pos), pos);
-            }
-
-            @Override
-            public void onItemDoubleClick(View view, int pos) {
+        mCardListAdapter.setOnItemClickListener((adapter, view, position) -> {
+            onCardClick(view, mCardListAdapter.getItem(position), position);
+        });
+        mCardListAdapter.setOnItemLongClickListener((adapter, view, position) -> {
+            onCardLongClick(view, mCardListAdapter.getItem(position), position);
+            return true;
+        });
 
-            }
-        }));
+//        mListView.addOnItemTouchListener(new RecyclerViewItemListener(mListView, new RecyclerViewItemListener.OnItemListener() {
+//            @Override
+//            public void onItemClick(View view, int pos) {
+//                onCardClick(view, mCardListAdapter.getItem(pos), pos);
+//            }
+//
+//            @Override
+//            public void onItemLongClick(View view, int pos) {
+//                onCardLongClick(view, mCardListAdapter.getItem(pos), pos);
+//            }
+//
+//            @Override
+//            public void onItemDoubleClick(View view, int pos) {
+//
+//            }
+//        }));
         mListView.addOnScrollListener(new RecyclerView.OnScrollListener() {
             @Override
             public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newState) {