修复卡组保存后卡组码无法刷新的问题

dialogUtils使用云端1.8.9.20
gradle版本升级至7.2.0

build.gradle

@@ -10,7 +10,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.2'
+        classpath 'com.android.tools.build:gradle:7.2.0'
         classpath 'com.android.tools.build:gradle-experimental:0.11.1'
         //classpath 'me.tatarka:gradle-retrolambda:3.2.5'
     }

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip

mobile/build.gradle

@@ -115,7 +115,7 @@ dependencies {
     implementation 'com.nightonke:boommenu:2.1.0'
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     //dialog库
-    implementation(name: 'dialogutils2-release', ext: 'aar')
+    implementation 'com.github.feihuaduo:DialogUtils:1.8.9.20'
     //recyclerview的adapter库
     implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:3.0.4'
     implementation 'androidx.appcompat:appcompat:1.2.0'

mobile/src/main/java/cn/garymb/ygomobile/adapter/TextBaseAdapter.java

+package cn.garymb.ygomobile.adapter;
+
+import android.content.Context;
+import android.view.Gravity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AbsListView;
+import android.widget.BaseAdapter;
+
+import androidx.appcompat.widget.AppCompatTextView;
+import androidx.core.content.ContextCompat;
+
+import cn.garymb.ygomobile.lite.R;
+
+/**
+ * Create By feihua  On 2022/5/18
+ */
+
+public class TextBaseAdapter extends BaseAdapter {
+
+    private Context context;
+    private String[] data;
+    private int leftPadding;
+    private int rightPadding;
+    private int topPadding;
+    private int bottomPadding;
+    private int textColor = 0;
+
+    public TextBaseAdapter(Context context, String[] data, int textColor, int leftPadding, int topPadding, int rightPadding, int bottomPadding) {
+        this.context = context;
+        this.data = data;
+        this.textColor = textColor;
+        this.leftPadding = leftPadding;
+        this.rightPadding = rightPadding;
+        this.topPadding = topPadding;
+        this.bottomPadding = bottomPadding;
+    }
+
+    @Override
+    public int getCount() {
+        return data.length;//设置此数据适配起有几个item
+    }
+
+    @Override
+    public Object getItem(int p1)//未知，好像无用
+    {
+        return data[p1];
+    }
+
+    @Override
+    public long getItemId(int p1)//未知，好像无用
+    {
+        return p1;
+    }
+
+    @Override
+    public View getView(int p1, View p2, ViewGroup p3) {
+        AppCompatTextView t = new AppCompatTextView(context);
+        if (textColor == 0)
+            t.setTextColor(ContextCompat.getColor(context, R.color.colorAccent));
+        else
+            t.setTextColor(textColor);
+        t.setText(data[p1]);//p1为对应的数组下标
+        t.setTextSize(20);
+        t.setGravity(Gravity.CENTER);
+        t.setPadding(leftPadding, topPadding, rightPadding, bottomPadding);
+        t.setLayoutParams(new AbsListView.LayoutParams(AbsListView.LayoutParams.MATCH_PARENT, AbsListView.LayoutParams.MATCH_PARENT));
+        return t;//返回设置好的view组件，也可以是布局，也可以是控件
+    }
+
+}
+

mobile/src/main/java/cn/garymb/ygomobile/loader/CardLoader.java

@@ -134,7 +134,7 @@ public class CardLoader implements ICardSearcher {
                 if (searchInfo != null && card.Name.equals(searchInfo.getKeyWord().getValue())) {
                     cards.remove(i);
                     keywordtmp.add(card);
-                    continue;//ظ
+                    continue;//避免重复
                 }
                 if (searchInfo == null || searchInfo.isValid(card)) {
                     list.add(card);

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

@@ -774,11 +774,18 @@ public class DeckManagerActivity extends BaseCardsActivity implements RecyclerVi
 //        if (file != null) {
 //            loadDeckFromFile(file);
 //        }
+        Deck deck = mDeckAdapater.toDeck(mDeckAdapater.getYdkFile());
+        if (deck.getDeckCount()==0){
+            builderShareLoading.dismiss();
+            YGOUtil.show("卡组中没有卡片");
+            return;
+        }
+
         //延时半秒，使整体看起来更流畅
-        new Handler().postDelayed(this::shareDeck1, 500);
+        new Handler().postDelayed(() -> shareDeck1(deck), 500);
     }
 
-    private void shareDeck1() {
+    private void shareDeck1(Deck deck) {
         //开启绘图缓存
         mRecyclerView.setDrawingCacheEnabled(true);
         //这个方法可调可不调，因为在getDrawingCache()里会自动判断有没有缓存有没有准备好，
@@ -793,7 +800,7 @@ public class DeckManagerActivity extends BaseCardsActivity implements RecyclerVi
         mRecyclerView.destroyDrawingCache();
 //        shotRecyclerView(mRecyclerView)
 
-        Deck deck = mDeckAdapater.toDeck(mDeckAdapater.getYdkFile());
+
         String deckName = deck.getName();
         int end = deckName.lastIndexOf(".");
         if (end != -1) {
@@ -803,13 +810,13 @@ public class DeckManagerActivity extends BaseCardsActivity implements RecyclerVi
         BitmapUtil.saveBitmap(bitmap, savePath, 50);
         builderShareLoading.dismiss();
         DialogUtils du = DialogUtils.getdx(this);
-        View viewDialog = du.dialogBottomSheet(R.layout.dialog_deck_share,0);
+        View viewDialog = du.dialogBottomSheet(R.layout.dialog_deck_share,true);
         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);
         TextView tv_code = viewDialog.findViewById(R.id.et_code);
-        tv_code.setText(mDeckAdapater.getDeckInfo().toDeck().toAppUri().toString());
-        ImageUtil.setImage(this, savePath, iv_image);
+        tv_code.setText(deck.toAppUri().toString());
+        ImageUtil.show(this, savePath, iv_image,System.currentTimeMillis()+"");
 
         bt_code_share.setOnClickListener(v -> {
             du.dis();

mobile/src/main/java/cn/garymb/ygomobile/ui/mycard/mcchat/util/ImageUtil.java

@@ -4,15 +4,24 @@ import android.content.Context;
 import android.graphics.ColorMatrix;
 import android.graphics.ColorMatrixColorFilter;
 import android.net.Uri;
+import android.text.TextUtils;
 import android.widget.ImageView;
 
+import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.bumptech.glide.request.RequestOptions;
+import com.bumptech.glide.signature.ObjectKey;
+import com.ourygo.assistant.util.Util;
 
 import cn.garymb.ygomobile.lite.R;
 import cn.garymb.ygomobile.utils.glide.GlideCompat;
 
 public class ImageUtil {
 
+    public static final RequestOptions imageOption = RequestOptions
+            .diskCacheStrategyOf(DiskCacheStrategy.DATA)
+            .placeholder(R.drawable.unknown);
+
     public static void setAvatar(Context context, String url, final ImageView im) {
         if (url != null) {
             GlideCompat.with(context)
@@ -25,13 +34,14 @@ public class ImageUtil {
 
 
     public static void setImage(Context context, String url, final ImageView im) {
-        if (url != null) {
-            GlideCompat.with(context)
-                    .load(url)
-                    .diskCacheStrategy(DiskCacheStrategy.DATA)
-                    .placeholder(R.drawable.unknown)
-                    .into(im);
-        }
+//        if (url != null) {
+//            GlideCompat.with(context)
+//                    .load(url)
+//                    .diskCacheStrategy(DiskCacheStrategy.DATA)
+//                    .placeholder(R.drawable.unknown)
+//                    .into(im);
+//        }
+        show(context, url, im, null);
     }
 
     public static void setGrayImage(int key, ImageView imageView) {
@@ -41,9 +51,29 @@ public class ImageUtil {
         imageView.setColorFilter(filter);
     }
 
-    public static void reImageColor(int key,ImageView imageView) {
+    public static void reImageColor(int key, ImageView imageView) {
         imageView.setColorFilter(null);
     }
 
+    public static void show(Context context, String uri, final ImageView im, String objectKey) {
+        if (!Util.isContextExisted(context))
+            return;
+        if (TextUtils.isEmpty(uri))
+            return;
+        if (TextUtils.isEmpty(objectKey)) {
+            setImage(context, uri, im);
+            Glide.with(context)
+                    .load(uri)
+                    .apply(imageOption)
+                    .into(im);
+        } else {
+            Glide.with(context)
+                    .load(uri)
+                    .signature(new ObjectKey(objectKey))
+                    .apply(imageOption)
+                    .into(im);
+        }
+    }
+
 
 }

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

 package cn.garymb.ygomobile.utils;
 
+import static cn.garymb.ygomobile.lite.R.string.please_select_target_category;
+
 import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.text.InputType;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.Gravity;
 import android.view.KeyEvent;
 import android.view.View;
-import android.widget.AdapterView;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.ListView;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -31,6 +32,7 @@ import java.util.List;
 
 import cn.garymb.ygomobile.AppsSettings;
 import cn.garymb.ygomobile.Constants;
+import cn.garymb.ygomobile.adapter.TextBaseAdapter;
 import cn.garymb.ygomobile.bean.DeckType;
 import cn.garymb.ygomobile.bean.events.DeckFile;
 import cn.garymb.ygomobile.lite.R;
@@ -39,10 +41,40 @@ 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 class ViewHolder{
+    public static void dialogDeckSelect(Context context, String selectDeckPath, OnDeckMenuListener onDeckMenuListener) {
+        ViewHolder viewHolder = new ViewHolder(context, selectDeckPath, onDeckMenuListener);
+        viewHolder.show();
+    }
+
+    public static ListView dialogl(Context context, String title, String[] list) {
+        DialogUtils dialogUtils = DialogUtils.getInstance(context);
+        ListView listView = dialogUtils.dialogl1(title
+                , new TextBaseAdapter(context, list, YGOUtil.c(R.color.white)
+                        , 16, 16, 16, 16));
+        dialogUtils.setDialogBackgroundResource(R.drawable.radius);
+        dialogUtils.setTitleColor(YGOUtil.c(R.color.holo_blue_light));
+        return listView;
+    }
+
+    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);
+    }
+
+    private static class ViewHolder {
 
         private final int IMAGE_MOVE = 0;
         private final int IMAGE_COPY = 1;
@@ -61,9 +93,9 @@ public class YGODialogUtil {
         private final TextSelectAdapter<DeckFile> deckAdp;
         private final Dialog ygoDialog;
 
-        public ViewHolder(Context context, String selectDeckPath, OnDeckMenuListener onDeckMenuListener){
-		    DialogUtils du = DialogUtils.getdx(context);
-            View viewDialog = du.dialogBottomSheet(R.layout.dialog_deck_select, 0);
+        public ViewHolder(Context context, String selectDeckPath, OnDeckMenuListener onDeckMenuListener) {
+            DialogUtils du = DialogUtils.getdx(context);
+            View viewDialog = du.dialogBottomSheet(R.layout.dialog_deck_select, false);
             RecyclerView rv_type, rv_deck;
 
             rv_deck = viewDialog.findViewById(R.id.rv_deck);
@@ -178,48 +210,45 @@ public class YGODialogUtil {
             ll_add.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    du.dialogl(context.getString(R.string.new_deck),
+                    dialogl(context, 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();
-                            switch (position) {
-                                case 0:
-                                    //if (deckList.size()>=8){
-                                    //    YGOUtil.show("最多只能有5个自定义分类");
-                                    //}
-                                    DialogPlus builder = new DialogPlus(context);
-                                    builder.setTitle(R.string.please_input_category_name);
-                                    EditText editText = new EditText(context);
-                                    editText.setGravity(Gravity.TOP | Gravity.LEFT);
-                                    editText.setInputType(InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
-                                    editText.setSingleLine();
-                                    builder.setContentView(editText);
-                                    builder.setOnCloseLinster(DialogInterface::dismiss);
-                                    builder.setLeftButtonListener((dlg, s) -> {
-                                        String name = editText.getText().toString().trim();
-                                        if (TextUtils.isEmpty(name)) {
-                                            YGOUtil.show(context.getString(R.string.invalid_category_name));
-                                            return;
-                                        }
-                                        File file = new File(AppsSettings.get().getDeckDir(), name);
-                                        if (IOUtils.createFolder(file)) {
-                                            typeList.add(new DeckType(name, file.getAbsolutePath()));
-                                            typeAdp.notifyItemInserted(typeList.size() - 1);
-                                            dlg.dismiss();
-                                        } else {
-                                            YGOUtil.show(context.getString(R.string.create_new_failed));
-                                        }
-
-                                    });
-                                    builder.show();
-                                    break;
-                                case 1:
-                                    onDeckMenuListener.onDeckNew(typeList.get(typeAdp.getSelectPosition()));
-                                    dismiss();
-                                    break;
-                            }
+                                    context.getString(R.string.deck_name)}).setOnItemClickListener((parent, view, position, id) -> {
+                        du.dis();
+                        switch (position) {
+                            case 0:
+                                //if (deckList.size()>=8){
+                                //    YGOUtil.show("最多只能有5个自定义分类");
+                                //}
+                                DialogPlus builder = new DialogPlus(context);
+                                builder.setTitle(R.string.please_input_category_name);
+                                EditText editText = new EditText(context);
+                                editText.setGravity(Gravity.TOP | Gravity.LEFT);
+                                editText.setInputType(InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
+                                editText.setSingleLine();
+                                builder.setContentView(editText);
+                                builder.setOnCloseLinster(DialogInterface::dismiss);
+                                builder.setLeftButtonListener((dlg, s) -> {
+                                    String name = editText.getText().toString().trim();
+                                    if (TextUtils.isEmpty(name)) {
+                                        YGOUtil.show(context.getString(R.string.invalid_category_name));
+                                        return;
+                                    }
+                                    File file = new File(AppsSettings.get().getDeckDir(), name);
+                                    if (IOUtils.createFolder(file)) {
+                                        typeList.add(new DeckType(name, file.getAbsolutePath()));
+                                        typeAdp.notifyItemInserted(typeList.size() - 1);
+                                        dlg.dismiss();
+                                    } else {
+                                        YGOUtil.show(context.getString(R.string.create_new_failed));
+                                    }
+
+                                });
+                                builder.show();
+                                break;
+                            case 1:
+                                onDeckMenuListener.onDeckNew(typeList.get(typeAdp.getSelectPosition()));
+                                dismiss();
+                                break;
                         }
                     });
                 }
@@ -228,48 +257,46 @@ public class YGODialogUtil {
             ll_move.setOnClickListener(v -> {
                 List<DeckType> otherType = getOtherTypeList();
 
-                du.dialogl(context.getString(please_select_target_category),
-                        getStringType(otherType),
-                    R.drawable.radius).setOnItemClickListener((parent, view, position, id) -> {
-                        du.dis();
-                        DeckType toType = otherType.get(position);
-                        IOUtils.createFolder(new File(toType.getPath()));
-                        List<DeckFile> deckFileList = deckAdp.getSelectList();
-                        for (DeckFile deckFile : deckFileList) {
-                            try {
+                dialogl(context, context.getString(please_select_target_category),
+                        getStringType(otherType)).setOnItemClickListener((parent, view, position, id) -> {
+                    du.dis();
+                    DeckType toType = otherType.get(position);
+                    IOUtils.createFolder(new File(toType.getPath()));
+                    List<DeckFile> deckFileList = deckAdp.getSelectList();
+                    for (DeckFile deckFile : deckFileList) {
+                        try {
                             FileUtils.moveFile(deckFile.getPath(), new File(toType.getPath(), deckFile.getFileName()).getPath());
-                            } catch (IOException e) {
-                                e.printStackTrace();
-                            }
-                            deckList.remove(deckFile);
+                        } catch (IOException e) {
+                            e.printStackTrace();
                         }
-                        YGOUtil.show(context.getString(R.string.done));
-                        onDeckMenuListener.onDeckMove(deckAdp.getSelectList(), toType);
-                        clearDeckSelect();
+                        deckList.remove(deckFile);
+                    }
+                    YGOUtil.show(context.getString(R.string.done));
+                    onDeckMenuListener.onDeckMove(deckAdp.getSelectList(), toType);
+                    clearDeckSelect();
                 });
             });
 
             ll_copy.setOnClickListener(v -> {
                 List<DeckType> otherType = getOtherTypeList();
 
-                du.dialogl(context.getString(please_select_target_category),
-                        getStringType(otherType),
-                        R.drawable.radius).setOnItemClickListener((parent, view, position, id) -> {
-                            du.dis();
-                            DeckType toType = otherType.get(position);
-                            IOUtils.createFolder(new File(toType.getPath()));
-                            List<DeckFile> deckFileList = deckAdp.getSelectList();
-                            for (DeckFile deckFile : deckFileList) {
-                                try {
-                                FileUtils.copyFile(deckFile.getPath(), new File(toType.getPath(), deckFile.getFileName()).getPath());
-                                } catch (IOException e) {
-                                    e.printStackTrace();
-                                }
-                            }
-                            YGOUtil.show(context.getString(R.string.done));
-                            onDeckMenuListener.onDeckCopy(deckAdp.getSelectList(), toType);
-                            clearDeckSelect();
-                        });
+                dialogl(context, context.getString(please_select_target_category),
+                        getStringType(otherType)).setOnItemClickListener((parent, view, position, id) -> {
+                    du.dis();
+                    DeckType toType = otherType.get(position);
+                    IOUtils.createFolder(new File(toType.getPath()));
+                    List<DeckFile> deckFileList = deckAdp.getSelectList();
+                    for (DeckFile deckFile : deckFileList) {
+                        try {
+                            FileUtils.copyFile(deckFile.getPath(), new File(toType.getPath(), deckFile.getFileName()).getPath());
+                        } catch (IOException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                    YGOUtil.show(context.getString(R.string.done));
+                    onDeckMenuListener.onDeckCopy(deckAdp.getSelectList(), toType);
+                    clearDeckSelect();
+                });
             });
 
             ll_del.setOnClickListener(new View.OnClickListener() {
@@ -418,8 +445,8 @@ public class YGODialogUtil {
             hideAllDeckUtil();
         }
 
-        public void show(){
-            if(ygoDialog != null && !ygoDialog.isShowing()) {
+        public void show() {
+            if (ygoDialog != null && !ygoDialog.isShowing()) {
                 ygoDialog.show();
             }
         }
@@ -431,27 +458,4 @@ public class YGODialogUtil {
 
     }
 
-
-    public static void dialogDeckSelect(Context context, String selectDeckPath, OnDeckMenuListener onDeckMenuListener) {
-        ViewHolder viewHolder = new ViewHolder(context, selectDeckPath, onDeckMenuListener);
-        viewHolder.show();
-    }
-
-    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);
-    }
-
 }