同步卡组接口添加新字段时间戳、卡组分类

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

@@ -204,6 +204,7 @@ public class DeckSquareApiUtil {
 
         deckData.setDeckId(deckId);
         deckData.setDeckName(deckfile.getName());
+        deckData.setDeckType(deckfile.getTypeName());
         deckData.setDeckCoverCard1(deckfile.getFirstCode());
         deckData.setDelete(false);
         deckData.setDeckYdk(deckContent);
@@ -243,7 +244,7 @@ public class DeckSquareApiUtil {
             data.setDeckName(myDeckItem.getDeckName());
             data.setDeckCoverCard1(myDeckItem.getDeckCoverCard1());
             data.setDeckId(deckIdList.get(i));
-
+            data.setDeckUpdateTime(myDeckItem.getUpdateTimestamp());
             decks.add(data);
         }
         return pushMultiDecks(decks, loginToken);
@@ -327,12 +328,14 @@ public class DeckSquareApiUtil {
         if (deckIdResult == null) {
             return null;
         }
-        List<String> deckId = deckIdResult.getDeckId();//从服务器获取
-        if (deckId == null) {
+        List<String> deckIdList = deckIdResult.getDeckId();//从服务器获取
+        if (deckIdList == null) {
             return null;
+        } else {
+            LogUtil.i(TAG,"requestIdAndPushNewDecks deckIdList"+ deckIdList);
         }
 
-        return pushDecks(deckDataList, loginToken, deckId);
+        return pushDecks(deckDataList, loginToken, deckIdList);
     }
 
     /**
@@ -353,12 +356,14 @@ public class DeckSquareApiUtil {
             PushMultiDeck.DeckData data = new PushMultiDeck.DeckData();
             data.setDeckId(item.getDeckId());
             data.setDeckName(item.getDeckName());
+            data.setDeckType(item.getDeckType());
             data.setDeckCoverCard1(item.getDeckCoverCard1());
+            data.setDeckUpdateTime(item.getUpdateTimestamp());
 
             String deckContent = DeckSquareFileUtil.setDeckId(item.getDeckPath(), loginToken.getUserId(), item.getDeckId());
 
             data.setDeckYdk(deckContent);
-            LogUtil.w(TAG, "seesee syncMyDecks*要上传的 本地卡组: " + data.getDeckName()+"//"+data.getDeckId()+"//"+data.getDeckCoverCard1()+"//"+data.getDeckYdk());
+            LogUtil.w(TAG, "syncMyDecks *要上传的* 本地卡组: " + data.getDeckType() +"//" + data.getDeckName()+"//"+data.getDeckId()+"//"+data.getDeckCoverCard1()+"//"+data.getDeckUpdateTime());
             dataList.add(data);
         }
         return pushMultiDecks(dataList, loginToken);
@@ -743,8 +748,8 @@ public class DeckSquareApiUtil {
         // 剩余的在线卡组都是新卡组（云端独有，需要下载）
         backupDownloadDecks.addAll(onlineDecks);
 
-        LogUtil.w(TAG, "seesee +要下载的 云备份卡组: " + backupDownloadDecks);
         for (MyOnlineDeckDetail onlineDeck : backupDownloadDecks) {
+            LogUtil.w(TAG, "synchronizeDecks(750) +要下载的 云备份卡组: " + onlineDeck.getDeckType() + "//" + onlineDeck.getDeckName() + "//" + onlineDeck.getDeckUpdateDate());
             // 确保文件名包含.ydk扩展名
             String fileName = onlineDeck.getDeckName();
             if (!fileName.toLowerCase().endsWith(Constants.YDK_FILE_EX)) {
@@ -755,9 +760,9 @@ public class DeckSquareApiUtil {
 
             // 保存在线卡组到本地
             boolean saved = DeckSquareFileUtil.saveFileToPath(fileFullPath, onlineDeck.getDeckYdk(), onlineDeck.getDeckUpdateDate());
-            if (!saved) LogUtil.e(TAG, "seesee Failed to save deck file: " + fileFullPath);
+            if (!saved) LogUtil.e(TAG, "synchronizeDecks(761) 保存失败！的 云备份卡组: " + fileFullPath);
 
-            LogUtil.i(TAG, "seesee Deck saved to: " + fileFullPath);
+            LogUtil.i(TAG, "synchronizeDecks(763) 保存成功√的 云备份卡组: " + fileFullPath);
         }
 
         // 上传本地卡组覆盖在线卡组

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

@@ -33,7 +33,7 @@ import ocgcore.data.Card;
 
 public class DeckSquareFileUtil {
     //
-    private static final String TAG = "decksquareApiUtil";
+    private static final String TAG = "DeckSquareFileUtil";
 
     //将MyOnlineDeckDetail转MyDeckItem类型list，有时候会需要用到
     public static List<MyDeckItem> toDeckItemList(List<MyOnlineDeckDetail> serverDecks) {
@@ -44,7 +44,7 @@ public class DeckSquareFileUtil {
             item.setDeckId(detail.getDeckId());
             item.setUserId(detail.getUserId());
             item.setDeckCoverCard1(detail.getDeckCoverCard1());
-            item.setUpdateDate(detail.getDeckUpdateDate());
+            item.setUpdateTimestamp(detail.getDeckUpdateDate());
             item.setPublic(detail.isPublic());
             myOnlineDecks.add(item);
         }
@@ -74,7 +74,7 @@ public class DeckSquareFileUtil {
                         }
                         // userId = Integer.parseInt(line.replaceAll("###", ""));
                     } catch (NumberFormatException e) {
-                        LogUtil.e(TAG, "integer" + line + "parse error" + e.toString());
+                        LogUtil.e(TAG, "getId(77): integer" + line + "parse error" + e.toString());
                     }
 
                 } else if (line.startsWith("##")) {
@@ -148,6 +148,7 @@ public class DeckSquareFileUtil {
             String deckId = getId(file);
             MyDeckItem item = new MyDeckItem();
             item.setDeckName(file.getName());
+            item.setDeckType(file.getParentFile().getName());
             item.setUpdateTimestamp(file.lastModified());
             item.setDeckPath(file.getPath());
             if (deckId != null) {

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

@@ -11,6 +11,7 @@ public class MyOnlineDeckDetail implements Parcelable {
     private String deckId;
     private String deckContributor;
     private String deckName;
+    private String deckType;
     private String deckRank;
     private String deckLike;
     private long deckUploadDate;
@@ -31,6 +32,7 @@ public class MyOnlineDeckDetail implements Parcelable {
         deckId = in.readString();
         deckContributor = in.readString();
         deckName = in.readString();
+        deckType = in.readString();
         deckRank = in.readString();
         deckLike = in.readString();
         deckUploadDate = in.readLong();
@@ -69,6 +71,7 @@ public class MyOnlineDeckDetail implements Parcelable {
         dest.writeString(deckId);
         dest.writeString(deckContributor);
         dest.writeString(deckName);
+        dest.writeString(deckType);
         dest.writeString(deckRank);
         dest.writeString(deckLike);
         dest.writeLong(deckUploadDate);
@@ -110,6 +113,14 @@ public class MyOnlineDeckDetail implements Parcelable {
         this.deckName = deckName;
     }
 
+    public void setDeckType(String deckType) {
+        this.deckType = deckType;
+    }
+
+    public String getDeckType() {
+        return deckType;
+    }
+
     public String getDeckRank() {
         return deckRank;
     }

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

@@ -39,11 +39,13 @@ public class PushMultiDeck {
     public static class DeckData {
         private String deckId;
         private String deckName;
+        private String deckType;
         private Integer deckCoverCard1 = 0;
         private Integer deckCoverCard2 = 0;
         private Integer deckCoverCard3 = 0;
         private Integer deckCase = 0;
         private Integer deckProtector = 0;
+        private long timestamp = 0;
         private String deckYdk;
 
         public String getDeckId() {
@@ -62,6 +64,14 @@ public class PushMultiDeck {
             this.deckName = deckName;
         }
 
+        public String getDeckType() {
+            return deckType;
+        }
+
+        public void setDeckType(String deckType) {
+            this.deckType = deckType;
+        }
+
         public Integer getDeckCoverCard1() {
             return deckCoverCard1;
         }
@@ -102,6 +112,14 @@ public class PushMultiDeck {
             this.deckProtector = deckProtector;
         }
 
+        public long getDeckUpdateTime() {
+            return timestamp;
+        }
+
+        public void setDeckUpdateTime(long deckUpdateTime) {
+            this.timestamp = deckUpdateTime;
+        }
+
         public String getDeckYdk() {
             return deckYdk;
         }

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

@@ -33,6 +33,7 @@ public class PushSingleDeck {
     public static class DeckData {
         private String deckId;
         private String deckName;
+        private String deckType;
         private Integer deckCoverCard1 = 0;
         private Integer deckCoverCard2 = 0;
         private Integer deckCoverCard3 = 0;
@@ -57,6 +58,14 @@ public class PushSingleDeck {
             this.deckName = deckName;
         }
 
+        public String getDeckType() {
+            return deckType;
+        }
+
+        public void setDeckType(String deckType) {
+            this.deckType = deckType;
+        }
+
         public Integer getDeckCoverCard1(Integer firstCode) {
             return deckCoverCard1;
         }

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

@@ -5,11 +5,12 @@ public class MyDeckItem {
     private int idUploaded;
 
     private int userId;
+
     private String deckName;
 
-    private String deckId;
+    private String deckType;
 
-    private long updateDate;
+    private String deckId;
 
     private long updateTimestamp;
 
@@ -43,20 +44,20 @@ public class MyDeckItem {
         this.deckName = deckName;
     }
 
-    public String getDeckId() {
-        return deckId;
+    public String getDeckType() {
+        return deckType;
     }
 
-    public void setDeckId(String deckId) {
-        this.deckId = deckId;
+    public void setDeckType(String deckType) {
+        this.deckType = deckType;
     }
 
-    public long getUpdateDate() {
-        return updateDate;
+    public String getDeckId() {
+        return deckId;
     }
 
-    public void setUpdateDate(long updateDate) {
-        this.updateDate = updateDate;
+    public void setDeckId(String deckId) {
+        this.deckId = deckId;
     }
 
     public long getUpdateTimestamp() {
@@ -98,8 +99,8 @@ public class MyDeckItem {
                 "idUploaded=" + idUploaded +
                 ", userId=" + userId +
                 ", deckName='" + deckName + '\'' +
+                ", deckType='" + deckType + '\'' +
                 ", deckId='" + deckId + '\'' +
-                ", updateDate='" + updateDate + '\'' +
                 ", updateTimestamp=" + updateTimestamp +
                 ", deckPath='" + deckPath + '\'' +
                 ", deckCoverCard1=" + deckCoverCard1 +

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

@@ -5,7 +5,6 @@ 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.PushMultiResponse;
-import cn.garymb.ygomobile.ui.cards.deck_square.api_response.PushSingleDeckResponse;
 
 public class SyncMutliDeckResult {
     boolean flag = false;

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

-package cn.garymb.ygomobile.ui.cards.deck_square.bo;
-
-import java.util.List;
-
-public class UserDeckIds {
-    public List<String> deckId;
-}