根据接口时间戳类型改成long

卡组管理dialog重新启用横划翻页
okhttp握手时间回滚为40秒

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

@@ -1335,7 +1335,7 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
                     String fileFullName = deckData.getDeckName() + YDK_FILE_EX;
                     File dir = new File(getActivity().getApplicationInfo().dataDir, "cache");
                     //将卡组存到cache缓存目录中
-                    boolean result = DeckSquareFileUtil.saveFileToPath(dir.getPath(), fileFullName, deckData.getDeckYdk(), convertToUnixTimestamp(deckData.getDeckUpdateDate()));
+                    boolean result = DeckSquareFileUtil.saveFileToPath(dir.getPath(), fileFullName, deckData.getDeckYdk(), deckData.getDeckUpdateDate());
                     if (result) {//存储成功，使用预加载功能
                         LogUtil.i(TAG, "square deck detail done");
                         //File file = new File(dir, fileFullName);

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

@@ -51,7 +51,7 @@ public class DeckManageDialog extends DialogFragment implements YGODeckDialogUti
 
         ViewPager2 viewPager = view.findViewById(R.id.deck_view_pager);
         TabLayout tabLayout = view.findViewById(R.id.deck_manager_tab_layout);
-        viewPager.setUserInputEnabled(false);
+        viewPager.setUserInputEnabled(true);
         // Setup adapter
         ViewPagerAdapter adapter = new ViewPagerAdapter(this, mOnDeckMenuListener, this);
         viewPager.setAdapter(adapter);

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

@@ -516,7 +516,7 @@ public class DeckSquareApiUtil {
                         if (onlineDeck.getDeckName().equals(deckFile.getName())) {
                             // 删除在线卡组（异步处理）
                             VUiKit.defer().when(() -> {
-                                PushSingleDeckResponse deckResponse = DeckSquareApiUtil.deleteDeck(onlineDeck.getDeckId(), loginToken);
+                                PushSingleDeckResponse deckResponse = deleteDeck(onlineDeck.getDeckId(), loginToken);
                                 return deckResponse;
                             }).fail((deleteError) -> {
                                 LogUtil.e(TAG, "Delete Online Deck failed: " + deleteError);
@@ -617,7 +617,7 @@ public class DeckSquareApiUtil {
                     foundOnlineDeck = true;
                     // 比对更新时间
                     long localUpdateDate = localDeck.getUpdateTimestamp();
-                    long onlineUpdateDate = DeckSquareFileUtil.convertToUnixTimestamp(onlineDeck.getDeckUpdateDate());//todo 这里应该把2025-05-19T06:11:17转成毫秒，onlineDeck.getDeckUpdateDate();
+                    long onlineUpdateDate = onlineDeck.getDeckUpdateDate();//todo 这里应该把2025-05-19T06:11:17转成毫秒，onlineDeck.getDeckUpdateDate();
                     LogUtil.d("seesee 本地和在线时间差", localDeckName + ": " + (localUpdateDate - onlineUpdateDate > 0 ? "本地的-新" : "在线的-新"));
                     LogUtil.d("seesee 差多少", localDeckName + ": " + (localUpdateDate - onlineUpdateDate));
                     if (onlineUpdateDate > localUpdateDate) {
@@ -676,7 +676,7 @@ public class DeckSquareApiUtil {
             if (!onlineDeckProcessed.get(onLineDeckName)) {
                 autoSyncResult.newDownload.add(onlineDeck);
                 LogUtil.w(TAG, "sync-download new deck: " + onlineDeck.getDeckName());
-                SyncMutliDeckResult.DownloadResult downloadResult = downloadMissingDeckToLocal(onlineDeck, DeckSquareFileUtil.convertToUnixTimestamp(onlineDeck.getDeckUpdateDate()));
+                SyncMutliDeckResult.DownloadResult downloadResult = downloadMissingDeckToLocal(onlineDeck, onlineDeck.getDeckUpdateDate());
                 autoSyncResult.downloadResponse.add(downloadResult);
             }
         }
@@ -720,7 +720,6 @@ public class DeckSquareApiUtil {
             localDeck.setDeckName(localDeckName);
             localDeck.setDeckCoverCard1(DeckUtil.getFirstCardCode(localDeck.getDeckPath()));
 
-            boolean isMatched = false;
             // 2. 使用在线卡组的迭代器遍历（支持安全删除）
             Iterator<MyOnlineDeckDetail> onlineIterator = onlineDecks.iterator();
             while (onlineIterator.hasNext()) {
@@ -733,7 +732,6 @@ public class DeckSquareApiUtil {
                     syncUploadDecks.add(localDeck);
                     localIterator.remove(); // 安全删除本地卡组（迭代器方法）
                     onlineIterator.remove(); // 安全删除在线卡组（迭代器方法）
-                    isMatched = true;
                     break; // 匹配后跳出内部循环
                 }
             }
@@ -756,7 +754,7 @@ public class DeckSquareApiUtil {
             String fileFullPath = AppsSettings.get().getDeckDir() + "/" + fileName;
 
             // 保存在线卡组到本地
-            boolean saved = DeckSquareFileUtil.saveFileToPath(fileFullPath, onlineDeck.getDeckYdk(), DeckSquareFileUtil.convertToUnixTimestamp(onlineDeck.getDeckUpdateDate()));
+            boolean saved = DeckSquareFileUtil.saveFileToPath(fileFullPath, onlineDeck.getDeckYdk(), onlineDeck.getDeckUpdateDate());
             if (!saved) LogUtil.e(TAG, "seesee Failed to save deck file: " + fileFullPath);
 
             LogUtil.i(TAG, "seesee Deck saved to: " + fileFullPath);

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

 package cn.garymb.ygomobile.ui.cards.deck_square;
 
 
+import static cn.garymb.ygomobile.ui.cards.deck_square.DeckSquareFileUtil.convertToGMTDate;
+
 import android.util.Log;
 import android.widget.ImageView;
 
@@ -73,7 +75,7 @@ public class DeckSquareListAdapter extends BaseQuickAdapter<OnlineDeckDetail, Ba
     protected void convert(BaseViewHolder helper, OnlineDeckDetail item) {
         helper.setText(R.id.deck_info_name, item.getDeckName());
         helper.setText(R.id.deck_contributor, item.getDeckContributor());
-        helper.setText(R.id.deck_last_date, item.getLastDate());
+        helper.setText(R.id.deck_last_date, convertToGMTDate(item.getLastDate()));
         helper.setText(R.id.like_count, item.getDeckLike()+"");
         ImageView cardImage = helper.getView(R.id.deck_info_image);
         long code = item.getDeckCoverCard1();

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

@@ -36,7 +36,7 @@ import cn.garymb.ygomobile.utils.glide.GlideCompat;
 //之后读取平台上的卡组，与本地卡组列表做比较。
 
 public class DeckSquareMyDeckFragment extends Fragment {
-    private static final String TAG = "seesee";
+    private static final String TAG = "DeckSquareMyDeckFragment";
     private FragmentDeckSquareMyDeckBinding binding;
     private MyDeckListAdapter deckListAdapter;
     private String keyWord;

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

 package cn.garymb.ygomobile.ui.cards.deck_square;
 
 import static cn.garymb.ygomobile.ui.cards.DeckManagerFragment.originalData;
+import static cn.garymb.ygomobile.ui.cards.deck_square.DeckSquareFileUtil.convertToGMTDate;
 
 import android.util.Log;
 import android.widget.ImageView;
@@ -157,7 +158,7 @@ public class MyDeckListAdapter extends BaseQuickAdapter<MyOnlineDeckDetail, Base
     @Override
     protected void convert(BaseViewHolder helper, MyOnlineDeckDetail item) {
         helper.setText(R.id.my_deck_name, item.getDeckName());
-        helper.setText(R.id.deck_update_date, item.getDeckUpdateDate());
+        helper.setText(R.id.deck_update_date, convertToGMTDate(item.getDeckUpdateDate()));
         ImageView cardImage = helper.getView(R.id.deck_info_image);
         long code = item.getDeckCoverCard1();
         if (item.isPublic()) {

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

@@ -13,8 +13,8 @@ public class MyOnlineDeckDetail implements Parcelable {
     private String deckName;
     private String deckRank;
     private String deckLike;
-    private String deckUploadDate;
-    private String deckUpdateDate;
+    private long deckUploadDate;
+    private long deckUpdateDate;
     private int deckCoverCard1;
     private int deckCoverCard2;
     private int deckCoverCard3;
@@ -27,14 +27,14 @@ public class MyOnlineDeckDetail implements Parcelable {
     private boolean isDelete;
 
 
-    protected MyOnlineDeckDetail(Parcel in) {
+    public MyOnlineDeckDetail(Parcel in) {
         deckId = in.readString();
         deckContributor = in.readString();
         deckName = in.readString();
         deckRank = in.readString();
         deckLike = in.readString();
-        deckUploadDate = in.readString();
-        deckUpdateDate = in.readString();
+        deckUploadDate = in.readLong();
+        deckUpdateDate = in.readLong();
         deckCoverCard1 = in.readInt();
         deckCoverCard2 = in.readInt();
         deckCoverCard3 = in.readInt();
@@ -71,8 +71,8 @@ public class MyOnlineDeckDetail implements Parcelable {
         dest.writeString(deckName);
         dest.writeString(deckRank);
         dest.writeString(deckLike);
-        dest.writeString(deckUploadDate);
-        dest.writeString(deckUpdateDate);
+        dest.writeLong(deckUploadDate);
+        dest.writeLong(deckUpdateDate);
         dest.writeInt(deckCoverCard1);
         dest.writeInt(deckCoverCard2);
         dest.writeInt(deckCoverCard3);
@@ -126,19 +126,19 @@ public class MyOnlineDeckDetail implements Parcelable {
         this.deckLike = deckLike;
     }
 
-    public String getDeckUploadDate() {
+    public long getDeckUploadDate() {
         return deckUploadDate;
     }
 
-    public void setDeckUploadDate(String deckUploadDate) {
+    public void setDeckUploadDate(long deckUploadDate) {
         this.deckUploadDate = deckUploadDate;
     }
 
-    public String getDeckUpdateDate() {
+    public long getDeckUpdateDate() {
         return deckUpdateDate;
     }
 
-    public void setDeckUpdateDate(String deckUpdateDate) {
+    public void setDeckUpdateDate(long deckUpdateDate) {
         this.deckUpdateDate = deckUpdateDate;
     }
 

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

@@ -16,7 +16,7 @@ public class OnlineDeckDetail implements Parcelable {
     private int deckCoverCard3;
     private int deckCase;
     private int deckProtector;
-    private String lastDate;
+    private long lastDate;
     private int userId;
 
 
@@ -30,7 +30,7 @@ public class OnlineDeckDetail implements Parcelable {
         deckCoverCard3 = in.readInt();
         deckCase = in.readInt();
         deckProtector = in.readInt();
-        lastDate = in.readString();
+        lastDate = in.readLong();
         userId = in.readInt();
     }
 
@@ -62,7 +62,7 @@ public class OnlineDeckDetail implements Parcelable {
         dest.writeInt(deckCoverCard3);
         dest.writeInt(deckCase);
         dest.writeInt(deckProtector);
-        dest.writeString(lastDate);
+        dest.writeLong(lastDate);
         dest.writeInt(userId);
     }
 
@@ -138,11 +138,9 @@ public class OnlineDeckDetail implements Parcelable {
         this.deckProtector = deckProtector;
     }
 
-    public String getLastDate() {
-        return lastDate;
-    }
+    public long getLastDate() {return lastDate;}
 
-    public void setLastDate(String lastDate) {
+    public void setLastDate(long lastDate) {
         this.lastDate = lastDate;
     }
 

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

@@ -9,7 +9,8 @@ public class MyDeckItem {
 
     private String deckId;
 
-    private String updateDate;
+    private long updateDate;
+
     private long updateTimestamp;
 
     private String deckPath;//本地卡组时，存储卡组路径
@@ -50,11 +51,11 @@ public class MyDeckItem {
         this.deckId = deckId;
     }
 
-    public String getUpdateDate() {
+    public long getUpdateDate() {
         return updateDate;
     }
 
-    public void setUpdateDate(String updateDate) {
+    public void setUpdateDate(long updateDate) {
         this.updateDate = updateDate;
     }
 

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

@@ -29,7 +29,7 @@ public class OkhttpUtil {
             .readTimeout(30, TimeUnit.SECONDS)
             .writeTimeout(30, TimeUnit.SECONDS)
             // keep-alive and connection pool defaults
-            .connectionPool(new ConnectionPool(2, 20, TimeUnit.SECONDS))
+            .connectionPool(new ConnectionPool(2, 40, TimeUnit.SECONDS))
             .build();