修改界面参数

app/src/main/AndroidManifest.xml

@@ -12,7 +12,8 @@
         android:label="@string/app_name_mes"
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"
-        tools:replace="allowBackup,label,theme">
+        tools:replace="allowBackup,label,theme"
+        tools:targetApi="m">
         <activity android:name=".activity.VideoActivity" />
         <activity android:name=".activity.ProductCodeActivity" />
         <activity android:name=".activity.BaseSelectActivity" />

app/src/main/res/values-v19/styles.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <!-- Customize your theme here. -->
-        <!--<item name="android:windowTranslucentStatus">true</item>-->
-    </style>
-
-
-    <style name="NoOverLayStyle" parent="@style/AppTheme">
-        <item name="android:windowContentOverlay">@null</item>
-        <!--<item name="android:windowBackground">@drawable/app_splash_pic</item>-->
-        <item name="android:windowTranslucentStatus">true</item>
-    </style>
-
-</resources>

app/src/main/res/values-v21/styles.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="PopWinStyle">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:orientation">vertical</item>
-        <item name="android:layout_centerInParent">true</item>
-        <item name="android:translationZ">50dp</item>
-    </style>
-
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <!-- Customize your theme here. -->
-        <!--<item name="android:windowTranslucentStatus">true</item>-->
-    </style>
-
-    <style name="NoOverLayStyle" parent="@style/AppTheme">
-        <item name="android:windowContentOverlay">@null</item>
-        <!--<item name="android:windowBackground">@drawable/app_splash_pic</item>-->
-        <item name="android:windowTranslucentStatus">true</item>
-    </style>
-</resources>

pda_libs/pulltoreflashlibrary/build/intermediates/incremental/mergeDebugJniLibFolders/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:\GongSi\AS_XiangMu\ESOP-STANDARD\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\GongSi\AS_XiangMu\ESOP-STANDARD\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\debug\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\newEsop\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\jniLibs"/></dataSet><dataSet config="debug" 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\debug\jniLibs"/></dataSet></merger>

pda_libs/pulltoreflashlibrary/build/intermediates/incremental/mergeDebugShaders/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:\GongSi\AS_XiangMu\ESOP-STANDARD\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\GongSi\AS_XiangMu\ESOP-STANDARD\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\debug\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\newEsop\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\shaders"/></dataSet><dataSet config="debug" 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\debug\shaders"/></dataSet></merger>

pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageDebugAssets/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:\GongSi\AS_XiangMu\ESOP-STANDARD\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\assets"/><source path="D:\GongSi\AS_XiangMu\ESOP-STANDARD\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\GongSi\AS_XiangMu\ESOP-STANDARD\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\debug\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\newEsop\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\src\main\assets"/><source path="D:\AndroidData\newEsop\ESOP-STANDARD\pda_libs\pulltoreflashlibrary\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" 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\debug\assets"/></dataSet></merger>

pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageDebugResources/compile-file-map.properties

@@ -1,18 +1,18 @@
-#Fri Sep 20 17:28:20 CST 2024
-D\:\\GongSi\\AS_XiangMu\\ESOP-STANDARD\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_rotate.png=D\:\\GongSi\\AS_XiangMu\\ESOP-STANDARD\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\default_ptr_rotate.png
-D\:\\GongSi\\AS_XiangMu\\ESOP-STANDARD\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_flip.png=D\:\\GongSi\\AS_XiangMu\\ESOP-STANDARD\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\default_ptr_flip.png
-D\:\\GongSi\\AS_XiangMu\\ESOP-STANDARD\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_flip.png=D\:\\GongSi\\AS_XiangMu\\ESOP-STANDARD\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\default_ptr_flip.png
-D\:\\GongSi\\AS_XiangMu\\ESOP-STANDARD\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\indicator_arrow.png=D\:\\GongSi\\AS_XiangMu\\ESOP-STANDARD\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\indicator_arrow.png
-D\:\\GongSi\\AS_XiangMu\\ESOP-STANDARD\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\indicator_arrow.png=D\:\\GongSi\\AS_XiangMu\\ESOP-STANDARD\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\indicator_arrow.png
-D\:\\GongSi\\AS_XiangMu\\ESOP-STANDARD\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_bottom.xml=D\:\\GongSi\\AS_XiangMu\\ESOP-STANDARD\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_out_to_bottom.xml
-D\:\\GongSi\\AS_XiangMu\\ESOP-STANDARD\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_top.xml=D\:\\GongSi\\AS_XiangMu\\ESOP-STANDARD\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_in_from_top.xml
-D\:\\GongSi\\AS_XiangMu\\ESOP-STANDARD\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_vertical.xml=D\:\\GongSi\\AS_XiangMu\\ESOP-STANDARD\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\layout\\pull_to_refresh_header_vertical.xml
-D\:\\GongSi\\AS_XiangMu\\ESOP-STANDARD\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_rotate.png=D\:\\GongSi\\AS_XiangMu\\ESOP-STANDARD\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\default_ptr_rotate.png
-D\:\\GongSi\\AS_XiangMu\\ESOP-STANDARD\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_horizontal.xml=D\:\\GongSi\\AS_XiangMu\\ESOP-STANDARD\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\layout\\pull_to_refresh_header_horizontal.xml
-D\:\\GongSi\\AS_XiangMu\\ESOP-STANDARD\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_top.xml=D\:\\GongSi\\AS_XiangMu\\ESOP-STANDARD\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable\\indicator_bg_top.xml
-D\:\\GongSi\\AS_XiangMu\\ESOP-STANDARD\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\indicator_arrow.png=D\:\\GongSi\\AS_XiangMu\\ESOP-STANDARD\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\indicator_arrow.png
-D\:\\GongSi\\AS_XiangMu\\ESOP-STANDARD\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_top.xml=D\:\\GongSi\\AS_XiangMu\\ESOP-STANDARD\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_out_to_top.xml
-D\:\\GongSi\\AS_XiangMu\\ESOP-STANDARD\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_flip.png=D\:\\GongSi\\AS_XiangMu\\ESOP-STANDARD\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\default_ptr_flip.png
-D\:\\GongSi\\AS_XiangMu\\ESOP-STANDARD\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_rotate.png=D\:\\GongSi\\AS_XiangMu\\ESOP-STANDARD\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\default_ptr_rotate.png
-D\:\\GongSi\\AS_XiangMu\\ESOP-STANDARD\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_bottom.xml=D\:\\GongSi\\AS_XiangMu\\ESOP-STANDARD\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable\\indicator_bg_bottom.xml
-D\:\\GongSi\\AS_XiangMu\\ESOP-STANDARD\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_bottom.xml=D\:\\GongSi\\AS_XiangMu\\ESOP-STANDARD\\ESOP-STANDARD\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_in_from_bottom.xml
+#Fri Oct 11 18:46:00 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\\debug\\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\\debug\\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\\debug\\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\\debug\\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\\debug\\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\\debug\\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\\debug\\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\\debug\\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\\debug\\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\\debug\\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\\debug\\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\\debug\\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\\debug\\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\\debug\\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\\debug\\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\\debug\\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\\debug\\anim\\slide_in_from_top.xml

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

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

pda_libs/pulltoreflashlibrary/build/outputs/logs/manifest-merger-debug-report.txt

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