Merge pull request #191 from zhuhongbozhuhongbo/master

开发部分卡组自动同步功能

mobile/src/main/java/cn/garymb/ygomobile/deck_square/DeckSquareApiUtil.java

@@ -23,11 +23,11 @@ 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.PushCardJson;
 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.api_response.SyncDeckReq;
 import cn.garymb.ygomobile.deck_square.api_response.SyncDecksResponse;
 import cn.garymb.ygomobile.ui.plus.VUiKit;
 import cn.garymb.ygomobile.utils.LogUtil;
@@ -73,6 +73,13 @@ public class DeckSquareApiUtil {
     }
 
 
+    /**
+     * 根据条件，分页查询卡组的列表（不查询卡组的内容，只查询卡组名、卡组id等概括性信息）
+     *
+     * @param condition
+     * @return
+     * @throws IOException
+     */
     public static SquareDeckResponse getSquareDecks(GetSquareDeckCondition condition) throws IOException {
 
         SquareDeckResponse result = null;
@@ -133,7 +140,7 @@ public class DeckSquareApiUtil {
 
     /**
      * 阻塞方法
-     * 根据卡组ID查询一个卡组，不需要传入token，可以查询已登录用户或其它未登录用户的卡组
+     * 根据卡组ID查询一个卡组的内容，不需要传入token，可以查询已登录用户或其它未登录用户的卡组
      *
      * @param deckId
      * @return
@@ -161,8 +168,8 @@ public class DeckSquareApiUtil {
 
 
     /**
-     * 阻塞方法，用于推送新卡组。首先从服务器请求一个新的卡组id，之后将卡组上传到服务器
-     * 先同步推送，之后异步推送。首先调用服务端api获取卡组id，之后将卡组id设置到ydk中，之后调用服务器api将卡组上传
+     * 阻塞方法，推送新卡组的内容时使用。首先从服务器请求一个新的卡组id，之后将卡组上传到服务器
+     * 首先调用服务端api获取卡组id，之后将卡组id设置到ydk中，之后调用服务器api将卡组上传
      *
      * @param deckFile
      * @param loginToken
@@ -203,7 +210,7 @@ public class DeckSquareApiUtil {
     }
 
     /**
-     * 将对应于deckId、deckName的卡组内容json推送到服务器。
+     * 阻塞方法，将对应于deckId、deckName的卡组内容json推送到服务器。
      * 如果在服务器上不存在deckId、deckName对应的记录，则创建新卡组
      * 如果在服务器存在deckId相同的记录，则更新卡组，deckName会覆盖服务器上的卡组名
      * 如果在服务器存在deckName相同、deckId不同的记录，则更新失败
@@ -225,19 +232,19 @@ public class DeckSquareApiUtil {
 
 
         Gson gson = new Gson();
-        PushCardJson pushCardJson = new PushCardJson();
-        pushCardJson.setDeckContributor(loginToken.getUserId().toString());
-        pushCardJson.setUserId(loginToken.getUserId());
-        PushCardJson.DeckData deckData = new PushCardJson.DeckData();
+        PushSingleDeck pushSingleDeck = new PushSingleDeck();
+        pushSingleDeck.setDeckContributor(loginToken.getUserId().toString());
+        pushSingleDeck.setUserId(loginToken.getUserId());
+        PushSingleDeck.DeckData deckData = new PushSingleDeck.DeckData();
 
         deckData.setDeckId(deckId);
         deckData.setDeckName(deckfile.getName());
         deckData.setDeckCoverCard1(deckfile.getFirstCode());
         deckData.setDelete(false);
         deckData.setDeckYdk(deckContent);
-        pushCardJson.setDeck(deckData);
+        pushSingleDeck.setDeck(deckData);
 
-        String json = gson.toJson(pushCardJson);
+        String json = gson.toJson(pushSingleDeck);
         Response response = OkhttpUtil.postJson(url, json, headers, 1000);
         String responseBodyString = response.body().string();
 
@@ -246,20 +253,27 @@ public class DeckSquareApiUtil {
 
         return result;
     }
- 
-    public static SyncDecksResponse syncDecks(List<PushCardJson.DeckData> deckDataList, LoginToken loginToken) throws IOException {
+
+
+    /**
+     * @param deckDataList
+     * @param loginToken
+     * @return
+     * @throws IOException
+     */
+    public static SyncDecksResponse syncDecks(List<PushMultiDeck.DeckData> deckDataList, LoginToken loginToken) throws IOException {
         SyncDecksResponse result = null;
         String url = "http://rarnu.xyz:38383/api/mdpro3/sync/multi";
         Map<String, String> headers = new HashMap<>();
         headers.put("ReqSource", "MDPro3");
         headers.put("token", loginToken.getServerToken());
         Gson gson = new Gson();
-        SyncDeckReq syncDeckReq = new SyncDeckReq();
-        syncDeckReq.setDeckContributor(loginToken.getUserId().toString());
-        syncDeckReq.setUserId(loginToken.getUserId());
-        syncDeckReq.setDeckDataList(deckDataList);
+        PushMultiDeck pushMultiDeck = new PushMultiDeck();
+        pushMultiDeck.setDeckContributor(loginToken.getUserId().toString());
+        pushMultiDeck.setUserId(loginToken.getUserId());
+        pushMultiDeck.setDecks(deckDataList);
 
-        String json = gson.toJson(syncDeckReq);
+        String json = gson.toJson(pushMultiDeck);
         Response response = OkhttpUtil.postJson(url, json, headers, 1000);
         String responseBodyString = response.body().string();
 
@@ -380,16 +394,16 @@ public class DeckSquareApiUtil {
 
         Gson gson = new Gson();
 
-        PushCardJson pushCardJson = new PushCardJson();
-        PushCardJson.DeckData deckData = new PushCardJson.DeckData();
+        PushSingleDeck pushSingleDeck = new PushSingleDeck();
+        PushSingleDeck.DeckData deckData = new PushSingleDeck.DeckData();
 
         deckData.setDeckId(deckId);
         deckData.setDelete(true);
-        pushCardJson.setDeck(deckData);
-        pushCardJson.setUserId(loginToken.getUserId());
+        pushSingleDeck.setDeck(deckData);
+        pushSingleDeck.setUserId(loginToken.getUserId());
 
 
-        String json = gson.toJson(pushCardJson);
+        String json = gson.toJson(pushSingleDeck);
 
         Response response = OkhttpUtil.postJson(url, json, headers, 1000);
         String responseBodyString = response.body().string();
@@ -410,6 +424,67 @@ public class DeckSquareApiUtil {
         String url = "http://rarnu.xyz:38383/api/mdpro3/deck/" + deckId;
     }
 
+
+    public static boolean synchronizeDecksV2() throws IOException {
+        // 检查用户是否登录
+        LoginToken loginToken = DeckSquareApiUtil.getLoginData();
+        if (loginToken == null) {
+            return false;
+        }
+
+        // 获取本地卡组列表
+        List<MyDeckItem> localDecks = DeckSquareFileUtil.getMyDeckItem();
+        // 获取在线卡组列表
+        MyDeckResponse onlineDecksResponse = DeckSquareApiUtil.getUserDecks(loginToken);
+        if (onlineDecksResponse == null || onlineDecksResponse.getData() == null) {
+            return false;
+        }
+        List<MyOnlineDeckDetail> onlineDecks = onlineDecksResponse.getData();
+
+
+        // 用于标记在线卡组是否在本地有对应
+        Map<String, Boolean> onlineDeckProcessed = new HashMap<>();
+        for (MyOnlineDeckDetail onlineDeck : onlineDecks) {
+            onlineDeckProcessed.put(onlineDeck.getDeckName(), false);
+        }
+
+        // 遍历本地卡组，处理同名卡组的情况
+        for (MyDeckItem localDeck : localDecks) {
+            String localDeckName = localDeck.getDeckName();
+            localDeckName = localDeckName.replace(".ydk", "");
+
+            for (MyOnlineDeckDetail onlineDeck : onlineDecks) {
+
+                if (localDeckName.equals(onlineDeck.getDeckName())) {
+                    // 标记该在线卡组已处理
+                    onlineDeckProcessed.put(onlineDeck.getDeckName(), true);
+
+                    // 比对更新时间
+                    String localUpdateDate = localDeck.getUpdateDate();
+                    String onlineUpdateDate = String.valueOf(0);//todo 这里应该把2025-05-19T06:11:17转成毫秒，onlineDeck.getDeckUpdateDate();
+                    if (onlineUpdateDate != null && (localUpdateDate == null || onlineUpdateDate.compareTo(localUpdateDate) > 0)) {
+                        // 在线卡组更新时间更晚，下载在线卡组覆盖本地卡组
+                        downloadOnlineDeck(onlineDeck, localDeck.getDeckPath());
+                    } else {
+                        // 本地卡组更新时间更晚，上传本地卡组覆盖在线卡组
+                        uploadLocalDeck(localDeck, onlineDeck.getDeckId(), loginToken);
+                    }
+                    break;
+                }
+            }
+        }
+
+        // 处理只存在于在线的卡组（即本地没有同名卡组）
+        for (MyOnlineDeckDetail onlineDeck : onlineDecks) {
+            if (!onlineDeckProcessed.get(onlineDeck.getDeckName())) {
+                downloadMissingDeckToLocal(onlineDeck);
+            }
+        }
+
+        return true;
+
+    }
+
     public static void synchronizeDecks() {
         // 检查用户是否登录
         LoginToken loginToken = DeckSquareApiUtil.getLoginData();

mobile/src/main/java/cn/garymb/ygomobile/deck_square/DeckSquareFileUtil.java

@@ -98,6 +98,10 @@ public class DeckSquareFileUtil {
             String deckId = getId(file);
             MyDeckItem item = new MyDeckItem();
             item.deckName = file.getName();
+
+
+
+            item.setUpdateDate(String.valueOf(file.lastModified()));
             item.setDeckSouce(0);
             item.setDeckPath(file.getPath());
             if (deckId != null) {

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

@@ -23,6 +23,7 @@ import cn.garymb.ygomobile.ui.mycard.mcchat.ChatMessage;
 import cn.garymb.ygomobile.ui.mycard.mcchat.management.UserManagement;
 import cn.garymb.ygomobile.ui.plus.DialogPlus;
 import cn.garymb.ygomobile.ui.plus.VUiKit;
+import cn.garymb.ygomobile.utils.LogUtil;
 import cn.garymb.ygomobile.utils.SharedPreferenceUtil;
 import cn.garymb.ygomobile.utils.YGODeckDialogUtil;
 import cn.garymb.ygomobile.utils.YGOUtil;
@@ -56,7 +57,7 @@ public class DeckSquareMyDeckFragment extends Fragment {
             binding.tvMycardUserName.setText(SharedPreferenceUtil.getMyCardUserName());
             GlideCompat.with(getActivity()).load(ChatMessage.getAvatarUrl(SharedPreferenceUtil.getMyCardUserName())).into(binding.myDeckAvatar);//刷新头像图片
         }
-        DeckSquareApiUtil.synchronizeDecks();
+        //DeckSquareApiUtil.synchronizeDecks();
         binding.btnLogin.setOnClickListener(v -> attemptLogin());
         binding.btnRegister.setOnClickListener(v -> WebActivity.open(getContext(), getString(R.string.register), MyCard.URL_MC_SIGN_UP));
         deckListAdapter = new MyDeckListAdapter(R.layout.item_my_deck, onDeckMenuListener, mDialogListener);
@@ -115,6 +116,17 @@ public class DeckSquareMyDeckFragment extends Fragment {
                     deckListAdapter.filter(s.toString());
                 }
             }
+        });
+
+        /** 自动同步 */
+        VUiKit.defer().when(() -> {
+            return DeckSquareApiUtil.synchronizeDecksV2();
+        }).fail((e) -> {
+
+            LogUtil.i(TAG, "Like deck fail" + e.getMessage());
+        }).done((result) -> {
+
+
         });
         return binding.getRoot();
 
@@ -191,6 +203,17 @@ public class DeckSquareMyDeckFragment extends Fragment {
             }
 
         });
-        DeckSquareApiUtil.synchronizeDecks();
+        /** 自动同步 */
+        VUiKit.defer().when(() -> {
+
+            return DeckSquareApiUtil.synchronizeDecksV2();
+        }).fail((e) -> {
+
+            LogUtil.i(TAG, "Like deck fail" + e.getMessage());
+        }).done((result) -> {
+
+
+        });
+        //DeckSquareApiUtil.synchronizeDecks();
     }
 }

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

+package cn.garymb.ygomobile.deck_square.api_response;
+
+import java.util.List;
+
+import cn.garymb.ygomobile.deck_square.api_response.PushSingleDeck.DeckData;
+
+/*卡组同步请求类*/
+public class PushMultiDeck {
+    private String deckContributor;
+    private Integer userId;
+    private List<DeckData> decks;
+
+    public String getDeckContributor() {
+        return deckContributor;
+    }
+
+    public void setDeckContributor(String deckContributor) {
+        this.deckContributor = deckContributor;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public List<DeckData> getDecks() {
+        return decks;
+    }
+
+
+    public void setDecks(List<DeckData> decks_) {
+        this.decks = decks_;
+    }
+
+
+
+
+    public static class DeckData {
+        private String deckId;
+        private String deckName;
+        private Integer deckCoverCard1 = 0;
+        private Integer deckCoverCard2 = 0;
+        private Integer deckCoverCard3 = 0;
+        private Integer deckCase = 0;
+        private Integer deckProtector = 0;
+        private String deckYdk;
+
+        public String getDeckId() {
+            return deckId;
+        }
+
+        public void setDeckId(String deckId) {
+            this.deckId = deckId;
+        }
+
+        public String getDeckName() {
+            return deckName;
+        }
+
+        public void setDeckName(String deckName) {
+            this.deckName = deckName;
+        }
+
+        public Integer getDeckCoverCard1(Integer firstCode) {
+            return deckCoverCard1;
+        }
+
+        public void setDeckCoverCard1(Integer deckCoverCard1) {
+            this.deckCoverCard1 = deckCoverCard1;
+        }
+
+        public Integer getDeckCoverCard2() {
+            return deckCoverCard2;
+        }
+
+        public void setDeckCoverCard2(Integer deckCoverCard2) {
+            this.deckCoverCard2 = deckCoverCard2;
+        }
+
+        public Integer getDeckCoverCard3() {
+            return deckCoverCard3;
+        }
+
+        public void setDeckCoverCard3(Integer deckCoverCard3) {
+            this.deckCoverCard3 = deckCoverCard3;
+        }
+
+        public Integer getDeckCase() {
+            return deckCase;
+        }
+
+        public void setDeckCase(Integer deckCase) {
+            this.deckCase = deckCase;
+        }
+
+        public Integer getDeckProtector() {
+            return deckProtector;
+        }
+
+        public void setDeckProtector(Integer deckProtector) {
+            this.deckProtector = deckProtector;
+        }
+
+        public String getDeckYdk() {
+            return deckYdk;
+        }
+
+        public void setDeckYdk(String deckYdk) {
+            this.deckYdk = deckYdk;
+        }
+
+    }
+}

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

 package cn.garymb.ygomobile.deck_square.api_response;
 
-public class PushCardJson {
+public class PushSingleDeck {
 
     private String deckContributor;
     private Integer userId;

mobile/src/main/java/cn/garymb/ygomobile/deck_square/api_response/SyncDeckReq.java

-package cn.garymb.ygomobile.deck_square.api_response;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import cn.garymb.ygomobile.deck_square.api_response.PushCardJson.DeckData;
-
-/*卡组同步请求类*/
-public class SyncDeckReq {
-    private String deckContributor;
-    private Integer userId;
-    private List<DeckData> deckDataList;
-
-    public String getDeckContributor() {
-        return deckContributor;
-    }
-
-    public void setDeckContributor(String deckContributor) {
-        this.deckContributor = deckContributor;
-    }
-
-    public Integer getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Integer userId) {
-        this.userId = userId;
-    }
-
-    public List<DeckData> getDeckDataList() {
-        return deckDataList;
-    }
-
-    public void setDeckDataList(List<DeckData> _deckDataList) {
-        this.deckDataList = _deckDataList;
-    }
-}