diff --git a/src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.bin b/src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.bin index 17c1296..58ea38c 100644 Binary files a/src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.bin and b/src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.bin differ diff --git a/src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.lock b/src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.lock index 4e1ec25..69e7ad2 100644 Binary files a/src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.lock and b/src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.lock differ diff --git a/src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.bin b/src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.bin index cf873bc..5cb1966 100644 Binary files a/src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.bin and b/src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.bin differ diff --git a/src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.lock b/src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.lock index 319cf55..1984f4c 100644 Binary files a/src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.lock and b/src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.lock differ diff --git a/src/Notes-master1/.gradle/8.0/fileHashes/resourceHashesCache.bin b/src/Notes-master1/.gradle/8.0/fileHashes/resourceHashesCache.bin index 2da507d..1ea2a8c 100644 Binary files a/src/Notes-master1/.gradle/8.0/fileHashes/resourceHashesCache.bin and b/src/Notes-master1/.gradle/8.0/fileHashes/resourceHashesCache.bin differ diff --git a/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock index a9c118b..d4e10cf 100644 Binary files a/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/src/Notes-master1/.gradle/file-system.probe b/src/Notes-master1/.gradle/file-system.probe index 7303ad8..c68cc8f 100644 Binary files a/src/Notes-master1/.gradle/file-system.probe and b/src/Notes-master1/.gradle/file-system.probe differ diff --git a/src/Notes-master1/app/build/intermediates/apk/debug/app-debug.apk b/src/Notes-master1/app/build/intermediates/apk/debug/app-debug.apk index 910da78..1bd4cb0 100644 Binary files a/src/Notes-master1/app/build/intermediates/apk/debug/app-debug.apk and b/src/Notes-master1/app/build/intermediates/apk/debug/app-debug.apk differ diff --git a/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex index 3d6a4a9..46dc167 100644 Binary files a/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and b/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties index 75c0356..836021b 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties +++ b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties @@ -1,4 +1,4 @@ -#Tue Nov 07 09:00:46 CST 2023 +#Fri Dec 29 11:13:38 CST 2023 net.micode.notes.app-main-6\:/color/primary_text_dark.xml=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat net.micode.notes.app-main-6\:/color/secondary_text_dark.xml=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat net.micode.notes.app-main-6\:/drawable-hdpi/bg_btn_set_color.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml index e49b0c3..0102458 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml +++ b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml @@ -133,7 +133,7 @@ 短信 邮件 diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties b/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties index 49882f9..81e2dba 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties +++ b/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties @@ -1,4 +1,4 @@ -#Tue Nov 07 09:00:49 CST 2023 +#Fri Dec 29 11:13:38 CST 2023 net.micode.notes.app-main-5\:/color/primary_text_dark.xml=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\color\\primary_text_dark.xml net.micode.notes.app-main-5\:/color/secondary_text_dark.xml=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\color\\secondary_text_dark.xml net.micode.notes.app-main-5\:/drawable-hdpi/bg_btn_set_color.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_btn_set_color.png diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml b/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml index e49b0c3..0102458 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml +++ b/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml @@ -133,7 +133,7 @@ 短信 邮件 diff --git a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index 253f8b2..67a6e59 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,4 @@ -#Thu Dec 14 11:08:34 CST 2023 +#Fri Dec 29 11:13:41 CST 2023 base.0=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex path.0=classes.dex renamed.0=classes.dex diff --git a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources index 7c0f13d..8e9c34b 100644 Binary files a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class index f1ba220..38a2bb3 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class index 76c0c9d..5a71deb 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class index 0fd6977..2420706 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class index 0468652..912f9e5 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class index 54fa572..1affd11 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class index 062ecb5..506cacf 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class index c217873..c4fd93c 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class index d3dbb60..826aba0 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class index 8f0a21b..8412cad 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class index 127437f..b32bba9 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class index 99e161f..33ee730 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class index f249e33..a000c75 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class index 81f06d3..95be742 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class index 3d4e8b1..80e8367 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class index 83dc6c8..bb2e277 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat index 40e69d2..577bcf3 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json index 35d3ab4..e4b1d37 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rCN_values-zh-rCN.arsc.flat", + "outputFile": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\values-zh-rCN_values-zh-rCN.arsc.flat", "map": [ { "source": "D:\\anzhuo studio\\2\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", @@ -45,6 +45,92 @@ }, { "outputFile": "net.micode.notes.app-merged_res-4:/values_values.arsc.flat", + "map": [ + { + "source": "D:\\anzhuo studio\\2\\Notes-master1\\app\\src\\main\\res\\values\\dimens.xml", + "from": { + "startLines": "-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1" + }, + "to": { + "startLines": "13,14,15,16,17", + "startColumns": "4,4,4,4,4", + "startOffsets": "477,529,582,635,687", + "endColumns": "51,52,52,51,51", + "endOffsets": "524,577,630,682,734" + } + }, + { + "source": "D:\\anzhuo studio\\2\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml", + "from": { + "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + }, + "to": { + "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", + "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" + } + }, + { + "source": "D:\\anzhuo studio\\2\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml", + "from": { + "startLines": "-1,-1,64,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,2640,-1,-1,-1,-1,-1,-1,-1,-1", + "endLines": "-1,-1,67,-1,-1,-1,-1,-1,-1,-1,-1", + "endColumns": "-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1", + "endOffsets": "-1,-1,2846,-1,-1,-1,-1,-1,-1,-1,-1" + }, + "to": { + "startLines": "125,129,133,137,140,144,148,152,156,160,164", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8124,8328,8539,8749,8909,9092,9277,9462,9665,9871,10054", + "endLines": "128,132,136,139,143,147,151,155,159,163,167", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "8323,8534,8744,8904,9087,9272,9457,9660,9866,10049,10250" + } + }, + { + "source": "D:\\anzhuo studio\\2\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml", + "from": { + "startLines": "-1,-1", + "startColumns": "-1,-1", + "startOffsets": "-1,-1" + }, + "to": { + "startLines": "2,8", + "startColumns": "4,4", + "startOffsets": "105,300", + "endLines": "7,11", + "endColumns": "19,19", + "endOffsets": "295,415" + } + }, + { + "source": "D:\\anzhuo studio\\2\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml", + "from": { + "startLines": "-1", + "startColumns": "-1", + "startOffsets": "-1" + }, + "to": { + "startLines": "12", + "startColumns": "4", + "startOffsets": "420", + "endColumns": "56", + "endOffsets": "472" + } + } + ] + }, + { + "outputFile": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\values_values.arsc.flat", "map": [ { "source": "D:\\anzhuo studio\\2\\Notes-master1\\app\\src\\main\\res\\values\\dimens.xml", @@ -140,7 +226,7 @@ ] }, { - "outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rTW_values-zh-rTW.arsc.flat", + "outputFile": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\values-zh-rTW_values-zh-rTW.arsc.flat", "map": [ { "source": "D:\\anzhuo studio\\2\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json index 5d519b8..2e6d3e5 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json @@ -2,6 +2,92 @@ "logs": [ { "outputFile": "net.micode.notes.app-mergeDebugResources-2:/values/values.xml", + "map": [ + { + "source": "D:\\anzhuo studio\\2\\Notes-master1\\app\\src\\main\\res\\values\\dimens.xml", + "from": { + "startLines": "-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1" + }, + "to": { + "startLines": "13,14,15,16,17", + "startColumns": "4,4,4,4,4", + "startOffsets": "477,529,582,635,687", + "endColumns": "51,52,52,51,51", + "endOffsets": "524,577,630,682,734" + } + }, + { + "source": "D:\\anzhuo studio\\2\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml", + "from": { + "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + }, + "to": { + "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", + "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" + } + }, + { + "source": "D:\\anzhuo studio\\2\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml", + "from": { + "startLines": "-1,-1,64,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,2640,-1,-1,-1,-1,-1,-1,-1,-1", + "endLines": "-1,-1,67,-1,-1,-1,-1,-1,-1,-1,-1", + "endColumns": "-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1", + "endOffsets": "-1,-1,2846,-1,-1,-1,-1,-1,-1,-1,-1" + }, + "to": { + "startLines": "125,129,133,137,140,144,148,152,156,160,164", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8124,8328,8539,8749,8909,9092,9277,9462,9665,9871,10054", + "endLines": "128,132,136,139,143,147,151,155,159,163,167", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "8323,8534,8744,8904,9087,9272,9457,9660,9866,10049,10250" + } + }, + { + "source": "D:\\anzhuo studio\\2\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml", + "from": { + "startLines": "-1,-1", + "startColumns": "-1,-1", + "startOffsets": "-1,-1" + }, + "to": { + "startLines": "2,8", + "startColumns": "4,4", + "startOffsets": "105,300", + "endLines": "7,11", + "endColumns": "19,19", + "endOffsets": "295,415" + } + }, + { + "source": "D:\\anzhuo studio\\2\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml", + "from": { + "startLines": "-1", + "startColumns": "-1", + "startOffsets": "-1" + }, + "to": { + "startLines": "12", + "startColumns": "4", + "startOffsets": "420", + "endColumns": "56", + "endOffsets": "472" + } + } + ] + }, + { + "outputFile": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-mergeDebugResources-2:\\values\\values.xml", "map": [ { "source": "D:\\anzhuo studio\\2\\Notes-master1\\app\\src\\main\\res\\values\\dimens.xml", diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/values/values.xml b/src/Notes-master1/app/build/intermediates/packaged_res/debug/values/values.xml index e49b0c3..0102458 100644 --- a/src/Notes-master1/app/build/intermediates/packaged_res/debug/values/values.xml +++ b/src/Notes-master1/app/build/intermediates/packaged_res/debug/values/values.xml @@ -133,7 +133,7 @@ \ No newline at end of file