Преглед на файлове

去除多余版本控制

songw преди 2 месеца
родител
ревизия
b5c9b96c5e
променени са 24 файла, в които са добавени 45 реда и са изтрити 45 реда
  1. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/release/out/anim_slide_in_from_bottom.xml.flat
  2. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/release/out/anim_slide_in_from_top.xml.flat
  3. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/release/out/anim_slide_out_to_bottom.xml.flat
  4. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/release/out/anim_slide_out_to_top.xml.flat
  5. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/release/out/drawable-hdpi-v4_default_ptr_flip.png.flat
  6. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/release/out/drawable-hdpi-v4_default_ptr_rotate.png.flat
  7. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/release/out/drawable-hdpi-v4_indicator_arrow.png.flat
  8. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/release/out/drawable-mdpi-v4_default_ptr_flip.png.flat
  9. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/release/out/drawable-mdpi-v4_default_ptr_rotate.png.flat
  10. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/release/out/drawable-mdpi-v4_indicator_arrow.png.flat
  11. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/release/out/drawable-xhdpi-v4_default_ptr_flip.png.flat
  12. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/release/out/drawable-xhdpi-v4_default_ptr_rotate.png.flat
  13. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/release/out/drawable-xhdpi-v4_indicator_arrow.png.flat
  14. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/release/out/drawable_indicator_bg_bottom.xml.flat
  15. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/release/out/drawable_indicator_bg_top.xml.flat
  16. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/release/out/layout_pull_to_refresh_header_horizontal.xml.flat
  17. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/release/out/layout_pull_to_refresh_header_vertical.xml.flat
  18. 1 1
      pda_libs/pulltoreflashlibrary/build/intermediates/incremental/mergeReleaseJniLibFolders/merger.xml
  19. 1 1
      pda_libs/pulltoreflashlibrary/build/intermediates/incremental/mergeReleaseShaders/merger.xml
  20. 1 1
      pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageReleaseAssets/merger.xml
  21. 18 18
      pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties
  22. 0 0
      pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageReleaseResources/merger.xml
  23. 3 3
      pda_libs/pulltoreflashlibrary/build/intermediates/manifest_merge_blame_file/release/manifest-merger-blame-release-report.txt
  24. 21 21
      pda_libs/pulltoreflashlibrary/build/outputs/logs/manifest-merger-release-report.txt

BIN
pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/release/out/anim_slide_in_from_bottom.xml.flat


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/release/out/anim_slide_in_from_top.xml.flat


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/release/out/anim_slide_out_to_bottom.xml.flat


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/release/out/anim_slide_out_to_top.xml.flat


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/release/out/drawable-hdpi-v4_default_ptr_flip.png.flat


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/release/out/drawable-hdpi-v4_default_ptr_rotate.png.flat


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/release/out/drawable-hdpi-v4_indicator_arrow.png.flat


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/release/out/drawable-mdpi-v4_default_ptr_flip.png.flat


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/release/out/drawable-mdpi-v4_default_ptr_rotate.png.flat


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/release/out/drawable-mdpi-v4_indicator_arrow.png.flat


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/release/out/drawable-xhdpi-v4_default_ptr_flip.png.flat


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/release/out/drawable-xhdpi-v4_default_ptr_rotate.png.flat


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/release/out/drawable-xhdpi-v4_indicator_arrow.png.flat


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/release/out/drawable_indicator_bg_bottom.xml.flat


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/release/out/drawable_indicator_bg_top.xml.flat


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/release/out/layout_pull_to_refresh_header_horizontal.xml.flat


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/release/out/layout_pull_to_refresh_header_vertical.xml.flat


+ 1 - 1
pda_libs/pulltoreflashlibrary/build/intermediates/incremental/mergeReleaseJniLibFolders/merger.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\AndroidData\newEsop\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\jniLibs"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\AndroidData\newEsop\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\release\jniLibs"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\AndroidData\YiDao_ESOP\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\jniLibs"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\AndroidData\YiDao_ESOP\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\release\jniLibs"/></dataSet></merger>

+ 1 - 1
pda_libs/pulltoreflashlibrary/build/intermediates/incremental/mergeReleaseShaders/merger.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\AndroidData\newEsop\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\shaders"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\AndroidData\newEsop\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\release\shaders"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\AndroidData\YiDao_ESOP\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\shaders"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\AndroidData\YiDao_ESOP\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\release\shaders"/></dataSet></merger>

+ 1 - 1
pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageReleaseAssets/merger.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\AndroidData\newEsop\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\assets"/><source path="D:\AndroidData\newEsop\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\build\intermediates\shader_assets\release\out"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\AndroidData\newEsop\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\release\assets"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\AndroidData\YiDao_ESOP\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\assets"/><source path="D:\AndroidData\YiDao_ESOP\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\build\intermediates\shader_assets\release\out"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\AndroidData\YiDao_ESOP\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\release\assets"/></dataSet></merger>

+ 18 - 18
pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties

@@ -1,18 +1,18 @@
-#Fri Oct 11 21:31:17 CST 2024
-D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_top.xml=D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\anim\\slide_out_to_top.xml
-D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_rotate.png=D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\default_ptr_rotate.png
-D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_top.xml=D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable\\indicator_bg_top.xml
-D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_flip.png=D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\default_ptr_flip.png
-D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_bottom.xml=D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\anim\\slide_out_to_bottom.xml
-D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\indicator_arrow.png=D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-v4\\indicator_arrow.png
-D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\indicator_arrow.png=D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\indicator_arrow.png
-D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_bottom.xml=D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable\\indicator_bg_bottom.xml
-D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_vertical.xml=D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\layout\\pull_to_refresh_header_vertical.xml
-D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_flip.png=D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\default_ptr_flip.png
-D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_flip.png=D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-v4\\default_ptr_flip.png
-D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_bottom.xml=D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\anim\\slide_in_from_bottom.xml
-D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_rotate.png=D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-v4\\default_ptr_rotate.png
-D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_rotate.png=D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\default_ptr_rotate.png
-D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_horizontal.xml=D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\layout\\pull_to_refresh_header_horizontal.xml
-D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\indicator_arrow.png=D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\indicator_arrow.png
-D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_top.xml=D\:\\AndroidData\\newEsop\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\anim\\slide_in_from_top.xml
+#Mon Dec 22 10:40:09 CST 2025
+D\:\\AndroidData\\YiDao_ESOP\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_bottom.xml=D\:\\AndroidData\\YiDao_ESOP\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\anim\\slide_out_to_bottom.xml
+D\:\\AndroidData\\YiDao_ESOP\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_flip.png=D\:\\AndroidData\\YiDao_ESOP\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-v4\\default_ptr_flip.png
+D\:\\AndroidData\\YiDao_ESOP\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_bottom.xml=D\:\\AndroidData\\YiDao_ESOP\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\anim\\slide_in_from_bottom.xml
+D\:\\AndroidData\\YiDao_ESOP\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_rotate.png=D\:\\AndroidData\\YiDao_ESOP\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\default_ptr_rotate.png
+D\:\\AndroidData\\YiDao_ESOP\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_bottom.xml=D\:\\AndroidData\\YiDao_ESOP\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable\\indicator_bg_bottom.xml
+D\:\\AndroidData\\YiDao_ESOP\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\indicator_arrow.png=D\:\\AndroidData\\YiDao_ESOP\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\indicator_arrow.png
+D\:\\AndroidData\\YiDao_ESOP\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_top.xml=D\:\\AndroidData\\YiDao_ESOP\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\anim\\slide_in_from_top.xml
+D\:\\AndroidData\\YiDao_ESOP\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_vertical.xml=D\:\\AndroidData\\YiDao_ESOP\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\layout\\pull_to_refresh_header_vertical.xml
+D\:\\AndroidData\\YiDao_ESOP\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\indicator_arrow.png=D\:\\AndroidData\\YiDao_ESOP\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\indicator_arrow.png
+D\:\\AndroidData\\YiDao_ESOP\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_horizontal.xml=D\:\\AndroidData\\YiDao_ESOP\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\layout\\pull_to_refresh_header_horizontal.xml
+D\:\\AndroidData\\YiDao_ESOP\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_flip.png=D\:\\AndroidData\\YiDao_ESOP\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\default_ptr_flip.png
+D\:\\AndroidData\\YiDao_ESOP\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_rotate.png=D\:\\AndroidData\\YiDao_ESOP\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\default_ptr_rotate.png
+D\:\\AndroidData\\YiDao_ESOP\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_flip.png=D\:\\AndroidData\\YiDao_ESOP\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\default_ptr_flip.png
+D\:\\AndroidData\\YiDao_ESOP\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_top.xml=D\:\\AndroidData\\YiDao_ESOP\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\anim\\slide_out_to_top.xml
+D\:\\AndroidData\\YiDao_ESOP\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_top.xml=D\:\\AndroidData\\YiDao_ESOP\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable\\indicator_bg_top.xml
+D\:\\AndroidData\\YiDao_ESOP\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_rotate.png=D\:\\AndroidData\\YiDao_ESOP\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-v4\\default_ptr_rotate.png
+D\:\\AndroidData\\YiDao_ESOP\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\indicator_arrow.png=D\:\\AndroidData\\YiDao_ESOP\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-v4\\indicator_arrow.png

Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageReleaseResources/merger.xml


+ 3 - 3
pda_libs/pulltoreflashlibrary/build/intermediates/manifest_merge_blame_file/release/manifest-merger-blame-release-report.txt

@@ -6,11 +6,11 @@
 6
 7    <uses-sdk
 8        android:minSdkVersion="17"
-8-->D:\AndroidData\newEsop\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
+8-->D:\AndroidData\YiDao_ESOP\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
 9        android:targetSdkVersion="28" />
-9-->D:\AndroidData\newEsop\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
+9-->D:\AndroidData\YiDao_ESOP\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
 10
 11    <application />
-11-->D:\AndroidData\newEsop\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:8:5-20
+11-->D:\AndroidData\YiDao_ESOP\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:8:5-20
 12
 13</manifest>

+ 21 - 21
pda_libs/pulltoreflashlibrary/build/outputs/logs/manifest-merger-release-report.txt

@@ -1,31 +1,31 @@
 -- Merging decision tree log ---
 manifest
-ADDED from D:\AndroidData\newEsop\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:2:1-10:12
-INJECTED from D:\AndroidData\newEsop\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:2:1-10:12
-INJECTED from D:\AndroidData\newEsop\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:2:1-10:12
+ADDED from D:\AndroidData\YiDao_ESOP\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:2:1-10:12
+INJECTED from D:\AndroidData\YiDao_ESOP\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:2:1-10:12
+INJECTED from D:\AndroidData\YiDao_ESOP\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:2:1-10:12
 	package
-		ADDED from D:\AndroidData\newEsop\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:3:5-49
-		INJECTED from D:\AndroidData\newEsop\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
-		INJECTED from D:\AndroidData\newEsop\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
+		ADDED from D:\AndroidData\YiDao_ESOP\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:3:5-49
+		INJECTED from D:\AndroidData\YiDao_ESOP\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
+		INJECTED from D:\AndroidData\YiDao_ESOP\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
 	android:versionName
-		ADDED from D:\AndroidData\newEsop\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:5:5-32
+		ADDED from D:\AndroidData\YiDao_ESOP\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:5:5-32
 	xmlns:android
-		ADDED from D:\AndroidData\newEsop\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:2:11-69
+		ADDED from D:\AndroidData\YiDao_ESOP\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:2:11-69
 	android:versionCode
-		ADDED from D:\AndroidData\newEsop\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:4:5-31
+		ADDED from D:\AndroidData\YiDao_ESOP\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:4:5-31
 application
-ADDED from D:\AndroidData\newEsop\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:8:5-20
+ADDED from D:\AndroidData\YiDao_ESOP\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:8:5-20
 uses-sdk
-INJECTED from D:\AndroidData\newEsop\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml reason: use-sdk injection requested
-INJECTED from D:\AndroidData\newEsop\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
-INJECTED from D:\AndroidData\newEsop\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
-INJECTED from D:\AndroidData\newEsop\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
-INJECTED from D:\AndroidData\newEsop\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
+INJECTED from D:\AndroidData\YiDao_ESOP\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml reason: use-sdk injection requested
+INJECTED from D:\AndroidData\YiDao_ESOP\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
+INJECTED from D:\AndroidData\YiDao_ESOP\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
+INJECTED from D:\AndroidData\YiDao_ESOP\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
+INJECTED from D:\AndroidData\YiDao_ESOP\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
 	android:targetSdkVersion
-		INJECTED from D:\AndroidData\newEsop\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
-		ADDED from D:\AndroidData\newEsop\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
-		INJECTED from D:\AndroidData\newEsop\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
+		INJECTED from D:\AndroidData\YiDao_ESOP\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
+		ADDED from D:\AndroidData\YiDao_ESOP\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
+		INJECTED from D:\AndroidData\YiDao_ESOP\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
 	android:minSdkVersion
-		INJECTED from D:\AndroidData\newEsop\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
-		ADDED from D:\AndroidData\newEsop\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
-		INJECTED from D:\AndroidData\newEsop\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
+		INJECTED from D:\AndroidData\YiDao_ESOP\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
+		ADDED from D:\AndroidData\YiDao_ESOP\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
+		INJECTED from D:\AndroidData\YiDao_ESOP\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml

Някои файлове не бяха показани, защото твърде много файлове са промени