加载卡组时置换先行密码为正式密码

mobile/build.gradle

@@ -100,7 +100,7 @@ dependencies {
 //    implementation 'com.android.support:appcompat-v7:' + rootProject.ext.supportVersion
 //    implementation 'com.android.support:recyclerview-v7:' + rootProject.ext.supportVersion
 //    implementation 'com.android.support:design:' + rootProject.ext.supportVersion
-
+    implementation 'cn.hutool:hutool-all:latest.release'
     implementation 'org.jdeferred:jdeferred-android-aar:1.2.4'
     implementation 'com.github.bumptech.glide:glide:4.12.0'
     implementation 'androidx.navigation:navigation-fragment:2.3.5'

mobile/src/main/java/cn/garymb/ygomobile/Constants.java

@@ -151,6 +151,7 @@ public interface Constants {
     String URL_HELP = "https://www.wolai.com/hgRyrSXQuq4rzMwzXhHBqA";
     String URL_MASTER_RULE_CN = "https://ocg-rule.readthedocs.io/";
     String WIKI_SEARCH_URL = "https://ygocdb.com/card/";
+    String URL_YGO233_ComparisionTable = "https://ygocdb.com/api/v0/idChangelog.jsonp";
     String URL_YGO233_ADVANCE = "https://ygo233.com/pre";
     String URL_YGO233_DATAVER = "https://ygo233.com/pre/dataver";
     String URL_YGO233_FILE = "https://ygo233.com/pre/download-ygomobile";
@@ -273,15 +274,21 @@ public interface Constants {
             ,"s"
             ,"t"
             ,"u"
-            ,"v"
-            ,"w"
-            ,"x"
-            ,"y"
-            ,"z"
-            ,"A"
-            ,"B"
-            ,"C"
-            ,"D"
+            , "v"
+            , "w"
+            , "x"
+            , "y"
+            , "z"
+            , "A"
+            , "B"
+            , "C"
+            , "D"
     };
+    //23333先行密码与正式密码对照数组
+    Integer[] oldIDsArray = {
+            100200209, 100200210, 100200211, 100200212, 100200213, 100200214, 100200215, 100200216, 100200217, 100200218, 100200219, 100200220, 100282002, 100283001, 100284001, 100284002, 100284003, 100285001, 100285002, 100285003, 100285004, 100285005, 100285006, 100286001, 100286002, 100286003, 100286004, 100286005, 100286006, 100286007, 100286008, 100286009, 100286010, 100286011, 100286012, 100286013, 100286014, 100286015, 100286016, 100286017, 100286018, 100286019, 100286020, 100287004, 100287005, 100287006, 100287007, 100287011, 100287012, 100287013, 100287014, 100287019, 100287020, 100287021, 100287022, 100287027, 100287028, 100287029, 100287030, 100287034, 100287035, 100287036, 100287037, 100287043, 100287044, 100287045, 100287046, 100288001, 100288002, 100289001, 100290001, 100290002, 100290003, 100290004, 100290005, 100290006, 100290007, 100290008, 100290009, 100290010, 100290011, 100290012, 100290013, 100290014, 100290015, 100290016, 100290017, 100290018, 100290019, 100290020, 100290021, 100290022, 100290023, 100290024, 100290025, 100290026, 100290027, 100290028, 100290029, 100290030, 100290031, 100290032, 100290033, 100290034, 100290035, 100290036, 100290037, 100290038, 100290039, 100290040, 100290041, 100290042, 100290043, 100290044, 100290045, 100290046, 100291001, 100291002, 100291003, 100312001, 100312002, 100312022, 100312033, 100312040, 100312051, 100312052, 100312053, 100313001, 100313002, 100313003, 100313025, 100313026, 100313034, 100313051, 100313052, 100343001, 100343002, 100343003, 100343020, 100343021, 100343031, 100343032, 100343041, 100343042, 100344016, 100344017, 100344032, 100344033, 100344034, 100344051, 100344054, 100418011, 100418014, 100418015, 100418016, 100418017, 100418018, 100418019, 100418020, 100418021, 100418022, 100418023, 100418024, 100418025, 100418026, 100418027, 100418028, 100418029, 100418030, 100418031, 100418032, 100418033, 100418034, 100418035, 100418036, 100418037, 100418038, 100418039, 100418201, 100418202, 100418203, 100418204, 100418205, 100418206, 100418207, 100418208, 100418209, 100418210, 100418211, 100418212, 100426001, 100426002, 100426003, 100426004, 100426005, 100426006, 100426007, 100426016, 100426017, 100426018, 100426019, 100426020, 100426021, 100426022, 100426031, 100426032, 100426033, 100426034, 100426035, 100426036, 100426037, 100427001, 100427002, 100427003, 100427004, 100427005, 100427006, 100427007, 100427021, 100427022, 100427023, 100427024, 100427025, 100427026, 100427027, 100427030, 100427031, 100427032, 100427033, 100427034, 100427035, 100427036, 101106000, 101106001, 101106003, 101106004, 101106005, 101106006, 101106007, 101106008, 101106009, 101106010, 101106011, 101106012, 101106013, 101106014, 101106015, 101106016, 101106017, 101106018, 101106019, 101106020, 101106021, 101106022, 101106023, 101106024, 101106025, 101106026, 101106027, 101106028, 101106029, 101106030, 101106031, 101106032, 101106033, 101106034, 101106035, 101106037, 101106038, 101106039, 101106040, 101106041, 101106042, 101106043, 101106044, 101106045, 101106046, 101106047, 101106048, 101106049, 101106050, 101106051, 101106053, 101106054, 101106055, 101106056, 101106057, 101106058, 101106059, 101106060, 101106061, 101106062, 101106063, 101106064, 101106065, 101106066, 101106067, 101106068, 101106069, 101106070, 101106071, 101106072, 101106073, 101106074, 101106075, 101106076, 101106077, 101106078, 101106079, 101106080, 101106081, 101106082, 101106083, 101106084, 101106085, 101106086, 101106087, 101106088, 101106089, 101106090, 101106091, 101106201, 101106202, 101106203, 101107000, 101107001, 101107002, 101107003, 101107004, 101107005, 101107006, 101107007, 101107008, 101107009, 101107010, 101107011, 101107012, 101107013, 101107014, 101107015, 101107016, 101107017, 101107018, 101107019, 101107020, 101107021, 101107022, 101107023, 101107024, 101107025, 101107026, 101107027, 101107028, 101107029, 101107030, 101107031, 101107032, 101107033, 101107034, 101107035, 101107036, 101107037, 101107038, 101107039, 101107040, 101107041, 101107042, 101107043, 101107044, 101107045, 101107046, 101107047, 101107048, 101107049, 101107050, 101107051, 101107052, 101107053, 101107054, 101107055, 101107056, 101107057, 101107058, 101107059, 101107060, 101107061, 101107062, 101107063, 101107064, 101107065, 101107066, 101107067, 101107068, 101107069, 101107070, 101107071, 101107072, 101107073, 101107074, 101107075, 101107076, 101107077, 101107078, 101107079, 101107080, 101107081, 101107082, 101107083, 101107084, 101107085, 101107086, 101107087, 101107088, 101107089, 101107090, 101107091, 101108000, 101108001, 101108002, 101108003, 101108004, 101108005, 101108006, 101108007, 101108008, 101108009, 101108010, 101108011, 101108012, 101108013, 101108014, 101108015, 101108016, 101108017, 101108018, 101108019, 101108020, 101108021, 101108022, 101108023, 101108024, 101108025, 101108026, 101108027, 101108028, 101108029, 101108030, 101108031, 101108032, 101108033, 101108034, 101108035, 101108036, 101108037, 101108038, 101108039, 101108040, 101108041, 101108042, 101108043, 101108044, 101108045, 101108046, 101108047, 101108048, 101108049, 101108050, 101108051, 101108052, 101108053, 101108054, 101108055, 101108056, 101108057, 101108058, 101108059, 101108060, 101108061, 101108062, 101108063, 101108064, 101108065, 101108066, 101108067, 101108068, 101108069, 101108070, 101108071, 101108072, 101108073, 101108074, 101108075, 101108076, 101108077, 101108078, 101108079, 101108080, 101108081, 101108082, 101108083, 101108084, 101108085, 101108086, 101108087, 101108088, 101108089, 101108090, 101108091, 101109000, 101109001, 101109002, 101109003, 101109004, 101109005, 101109006, 101109007, 101109008, 101109009, 101109010, 101109011, 101109012, 101109013, 101109014, 101109015, 101109016, 101109017, 101109018, 101109019, 101109020, 101109021, 101109022, 101109023, 101109024, 101109025, 101109026, 101109027, 101109028, 101109029, 101109030, 101109031, 101109032, 101109033, 101109034, 101109035, 101109036, 101109037, 101109038, 101109039, 101109040, 101109041, 101109042, 101109043, 101109044, 101109045, 101109046, 101109047, 101109048, 101109049, 101109050, 101109051, 101109052, 101109053, 101109054, 101109055, 101109056, 101109057, 101109058, 101109059, 101109060, 101109061, 101109062, 101109063, 101109064, 101109065, 101109066, 101109067, 101109068, 101109069, 101109070, 101109071, 101109072, 101109073, 101109074, 101109075, 101109076, 101109077, 101109078, 101109079, 101109080, 101109081, 101109082, 101109083, 101109084, 101109085, 101109086, 101109087, 101109088, 101109089, 101109090, 101109091, 101110001, 101110002, 101110003, 101110004, 101110005, 101110006, 101110007, 101110008, 101110009, 101110010, 101110011, 101110012, 101110013, 101110014, 101110015, 101110016, 101110017, 101110018, 101110019, 101110020, 101110021, 101110022, 101110023, 101110024, 101110025, 101110026, 101110027, 101110028, 101110029, 101110030, 101110031, 101110032, 101110033, 101110034, 101110035, 101110036, 101110037, 101110038, 101110039, 101110040, 101110041, 101110042, 101110043, 101110044, 101110045, 101110046, 101110047, 101110048, 101110049, 101110050, 101110051, 101110052, 101110053, 101110054, 101110055, 101110056, 101110057, 101110058, 101110059, 101110060, 101110061, 101110062, 101110063, 101110064, 101110065, 101110066, 101110067, 101110068, 101110069, 101110070, 101110071, 101110072, 101110073, 101110074, 101110075, 101110076, 101110077, 101110078, 101110079, 101110080};
+
+    Integer[] newIDsArray = {
+            57511992, 90583279, 76352503, 77672444, 75311421, 12527118, 27657173, 50699850, 96084564, 86605515, 15464375, 15198996, 49858495, 5916510, 3103067, 38105306, 85758066, 33331231, 9726840, 36114945, 62219643, 9603252, 35098357, 89839552, 77590412, 88617904, 42228966, 86469231, 47077697, 84900597, 1683982, 64104037, 99370594, 61103515, 35705817, 20994205, 57499304, 83888009, 19272658, 56677752, 82661461, 19050066, 55554175, 70551291, 6556909, 43940008, 79339613, 5833312, 32828466, 78217065, 5611760, 31006879, 68490573, 4599182, 30983281, 67378935, 93777634, 30761649, 66156348, 92644052, 39049051, 65433790, 92428405, 28827503, 64211118, 91706817, 27104921, 54878729, 91262474, 26988374, 11020863, 58415502, 76076738, 84813516, 11808215, 47292920, 84797028, 10186633, 46570372, 83575471, 19963185, 46358784, 72843899, 18847598, 45236142, 71620241, 39396763, 75780818, 8025950, 44413654, 70508653, 7903368, 33391067, 70786111, 6180710, 32175429, 79663524, 5068132, 32453837, 68441986, 4836680, 31230289, 67725394, 94113093, 30118701, 62503746, 99991455, 25396150, 62480168, 98875863, 25273572, 61668670, 97053215, 24151924, 50546029, 37930737, 23099524, 59494222, 85888377, 91434602, 38529357, 64927055, 90312154, 37706769, 63101468, 90290572, 26684111, 41406613, 77895328, 3289027, 30284022, 76672730, 3167439, 39552584, 65956182, 19096726, 45484331, 82489470, 18973184, 44362883, 81767888, 17751597, 44146295, 70534340, 12877076, 58371671, 85766789, 11155484, 47149093, 84544192, 10938846, 13179234, 2347656, 48745395, 75730490, 1225009, 37629703, 74018812, 2511, 33407125, 69895264, 5380979, 32785578, 68779682, 5168381, 92107604, 29595202, 31562086, 68957034, 94445733, 66712905, 30430448, 67835547, 20618850, 93229151, 55990317, 92385016, 28373620, 49131917, 15130912, 41525660, 88919365, 14418464, 41802073, 87897777, 13291886, 40680521, 76075139, 49568943, 75952542, 61496006, 98881700, 34876719, 61374414, 97769122, 23153227, 60158866, 96546575, 23931679, 69436288, 95824983, 22819092, 58203736, 95602345, 21057444, 57541158, 84546257, 20934852, 57329501, 83723605, 19712214, 38082437, 1876841, 64487132, 37260946, 63265554, 90659259, 36148308, 63542003, 99937011, 25926710, 62320425, 98715423, 25209168, 51208877, 97692972, 24087580, 50486289, 97870394, 23965033, 59353647, 86758746, 48784854, 67127799, 20001443, 56495147, 93490856, 29884951, 55273560, 82777208, 28762303, 55151012, 81555617, 53212882, 18940725, 54334420, 80433039, 17827173, 80611581, 16605586, 42090294, 89594399, 15983048, 42377643, 78362751, 14761450, 41255165, 73640163, 44818, 46033517, 72427512, 9822220, 35311929, 72305034, 8700633, 34198387, 71583486, 34072799, 6855503, 60461804, 33250142, 69248256, 96633955, 32138660, 69522668, 95911373, 21915012, 68300121, 94798725, 21293424, 67288539, 93672138, 56465981, 93850690, 29948294, 55343303, 82738008, 28126717, 55521751, 81615450, 17000165, 54408264, 80893872, 17888577, 53286626, 89771220, 16165939, 42560034, 89558743, 15943341, 41348446, 78836195, 14821890, 41215808, 77610503, 4008212, 40493210, 16598965, 43986064, 79371769, 20295753, 56790702, 82184400, 25573115, 51578214, 88962829, 14357527, 50855622, 87240371, 13234975, 40633084, 93612434, 7987191, 20071842, 46123974, 31699677, 77683371, 3078380, 30576089, 66961194, 3355732, 39354437, 66749546, 92133240, 38628859, 65626958, 91011603, 28406301, 64804316, 90299015, 27383719, 53782828, 90176467, 26561172, 52566270, 99054885, 25449584, 52843699, 88232397, 24226942, 51611041, 87116749, 14504454, 50599453, 86993168, 13382806, 49776811, 86271510, 12266229, 48654323, 85059922, 11443677, 48832775, 74936480, 11321089, 47710198, 73104892, 109401, 46593546, 73082255, 9486959, 35871958, 72860663, 8264361, 35659410, 71143015, 7142724, 34536828, 60921537, 7320132, 33814281, 69809989, 96203584, 32692693, 69087397, 95471006, 21570001, 64964750, 90359458, 27753563, 53742162, 99137266, 26631975, 52020510, 99414629, 25419323, 52807032, 28292031, 64797746, 91781484, 27170599, 54564198, 90969892, 26357901, 53442500, 84462118, 10851853, 57946551, 83340560, 19739265, 82128978, 19516687, 45001322, 71406430, 18890039, 44889144, 16312943, 21949879, 58938528, 84332527, 21727231, 57111330, 83610035, 10604644, 56099748, 83488497, 19882096, 46877100, 82361809, 18760514, 45154513, 71549257, 18548966, 44932065, 70427670, 17825378, 43210483, 70204022, 6609736, 42198835, 79582540, 5577149, 52253888, 32975247, 78360952, 4754691, 31259606, 67248304, 4632019, 30037118, 66425726, 3410461, 39915560, 66309175, 92798873, 38192988, 65187687, 91575236, 24070330, 60465049, 97453744, 23848752, 59242457, 96637156, 22125101, 59120809, 95515518, 21903613, 58308221, 84792926, 21887075, 57285770, 83670388, 10065487, 56063182, 83558891, 19942835, 45337544, 82735249, 18720257, 45115956, 81613061, 17008760, 44092304, 70491413, 17885118, 43270827, 79775821, 6763530, 42158279, 79552283, 5941982, 32335697, 78420796, 4825390, 31213049, 7608148, 54656181, 80040886, 26435595, 53923690, 89328238, 52707042, 88106656, 15590355, 41085464, 88083109, 14478717, 72309040, 13256226, 40740224, 76145933, 13533678, 49928686, 75922381, 2311090, 48806195, 75290703, 1295442, 37683547, 74078255, 37961969, 572850, 73956664, 9350312, 36745317, 62133026, 9238125, 35622739, 61011438, 98416533, 34800281, 1855886, 37343995, 63748694, 132308, 36521307, 63526052, 99910751, 35405755, 62803464, 98898163, 35283277, 61681816, 94076521, 20560620, 66569334, 93953933, 29348048, 56733747, 92731385, 28226490, 55610199, 81019803, 28403802, 54498517, 80993256, 27381364, 53776969, 80170678, 16169772, 89058026, 52553471, 15443125, 42431833, 88836438, 14220547, 41619242, 77103950, 14108995, 40597694, 76981308, 13386407, 49370016, 76869711, 2263869, 49658464, 75047173, 1041278, 38436986, 74920585, 1329620, 37313338, 63708033, 197042, 36591747, 63086455, 9070454, 35479109, 84366728, 11765832, 47759571, 73244186, 10632284, 46037983, 73421698, 9416697, 46815301, 8794055, 45792753, 71187462, 8571567, 34976176, 70465810, 7459919, 33854624, 60242223, 6637331, 32731036, 69120785, 95515789, 32909498, 68304193, 94392192, 31887806, 67282505, 94670654, 20065259, 66069967, 93454062, 29942771, 56347375, 92332424, 28720123, 55125728, 81519836, 28004531, 54092240, 12061457, 81497285, 27882993, 53270092, 80275707, 16769305, 53154400, 89552119, 15947754, 42932862, 84330567, 11825276, 47219274, 73218989, 10602628, 46057733, 73542331, 9940036, 45935145, 72329844, 8728498, 45112597, 71607202, 7602800, 34090915, 70485614, 7889323, 33878367, 60362066, 6767771, 32152870, 69540484, 95545183, 32939238, 8428836, 34813545, 71817640, 7206349, 34690953, 60095092, 6589707, 33578406, 69973414, 96367119, 32756828, 68250822, 95245571, 21639276, 68038375, 94423983, 20417688, 67906797};
 
 }

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

 package cn.garymb.ygomobile.loader;
 
+import static cn.garymb.ygomobile.Constants.newIDsArray;
+import static cn.garymb.ygomobile.Constants.oldIDsArray;
+
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.SparseArray;
@@ -16,6 +19,7 @@ import cn.garymb.ygomobile.bean.Deck;
 import cn.garymb.ygomobile.bean.DeckInfo;
 import cn.garymb.ygomobile.ui.cards.deck.DeckItemType;
 import cn.garymb.ygomobile.utils.IOUtils;
+import cn.hutool.core.util.ArrayUtil;
 import ocgcore.data.Card;
 import ocgcore.data.LimitList;
 
@@ -72,6 +76,10 @@ public class DeckLoader {
                 if (type == DeckItemType.MainCard && deck.getMainCount() < Constants.DECK_MAIN_MAX) {
                     Integer i = mIds.get(id);
                     if (i == null) {
+                        if (ArrayUtil.contains(oldIDsArray, id)) {
+                            id = ArrayUtil.get(newIDsArray,id);
+                            Log.i("3.10.1","看看id="+id);
+                        }
                         mIds.put(id, 1);
                         deck.addMain(id);
                     } else if (i < Constants.CARD_MAX_COUNT) {