修改pdf下载工具类

base/build/intermediates/incremental/packageDebugResources/compile-file-map.properties

@@ -1,19 +1,19 @@
-#Fri Nov 13 11:26:39 CST 2020
-D\:\\zhongyicommit\\new\\bvvm\\base\\src\\main\\res\\anim\\dialog_right_out.xml=D\:\\zhongyicommit\\new\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\dialog_right_out.xml
-D\:\\zhongyicommit\\new\\bvvm\\base\\src\\main\\res\\anim\\dialog_bottom_out.xml=D\:\\zhongyicommit\\new\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\dialog_bottom_out.xml
-D\:\\zhongyicommit\\new\\bvvm\\base\\src\\main\\res\\anim\\dialog_scale_in.xml=D\:\\zhongyicommit\\new\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\dialog_scale_in.xml
-D\:\\zhongyicommit\\new\\bvvm\\base\\src\\main\\res\\anim\\dialog_left_in.xml=D\:\\zhongyicommit\\new\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\dialog_left_in.xml
-D\:\\zhongyicommit\\new\\bvvm\\base\\src\\main\\res\\anim\\item_animation_fall_down.xml=D\:\\zhongyicommit\\new\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\item_animation_fall_down.xml
-D\:\\zhongyicommit\\new\\bvvm\\base\\src\\main\\res\\anim\\dialog_bottom_in.xml=D\:\\zhongyicommit\\new\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\dialog_bottom_in.xml
-D\:\\zhongyicommit\\new\\bvvm\\base\\src\\main\\res\\anim\\layout_animation_from_bottom.xml=D\:\\zhongyicommit\\new\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\layout_animation_from_bottom.xml
-D\:\\zhongyicommit\\new\\bvvm\\base\\src\\main\\res\\anim\\layout_animation_fall_down.xml=D\:\\zhongyicommit\\new\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\layout_animation_fall_down.xml
-D\:\\zhongyicommit\\new\\bvvm\\base\\src\\main\\res\\anim\\item_animation_from_bottom.xml=D\:\\zhongyicommit\\new\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\item_animation_from_bottom.xml
-D\:\\zhongyicommit\\new\\bvvm\\base\\src\\main\\res\\anim\\dialog_scale_out.xml=D\:\\zhongyicommit\\new\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\dialog_scale_out.xml
-D\:\\zhongyicommit\\new\\bvvm\\base\\src\\main\\res\\anim\\dialog_left_out.xml=D\:\\zhongyicommit\\new\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\dialog_left_out.xml
-D\:\\zhongyicommit\\new\\bvvm\\base\\src\\main\\res\\anim\\dialog_right_in.xml=D\:\\zhongyicommit\\new\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\dialog_right_in.xml
-D\:\\zhongyicommit\\new\\bvvm\\base\\src\\main\\res\\anim\\item_animation_from_right.xml=D\:\\zhongyicommit\\new\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\item_animation_from_right.xml
-D\:\\zhongyicommit\\new\\bvvm\\base\\src\\main\\res\\anim\\layout_animation_from_right.xml=D\:\\zhongyicommit\\new\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\layout_animation_from_right.xml
-D\:\\zhongyicommit\\new\\bvvm\\base\\src\\main\\res\\anim\\dialog_ios_out.xml=D\:\\zhongyicommit\\new\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\dialog_ios_out.xml
-D\:\\zhongyicommit\\new\\bvvm\\base\\src\\main\\res\\anim\\dialog_top_out.xml=D\:\\zhongyicommit\\new\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\dialog_top_out.xml
-D\:\\zhongyicommit\\new\\bvvm\\base\\src\\main\\res\\anim\\dialog_top_in.xml=D\:\\zhongyicommit\\new\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\dialog_top_in.xml
-D\:\\zhongyicommit\\new\\bvvm\\base\\src\\main\\res\\anim\\dialog_ios_in.xml=D\:\\zhongyicommit\\new\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\dialog_ios_in.xml
+#Wed Nov 18 15:24:21 CST 2020
+D\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\layout_animation_fall_down.xml=D\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\layout_animation_fall_down.xml
+D\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\dialog_top_out.xml=D\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\dialog_top_out.xml
+D\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\dialog_top_in.xml=D\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\dialog_top_in.xml
+D\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\item_animation_from_bottom.xml=D\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\item_animation_from_bottom.xml
+D\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\dialog_ios_in.xml=D\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\dialog_ios_in.xml
+D\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\dialog_bottom_in.xml=D\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\dialog_bottom_in.xml
+D\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\dialog_scale_out.xml=D\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\dialog_scale_out.xml
+D\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\item_animation_from_right.xml=D\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\item_animation_from_right.xml
+D\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\dialog_right_in.xml=D\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\dialog_right_in.xml
+D\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\layout_animation_from_right.xml=D\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\layout_animation_from_right.xml
+D\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\dialog_bottom_out.xml=D\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\dialog_bottom_out.xml
+D\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\dialog_left_in.xml=D\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\dialog_left_in.xml
+D\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\dialog_ios_out.xml=D\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\dialog_ios_out.xml
+D\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\dialog_left_out.xml=D\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\dialog_left_out.xml
+D\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\dialog_right_out.xml=D\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\dialog_right_out.xml
+D\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\item_animation_fall_down.xml=D\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\item_animation_fall_down.xml
+D\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\layout_animation_from_bottom.xml=D\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\layout_animation_from_bottom.xml
+D\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\dialog_scale_in.xml=D\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\dialog_scale_in.xml

base/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt

@@ -4,8 +4,8 @@
 4
 5    <uses-sdk
 6        android:minSdkVersion="15"
-6-->D:\zhongyicommit\new\bvvm\base\src\main\AndroidManifest.xml
+6-->D:\zhongyicommit\bvvm\base\src\main\AndroidManifest.xml
 7        android:targetSdkVersion="28" />
-7-->D:\zhongyicommit\new\bvvm\base\src\main\AndroidManifest.xml
+7-->D:\zhongyicommit\bvvm\base\src\main\AndroidManifest.xml
 8
 9</manifest>

base/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt

@@ -3,34 +3,34 @@
 3    package="com.hjq.base.test" >
 4
 5    <uses-sdk
-5-->D:\zhongyicommit\new\bvvm\base\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger640891830397674842.xml:5:5-74
+5-->D:\zhongyicommit\bvvm\base\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger7787260107242283803.xml:5:5-74
 6        android:minSdkVersion="15"
-6-->D:\zhongyicommit\new\bvvm\base\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger640891830397674842.xml:5:15-41
+6-->D:\zhongyicommit\bvvm\base\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger7787260107242283803.xml:5:15-41
 7        android:targetSdkVersion="28" />
-7-->D:\zhongyicommit\new\bvvm\base\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger640891830397674842.xml:5:42-71
+7-->D:\zhongyicommit\bvvm\base\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger7787260107242283803.xml:5:42-71
 8
 9    <instrumentation
-9-->D:\zhongyicommit\new\bvvm\base\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger640891830397674842.xml:11:5-15:67
+9-->D:\zhongyicommit\bvvm\base\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger7787260107242283803.xml:11:5-15:67
 10        android:name="android.test.InstrumentationTestRunner"
-10-->D:\zhongyicommit\new\bvvm\base\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger640891830397674842.xml:11:22-75
+10-->D:\zhongyicommit\bvvm\base\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger7787260107242283803.xml:11:22-75
 11        android:functionalTest="false"
-11-->D:\zhongyicommit\new\bvvm\base\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger640891830397674842.xml:14:22-52
+11-->D:\zhongyicommit\bvvm\base\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger7787260107242283803.xml:14:22-52
 12        android:handleProfiling="false"
-12-->D:\zhongyicommit\new\bvvm\base\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger640891830397674842.xml:13:22-53
+12-->D:\zhongyicommit\bvvm\base\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger7787260107242283803.xml:13:22-53
 13        android:label="Tests for com.hjq.base.test"
-13-->D:\zhongyicommit\new\bvvm\base\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger640891830397674842.xml:15:22-65
+13-->D:\zhongyicommit\bvvm\base\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger7787260107242283803.xml:15:22-65
 14        android:targetPackage="com.hjq.base.test" />
-14-->D:\zhongyicommit\new\bvvm\base\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger640891830397674842.xml:12:22-63
+14-->D:\zhongyicommit\bvvm\base\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger7787260107242283803.xml:12:22-63
 15
 16    <application
-16-->D:\zhongyicommit\new\bvvm\base\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger640891830397674842.xml:7:5-9:19
+16-->D:\zhongyicommit\bvvm\base\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger7787260107242283803.xml:7:5-9:19
 17        android:appComponentFactory="android.support.v4.app.CoreComponentFactory"
 17-->[com.android.support:support-compat:28.0.0] C:\Users\Administrator\.gradle\caches\transforms-2\files-2.1\e63d8f2ee6b637112952f2d1c00d8add\support-compat-28.0.0\AndroidManifest.xml:22:18-91
 18        android:debuggable="true" >
-18-->D:\zhongyicommit\new\bvvm\base\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger640891830397674842.xml:7:18-43
+18-->D:\zhongyicommit\bvvm\base\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger7787260107242283803.xml:7:18-43
 19        <uses-library android:name="android.test.runner" />
-19-->D:\zhongyicommit\new\bvvm\base\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger640891830397674842.xml:8:9-60
-19-->D:\zhongyicommit\new\bvvm\base\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger640891830397674842.xml:8:23-57
+19-->D:\zhongyicommit\bvvm\base\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger7787260107242283803.xml:8:9-60
+19-->D:\zhongyicommit\bvvm\base\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger7787260107242283803.xml:8:23-57
 20    </application>
 21
 22</manifest>

base/build/outputs/logs/manifest-merger-debug-report.txt

@@ -1,25 +1,25 @@
 -- Merging decision tree log ---
 manifest
-ADDED from D:\zhongyicommit\new\bvvm\base\src\main\AndroidManifest.xml:1:1-36
-INJECTED from D:\zhongyicommit\new\bvvm\base\src\main\AndroidManifest.xml:1:1-36
-INJECTED from D:\zhongyicommit\new\bvvm\base\src\main\AndroidManifest.xml:1:1-36
+ADDED from D:\zhongyicommit\bvvm\base\src\main\AndroidManifest.xml:1:1-36
+INJECTED from D:\zhongyicommit\bvvm\base\src\main\AndroidManifest.xml:1:1-36
+INJECTED from D:\zhongyicommit\bvvm\base\src\main\AndroidManifest.xml:1:1-36
 	package
-		ADDED from D:\zhongyicommit\new\bvvm\base\src\main\AndroidManifest.xml:1:11-33
-		INJECTED from D:\zhongyicommit\new\bvvm\base\src\main\AndroidManifest.xml
-		INJECTED from D:\zhongyicommit\new\bvvm\base\src\main\AndroidManifest.xml
+		ADDED from D:\zhongyicommit\bvvm\base\src\main\AndroidManifest.xml:1:11-33
+		INJECTED from D:\zhongyicommit\bvvm\base\src\main\AndroidManifest.xml
+		INJECTED from D:\zhongyicommit\bvvm\base\src\main\AndroidManifest.xml
 	xmlns:android
-		ADDED from D:\zhongyicommit\new\bvvm\base\src\main\AndroidManifest.xml:1:1-36
+		ADDED from D:\zhongyicommit\bvvm\base\src\main\AndroidManifest.xml:1:1-36
 uses-sdk
-INJECTED from D:\zhongyicommit\new\bvvm\base\src\main\AndroidManifest.xml reason: use-sdk injection requested
-INJECTED from D:\zhongyicommit\new\bvvm\base\src\main\AndroidManifest.xml
-INJECTED from D:\zhongyicommit\new\bvvm\base\src\main\AndroidManifest.xml
-INJECTED from D:\zhongyicommit\new\bvvm\base\src\main\AndroidManifest.xml
-INJECTED from D:\zhongyicommit\new\bvvm\base\src\main\AndroidManifest.xml
+INJECTED from D:\zhongyicommit\bvvm\base\src\main\AndroidManifest.xml reason: use-sdk injection requested
+INJECTED from D:\zhongyicommit\bvvm\base\src\main\AndroidManifest.xml
+INJECTED from D:\zhongyicommit\bvvm\base\src\main\AndroidManifest.xml
+INJECTED from D:\zhongyicommit\bvvm\base\src\main\AndroidManifest.xml
+INJECTED from D:\zhongyicommit\bvvm\base\src\main\AndroidManifest.xml
 	android:targetSdkVersion
-		INJECTED from D:\zhongyicommit\new\bvvm\base\src\main\AndroidManifest.xml
-		ADDED from D:\zhongyicommit\new\bvvm\base\src\main\AndroidManifest.xml
-		INJECTED from D:\zhongyicommit\new\bvvm\base\src\main\AndroidManifest.xml
+		INJECTED from D:\zhongyicommit\bvvm\base\src\main\AndroidManifest.xml
+		ADDED from D:\zhongyicommit\bvvm\base\src\main\AndroidManifest.xml
+		INJECTED from D:\zhongyicommit\bvvm\base\src\main\AndroidManifest.xml
 	android:minSdkVersion
-		INJECTED from D:\zhongyicommit\new\bvvm\base\src\main\AndroidManifest.xml
-		ADDED from D:\zhongyicommit\new\bvvm\base\src\main\AndroidManifest.xml
-		INJECTED from D:\zhongyicommit\new\bvvm\base\src\main\AndroidManifest.xml
+		INJECTED from D:\zhongyicommit\bvvm\base\src\main\AndroidManifest.xml
+		ADDED from D:\zhongyicommit\bvvm\base\src\main\AndroidManifest.xml
+		INJECTED from D:\zhongyicommit\bvvm\base\src\main\AndroidManifest.xml

dialog/build/intermediates/incremental/packageDebugResources/compile-file-map.properties

@@ -1,33 +1,33 @@
-#Fri Nov 13 11:26:39 CST 2020
-D\:\\zhongyicommit\\new\\bvvm\\dialog\\src\\main\\res\\mipmap-xxhdpi\\ic_dialog_finish_dark.png=D\:\\zhongyicommit\\new\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\mipmap-xxhdpi-v4\\ic_dialog_finish_dark.png
-D\:\\zhongyicommit\\new\\bvvm\\dialog\\src\\main\\res\\mipmap-xxhdpi\\ic_dialog_delete.png=D\:\\zhongyicommit\\new\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\mipmap-xxhdpi-v4\\ic_dialog_delete.png
-D\:\\zhongyicommit\\new\\bvvm\\dialog\\src\\main\\res\\mipmap-xxhdpi\\ic_dialog_warning.png=D\:\\zhongyicommit\\new\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\mipmap-xxhdpi-v4\\ic_dialog_warning.png
-D\:\\zhongyicommit\\new\\bvvm\\dialog\\src\\main\\res\\layout\\dialog_wheel.xml=D\:\\zhongyicommit\\new\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\layout\\dialog_wheel.xml
-D\:\\zhongyicommit\\new\\bvvm\\dialog\\src\\main\\res\\drawable\\dialog_message_bg.xml=D\:\\zhongyicommit\\new\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\drawable\\dialog_message_bg.xml
-D\:\\zhongyicommit\\new\\bvvm\\dialog\\src\\main\\res\\drawable\\dialog_rounded_corner_bg.xml=D\:\\zhongyicommit\\new\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\drawable\\dialog_rounded_corner_bg.xml
-D\:\\zhongyicommit\\new\\bvvm\\dialog\\src\\main\\res\\drawable\\dialog_toast_bg.xml=D\:\\zhongyicommit\\new\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\drawable\\dialog_toast_bg.xml
-D\:\\zhongyicommit\\new\\bvvm\\dialog\\src\\main\\res\\drawable\\dialog_input_text_bg.xml=D\:\\zhongyicommit\\new\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\drawable\\dialog_input_text_bg.xml
-D\:\\zhongyicommit\\new\\bvvm\\dialog\\src\\main\\res\\layout\\dialog_address.xml=D\:\\zhongyicommit\\new\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\layout\\dialog_address.xml
-D\:\\zhongyicommit\\new\\bvvm\\dialog\\src\\main\\res\\drawable\\dialog_menu_item_bottom.xml=D\:\\zhongyicommit\\new\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\drawable\\dialog_menu_item_bottom.xml
-D\:\\zhongyicommit\\new\\bvvm\\dialog\\src\\main\\res\\layout\\dialog_input.xml=D\:\\zhongyicommit\\new\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\layout\\dialog_input.xml
-D\:\\zhongyicommit\\new\\bvvm\\dialog\\src\\main\\res\\mipmap-xxhdpi\\ic_dialog_finish.png=D\:\\zhongyicommit\\new\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\mipmap-xxhdpi-v4\\ic_dialog_finish.png
-D\:\\zhongyicommit\\new\\bvvm\\dialog\\src\\main\\res\\drawable\\dialog_menu_item.xml=D\:\\zhongyicommit\\new\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\drawable\\dialog_menu_item.xml
-D\:\\zhongyicommit\\new\\bvvm\\dialog\\src\\main\\res\\drawable\\dialog_message_one_button.xml=D\:\\zhongyicommit\\new\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\drawable\\dialog_message_one_button.xml
-D\:\\zhongyicommit\\new\\bvvm\\dialog\\src\\main\\res\\drawable\\dialog_message_right_button.xml=D\:\\zhongyicommit\\new\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\drawable\\dialog_message_right_button.xml
-D\:\\zhongyicommit\\new\\bvvm\\dialog\\src\\main\\res\\layout\\dialog_pay_password.xml=D\:\\zhongyicommit\\new\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\layout\\dialog_pay_password.xml
-D\:\\zhongyicommit\\new\\bvvm\\dialog\\src\\main\\res\\drawable\\dialog_message_left_button.xml=D\:\\zhongyicommit\\new\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\drawable\\dialog_message_left_button.xml
-D\:\\zhongyicommit\\new\\bvvm\\dialog\\src\\main\\res\\layout\\item_dialog_pay_password.xml=D\:\\zhongyicommit\\new\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\layout\\item_dialog_pay_password.xml
-D\:\\zhongyicommit\\new\\bvvm\\dialog\\src\\main\\res\\drawable\\dialog_pay_password_item_selector.xml=D\:\\zhongyicommit\\new\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\drawable\\dialog_pay_password_item_selector.xml
-D\:\\zhongyicommit\\new\\bvvm\\dialog\\src\\main\\res\\layout\\view_adddress_tab_view.xml=D\:\\zhongyicommit\\new\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\layout\\view_adddress_tab_view.xml
-D\:\\zhongyicommit\\new\\bvvm\\dialog\\src\\main\\res\\drawable\\dialog_menu_item_middle.xml=D\:\\zhongyicommit\\new\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\drawable\\dialog_menu_item_middle.xml
-D\:\\zhongyicommit\\new\\bvvm\\dialog\\src\\main\\res\\layout\\dialog_message.xml=D\:\\zhongyicommit\\new\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\layout\\dialog_message.xml
-D\:\\zhongyicommit\\new\\bvvm\\dialog\\src\\main\\res\\layout\\dialog_toast.xml=D\:\\zhongyicommit\\new\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\layout\\dialog_toast.xml
-D\:\\zhongyicommit\\new\\bvvm\\dialog\\src\\main\\res\\mipmap-xxhdpi\\ic_dialog_close.png=D\:\\zhongyicommit\\new\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\mipmap-xxhdpi-v4\\ic_dialog_close.png
-D\:\\zhongyicommit\\new\\bvvm\\dialog\\src\\main\\res\\mipmap-xxhdpi\\ic_dialog_warning_dark.png=D\:\\zhongyicommit\\new\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\mipmap-xxhdpi-v4\\ic_dialog_warning_dark.png
-D\:\\zhongyicommit\\new\\bvvm\\dialog\\src\\main\\res\\drawable\\dialog_menu_item_top.xml=D\:\\zhongyicommit\\new\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\drawable\\dialog_menu_item_top.xml
-D\:\\zhongyicommit\\new\\bvvm\\dialog\\src\\main\\res\\mipmap-xxhdpi\\ic_dialog_error_dark.png=D\:\\zhongyicommit\\new\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\mipmap-xxhdpi-v4\\ic_dialog_error_dark.png
-D\:\\zhongyicommit\\new\\bvvm\\dialog\\src\\main\\res\\layout\\item_dialog_menu.xml=D\:\\zhongyicommit\\new\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\layout\\item_dialog_menu.xml
-D\:\\zhongyicommit\\new\\bvvm\\dialog\\src\\main\\res\\drawable\\dialog_pay_password_item_del_selector.xml=D\:\\zhongyicommit\\new\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\drawable\\dialog_pay_password_item_del_selector.xml
-D\:\\zhongyicommit\\new\\bvvm\\dialog\\src\\main\\res\\layout\\dialog_menu.xml=D\:\\zhongyicommit\\new\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\layout\\dialog_menu.xml
-D\:\\zhongyicommit\\new\\bvvm\\dialog\\src\\main\\res\\layout\\dialog_wait.xml=D\:\\zhongyicommit\\new\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\layout\\dialog_wait.xml
-D\:\\zhongyicommit\\new\\bvvm\\dialog\\src\\main\\res\\mipmap-xxhdpi\\ic_dialog_error.png=D\:\\zhongyicommit\\new\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\mipmap-xxhdpi-v4\\ic_dialog_error.png
+#Wed Nov 18 15:24:22 CST 2020
+D\:\\zhongyicommit\\bvvm\\dialog\\src\\main\\res\\layout\\item_dialog_pay_password.xml=D\:\\zhongyicommit\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\layout\\item_dialog_pay_password.xml
+D\:\\zhongyicommit\\bvvm\\dialog\\src\\main\\res\\mipmap-xxhdpi\\ic_dialog_warning_dark.png=D\:\\zhongyicommit\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\mipmap-xxhdpi-v4\\ic_dialog_warning_dark.png
+D\:\\zhongyicommit\\bvvm\\dialog\\src\\main\\res\\mipmap-xxhdpi\\ic_dialog_finish.png=D\:\\zhongyicommit\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\mipmap-xxhdpi-v4\\ic_dialog_finish.png
+D\:\\zhongyicommit\\bvvm\\dialog\\src\\main\\res\\mipmap-xxhdpi\\ic_dialog_finish_dark.png=D\:\\zhongyicommit\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\mipmap-xxhdpi-v4\\ic_dialog_finish_dark.png
+D\:\\zhongyicommit\\bvvm\\dialog\\src\\main\\res\\mipmap-xxhdpi\\ic_dialog_error_dark.png=D\:\\zhongyicommit\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\mipmap-xxhdpi-v4\\ic_dialog_error_dark.png
+D\:\\zhongyicommit\\bvvm\\dialog\\src\\main\\res\\drawable\\dialog_rounded_corner_bg.xml=D\:\\zhongyicommit\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\drawable\\dialog_rounded_corner_bg.xml
+D\:\\zhongyicommit\\bvvm\\dialog\\src\\main\\res\\layout\\view_adddress_tab_view.xml=D\:\\zhongyicommit\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\layout\\view_adddress_tab_view.xml
+D\:\\zhongyicommit\\bvvm\\dialog\\src\\main\\res\\layout\\item_dialog_menu.xml=D\:\\zhongyicommit\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\layout\\item_dialog_menu.xml
+D\:\\zhongyicommit\\bvvm\\dialog\\src\\main\\res\\mipmap-xxhdpi\\ic_dialog_close.png=D\:\\zhongyicommit\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\mipmap-xxhdpi-v4\\ic_dialog_close.png
+D\:\\zhongyicommit\\bvvm\\dialog\\src\\main\\res\\drawable\\dialog_menu_item.xml=D\:\\zhongyicommit\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\drawable\\dialog_menu_item.xml
+D\:\\zhongyicommit\\bvvm\\dialog\\src\\main\\res\\drawable\\dialog_menu_item_top.xml=D\:\\zhongyicommit\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\drawable\\dialog_menu_item_top.xml
+D\:\\zhongyicommit\\bvvm\\dialog\\src\\main\\res\\layout\\dialog_toast.xml=D\:\\zhongyicommit\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\layout\\dialog_toast.xml
+D\:\\zhongyicommit\\bvvm\\dialog\\src\\main\\res\\layout\\dialog_message.xml=D\:\\zhongyicommit\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\layout\\dialog_message.xml
+D\:\\zhongyicommit\\bvvm\\dialog\\src\\main\\res\\drawable\\dialog_message_left_button.xml=D\:\\zhongyicommit\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\drawable\\dialog_message_left_button.xml
+D\:\\zhongyicommit\\bvvm\\dialog\\src\\main\\res\\drawable\\dialog_menu_item_bottom.xml=D\:\\zhongyicommit\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\drawable\\dialog_menu_item_bottom.xml
+D\:\\zhongyicommit\\bvvm\\dialog\\src\\main\\res\\mipmap-xxhdpi\\ic_dialog_warning.png=D\:\\zhongyicommit\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\mipmap-xxhdpi-v4\\ic_dialog_warning.png
+D\:\\zhongyicommit\\bvvm\\dialog\\src\\main\\res\\mipmap-xxhdpi\\ic_dialog_error.png=D\:\\zhongyicommit\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\mipmap-xxhdpi-v4\\ic_dialog_error.png
+D\:\\zhongyicommit\\bvvm\\dialog\\src\\main\\res\\layout\\dialog_address.xml=D\:\\zhongyicommit\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\layout\\dialog_address.xml
+D\:\\zhongyicommit\\bvvm\\dialog\\src\\main\\res\\drawable\\dialog_message_right_button.xml=D\:\\zhongyicommit\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\drawable\\dialog_message_right_button.xml
+D\:\\zhongyicommit\\bvvm\\dialog\\src\\main\\res\\drawable\\dialog_message_one_button.xml=D\:\\zhongyicommit\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\drawable\\dialog_message_one_button.xml
+D\:\\zhongyicommit\\bvvm\\dialog\\src\\main\\res\\layout\\dialog_menu.xml=D\:\\zhongyicommit\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\layout\\dialog_menu.xml
+D\:\\zhongyicommit\\bvvm\\dialog\\src\\main\\res\\layout\\dialog_wait.xml=D\:\\zhongyicommit\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\layout\\dialog_wait.xml
+D\:\\zhongyicommit\\bvvm\\dialog\\src\\main\\res\\layout\\dialog_pay_password.xml=D\:\\zhongyicommit\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\layout\\dialog_pay_password.xml
+D\:\\zhongyicommit\\bvvm\\dialog\\src\\main\\res\\drawable\\dialog_input_text_bg.xml=D\:\\zhongyicommit\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\drawable\\dialog_input_text_bg.xml
+D\:\\zhongyicommit\\bvvm\\dialog\\src\\main\\res\\mipmap-xxhdpi\\ic_dialog_delete.png=D\:\\zhongyicommit\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\mipmap-xxhdpi-v4\\ic_dialog_delete.png
+D\:\\zhongyicommit\\bvvm\\dialog\\src\\main\\res\\drawable\\dialog_pay_password_item_del_selector.xml=D\:\\zhongyicommit\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\drawable\\dialog_pay_password_item_del_selector.xml
+D\:\\zhongyicommit\\bvvm\\dialog\\src\\main\\res\\layout\\dialog_wheel.xml=D\:\\zhongyicommit\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\layout\\dialog_wheel.xml
+D\:\\zhongyicommit\\bvvm\\dialog\\src\\main\\res\\drawable\\dialog_menu_item_middle.xml=D\:\\zhongyicommit\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\drawable\\dialog_menu_item_middle.xml
+D\:\\zhongyicommit\\bvvm\\dialog\\src\\main\\res\\drawable\\dialog_message_bg.xml=D\:\\zhongyicommit\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\drawable\\dialog_message_bg.xml
+D\:\\zhongyicommit\\bvvm\\dialog\\src\\main\\res\\drawable\\dialog_toast_bg.xml=D\:\\zhongyicommit\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\drawable\\dialog_toast_bg.xml
+D\:\\zhongyicommit\\bvvm\\dialog\\src\\main\\res\\drawable\\dialog_pay_password_item_selector.xml=D\:\\zhongyicommit\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\drawable\\dialog_pay_password_item_selector.xml
+D\:\\zhongyicommit\\bvvm\\dialog\\src\\main\\res\\layout\\dialog_input.xml=D\:\\zhongyicommit\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\layout\\dialog_input.xml

dialog/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt

@@ -4,8 +4,8 @@
 4
 5    <uses-sdk
 6        android:minSdkVersion="15"
-6-->D:\zhongyicommit\new\bvvm\dialog\src\main\AndroidManifest.xml
+6-->D:\zhongyicommit\bvvm\dialog\src\main\AndroidManifest.xml
 7        android:targetSdkVersion="28" />
-7-->D:\zhongyicommit\new\bvvm\dialog\src\main\AndroidManifest.xml
+7-->D:\zhongyicommit\bvvm\dialog\src\main\AndroidManifest.xml
 8
 9</manifest>

dialog/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt

@@ -3,34 +3,34 @@
 3    package="com.hjq.dialog.test" >
 4
 5    <uses-sdk
-5-->D:\zhongyicommit\new\bvvm\dialog\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger3607313700856001574.xml:5:5-74
+5-->D:\zhongyicommit\bvvm\dialog\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger1483728187846629044.xml:5:5-74
 6        android:minSdkVersion="15"
-6-->D:\zhongyicommit\new\bvvm\dialog\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger3607313700856001574.xml:5:15-41
+6-->D:\zhongyicommit\bvvm\dialog\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger1483728187846629044.xml:5:15-41
 7        android:targetSdkVersion="28" />
-7-->D:\zhongyicommit\new\bvvm\dialog\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger3607313700856001574.xml:5:42-71
+7-->D:\zhongyicommit\bvvm\dialog\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger1483728187846629044.xml:5:42-71
 8
 9    <instrumentation
-9-->D:\zhongyicommit\new\bvvm\dialog\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger3607313700856001574.xml:11:5-15:69
+9-->D:\zhongyicommit\bvvm\dialog\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger1483728187846629044.xml:11:5-15:69
 10        android:name="android.test.InstrumentationTestRunner"
-10-->D:\zhongyicommit\new\bvvm\dialog\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger3607313700856001574.xml:11:22-75
+10-->D:\zhongyicommit\bvvm\dialog\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger1483728187846629044.xml:11:22-75
 11        android:functionalTest="false"
-11-->D:\zhongyicommit\new\bvvm\dialog\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger3607313700856001574.xml:14:22-52
+11-->D:\zhongyicommit\bvvm\dialog\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger1483728187846629044.xml:14:22-52
 12        android:handleProfiling="false"
-12-->D:\zhongyicommit\new\bvvm\dialog\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger3607313700856001574.xml:13:22-53
+12-->D:\zhongyicommit\bvvm\dialog\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger1483728187846629044.xml:13:22-53
 13        android:label="Tests for com.hjq.dialog.test"
-13-->D:\zhongyicommit\new\bvvm\dialog\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger3607313700856001574.xml:15:22-67
+13-->D:\zhongyicommit\bvvm\dialog\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger1483728187846629044.xml:15:22-67
 14        android:targetPackage="com.hjq.dialog.test" />
-14-->D:\zhongyicommit\new\bvvm\dialog\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger3607313700856001574.xml:12:22-65
+14-->D:\zhongyicommit\bvvm\dialog\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger1483728187846629044.xml:12:22-65
 15
 16    <application
-16-->D:\zhongyicommit\new\bvvm\dialog\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger3607313700856001574.xml:7:5-9:19
+16-->D:\zhongyicommit\bvvm\dialog\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger1483728187846629044.xml:7:5-9:19
 17        android:appComponentFactory="android.support.v4.app.CoreComponentFactory"
 17-->[com.android.support:support-compat:28.0.0] C:\Users\Administrator\.gradle\caches\transforms-2\files-2.1\e63d8f2ee6b637112952f2d1c00d8add\support-compat-28.0.0\AndroidManifest.xml:22:18-91
 18        android:debuggable="true" >
-18-->D:\zhongyicommit\new\bvvm\dialog\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger3607313700856001574.xml:7:18-43
+18-->D:\zhongyicommit\bvvm\dialog\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger1483728187846629044.xml:7:18-43
 19        <uses-library android:name="android.test.runner" />
-19-->D:\zhongyicommit\new\bvvm\dialog\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger3607313700856001574.xml:8:9-60
-19-->D:\zhongyicommit\new\bvvm\dialog\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger3607313700856001574.xml:8:23-57
+19-->D:\zhongyicommit\bvvm\dialog\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger1483728187846629044.xml:8:9-60
+19-->D:\zhongyicommit\bvvm\dialog\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger1483728187846629044.xml:8:23-57
 20    </application>
 21
 22</manifest>

dialog/build/outputs/logs/manifest-merger-debug-report.txt

@@ -1,25 +1,25 @@
 -- Merging decision tree log ---
 manifest
-ADDED from D:\zhongyicommit\new\bvvm\dialog\src\main\AndroidManifest.xml:1:1-38
-INJECTED from D:\zhongyicommit\new\bvvm\dialog\src\main\AndroidManifest.xml:1:1-38
-INJECTED from D:\zhongyicommit\new\bvvm\dialog\src\main\AndroidManifest.xml:1:1-38
+ADDED from D:\zhongyicommit\bvvm\dialog\src\main\AndroidManifest.xml:1:1-38
+INJECTED from D:\zhongyicommit\bvvm\dialog\src\main\AndroidManifest.xml:1:1-38
+INJECTED from D:\zhongyicommit\bvvm\dialog\src\main\AndroidManifest.xml:1:1-38
 	package
-		ADDED from D:\zhongyicommit\new\bvvm\dialog\src\main\AndroidManifest.xml:1:11-35
-		INJECTED from D:\zhongyicommit\new\bvvm\dialog\src\main\AndroidManifest.xml
-		INJECTED from D:\zhongyicommit\new\bvvm\dialog\src\main\AndroidManifest.xml
+		ADDED from D:\zhongyicommit\bvvm\dialog\src\main\AndroidManifest.xml:1:11-35
+		INJECTED from D:\zhongyicommit\bvvm\dialog\src\main\AndroidManifest.xml
+		INJECTED from D:\zhongyicommit\bvvm\dialog\src\main\AndroidManifest.xml
 	xmlns:android
-		ADDED from D:\zhongyicommit\new\bvvm\dialog\src\main\AndroidManifest.xml:1:1-38
+		ADDED from D:\zhongyicommit\bvvm\dialog\src\main\AndroidManifest.xml:1:1-38
 uses-sdk
-INJECTED from D:\zhongyicommit\new\bvvm\dialog\src\main\AndroidManifest.xml reason: use-sdk injection requested
-INJECTED from D:\zhongyicommit\new\bvvm\dialog\src\main\AndroidManifest.xml
-INJECTED from D:\zhongyicommit\new\bvvm\dialog\src\main\AndroidManifest.xml
-INJECTED from D:\zhongyicommit\new\bvvm\dialog\src\main\AndroidManifest.xml
-INJECTED from D:\zhongyicommit\new\bvvm\dialog\src\main\AndroidManifest.xml
+INJECTED from D:\zhongyicommit\bvvm\dialog\src\main\AndroidManifest.xml reason: use-sdk injection requested
+INJECTED from D:\zhongyicommit\bvvm\dialog\src\main\AndroidManifest.xml
+INJECTED from D:\zhongyicommit\bvvm\dialog\src\main\AndroidManifest.xml
+INJECTED from D:\zhongyicommit\bvvm\dialog\src\main\AndroidManifest.xml
+INJECTED from D:\zhongyicommit\bvvm\dialog\src\main\AndroidManifest.xml
 	android:targetSdkVersion
-		INJECTED from D:\zhongyicommit\new\bvvm\dialog\src\main\AndroidManifest.xml
-		ADDED from D:\zhongyicommit\new\bvvm\dialog\src\main\AndroidManifest.xml
-		INJECTED from D:\zhongyicommit\new\bvvm\dialog\src\main\AndroidManifest.xml
+		INJECTED from D:\zhongyicommit\bvvm\dialog\src\main\AndroidManifest.xml
+		ADDED from D:\zhongyicommit\bvvm\dialog\src\main\AndroidManifest.xml
+		INJECTED from D:\zhongyicommit\bvvm\dialog\src\main\AndroidManifest.xml
 	android:minSdkVersion
-		INJECTED from D:\zhongyicommit\new\bvvm\dialog\src\main\AndroidManifest.xml
-		ADDED from D:\zhongyicommit\new\bvvm\dialog\src\main\AndroidManifest.xml
-		INJECTED from D:\zhongyicommit\new\bvvm\dialog\src\main\AndroidManifest.xml
+		INJECTED from D:\zhongyicommit\bvvm\dialog\src\main\AndroidManifest.xml
+		ADDED from D:\zhongyicommit\bvvm\dialog\src\main\AndroidManifest.xml
+		INJECTED from D:\zhongyicommit\bvvm\dialog\src\main\AndroidManifest.xml

image/build/intermediates/incremental/packageDebugResources/compile-file-map.properties

@@ -1,7 +1,7 @@
-#Fri Nov 13 11:26:39 CST 2020
-D\:\\zhongyicommit\\new\\bvvm\\image\\src\\main\\res\\mipmap-xxhdpi\\image_load_err.png=D\:\\zhongyicommit\\new\\bvvm\\image\\build\\intermediates\\packaged_res\\debug\\mipmap-xxhdpi-v4\\image_load_err.png
-D\:\\zhongyicommit\\new\\bvvm\\image\\src\\main\\res\\mipmap-xhdpi\\image_load_err.png=D\:\\zhongyicommit\\new\\bvvm\\image\\build\\intermediates\\packaged_res\\debug\\mipmap-xhdpi-v4\\image_load_err.png
-D\:\\zhongyicommit\\new\\bvvm\\image\\src\\main\\res\\mipmap-hdpi\\image_load_err.png=D\:\\zhongyicommit\\new\\bvvm\\image\\build\\intermediates\\packaged_res\\debug\\mipmap-hdpi-v4\\image_load_err.png
-D\:\\zhongyicommit\\new\\bvvm\\image\\src\\main\\res\\mipmap-hdpi\\image_loading.png=D\:\\zhongyicommit\\new\\bvvm\\image\\build\\intermediates\\packaged_res\\debug\\mipmap-hdpi-v4\\image_loading.png
-D\:\\zhongyicommit\\new\\bvvm\\image\\src\\main\\res\\mipmap-xhdpi\\image_loading.png=D\:\\zhongyicommit\\new\\bvvm\\image\\build\\intermediates\\packaged_res\\debug\\mipmap-xhdpi-v4\\image_loading.png
-D\:\\zhongyicommit\\new\\bvvm\\image\\src\\main\\res\\mipmap-xxhdpi\\image_loading.png=D\:\\zhongyicommit\\new\\bvvm\\image\\build\\intermediates\\packaged_res\\debug\\mipmap-xxhdpi-v4\\image_loading.png
+#Wed Nov 18 15:24:22 CST 2020
+D\:\\zhongyicommit\\bvvm\\image\\src\\main\\res\\mipmap-xxhdpi\\image_load_err.png=D\:\\zhongyicommit\\bvvm\\image\\build\\intermediates\\packaged_res\\debug\\mipmap-xxhdpi-v4\\image_load_err.png
+D\:\\zhongyicommit\\bvvm\\image\\src\\main\\res\\mipmap-hdpi\\image_load_err.png=D\:\\zhongyicommit\\bvvm\\image\\build\\intermediates\\packaged_res\\debug\\mipmap-hdpi-v4\\image_load_err.png
+D\:\\zhongyicommit\\bvvm\\image\\src\\main\\res\\mipmap-xxhdpi\\image_loading.png=D\:\\zhongyicommit\\bvvm\\image\\build\\intermediates\\packaged_res\\debug\\mipmap-xxhdpi-v4\\image_loading.png
+D\:\\zhongyicommit\\bvvm\\image\\src\\main\\res\\mipmap-xhdpi\\image_loading.png=D\:\\zhongyicommit\\bvvm\\image\\build\\intermediates\\packaged_res\\debug\\mipmap-xhdpi-v4\\image_loading.png
+D\:\\zhongyicommit\\bvvm\\image\\src\\main\\res\\mipmap-hdpi\\image_loading.png=D\:\\zhongyicommit\\bvvm\\image\\build\\intermediates\\packaged_res\\debug\\mipmap-hdpi-v4\\image_loading.png
+D\:\\zhongyicommit\\bvvm\\image\\src\\main\\res\\mipmap-xhdpi\\image_load_err.png=D\:\\zhongyicommit\\bvvm\\image\\build\\intermediates\\packaged_res\\debug\\mipmap-xhdpi-v4\\image_load_err.png

image/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt

@@ -4,8 +4,8 @@
 4
 5    <uses-sdk
 6        android:minSdkVersion="15"
-6-->D:\zhongyicommit\new\bvvm\image\src\main\AndroidManifest.xml
+6-->D:\zhongyicommit\bvvm\image\src\main\AndroidManifest.xml
 7        android:targetSdkVersion="28" />
-7-->D:\zhongyicommit\new\bvvm\image\src\main\AndroidManifest.xml
+7-->D:\zhongyicommit\bvvm\image\src\main\AndroidManifest.xml
 8
 9</manifest>

image/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt

@@ -3,34 +3,34 @@
 3    package="com.hjq.copy.test" >
 4
 5    <uses-sdk
-5-->D:\zhongyicommit\new\bvvm\image\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger3121903287839733818.xml:5:5-74
+5-->D:\zhongyicommit\bvvm\image\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger7629920327889552930.xml:5:5-74
 6        android:minSdkVersion="15"
-6-->D:\zhongyicommit\new\bvvm\image\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger3121903287839733818.xml:5:15-41
+6-->D:\zhongyicommit\bvvm\image\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger7629920327889552930.xml:5:15-41
 7        android:targetSdkVersion="28" />
-7-->D:\zhongyicommit\new\bvvm\image\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger3121903287839733818.xml:5:42-71
+7-->D:\zhongyicommit\bvvm\image\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger7629920327889552930.xml:5:42-71
 8
 9    <instrumentation
-9-->D:\zhongyicommit\new\bvvm\image\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger3121903287839733818.xml:11:5-15:67
+9-->D:\zhongyicommit\bvvm\image\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger7629920327889552930.xml:11:5-15:67
 10        android:name="android.test.InstrumentationTestRunner"
-10-->D:\zhongyicommit\new\bvvm\image\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger3121903287839733818.xml:11:22-75
+10-->D:\zhongyicommit\bvvm\image\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger7629920327889552930.xml:11:22-75
 11        android:functionalTest="false"
-11-->D:\zhongyicommit\new\bvvm\image\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger3121903287839733818.xml:14:22-52
+11-->D:\zhongyicommit\bvvm\image\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger7629920327889552930.xml:14:22-52
 12        android:handleProfiling="false"
-12-->D:\zhongyicommit\new\bvvm\image\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger3121903287839733818.xml:13:22-53
+12-->D:\zhongyicommit\bvvm\image\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger7629920327889552930.xml:13:22-53
 13        android:label="Tests for com.hjq.copy.test"
-13-->D:\zhongyicommit\new\bvvm\image\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger3121903287839733818.xml:15:22-65
+13-->D:\zhongyicommit\bvvm\image\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger7629920327889552930.xml:15:22-65
 14        android:targetPackage="com.hjq.copy.test" />
-14-->D:\zhongyicommit\new\bvvm\image\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger3121903287839733818.xml:12:22-63
+14-->D:\zhongyicommit\bvvm\image\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger7629920327889552930.xml:12:22-63
 15
 16    <application
-16-->D:\zhongyicommit\new\bvvm\image\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger3121903287839733818.xml:7:5-9:19
+16-->D:\zhongyicommit\bvvm\image\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger7629920327889552930.xml:7:5-9:19
 17        android:appComponentFactory="android.support.v4.app.CoreComponentFactory"
 17-->[com.android.support:support-compat:28.0.0] C:\Users\Administrator\.gradle\caches\transforms-2\files-2.1\e63d8f2ee6b637112952f2d1c00d8add\support-compat-28.0.0\AndroidManifest.xml:22:18-91
 18        android:debuggable="true" >
-18-->D:\zhongyicommit\new\bvvm\image\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger3121903287839733818.xml:7:18-43
+18-->D:\zhongyicommit\bvvm\image\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger7629920327889552930.xml:7:18-43
 19        <uses-library android:name="android.test.runner" />
-19-->D:\zhongyicommit\new\bvvm\image\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger3121903287839733818.xml:8:9-60
-19-->D:\zhongyicommit\new\bvvm\image\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger3121903287839733818.xml:8:23-57
+19-->D:\zhongyicommit\bvvm\image\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger7629920327889552930.xml:8:9-60
+19-->D:\zhongyicommit\bvvm\image\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger7629920327889552930.xml:8:23-57
 20    </application>
 21
 22</manifest>

image/build/outputs/logs/manifest-merger-debug-report.txt

@@ -1,25 +1,25 @@
 -- Merging decision tree log ---
 manifest
-ADDED from D:\zhongyicommit\new\bvvm\image\src\main\AndroidManifest.xml:1:1-36
-INJECTED from D:\zhongyicommit\new\bvvm\image\src\main\AndroidManifest.xml:1:1-36
-INJECTED from D:\zhongyicommit\new\bvvm\image\src\main\AndroidManifest.xml:1:1-36
+ADDED from D:\zhongyicommit\bvvm\image\src\main\AndroidManifest.xml:1:1-36
+INJECTED from D:\zhongyicommit\bvvm\image\src\main\AndroidManifest.xml:1:1-36
+INJECTED from D:\zhongyicommit\bvvm\image\src\main\AndroidManifest.xml:1:1-36
 	package
-		ADDED from D:\zhongyicommit\new\bvvm\image\src\main\AndroidManifest.xml:1:11-33
-		INJECTED from D:\zhongyicommit\new\bvvm\image\src\main\AndroidManifest.xml
-		INJECTED from D:\zhongyicommit\new\bvvm\image\src\main\AndroidManifest.xml
+		ADDED from D:\zhongyicommit\bvvm\image\src\main\AndroidManifest.xml:1:11-33
+		INJECTED from D:\zhongyicommit\bvvm\image\src\main\AndroidManifest.xml
+		INJECTED from D:\zhongyicommit\bvvm\image\src\main\AndroidManifest.xml
 	xmlns:android
-		ADDED from D:\zhongyicommit\new\bvvm\image\src\main\AndroidManifest.xml:1:1-36
+		ADDED from D:\zhongyicommit\bvvm\image\src\main\AndroidManifest.xml:1:1-36
 uses-sdk
-INJECTED from D:\zhongyicommit\new\bvvm\image\src\main\AndroidManifest.xml reason: use-sdk injection requested
-INJECTED from D:\zhongyicommit\new\bvvm\image\src\main\AndroidManifest.xml
-INJECTED from D:\zhongyicommit\new\bvvm\image\src\main\AndroidManifest.xml
-INJECTED from D:\zhongyicommit\new\bvvm\image\src\main\AndroidManifest.xml
-INJECTED from D:\zhongyicommit\new\bvvm\image\src\main\AndroidManifest.xml
+INJECTED from D:\zhongyicommit\bvvm\image\src\main\AndroidManifest.xml reason: use-sdk injection requested
+INJECTED from D:\zhongyicommit\bvvm\image\src\main\AndroidManifest.xml
+INJECTED from D:\zhongyicommit\bvvm\image\src\main\AndroidManifest.xml
+INJECTED from D:\zhongyicommit\bvvm\image\src\main\AndroidManifest.xml
+INJECTED from D:\zhongyicommit\bvvm\image\src\main\AndroidManifest.xml
 	android:targetSdkVersion
-		INJECTED from D:\zhongyicommit\new\bvvm\image\src\main\AndroidManifest.xml
-		ADDED from D:\zhongyicommit\new\bvvm\image\src\main\AndroidManifest.xml
-		INJECTED from D:\zhongyicommit\new\bvvm\image\src\main\AndroidManifest.xml
+		INJECTED from D:\zhongyicommit\bvvm\image\src\main\AndroidManifest.xml
+		ADDED from D:\zhongyicommit\bvvm\image\src\main\AndroidManifest.xml
+		INJECTED from D:\zhongyicommit\bvvm\image\src\main\AndroidManifest.xml
 	android:minSdkVersion
-		INJECTED from D:\zhongyicommit\new\bvvm\image\src\main\AndroidManifest.xml
-		ADDED from D:\zhongyicommit\new\bvvm\image\src\main\AndroidManifest.xml
-		INJECTED from D:\zhongyicommit\new\bvvm\image\src\main\AndroidManifest.xml
+		INJECTED from D:\zhongyicommit\bvvm\image\src\main\AndroidManifest.xml
+		ADDED from D:\zhongyicommit\bvvm\image\src\main\AndroidManifest.xml
+		INJECTED from D:\zhongyicommit\bvvm\image\src\main\AndroidManifest.xml

widget/build/intermediates/incremental/packageDebugResources/compile-file-map.properties

@@ -1,14 +1,14 @@
-#Fri Nov 13 11:26:39 CST 2020
-D\:\\zhongyicommit\\new\\bvvm\\widget\\src\\main\\res\\drawable-xxhdpi\\ic_stat_name.png=D\:\\zhongyicommit\\new\\bvvm\\widget\\build\\intermediates\\packaged_res\\debug\\drawable-xxhdpi-v4\\ic_stat_name.png
-D\:\\zhongyicommit\\new\\bvvm\\widget\\src\\main\\res\\mipmap-xxhdpi\\widget_input_delete.png=D\:\\zhongyicommit\\new\\bvvm\\widget\\build\\intermediates\\packaged_res\\debug\\mipmap-xxhdpi-v4\\widget_input_delete.png
-D\:\\zhongyicommit\\new\\bvvm\\widget\\src\\main\\res\\drawable-xxhdpi\\ic_input_show.png=D\:\\zhongyicommit\\new\\bvvm\\widget\\build\\intermediates\\packaged_res\\debug\\drawable-xxhdpi-v4\\ic_input_show.png
-D\:\\zhongyicommit\\new\\bvvm\\widget\\src\\main\\res\\drawable-hdpi\\ic_stat_name.png=D\:\\zhongyicommit\\new\\bvvm\\widget\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\ic_stat_name.png
-D\:\\zhongyicommit\\new\\bvvm\\widget\\src\\main\\res\\drawable-xhdpi\\ic_stat_name.png=D\:\\zhongyicommit\\new\\bvvm\\widget\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\ic_stat_name.png
-D\:\\zhongyicommit\\new\\bvvm\\widget\\src\\main\\res\\drawable-mdpi\\ic_stat_name.png=D\:\\zhongyicommit\\new\\bvvm\\widget\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\ic_stat_name.png
-D\:\\zhongyicommit\\new\\bvvm\\widget\\src\\main\\res\\layout\\widget_setting_bar.xml=D\:\\zhongyicommit\\new\\bvvm\\widget\\build\\intermediates\\packaged_res\\debug\\layout\\widget_setting_bar.xml
-D\:\\zhongyicommit\\new\\bvvm\\widget\\src\\main\\res\\layout\\widget_hint_layout.xml=D\:\\zhongyicommit\\new\\bvvm\\widget\\build\\intermediates\\packaged_res\\debug\\layout\\widget_hint_layout.xml
-D\:\\zhongyicommit\\new\\bvvm\\widget\\src\\main\\res\\drawable\\widget_bg_settting_bar_selector.xml=D\:\\zhongyicommit\\new\\bvvm\\widget\\build\\intermediates\\packaged_res\\debug\\drawable\\widget_bg_settting_bar_selector.xml
-D\:\\zhongyicommit\\new\\bvvm\\widget\\src\\main\\res\\mipmap-xhdpi\\widget_input_delete.png=D\:\\zhongyicommit\\new\\bvvm\\widget\\build\\intermediates\\packaged_res\\debug\\mipmap-xhdpi-v4\\widget_input_delete.png
-D\:\\zhongyicommit\\new\\bvvm\\widget\\src\\main\\res\\drawable-xxhdpi\\ic_input_hide.png=D\:\\zhongyicommit\\new\\bvvm\\widget\\build\\intermediates\\packaged_res\\debug\\drawable-xxhdpi-v4\\ic_input_hide.png
-D\:\\zhongyicommit\\new\\bvvm\\widget\\src\\main\\res\\mipmap-hdpi\\widget_input_delete.png=D\:\\zhongyicommit\\new\\bvvm\\widget\\build\\intermediates\\packaged_res\\debug\\mipmap-hdpi-v4\\widget_input_delete.png
-D\:\\zhongyicommit\\new\\bvvm\\widget\\src\\main\\res\\drawable-xxxhdpi\\ic_stat_name.png=D\:\\zhongyicommit\\new\\bvvm\\widget\\build\\intermediates\\packaged_res\\debug\\drawable-xxxhdpi-v4\\ic_stat_name.png
+#Wed Nov 18 15:24:22 CST 2020
+D\:\\zhongyicommit\\bvvm\\widget\\src\\main\\res\\drawable-hdpi\\ic_stat_name.png=D\:\\zhongyicommit\\bvvm\\widget\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\ic_stat_name.png
+D\:\\zhongyicommit\\bvvm\\widget\\src\\main\\res\\mipmap-xxhdpi\\widget_input_delete.png=D\:\\zhongyicommit\\bvvm\\widget\\build\\intermediates\\packaged_res\\debug\\mipmap-xxhdpi-v4\\widget_input_delete.png
+D\:\\zhongyicommit\\bvvm\\widget\\src\\main\\res\\drawable-xxxhdpi\\ic_stat_name.png=D\:\\zhongyicommit\\bvvm\\widget\\build\\intermediates\\packaged_res\\debug\\drawable-xxxhdpi-v4\\ic_stat_name.png
+D\:\\zhongyicommit\\bvvm\\widget\\src\\main\\res\\mipmap-hdpi\\widget_input_delete.png=D\:\\zhongyicommit\\bvvm\\widget\\build\\intermediates\\packaged_res\\debug\\mipmap-hdpi-v4\\widget_input_delete.png
+D\:\\zhongyicommit\\bvvm\\widget\\src\\main\\res\\drawable-xxhdpi\\ic_input_show.png=D\:\\zhongyicommit\\bvvm\\widget\\build\\intermediates\\packaged_res\\debug\\drawable-xxhdpi-v4\\ic_input_show.png
+D\:\\zhongyicommit\\bvvm\\widget\\src\\main\\res\\drawable-mdpi\\ic_stat_name.png=D\:\\zhongyicommit\\bvvm\\widget\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\ic_stat_name.png
+D\:\\zhongyicommit\\bvvm\\widget\\src\\main\\res\\drawable-xxhdpi\\ic_stat_name.png=D\:\\zhongyicommit\\bvvm\\widget\\build\\intermediates\\packaged_res\\debug\\drawable-xxhdpi-v4\\ic_stat_name.png
+D\:\\zhongyicommit\\bvvm\\widget\\src\\main\\res\\layout\\widget_setting_bar.xml=D\:\\zhongyicommit\\bvvm\\widget\\build\\intermediates\\packaged_res\\debug\\layout\\widget_setting_bar.xml
+D\:\\zhongyicommit\\bvvm\\widget\\src\\main\\res\\layout\\widget_hint_layout.xml=D\:\\zhongyicommit\\bvvm\\widget\\build\\intermediates\\packaged_res\\debug\\layout\\widget_hint_layout.xml
+D\:\\zhongyicommit\\bvvm\\widget\\src\\main\\res\\drawable\\widget_bg_settting_bar_selector.xml=D\:\\zhongyicommit\\bvvm\\widget\\build\\intermediates\\packaged_res\\debug\\drawable\\widget_bg_settting_bar_selector.xml
+D\:\\zhongyicommit\\bvvm\\widget\\src\\main\\res\\drawable-xhdpi\\ic_stat_name.png=D\:\\zhongyicommit\\bvvm\\widget\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\ic_stat_name.png
+D\:\\zhongyicommit\\bvvm\\widget\\src\\main\\res\\drawable-xxhdpi\\ic_input_hide.png=D\:\\zhongyicommit\\bvvm\\widget\\build\\intermediates\\packaged_res\\debug\\drawable-xxhdpi-v4\\ic_input_hide.png
+D\:\\zhongyicommit\\bvvm\\widget\\src\\main\\res\\mipmap-xhdpi\\widget_input_delete.png=D\:\\zhongyicommit\\bvvm\\widget\\build\\intermediates\\packaged_res\\debug\\mipmap-xhdpi-v4\\widget_input_delete.png

widget/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt

@@ -4,8 +4,8 @@
 4
 5    <uses-sdk
 6        android:minSdkVersion="15"
-6-->D:\zhongyicommit\new\bvvm\widget\src\main\AndroidManifest.xml
+6-->D:\zhongyicommit\bvvm\widget\src\main\AndroidManifest.xml
 7        android:targetSdkVersion="28" />
-7-->D:\zhongyicommit\new\bvvm\widget\src\main\AndroidManifest.xml
+7-->D:\zhongyicommit\bvvm\widget\src\main\AndroidManifest.xml
 8
 9</manifest>

widget/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt

@@ -3,34 +3,34 @@
 3    package="com.hjq.widget.test" >
 4
 5    <uses-sdk
-5-->D:\zhongyicommit\new\bvvm\widget\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger8505524245268238122.xml:5:5-74
+5-->D:\zhongyicommit\bvvm\widget\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger4603263811825392504.xml:5:5-74
 6        android:minSdkVersion="15"
-6-->D:\zhongyicommit\new\bvvm\widget\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger8505524245268238122.xml:5:15-41
+6-->D:\zhongyicommit\bvvm\widget\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger4603263811825392504.xml:5:15-41
 7        android:targetSdkVersion="28" />
-7-->D:\zhongyicommit\new\bvvm\widget\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger8505524245268238122.xml:5:42-71
+7-->D:\zhongyicommit\bvvm\widget\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger4603263811825392504.xml:5:42-71
 8
 9    <instrumentation
-9-->D:\zhongyicommit\new\bvvm\widget\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger8505524245268238122.xml:11:5-15:69
+9-->D:\zhongyicommit\bvvm\widget\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger4603263811825392504.xml:11:5-15:69
 10        android:name="android.test.InstrumentationTestRunner"
-10-->D:\zhongyicommit\new\bvvm\widget\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger8505524245268238122.xml:11:22-75
+10-->D:\zhongyicommit\bvvm\widget\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger4603263811825392504.xml:11:22-75
 11        android:functionalTest="false"
-11-->D:\zhongyicommit\new\bvvm\widget\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger8505524245268238122.xml:14:22-52
+11-->D:\zhongyicommit\bvvm\widget\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger4603263811825392504.xml:14:22-52
 12        android:handleProfiling="false"
-12-->D:\zhongyicommit\new\bvvm\widget\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger8505524245268238122.xml:13:22-53
+12-->D:\zhongyicommit\bvvm\widget\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger4603263811825392504.xml:13:22-53
 13        android:label="Tests for com.hjq.widget.test"
-13-->D:\zhongyicommit\new\bvvm\widget\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger8505524245268238122.xml:15:22-67
+13-->D:\zhongyicommit\bvvm\widget\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger4603263811825392504.xml:15:22-67
 14        android:targetPackage="com.hjq.widget.test" />
-14-->D:\zhongyicommit\new\bvvm\widget\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger8505524245268238122.xml:12:22-65
+14-->D:\zhongyicommit\bvvm\widget\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger4603263811825392504.xml:12:22-65
 15
 16    <application
-16-->D:\zhongyicommit\new\bvvm\widget\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger8505524245268238122.xml:7:5-9:19
+16-->D:\zhongyicommit\bvvm\widget\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger4603263811825392504.xml:7:5-9:19
 17        android:appComponentFactory="android.support.v4.app.CoreComponentFactory"
 17-->[com.android.support:support-compat:28.0.0] C:\Users\Administrator\.gradle\caches\transforms-2\files-2.1\e63d8f2ee6b637112952f2d1c00d8add\support-compat-28.0.0\AndroidManifest.xml:22:18-91
 18        android:debuggable="true" >
-18-->D:\zhongyicommit\new\bvvm\widget\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger8505524245268238122.xml:7:18-43
+18-->D:\zhongyicommit\bvvm\widget\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger4603263811825392504.xml:7:18-43
 19        <uses-library android:name="android.test.runner" />
-19-->D:\zhongyicommit\new\bvvm\widget\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger8505524245268238122.xml:8:9-60
-19-->D:\zhongyicommit\new\bvvm\widget\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger8505524245268238122.xml:8:23-57
+19-->D:\zhongyicommit\bvvm\widget\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger4603263811825392504.xml:8:9-60
+19-->D:\zhongyicommit\bvvm\widget\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger4603263811825392504.xml:8:23-57
 20    </application>
 21
 22</manifest>

widget/build/outputs/logs/manifest-merger-debug-report.txt

@@ -1,25 +1,25 @@
 -- Merging decision tree log ---
 manifest
-ADDED from D:\zhongyicommit\new\bvvm\widget\src\main\AndroidManifest.xml:1:1-38
-INJECTED from D:\zhongyicommit\new\bvvm\widget\src\main\AndroidManifest.xml:1:1-38
-INJECTED from D:\zhongyicommit\new\bvvm\widget\src\main\AndroidManifest.xml:1:1-38
+ADDED from D:\zhongyicommit\bvvm\widget\src\main\AndroidManifest.xml:1:1-38
+INJECTED from D:\zhongyicommit\bvvm\widget\src\main\AndroidManifest.xml:1:1-38
+INJECTED from D:\zhongyicommit\bvvm\widget\src\main\AndroidManifest.xml:1:1-38
 	package
-		ADDED from D:\zhongyicommit\new\bvvm\widget\src\main\AndroidManifest.xml:1:11-35
-		INJECTED from D:\zhongyicommit\new\bvvm\widget\src\main\AndroidManifest.xml
-		INJECTED from D:\zhongyicommit\new\bvvm\widget\src\main\AndroidManifest.xml
+		ADDED from D:\zhongyicommit\bvvm\widget\src\main\AndroidManifest.xml:1:11-35
+		INJECTED from D:\zhongyicommit\bvvm\widget\src\main\AndroidManifest.xml
+		INJECTED from D:\zhongyicommit\bvvm\widget\src\main\AndroidManifest.xml
 	xmlns:android
-		ADDED from D:\zhongyicommit\new\bvvm\widget\src\main\AndroidManifest.xml:1:1-38
+		ADDED from D:\zhongyicommit\bvvm\widget\src\main\AndroidManifest.xml:1:1-38
 uses-sdk
-INJECTED from D:\zhongyicommit\new\bvvm\widget\src\main\AndroidManifest.xml reason: use-sdk injection requested
-INJECTED from D:\zhongyicommit\new\bvvm\widget\src\main\AndroidManifest.xml
-INJECTED from D:\zhongyicommit\new\bvvm\widget\src\main\AndroidManifest.xml
-INJECTED from D:\zhongyicommit\new\bvvm\widget\src\main\AndroidManifest.xml
-INJECTED from D:\zhongyicommit\new\bvvm\widget\src\main\AndroidManifest.xml
+INJECTED from D:\zhongyicommit\bvvm\widget\src\main\AndroidManifest.xml reason: use-sdk injection requested
+INJECTED from D:\zhongyicommit\bvvm\widget\src\main\AndroidManifest.xml
+INJECTED from D:\zhongyicommit\bvvm\widget\src\main\AndroidManifest.xml
+INJECTED from D:\zhongyicommit\bvvm\widget\src\main\AndroidManifest.xml
+INJECTED from D:\zhongyicommit\bvvm\widget\src\main\AndroidManifest.xml
 	android:targetSdkVersion
-		INJECTED from D:\zhongyicommit\new\bvvm\widget\src\main\AndroidManifest.xml
-		ADDED from D:\zhongyicommit\new\bvvm\widget\src\main\AndroidManifest.xml
-		INJECTED from D:\zhongyicommit\new\bvvm\widget\src\main\AndroidManifest.xml
+		INJECTED from D:\zhongyicommit\bvvm\widget\src\main\AndroidManifest.xml
+		ADDED from D:\zhongyicommit\bvvm\widget\src\main\AndroidManifest.xml
+		INJECTED from D:\zhongyicommit\bvvm\widget\src\main\AndroidManifest.xml
 	android:minSdkVersion
-		INJECTED from D:\zhongyicommit\new\bvvm\widget\src\main\AndroidManifest.xml
-		ADDED from D:\zhongyicommit\new\bvvm\widget\src\main\AndroidManifest.xml
-		INJECTED from D:\zhongyicommit\new\bvvm\widget\src\main\AndroidManifest.xml
+		INJECTED from D:\zhongyicommit\bvvm\widget\src\main\AndroidManifest.xml
+		ADDED from D:\zhongyicommit\bvvm\widget\src\main\AndroidManifest.xml
+		INJECTED from D:\zhongyicommit\bvvm\widget\src\main\AndroidManifest.xml