访问 rs.source 对象之前添加空值检查

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

@@ -652,7 +652,14 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
             mCardSearcher.initItems();
             initLimitListSpinners(mLimitSpinner, mCardLoader.getLimitList());
             // 根据资源路径判断是否进入卡包展示模式
-            isPackMode = rs.source.getParent().equals(mSettings.getPackDeckDir()) || rs.source.getParent().equals(mSettings.getCacheDeckDir());
+            if (rs.source != null) {
+                String parentPath = rs.source.getParent();
+                isPackMode = parentPath != null &&
+                        (parentPath.equals(mSettings.getPackDeckDir()) ||
+                                parentPath.equals(mSettings.getCacheDeckDir()));
+            } else {
+                isPackMode = false;
+            }
             // 设置当前卡组显示
             if (rs.source != null) {
                 setCurDeck(rs, isPackMode);

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

@@ -447,7 +447,7 @@ public class DeckSquareApiUtil {
             localDeck.setDeckName(localDeckName);
             localDeck.setDeckCoverCard1(DeckUtil.getFirstCardCode(localDeck.getDeckPath()));
             localDeck.setDelete(false);
-            LogUtil.e(TAG,"本地卡组名称："+localDeck.getDeckType()+"-"+localDeck.getDeckName()+"  ID："+localDeck.getDeckId());
+            LogUtil.d(TAG,"本地卡组名称："+localDeck.getDeckType()+"-"+localDeck.getDeckName()+"  ID："+localDeck.getDeckId());
             // 2. 使用在线卡组的迭代器遍历（支持安全删除）
             Iterator<MyOnlineDeckDetail> onlineIterator = onlineDecks.iterator();
             while (onlineIterator.hasNext()) {
@@ -467,10 +467,11 @@ public class DeckSquareApiUtil {
         }
 
         // 上传本地卡组覆盖在线卡组
+        LogUtil.w(TAG, "+同步的 本地卡组: " + syncUploadDecks.size());
         syncMyDecks(syncUploadDecks, loginToken);
 
         // 剩余的本地卡组都是新增卡组（本地独有，需要上传）
-        LogUtil.w(TAG, "+上传新增的 本地卡组: " + localDecks);
+        LogUtil.w(TAG, "+上传新增的 本地卡组: " + localDecks.size());
         if (!localDecks.isEmpty()) {
             PushMultiResponse result = requestIdAndPushNewDecks(localDecks, loginToken);
             LogUtil.w(TAG, "上传结果数：" + result.getData());

mobile/src/main/java/cn/garymb/ygomobile/ui/settings/SettingFragment.java

@@ -444,7 +444,9 @@ public class SettingFragment extends PreferenceFragmentPlus {
             showFileChooser(preference, ".so", mSettings.getResourcePath(), "内核文件选择");
         }
         return false;
-    }    @SuppressLint("HandlerLeak")
+    }
+
+    @SuppressLint("HandlerLeak")
     Handler handler = new Handler() {
         @Override
         public void handleMessage(Message msg) {