build文件修改

.idea/compiler.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="1.8" />
+    <bytecodeTargetLevel target="11" />
   </component>
 </project>

.idea/gradle.xml

@@ -22,6 +22,5 @@
         <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
-    <option name="offlineMode" value="true" />
   </component>
 </project>

.idea/misc.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>

app/build.gradle

@@ -45,7 +45,7 @@ android {
             if (outputFile != null && outputFile.name.endsWith('.apk')) {
                 if (variant.buildType.name.equals('release')) {
                     def releaseInfo = getVersionName()
-                    fileName = "UAS_MES_STORAGE_RELEASE_${releaseInfo}.apk"
+                    fileName = "华研车间程序UAS_MES_STORAGE_RELEASE_${releaseInfo}.apk"
                 } else if (variant.buildType.name.equals('debug')) {
                     def debugInfo = getVersionName()
                     fileName = "UAS_MES_STORAGE_DEBUG_${debugInfo}.apk"
@@ -95,7 +95,7 @@ dependencies {
     implementation 'org.greenrobot:eventbus:3.2.0'
     implementation 'com.gavin.com.library:stickyDecoration:1.4.11'
     //OKGO
-    implementation 'com.lzy.net:okgo:+'
+    implementation 'com.lzy.net:okgo:3.0.4'
     implementation 'com.lzy.net:okrx2:2.0.2'
     implementation 'com.lzy.net:okserver:2.0.5'
     implementation 'com.contrarywind:Android-PickerView:4.1.9'

app/release/output.json

@@ -1 +0,0 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"v1.0","enabled":true,"outputFile":"UAS_MES_STORAGE_RELEASE_v1.0.apk","fullName":"release","baseName":"release"},"path":"UAS_MES_STORAGE_RELEASE_v1.0.apk","properties":{}}]

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\hyuas-mes\hyuas-mes\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\hyuas-mes\hyuas-mes\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\hyuas-mes\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\hyuas-mes\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\hyuas-mes\hyuas-mes\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\hyuas-mes\hyuas-mes\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\hyuas-mes\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\hyuas-mes\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\hyuas-mes\hyuas-mes\pda_libs\pulltoreflashlibrary\src\main\assets"/><source path="D:\GongSi\AS_XiangMu\hyuas-mes\hyuas-mes\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\hyuas-mes\hyuas-mes\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\hyuas-mes\pda_libs\pulltoreflashlibrary\src\main\assets"/><source path="D:\AndroidData\hyuas-mes\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\hyuas-mes\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 13 11:46:54 CST 2024
-D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\indicator_arrow.png=D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\indicator_arrow.png
-D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_flip.png=D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\default_ptr_flip.png
-D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_bottom.xml=D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_out_to_bottom.xml
-D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\indicator_arrow.png=D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\indicator_arrow.png
-D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_horizontal.xml=D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\layout\\pull_to_refresh_header_horizontal.xml
-D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_flip.png=D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\default_ptr_flip.png
-D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_bottom.xml=D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable\\indicator_bg_bottom.xml
-D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_top.xml=D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_in_from_top.xml
-D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\indicator_arrow.png=D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\indicator_arrow.png
-D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_rotate.png=D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\default_ptr_rotate.png
-D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_rotate.png=D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\default_ptr_rotate.png
-D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_top.xml=D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable\\indicator_bg_top.xml
-D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_bottom.xml=D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_in_from_bottom.xml
-D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_top.xml=D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_out_to_top.xml
-D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_vertical.xml=D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\layout\\pull_to_refresh_header_vertical.xml
-D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_rotate.png=D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\default_ptr_rotate.png
-D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_flip.png=D\:\\GongSi\\AS_XiangMu\\hyuas-mes\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\default_ptr_flip.png
+#Wed Feb 12 10:16:55 CST 2025
+D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_bottom.xml=D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_in_from_bottom.xml
+D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_bottom.xml=D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_out_to_bottom.xml
+D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_rotate.png=D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\default_ptr_rotate.png
+D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_bottom.xml=D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable\\indicator_bg_bottom.xml
+D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_rotate.png=D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\default_ptr_rotate.png
+D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_top.xml=D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_in_from_top.xml
+D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_horizontal.xml=D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\layout\\pull_to_refresh_header_horizontal.xml
+D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_top.xml=D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_out_to_top.xml
+D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_flip.png=D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\default_ptr_flip.png
+D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\indicator_arrow.png=D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\indicator_arrow.png
+D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_top.xml=D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable\\indicator_bg_top.xml
+D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_rotate.png=D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\default_ptr_rotate.png
+D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_flip.png=D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\default_ptr_flip.png
+D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_vertical.xml=D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\layout\\pull_to_refresh_header_vertical.xml
+D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_flip.png=D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\default_ptr_flip.png
+D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\indicator_arrow.png=D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\indicator_arrow.png
+D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\indicator_arrow.png=D\:\\AndroidData\\hyuas-mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\indicator_arrow.png

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