禁用对人机卡组修改

圆角dialog贴图

Classes/gframe/deck_con.cpp

@@ -482,15 +482,12 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 							}
 						}
 					}
-//					if(mainGame->cbCategorySelect->getSelected() == -1 || mainGame->cbDeckSelect->getSelected() == -1)
-//                    	break;
-
 					if(catesel > 0) {
 						mainGame->lstCategories->setSelected(catesel);
 						refreshDeckList();
 						mainGame->lstDecks->setSelected(0);
 						mainGame->cbDBCategory->setSelected(catesel);
-						changeCategory(catesel);//fixme
+						changeCategory(catesel);
 					}
 					break;
 				}
@@ -1062,11 +1059,9 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 						break;
 				}
 				refreshDeckList();
-//				if(mainGame->cbCategorySelect->getSelected() == -1 || mainGame->cbDeckSelect->getSelected() == -1)
-//                    break;
 				mainGame->lstDecks->setSelected(0);
 				mainGame->cbDBCategory->setSelected(catesel);
-				changeCategory(catesel);//fixme
+				changeCategory(catesel);
 				break;
 			}
 			case LISTBOX_DECKS: {

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

@@ -100,6 +100,7 @@ class DeckManagerActivityImpl extends BaseCardsAcitivity implements RecyclerView
     private CardDetail mCardDetail;
     private DialogPlus mDialog;
     private DialogPlus builderShareLoading;
+    private boolean isExit = false;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -165,14 +166,13 @@ class DeckManagerActivityImpl extends BaseCardsAcitivity implements RecyclerView
             }
         });
     }
-
+    //endregion
 
     @Override
     protected void onDestroy() {
         EventBus.getDefault().unregister(this);
         super.onDestroy();
     }
-    //endregion
 
     //region card edit
     @Override
@@ -213,6 +213,7 @@ class DeckManagerActivityImpl extends BaseCardsAcitivity implements RecyclerView
     public void onDragLongPressEnd() {
         mDeckAdapater.hideHeadView();
     }
+    //endregion
 
     @Override
     public void onDragEnd() {
@@ -277,7 +278,6 @@ class DeckManagerActivityImpl extends BaseCardsAcitivity implements RecyclerView
             setCurDeck(rs);
         });
     }
-    //endregion
 
     /**
      * 设置当前卡组
@@ -480,8 +480,6 @@ class DeckManagerActivityImpl extends BaseCardsAcitivity implements RecyclerView
         return false;
     }
 
-    private boolean isExit = false;
-
     @Override
     protected void onBackHome() {
         if (mDeckAdapater.isChanged()) {
@@ -614,7 +612,11 @@ class DeckManagerActivityImpl extends BaseCardsAcitivity implements RecyclerView
                     if (mDeckAdapater.getYdkFile() == null) {
                         inputDeckName(null, null, true);
                     } else {
-                        save(mDeckAdapater.getYdkFile());
+                        if (mDeckAdapater.getYdkFile().getParent().equals(mSettings.getAiDeckDir())) {
+                            Toast.makeText(this, R.string.donot_editor_bot_Deck, Toast.LENGTH_SHORT).show();
+                        } else {
+                            save(mDeckAdapater.getYdkFile());
+                        }
                     }
                 }
                 break;
@@ -626,7 +628,11 @@ class DeckManagerActivityImpl extends BaseCardsAcitivity implements RecyclerView
 //                }
 //                break;
             case R.id.action_rename:
-                inputDeckName(mDeckAdapater.getYdkFile(), null, false);
+                if (mDeckAdapater.getYdkFile().getParent().equals(mSettings.getAiDeckDir())) {
+                    Toast.makeText(this, R.string.donot_editor_bot_Deck, Toast.LENGTH_SHORT).show();
+                } else {
+                    inputDeckName(mDeckAdapater.getYdkFile(), null, false);
+                }
                 break;
             case R.id.action_deck_new:
                 createDeck(null);
@@ -646,22 +652,26 @@ class DeckManagerActivityImpl extends BaseCardsAcitivity implements RecyclerView
             }
             break;
             case R.id.action_delete_deck: {
-                DialogPlus builder = new DialogPlus(this);
-                builder.setTitle(R.string.question);
-                builder.setMessage(R.string.question_delete_deck);
-                builder.setMessageGravity(Gravity.CENTER_HORIZONTAL);
-                builder.setLeftButtonListener((dlg, rs) -> {
-                    File ydk = mDeckAdapater.getYdkFile();
-                    if (ydk == null) {
-                        return;
-                    }
-                    FileUtils.deleteFile(ydk);
-                    dlg.dismiss();
-                    File file = getFirstYdk();
-                    initDecksListSpinners(mDeckSpinner, file);
-                    loadDeckFromFile(file);
-                });
-                builder.show();
+                if (mDeckAdapater.getYdkFile().getParent().equals(mSettings.getAiDeckDir())) {
+                    Toast.makeText(this, R.string.donot_editor_bot_Deck, Toast.LENGTH_SHORT).show();
+                } else {
+                    DialogPlus builder = new DialogPlus(this);
+                    builder.setTitle(R.string.question);
+                    builder.setMessage(R.string.question_delete_deck);
+                    builder.setMessageGravity(Gravity.CENTER_HORIZONTAL);
+                    builder.setLeftButtonListener((dlg, rs) -> {
+                        File ydk = mDeckAdapater.getYdkFile();
+                        if (ydk == null) {
+                            return;
+                        }
+                        FileUtils.deleteFile(ydk);
+                        dlg.dismiss();
+                        File file = getFirstYdk();
+                        initDecksListSpinners(mDeckSpinner, file);
+                        loadDeckFromFile(file);
+                    });
+                    builder.show();
+                }
             }
             break;
             case R.id.action_unsort:
@@ -769,7 +779,7 @@ class DeckManagerActivityImpl extends BaseCardsAcitivity implements RecyclerView
         BitmapUtil.saveBitmap(bitmap, savePath, 50);
         builderShareLoading.dismiss();
         DialogUtils du = DialogUtils.getdx(DeckManagerActivityImpl.this);
-        View viewDialog = du.dialogBottomSheet(R.layout.dialog_deck_share,0);
+        View viewDialog = du.dialogBottomSheet(R.layout.dialog_deck_share, 0);
         ImageView iv_image = viewDialog.findViewById(R.id.iv_image);
         Button bt_image_share = viewDialog.findViewById(R.id.bt_image_share);
         Button bt_code_share = viewDialog.findViewById(R.id.bt_code_share);

mobile/src/main/java/cn/garymb/ygomobile/utils/YGODialogUtil.java

@@ -36,6 +36,8 @@ import cn.garymb.ygomobile.ui.mycard.mcchat.util.ImageUtil;
 import cn.garymb.ygomobile.ui.plus.DialogPlus;
 import cn.garymb.ygomobile.utils.recyclerview.DeckTypeTouchHelperCallback;
 
+import static cn.garymb.ygomobile.lite.R.string.please_select_target_category;
+
 public class YGODialogUtil {
 
     private static final int IMAGE_MOVE = 0;
@@ -50,7 +52,7 @@ public class YGODialogUtil {
 
     public static void dialogDeckSelect(Context context, String selectDeckPath, OnDeckMenuListener onDeckMenuListener) {
         DialogUtils du = DialogUtils.getdx(context);
-        View viewDialog = du.dialogBottomSheet(R.layout.dialog_deck_select,0);
+        View viewDialog = du.dialogBottomSheet(R.layout.dialog_deck_select, 0);
         RecyclerView rv_type, rv_deck;
 
         rv_deck = viewDialog.findViewById(R.id.rv_deck);
@@ -153,7 +155,9 @@ public class YGODialogUtil {
         ll_add.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                du.dialogl(context.getString(R.string.new_deck), new String[]{context.getString(R.string.category_name), context.getString(R.string.deck_name)}).setOnItemClickListener(new AdapterView.OnItemClickListener() {
+                du.dialogl(context.getString(R.string.new_deck),
+                        new String[]{context.getString(R.string.category_name),
+                                context.getString(R.string.deck_name)}, R.drawable.radius).setOnItemClickListener(new AdapterView.OnItemClickListener() {
                     @Override
                     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                         du.dis();
@@ -198,7 +202,9 @@ public class YGODialogUtil {
             public void onClick(View v) {
                 List<DeckType> otherType = getOtherTypeList();
 
-                du.dialogl(context.getString(R.string.please_select_target_category), getStringType(otherType)).setOnItemClickListener(new AdapterView.OnItemClickListener() {
+                du.dialogl(context.getString(please_select_target_category),
+                        getStringType(otherType),
+                        R.drawable.radius).setOnItemClickListener(new AdapterView.OnItemClickListener() {
                     @Override
                     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                         du.dis();
@@ -225,7 +231,9 @@ public class YGODialogUtil {
             public void onClick(View v) {
                 List<DeckType> otherType = getOtherTypeList();
 
-                du.dialogl(context.getString(R.string.please_select_target_category), getStringType(otherType)).setOnItemClickListener(new AdapterView.OnItemClickListener() {
+                du.dialogl(context.getString(please_select_target_category),
+                        getStringType(otherType),
+                        R.drawable.radius).setOnItemClickListener(new AdapterView.OnItemClickListener() {
                     @Override
                     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                         du.dis();
@@ -352,21 +360,6 @@ public class YGODialogUtil {
         return moveTypeList;
     }
 
-
-    public interface OnDeckMenuListener {
-        void onDeckSelect(DeckFile deckFile);
-
-        void onDeckDel(List<DeckFile> deckFileList);
-
-        void onDeckMove(List<DeckFile> deckFileList, DeckType toDeckType);
-
-        void onDeckCopy(List<DeckFile> deckFileList, DeckType toDeckType);
-
-        void onDeckNew(DeckType currentDeckType);
-
-    }
-
-
     private static void showAllDeckUtil() {
         ImageUtil.reImageColor(IMAGE_MOVE, iv_move);
         ImageUtil.reImageColor(IMAGE_DEL, iv_del);
@@ -403,7 +396,6 @@ public class YGODialogUtil {
         ll_move.setEnabled(false);
     }
 
-
     private static void clearDeckSelect() {
         deckAdp.setManySelect(false);
         hideAllDeckUtil();
@@ -414,6 +406,19 @@ public class YGODialogUtil {
             ygoDialog.dismiss();
     }
 
+    public interface OnDeckMenuListener {
+        void onDeckSelect(DeckFile deckFile);
+
+        void onDeckDel(List<DeckFile> deckFileList);
+
+        void onDeckMove(List<DeckFile> deckFileList, DeckType toDeckType);
+
+        void onDeckCopy(List<DeckFile> deckFileList, DeckType toDeckType);
+
+        void onDeckNew(DeckType currentDeckType);
+
+    }
+
     public interface OnDeckTypeListener {
         void onDeckTypeListener(int position);
     }

mobile/src/main/res/values-zh/strings.xml

@@ -263,4 +263,5 @@
     <string name="delete_confirm">确定删除该分类吗，分类下的卡组也将全部被删除</string>
     <string name="no_deck_is_selected">未选中卡组</string>
     <string name="done">完成！</string>
+    <string name="donot_editor_bot_Deck">请不要更改/删除AI卡组否则会导致人机模式无法正常使用</string>
 </resources>

mobile/src/main/res/values/strings.xml

@@ -266,4 +266,5 @@
     <string name="delete_confirm">will delete all deck of this Category</string>
     <string name="no_deck_is_selected">no_deck_is_selected</string>
     <string name="done">done！</string>
+    <string name="donot_editor_bot_Deck">Pls Donot edit/remove AI Deck, if you do\nAI mode wont work right</string>
 </resources>