修复卡组向云推送时，解析response的bug

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

@@ -77,14 +77,6 @@ import cn.garymb.ygomobile.bean.DeckType;
 import cn.garymb.ygomobile.bean.events.CardInfoEvent;
 import cn.garymb.ygomobile.bean.events.DeckFile;
 import cn.garymb.ygomobile.core.IrrlichtBridge;
-import cn.garymb.ygomobile.ui.cards.deck_square.DeckManageDialog;
-import cn.garymb.ygomobile.ui.cards.deck_square.DeckSquareApiUtil;
-import cn.garymb.ygomobile.ui.cards.deck_square.DeckSquareFileUtil;
-import cn.garymb.ygomobile.ui.cards.deck_square.api_response.BasicResponse;
-import cn.garymb.ygomobile.ui.cards.deck_square.api_response.DownloadDeckResponse;
-import cn.garymb.ygomobile.ui.cards.deck_square.api_response.LoginToken;
-import cn.garymb.ygomobile.ui.cards.deck_square.api_response.MyOnlineDeckDetail;
-import cn.garymb.ygomobile.ui.cards.deck_square.api_response.PushDeckResponse;
 import cn.garymb.ygomobile.lite.R;
 import cn.garymb.ygomobile.loader.CardLoader;
 import cn.garymb.ygomobile.loader.CardSearchInfo;
@@ -98,6 +90,14 @@ import cn.garymb.ygomobile.ui.cards.deck.DeckItem;
 import cn.garymb.ygomobile.ui.cards.deck.DeckItemTouchHelper;
 import cn.garymb.ygomobile.ui.cards.deck.DeckItemType;
 import cn.garymb.ygomobile.ui.cards.deck.DeckLayoutManager;
+import cn.garymb.ygomobile.ui.cards.deck_square.DeckManageDialog;
+import cn.garymb.ygomobile.ui.cards.deck_square.DeckSquareApiUtil;
+import cn.garymb.ygomobile.ui.cards.deck_square.DeckSquareFileUtil;
+import cn.garymb.ygomobile.ui.cards.deck_square.api_response.BasicResponse;
+import cn.garymb.ygomobile.ui.cards.deck_square.api_response.DownloadDeckResponse;
+import cn.garymb.ygomobile.ui.cards.deck_square.api_response.LoginToken;
+import cn.garymb.ygomobile.ui.cards.deck_square.api_response.MyOnlineDeckDetail;
+import cn.garymb.ygomobile.ui.cards.deck_square.api_response.PushSingleDeckResponse;
 import cn.garymb.ygomobile.ui.home.HomeActivity;
 import cn.garymb.ygomobile.ui.mycard.mcchat.util.ImageUtil;
 import cn.garymb.ygomobile.ui.plus.AOnGestureListener;
@@ -127,7 +127,7 @@ import ocgcore.enums.LimitType;
  * RecyclerViewItemListener.OnItemListener中
  */
 public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewItemListener.OnItemListener, OnItemDragListener, YGODeckDialogUtil.OnDeckMenuListener, CardLoader.CallBack, CardSearcher.CallBack {
-    private static final String TAG = "DeckManagerFragment";
+    private static final String TAG = "seesee";
     protected DrawerLayout mDrawerLayout;
     protected RecyclerView mListView;
     protected CardLoader mCardLoader;
@@ -251,9 +251,12 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
         mContext = (BaseActivity) getActivity();
         /** 自动同步 */
         if (SharedPreferenceUtil.getServerToken() != null) {
-            VUiKit.defer().when(DeckSquareApiUtil::synchronizeDecks).fail((e) -> {
+            VUiKit.defer().when(() -> {
+                return DeckSquareApiUtil.synchronizeDecksV2();
+            }).fail((e) -> {
                 LogUtil.i(TAG, "sync deck fail" + e.getMessage());
             }).done((result) -> {
+                LogUtil.i(TAG, "sync deck success");
             });
         }
     }
@@ -936,7 +939,7 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
                                         if (onlineDeck.getDeckName().equals(mDeckAdapater.getYdkFile().getName())) {
                                             // 删除在线卡组（异步处理）
                                             VUiKit.defer().when(() -> {
-                                                PushDeckResponse deckResponse = DeckSquareApiUtil.deleteDeck(onlineDeck.getDeckId(), loginToken);
+                                                PushSingleDeckResponse deckResponse = DeckSquareApiUtil.deleteDeck(onlineDeck.getDeckId(), loginToken);
                                                 return deckResponse;
                                             }).fail((deleteError) -> {
                                                 LogUtil.e(TAG, "Delete Online Deck failed: " + deleteError);

mobile/src/main/java/cn/garymb/ygomobile/ui/cards/deck_square/DeckSelectFragment.java

 package cn.garymb.ygomobile.ui.cards.deck_square;
 
-import static cn.garymb.ygomobile.Constants.YDK_FILE_EX;
-
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Build;
@@ -11,7 +9,6 @@ import android.text.InputType;
 import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.view.Gravity;
-import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -40,7 +37,7 @@ import cn.garymb.ygomobile.bean.DeckType;
 import cn.garymb.ygomobile.bean.events.DeckFile;
 import cn.garymb.ygomobile.ui.cards.deck_square.api_response.LoginToken;
 import cn.garymb.ygomobile.ui.cards.deck_square.api_response.MyOnlineDeckDetail;
-import cn.garymb.ygomobile.ui.cards.deck_square.api_response.PushDeckResponse;
+import cn.garymb.ygomobile.ui.cards.deck_square.api_response.PushSingleDeckResponse;
 import cn.garymb.ygomobile.lite.R;
 import cn.garymb.ygomobile.lite.databinding.FragmentDeckSelectBinding;
 import cn.garymb.ygomobile.ui.adapters.DeckListAdapter;
@@ -389,7 +386,7 @@ public class DeckSelectFragment extends Fragment {
                                             if (onlineDeck.getDeckName().equals(deckFile.getName())) {
                                                 // 删除在线卡组（异步处理）
                                                 VUiKit.defer().when(() -> {
-                                                    PushDeckResponse deckResponse = DeckSquareApiUtil.deleteDeck(onlineDeck.getDeckId(), loginToken);
+                                                    PushSingleDeckResponse deckResponse = DeckSquareApiUtil.deleteDeck(onlineDeck.getDeckId(), loginToken);
                                                     return deckResponse;
                                                 }).fail((deleteError) -> {
                                                     LogUtil.e(TAG, "Delete Online Deck failed: " + deleteError);

mobile/src/main/java/cn/garymb/ygomobile/ui/cards/deck_square/DeckSquareMyDeckFragment.java

@@ -14,10 +14,10 @@ import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.GridLayoutManager;
 
-import cn.garymb.ygomobile.ui.cards.deck_square.api_response.LoginResponse;
 import cn.garymb.ygomobile.lite.R;
 import cn.garymb.ygomobile.lite.databinding.FragmentDeckSquareMyDeckBinding;
 import cn.garymb.ygomobile.ui.activities.WebActivity;
+import cn.garymb.ygomobile.ui.cards.deck_square.api_response.LoginResponse;
 import cn.garymb.ygomobile.ui.mycard.MyCard;
 import cn.garymb.ygomobile.ui.mycard.bean.McUser;
 import cn.garymb.ygomobile.ui.mycard.mcchat.ChatMessage;
@@ -34,7 +34,7 @@ import cn.garymb.ygomobile.utils.glide.GlideCompat;
 //之后读取平台上的卡组，与本地卡组列表做比较。
 
 public class DeckSquareMyDeckFragment extends Fragment {
-    private static final String TAG = DeckSquareListAdapter.class.getSimpleName();
+    private static final String TAG = "seesee";
     private FragmentDeckSquareMyDeckBinding binding;
     private MyDeckListAdapter deckListAdapter;
     private String keyWord;
@@ -197,7 +197,7 @@ public class DeckSquareMyDeckFragment extends Fragment {
         /** 自动同步 */
         VUiKit.defer().when(() -> {
 
-            return DeckSquareApiUtil.synchronizeDecks();
+            return DeckSquareApiUtil.synchronizeDecksV2();
         }).fail((e) -> {
 
             YGOUtil.showTextToast("Sync decks fail", Toast.LENGTH_LONG);

mobile/src/main/java/cn/garymb/ygomobile/ui/cards/deck_square/MyDeckListAdapter.java

@@ -15,7 +15,7 @@ import cn.garymb.ygomobile.ui.cards.deck_square.api_response.BasicResponse;
 import cn.garymb.ygomobile.ui.cards.deck_square.api_response.LoginToken;
 import cn.garymb.ygomobile.ui.cards.deck_square.api_response.MyDeckResponse;
 import cn.garymb.ygomobile.ui.cards.deck_square.api_response.MyOnlineDeckDetail;
-import cn.garymb.ygomobile.ui.cards.deck_square.api_response.PushDeckResponse;
+import cn.garymb.ygomobile.ui.cards.deck_square.api_response.PushSingleDeckResponse;
 import cn.garymb.ygomobile.ui.cards.deck_square.bo.MyDeckItem;
 import cn.garymb.ygomobile.lite.R;
 import cn.garymb.ygomobile.loader.ImageLoader;
@@ -132,7 +132,7 @@ public class MyDeckListAdapter extends BaseQuickAdapter<MyDeckItem, BaseViewHold
 
             }
             VUiKit.defer().when(() -> {
-                PushDeckResponse result = DeckSquareApiUtil.deleteDeck(item.getDeckId(), loginToken);
+                PushSingleDeckResponse result = DeckSquareApiUtil.deleteDeck(item.getDeckId(), loginToken);
                 return result;
             }).fail(e -> {
                 LogUtil.i(TAG, "square deck detail fail" + e.getMessage());

mobile/src/main/java/cn/garymb/ygomobile/ui/cards/deck_square/api_response/PushMultiResponse.java

+package cn.garymb.ygomobile.ui.cards.deck_square.api_response;
+
+public class PushMultiResponse {
+
+
+    private Integer code;
+    private String message;
+    private Integer data;
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public Integer getData() {
+        return data;
+    }
+
+    public void setData(Integer data) {
+        this.data = data;
+    }
+}

mobile/src/main/java/cn/garymb/ygomobile/ui/cards/deck_square/api_response/PushDeckResponse.java → mobile/src/main/java/cn/garymb/ygomobile/ui/cards/deck_square/api_response/PushSingleDeckResponse.java

@@ -2,7 +2,7 @@ package cn.garymb.ygomobile.ui.cards.deck_square.api_response;
 
 //将卡组上传后，返回的响应
 //对应接口http://rarnu.xyz:38383/api/mdpro3/sync/single
-public class PushDeckResponse {
+public class PushSingleDeckResponse {
 
 
     private Integer code;

mobile/src/main/java/cn/garymb/ygomobile/ui/cards/deck_square/bo/SyncMutliDeckResult.java

@@ -4,12 +4,13 @@ import java.util.ArrayList;
 import java.util.List;
 
 import cn.garymb.ygomobile.ui.cards.deck_square.api_response.MyOnlineDeckDetail;
-import cn.garymb.ygomobile.ui.cards.deck_square.api_response.PushDeckResponse;
+import cn.garymb.ygomobile.ui.cards.deck_square.api_response.PushMultiResponse;
+import cn.garymb.ygomobile.ui.cards.deck_square.api_response.PushSingleDeckResponse;
 
 public class SyncMutliDeckResult {
     boolean flag = false;
     String info = null;
-    public PushDeckResponse pushResponse;
+    public PushMultiResponse pushResponse;
 
     public List<MyDeckItem> syncUpload;//用于记录已推送的卡组
     public List<MyDeckItem> newUpload;//用于记录第一次推送到云的卡组