卡组广场并入卡组管理

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

@@ -20,14 +20,11 @@ import java.nio.charset.StandardCharsets;
 import cn.garymb.ygomobile.Constants;
 import cn.garymb.ygomobile.bean.Deck;
 import cn.garymb.ygomobile.bean.DeckInfo;
-import cn.garymb.ygomobile.deck_square.DeckSquareListAdapter;
 import cn.garymb.ygomobile.ui.cards.deck.DeckItemType;
 import cn.garymb.ygomobile.ui.cards.deck.DeckUtils;
 import cn.garymb.ygomobile.utils.IOUtils;
-import cn.garymb.ygomobile.utils.LogUtil;
 import cn.hutool.core.util.ArrayUtil;
 import ocgcore.data.Card;
-import ocgcore.data.LimitList;
 
 public class DeckLoader {
     private static Boolean isChanged;

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

 package cn.garymb.ygomobile.ui.adapters;
 
-import static cn.garymb.ygomobile.deck_square.DeckSquareFileUtil.convertToGMTDate;
+import static cn.garymb.ygomobile.ui.cards.deck_square.DeckSquareFileUtil.convertToGMTDate;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -21,7 +21,7 @@ import cn.garymb.ygomobile.bean.Deck;
 import cn.garymb.ygomobile.bean.DeckInfo;
 import cn.garymb.ygomobile.bean.TextSelect;
 import cn.garymb.ygomobile.bean.events.DeckFile;
-import cn.garymb.ygomobile.deck_square.DeckSquareListAdapter;
+import cn.garymb.ygomobile.ui.cards.deck_square.DeckSquareListAdapter;
 import cn.garymb.ygomobile.lite.R;
 import cn.garymb.ygomobile.loader.CardLoader;
 import cn.garymb.ygomobile.loader.DeckLoader;

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

@@ -4,7 +4,7 @@ import static android.content.Context.CLIPBOARD_SERVICE;
 import static cn.garymb.ygomobile.Constants.ORI_DECK;
 import static cn.garymb.ygomobile.Constants.YDK_FILE_EX;
 import static cn.garymb.ygomobile.core.IrrlichtBridge.ACTION_SHARE_FILE;
-import static cn.garymb.ygomobile.deck_square.DeckSquareFileUtil.convertToUnixTimestamp;
+import static cn.garymb.ygomobile.ui.cards.deck_square.DeckSquareFileUtil.convertToUnixTimestamp;
 
 import android.content.ClipData;
 import android.content.ClipboardManager;
@@ -77,14 +77,14 @@ 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.deck_square.DeckManageDialog;
-import cn.garymb.ygomobile.deck_square.DeckSquareApiUtil;
-import cn.garymb.ygomobile.deck_square.DeckSquareFileUtil;
-import cn.garymb.ygomobile.deck_square.api_response.BasicResponse;
-import cn.garymb.ygomobile.deck_square.api_response.DownloadDeckResponse;
-import cn.garymb.ygomobile.deck_square.api_response.LoginToken;
-import cn.garymb.ygomobile.deck_square.api_response.MyOnlineDeckDetail;
-import cn.garymb.ygomobile.deck_square.api_response.PushDeckResponse;
+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;

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

-package cn.garymb.ygomobile.deck_square;
+package cn.garymb.ygomobile.ui.cards.deck_square;
 
 
-import static cn.garymb.ygomobile.Constants.TAG;
-
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -19,8 +17,6 @@ import com.google.android.material.tabs.TabLayout;
 import com.google.android.material.tabs.TabLayoutMediator;
 
 import cn.garymb.ygomobile.lite.R;
-import cn.garymb.ygomobile.ui.plus.VUiKit;
-import cn.garymb.ygomobile.utils.LogUtil;
 import cn.garymb.ygomobile.utils.YGODeckDialogUtil;
 
 public class DeckManageDialog extends DialogFragment implements YGODeckDialogUtil.OnDeckDialogListener {

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

-package cn.garymb.ygomobile.deck_square;
+package cn.garymb.ygomobile.ui.cards.deck_square;
 
 import android.content.Context;
 import android.content.DialogInterface;
@@ -34,9 +34,9 @@ import cn.garymb.ygomobile.AppsSettings;
 import cn.garymb.ygomobile.Constants;
 import cn.garymb.ygomobile.bean.DeckType;
 import cn.garymb.ygomobile.bean.events.DeckFile;
-import cn.garymb.ygomobile.deck_square.api_response.LoginToken;
-import cn.garymb.ygomobile.deck_square.api_response.MyOnlineDeckDetail;
-import cn.garymb.ygomobile.deck_square.api_response.PushDeckResponse;
+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.lite.databinding.FragmentDeckSelectBinding;
 import cn.garymb.ygomobile.ui.adapters.DeckListAdapter;

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

-package cn.garymb.ygomobile.deck_square;
-
-import static cn.garymb.ygomobile.deck_square.DeckSquareFileUtil.convertToUnixTimestamp;
+package cn.garymb.ygomobile.ui.cards.deck_square;
 
 import android.widget.Toast;
 
@@ -8,7 +6,6 @@ import com.google.gson.Gson;
 
 import java.io.File;
 import java.io.IOException;
-import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -18,23 +15,23 @@ import cn.garymb.ygomobile.AppsSettings;
 import cn.garymb.ygomobile.Constants;
 import cn.garymb.ygomobile.bean.DeckType;
 import cn.garymb.ygomobile.bean.events.DeckFile;
-import cn.garymb.ygomobile.deck_square.api_response.BasicResponse;
-import cn.garymb.ygomobile.deck_square.api_response.DeckIdResponse;
-import cn.garymb.ygomobile.deck_square.api_response.DeckMultiIdResponse;
-import cn.garymb.ygomobile.deck_square.api_response.DownloadDeckResponse;
-import cn.garymb.ygomobile.deck_square.api_response.GetSquareDeckCondition;
-import cn.garymb.ygomobile.deck_square.api_response.LoginRequest;
-import cn.garymb.ygomobile.deck_square.api_response.LoginResponse;
-import cn.garymb.ygomobile.deck_square.api_response.LoginToken;
-import cn.garymb.ygomobile.deck_square.api_response.MyDeckResponse;
-import cn.garymb.ygomobile.deck_square.api_response.MyOnlineDeckDetail;
-import cn.garymb.ygomobile.deck_square.api_response.PushDeckPublicState;
-import cn.garymb.ygomobile.deck_square.api_response.PushDeckResponse;
-import cn.garymb.ygomobile.deck_square.api_response.PushMultiDeck;
-import cn.garymb.ygomobile.deck_square.api_response.PushSingleDeck;
-import cn.garymb.ygomobile.deck_square.api_response.SquareDeckResponse;
-import cn.garymb.ygomobile.deck_square.bo.MyDeckItem;
-import cn.garymb.ygomobile.deck_square.bo.SyncMutliDeckResult;
+import cn.garymb.ygomobile.ui.cards.deck_square.api_response.BasicResponse;
+import cn.garymb.ygomobile.ui.cards.deck_square.api_response.DeckIdResponse;
+import cn.garymb.ygomobile.ui.cards.deck_square.api_response.DeckMultiIdResponse;
+import cn.garymb.ygomobile.ui.cards.deck_square.api_response.DownloadDeckResponse;
+import cn.garymb.ygomobile.ui.cards.deck_square.api_response.GetSquareDeckCondition;
+import cn.garymb.ygomobile.ui.cards.deck_square.api_response.LoginRequest;
+import cn.garymb.ygomobile.ui.cards.deck_square.api_response.LoginResponse;
+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.PushDeckPublicState;
+import cn.garymb.ygomobile.ui.cards.deck_square.api_response.PushDeckResponse;
+import cn.garymb.ygomobile.ui.cards.deck_square.api_response.PushMultiDeck;
+import cn.garymb.ygomobile.ui.cards.deck_square.api_response.PushSingleDeck;
+import cn.garymb.ygomobile.ui.cards.deck_square.api_response.SquareDeckResponse;
+import cn.garymb.ygomobile.ui.cards.deck_square.bo.MyDeckItem;
+import cn.garymb.ygomobile.ui.cards.deck_square.bo.SyncMutliDeckResult;
 import cn.garymb.ygomobile.utils.DeckUtil;
 import cn.garymb.ygomobile.utils.LogUtil;
 import cn.garymb.ygomobile.utils.OkhttpUtil;
@@ -580,7 +577,7 @@ public class DeckSquareApiUtil {
                     // 比对更新时间
                     long localUpdateDate = localDeck.getUpdateTimestamp();
 
-                    long onlineUpdateDate = convertToUnixTimestamp(onlineDeck.getDeckUpdateDate());//todo 这里应该把2025-05-19T06:11:17转成毫秒，onlineDeck.getDeckUpdateDate();
+                    long onlineUpdateDate = DeckSquareFileUtil.convertToUnixTimestamp(onlineDeck.getDeckUpdateDate());//todo 这里应该把2025-05-19T06:11:17转成毫秒，onlineDeck.getDeckUpdateDate();
 
                     if (onlineUpdateDate > localUpdateDate) {
                         // 在线卡组更新时间更晚，下载在线卡组覆盖本地卡组
@@ -628,7 +625,7 @@ public class DeckSquareApiUtil {
 
                 autoSyncResult.newDownload.add(onlineDeck);
                 LogUtil.w(TAG, "sync-download new deck: " + onlineDeck.getDeckName());
-                SyncMutliDeckResult.DownloadResult downloadResult = downloadMissingDeckToLocal(onlineDeck, convertToUnixTimestamp(onlineDeck.getDeckUpdateDate()));
+                SyncMutliDeckResult.DownloadResult downloadResult = downloadMissingDeckToLocal(onlineDeck, DeckSquareFileUtil.convertToUnixTimestamp(onlineDeck.getDeckUpdateDate()));
                 autoSyncResult.downloadResponse.add(downloadResult);
             }
         }
@@ -698,8 +695,7 @@ public class DeckSquareApiUtil {
         }
     }
 
-    private static boolean downloadOnlineDeck(MyOnlineDeckDetail onlineDeck, String
-            fileFullPath, Long onlineUpdateDate) {
+    private static boolean downloadOnlineDeck(MyOnlineDeckDetail onlineDeck, String fileFullPath, Long onlineUpdateDate) {
         try {
             // 根据卡组ID查询在线卡组详情
             DownloadDeckResponse deckResponse = DeckSquareApiUtil.getDeckById(onlineDeck.getDeckId());

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

-package cn.garymb.ygomobile.deck_square;
+package cn.garymb.ygomobile.ui.cards.deck_square;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -9,9 +9,6 @@ import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.time.Instant;
-import java.time.ZoneOffset;
-import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -20,7 +17,7 @@ import java.util.TimeZone;
 
 import cn.garymb.ygomobile.AppsSettings;
 import cn.garymb.ygomobile.Constants;
-import cn.garymb.ygomobile.deck_square.bo.MyDeckItem;
+import cn.garymb.ygomobile.ui.cards.deck_square.bo.MyDeckItem;
 import cn.garymb.ygomobile.utils.IOUtils;
 import cn.garymb.ygomobile.utils.LogUtil;
 import ocgcore.CardManager;

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

-package cn.garymb.ygomobile.deck_square;
+package cn.garymb.ygomobile.ui.cards.deck_square;
 
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextWatcher;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -16,7 +15,7 @@ import androidx.recyclerview.widget.GridLayoutManager;
 
 import cn.garymb.ygomobile.bean.DeckType;
 import cn.garymb.ygomobile.bean.events.DeckFile;
-import cn.garymb.ygomobile.deck_square.api_response.OnlineDeckDetail;
+import cn.garymb.ygomobile.ui.cards.deck_square.api_response.OnlineDeckDetail;
 import cn.garymb.ygomobile.lite.R;
 import cn.garymb.ygomobile.lite.databinding.FragmentDeckSquareBinding;
 import cn.garymb.ygomobile.utils.YGODeckDialogUtil;

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

-package cn.garymb.ygomobile.deck_square;
+package cn.garymb.ygomobile.ui.cards.deck_square;
 
 
 import android.util.Log;
@@ -7,11 +7,9 @@ import android.widget.ImageView;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.viewholder.BaseViewHolder;
 
-import java.util.List;
-
-import cn.garymb.ygomobile.deck_square.api_response.GetSquareDeckCondition;
-import cn.garymb.ygomobile.deck_square.api_response.OnlineDeckDetail;
-import cn.garymb.ygomobile.deck_square.api_response.SquareDeckResponse;
+import cn.garymb.ygomobile.ui.cards.deck_square.api_response.GetSquareDeckCondition;
+import cn.garymb.ygomobile.ui.cards.deck_square.api_response.OnlineDeckDetail;
+import cn.garymb.ygomobile.ui.cards.deck_square.api_response.SquareDeckResponse;
 import cn.garymb.ygomobile.lite.R;
 import cn.garymb.ygomobile.loader.ImageLoader;
 import cn.garymb.ygomobile.ui.plus.DialogPlus;

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

-package cn.garymb.ygomobile.deck_square;
+package cn.garymb.ygomobile.ui.cards.deck_square;
 
 import android.os.Bundle;
 import android.text.Editable;
@@ -14,7 +14,7 @@ import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.GridLayoutManager;
 
-import cn.garymb.ygomobile.deck_square.api_response.LoginResponse;
+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;

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

-package cn.garymb.ygomobile.deck_square;
+package cn.garymb.ygomobile.ui.cards.deck_square;
 
 import android.util.Log;
 import android.widget.ImageView;
@@ -11,12 +11,12 @@ import java.util.List;
 
 import cn.garymb.ygomobile.bean.DeckType;
 import cn.garymb.ygomobile.bean.events.DeckFile;
-import cn.garymb.ygomobile.deck_square.api_response.BasicResponse;
-import cn.garymb.ygomobile.deck_square.api_response.LoginToken;
-import cn.garymb.ygomobile.deck_square.api_response.MyDeckResponse;
-import cn.garymb.ygomobile.deck_square.api_response.MyOnlineDeckDetail;
-import cn.garymb.ygomobile.deck_square.api_response.PushDeckResponse;
-import cn.garymb.ygomobile.deck_square.bo.MyDeckItem;
+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.bo.MyDeckItem;
 import cn.garymb.ygomobile.lite.R;
 import cn.garymb.ygomobile.loader.ImageLoader;
 import cn.garymb.ygomobile.ui.plus.DialogPlus;

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

-package cn.garymb.ygomobile.deck_square.api_response;
+package cn.garymb.ygomobile.ui.cards.deck_square.api_response;
 
 public class BasicResponse {
 

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

-package cn.garymb.ygomobile.deck_square.api_response;
+package cn.garymb.ygomobile.ui.cards.deck_square.api_response;
 
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;

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

-package cn.garymb.ygomobile.deck_square.api_response;
+package cn.garymb.ygomobile.ui.cards.deck_square.api_response;
 
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;

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

-package cn.garymb.ygomobile.deck_square.api_response;
+package cn.garymb.ygomobile.ui.cards.deck_square.api_response;
 
 public class DeleteCardJson {
 

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

-package cn.garymb.ygomobile.deck_square.api_response;
+package cn.garymb.ygomobile.ui.cards.deck_square.api_response;
 
 public class DownloadDeckResponse {
     private Integer code;

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

-package cn.garymb.ygomobile.deck_square.api_response;
+package cn.garymb.ygomobile.ui.cards.deck_square.api_response;
 
 public class GetSquareDeckCondition {
     Integer page;

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

-package cn.garymb.ygomobile.deck_square.api_response;
+package cn.garymb.ygomobile.ui.cards.deck_square.api_response;
 
 public class LoginRequest {
     public String account;

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

-package cn.garymb.ygomobile.deck_square.api_response;
+package cn.garymb.ygomobile.ui.cards.deck_square.api_response;
 
 public class LoginResponse {
     public String token;

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

-package cn.garymb.ygomobile.deck_square.api_response;
+package cn.garymb.ygomobile.ui.cards.deck_square.api_response;
 
 public class LoginToken {
     Integer userId;

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

-package cn.garymb.ygomobile.deck_square.api_response;
+package cn.garymb.ygomobile.ui.cards.deck_square.api_response;
 
 import java.util.List;
 

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

-package cn.garymb.ygomobile.deck_square.api_response;
+package cn.garymb.ygomobile.ui.cards.deck_square.api_response;
 
 import android.os.Parcel;
 import android.os.Parcelable;

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

-package cn.garymb.ygomobile.deck_square.api_response;
+package cn.garymb.ygomobile.ui.cards.deck_square.api_response;
 
 import android.os.Parcel;
 import android.os.Parcelable;

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

-package cn.garymb.ygomobile.deck_square.api_response;
+package cn.garymb.ygomobile.ui.cards.deck_square.api_response;
 
 public class PushDeckPublicState {
 

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

-package cn.garymb.ygomobile.deck_square.api_response;
+package cn.garymb.ygomobile.ui.cards.deck_square.api_response;
 
 //将卡组上传后，返回的响应
 //对应接口http://rarnu.xyz:38383/api/mdpro3/sync/single

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

-package cn.garymb.ygomobile.deck_square.api_response;
+package cn.garymb.ygomobile.ui.cards.deck_square.api_response;
 
 import java.util.List;
 
-import cn.garymb.ygomobile.deck_square.api_response.PushSingleDeck.DeckData;
-
 /*卡组同步请求类*/
 public class PushMultiDeck {
     private String deckContributor;

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

-package cn.garymb.ygomobile.deck_square.api_response;
+package cn.garymb.ygomobile.ui.cards.deck_square.api_response;
 
 public class PushSingleDeck {
 

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

-package cn.garymb.ygomobile.deck_square.api_response;
+package cn.garymb.ygomobile.ui.cards.deck_square.api_response;
 
 import java.util.List;
 

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

-package cn.garymb.ygomobile.deck_square.bo;
+package cn.garymb.ygomobile.ui.cards.deck_square.bo;
 
 import android.os.Parcel;
 import android.os.Parcelable;

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

-package cn.garymb.ygomobile.deck_square.bo;
+package cn.garymb.ygomobile.ui.cards.deck_square.bo;
 
 public class MyDeckItem {
     //0代表未推到服务器，3代表包含deckId，1代表服务器存在可下载到本地，2代表已同步

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

-package cn.garymb.ygomobile.deck_square.bo;
-
-import org.minidns.record.A;
+package cn.garymb.ygomobile.ui.cards.deck_square.bo;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import cn.garymb.ygomobile.deck_square.api_response.MyOnlineDeckDetail;
-import cn.garymb.ygomobile.deck_square.api_response.PushDeckResponse;
+import cn.garymb.ygomobile.ui.cards.deck_square.api_response.MyOnlineDeckDetail;
+import cn.garymb.ygomobile.ui.cards.deck_square.api_response.PushDeckResponse;
 
 public class SyncMutliDeckResult {
     boolean flag = false;

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

-package cn.garymb.ygomobile.deck_square.bo;
+package cn.garymb.ygomobile.ui.cards.deck_square.bo;
 
 import java.util.List;