Переглянути джерело

修改了导航栏标签显示问题

ChengJH 3 роки тому
батько
коміт
b1dc29c8a6

+ 18 - 3
.idea/jarRepositories.xml

@@ -34,17 +34,32 @@
     <remote-repository>
       <option name="id" value="D:\Android\android-sdk\extras\m2repository" />
       <option name="name" value="D:\Android\android-sdk\extras\m2repository" />
-      <option name="url" value="file:/D:/Android/android-sdk/extras/m2repository/" />
+      <option name="url" value="file:/$PROJECT_DIR$/../../Android/android-sdk/extras/m2repository/" />
     </remote-repository>
     <remote-repository>
       <option name="id" value="D:\Android\android-sdk\extras\google\m2repository" />
       <option name="name" value="D:\Android\android-sdk\extras\google\m2repository" />
-      <option name="url" value="file:/D:/Android/android-sdk/extras/google/m2repository/" />
+      <option name="url" value="file:/$PROJECT_DIR$/../../Android/android-sdk/extras/google/m2repository/" />
     </remote-repository>
     <remote-repository>
       <option name="id" value="D:\Android\android-sdk\extras\android\m2repository" />
       <option name="name" value="D:\Android\android-sdk\extras\android\m2repository" />
-      <option name="url" value="file:/D:/Android/android-sdk/extras/android/m2repository/" />
+      <option name="url" value="file:/$PROJECT_DIR$/../../Android/android-sdk/extras/android/m2repository/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="D:\AndroidRel\AndroidSdk\extras\m2repository" />
+      <option name="name" value="D:\AndroidRel\AndroidSdk\extras\m2repository" />
+      <option name="url" value="file:/$PROJECT_DIR$/../../AndroidRel/AndroidSdk/extras/m2repository" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="D:\AndroidRel\AndroidSdk\extras\android\m2repository" />
+      <option name="name" value="D:\AndroidRel\AndroidSdk\extras\android\m2repository" />
+      <option name="url" value="file:/$PROJECT_DIR$/../../AndroidRel/AndroidSdk/extras/android/m2repository/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="D:\AndroidRel\AndroidSdk\extras\google\m2repository" />
+      <option name="name" value="D:\AndroidRel\AndroidSdk\extras\google\m2repository" />
+      <option name="url" value="file:/$PROJECT_DIR$/../../AndroidRel/AndroidSdk/extras/google/m2repository/" />
     </remote-repository>
   </component>
 </project>

+ 7 - 2
app/src/main/java/com/uas/gdstorage/fragment/ProductCheckFragment.java

@@ -16,6 +16,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.android.volley.Request;
 import com.uas.gdstorage.R;
+import com.uas.gdstorage.activity.FunctionActivity;
 import com.uas.gdstorage.adapter.CommonFormAdapter;
 import com.uas.gdstorage.adapter.SpotCheckAdapter;
 import com.uas.gdstorage.bean.CaptionValueBean;
@@ -60,7 +61,7 @@ public class ProductCheckFragment extends BaseFragment implements View.OnClickLi
 
     @Override
     protected void initViews() {
-        setTitle("成品检验");
+        FunctionActivity.setTitle("成品检验");
 
         mBoxEditText = root.findViewById(R.id.product_check_boxcode_et);
         mBoxEditText.requestFocus();
@@ -275,7 +276,11 @@ public class ProductCheckFragment extends BaseFragment implements View.OnClickLi
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         return false;
     }
-
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        ((TextView) (getActivity().findViewById(R.id.tv_actionbar_withback))).setText(getString(R.string.title_storage_in));
+    }
     @Override
     public boolean onFragmentBackPressed() {
         return false;

+ 1 - 0
app/src/main/java/com/uas/gdstorage/fragment/StorageInAddListFragment.java

@@ -580,6 +580,7 @@ public class StorageInAddListFragment extends BaseFragment implements HttpCallba
     public void onDestroyView() {
         super.onDestroyView();
         ((FunctionActivity) getActivity()).setScanIvVisible(false);
+        ((TextView) (getActivity().findViewById(R.id.tv_actionbar_withback))).setText(getString(R.string.title_storage_in));
     }
 
     @Override

+ 5 - 1
app/src/main/java/com/uas/gdstorage/fragment/StorageInCheckFragment.java

@@ -175,7 +175,11 @@ public class StorageInCheckFragment extends BaseFragment {
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         return false;
     }
-
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        ((TextView) (getActivity().findViewById(R.id.tv_actionbar_withback))).setText(getString(R.string.title_storage_in));
+    }
     @Override
     public boolean onFragmentBackPressed() {
         return false;

BIN
pda_libs/pulltoreflashlibrary/build/intermediates/incremental/debug-mergeJniLibs/merge-state


+ 1 - 1
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"><source path="D:\AndroidRel\CompanyWorkSpace\uas_mes\uas_mes\pda_libs\pulltoreflashlibrary\src\main\jniLibs"/></dataSet><dataSet config="debug"><source path="D:\AndroidRel\CompanyWorkSpace\uas_mes\uas_mes\pda_libs\pulltoreflashlibrary\src\debug\jniLibs"/></dataSet></merger>
+<merger version="3"><dataSet config="main"><source path="D:\AndroidData\uas_mes\pda_libs\pulltoreflashlibrary\src\main\jniLibs"/></dataSet><dataSet config="debug"><source path="D:\AndroidData\uas_mes\pda_libs\pulltoreflashlibrary\src\debug\jniLibs"/></dataSet></merger>

+ 1 - 1
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"><source path="D:\AndroidRel\CompanyWorkSpace\uas_mes\uas_mes\pda_libs\pulltoreflashlibrary\src\main\shaders"/></dataSet><dataSet config="debug"><source path="D:\AndroidRel\CompanyWorkSpace\uas_mes\uas_mes\pda_libs\pulltoreflashlibrary\src\debug\shaders"/></dataSet></merger>
+<merger version="3"><dataSet config="main"><source path="D:\AndroidData\uas_mes\pda_libs\pulltoreflashlibrary\src\main\shaders"/></dataSet><dataSet config="debug"><source path="D:\AndroidData\uas_mes\pda_libs\pulltoreflashlibrary\src\debug\shaders"/></dataSet></merger>

+ 1 - 1
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"><source path="D:\AndroidRel\CompanyWorkSpace\uas_mes\uas_mes\pda_libs\pulltoreflashlibrary\src\main\assets"/><source path="D:\AndroidRel\CompanyWorkSpace\uas_mes\uas_mes\pda_libs\pulltoreflashlibrary\build\generated\assets\shaders\debug"/></dataSet><dataSet config="debug"><source path="D:\AndroidRel\CompanyWorkSpace\uas_mes\uas_mes\pda_libs\pulltoreflashlibrary\src\debug\assets"/></dataSet></merger>
+<merger version="3"><dataSet config="main"><source path="D:\AndroidData\uas_mes\pda_libs\pulltoreflashlibrary\src\main\assets"/><source path="D:\AndroidData\uas_mes\pda_libs\pulltoreflashlibrary\build\generated\assets\shaders\debug"/></dataSet><dataSet config="debug"><source path="D:\AndroidData\uas_mes\pda_libs\pulltoreflashlibrary\src\debug\assets"/></dataSet></merger>

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

@@ -1,18 +1,18 @@
-#Thu Apr 07 15:52:07 CST 2022
-D\:\\AndroidRel\\CompanyWorkSpace\\uas_mes\\uas_mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_rotate.png=D\:\\AndroidRel\\CompanyWorkSpace\\uas_mes\\uas_mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\default_ptr_rotate.png
-D\:\\AndroidRel\\CompanyWorkSpace\\uas_mes\\uas_mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_vertical.xml=D\:\\AndroidRel\\CompanyWorkSpace\\uas_mes\\uas_mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\layout\\pull_to_refresh_header_vertical.xml
-D\:\\AndroidRel\\CompanyWorkSpace\\uas_mes\\uas_mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_flip.png=D\:\\AndroidRel\\CompanyWorkSpace\\uas_mes\\uas_mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\default_ptr_flip.png
-D\:\\AndroidRel\\CompanyWorkSpace\\uas_mes\\uas_mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_top.xml=D\:\\AndroidRel\\CompanyWorkSpace\\uas_mes\\uas_mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_in_from_top.xml
-D\:\\AndroidRel\\CompanyWorkSpace\\uas_mes\\uas_mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_rotate.png=D\:\\AndroidRel\\CompanyWorkSpace\\uas_mes\\uas_mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\default_ptr_rotate.png
-D\:\\AndroidRel\\CompanyWorkSpace\\uas_mes\\uas_mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_horizontal.xml=D\:\\AndroidRel\\CompanyWorkSpace\\uas_mes\\uas_mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\layout\\pull_to_refresh_header_horizontal.xml
-D\:\\AndroidRel\\CompanyWorkSpace\\uas_mes\\uas_mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_flip.png=D\:\\AndroidRel\\CompanyWorkSpace\\uas_mes\\uas_mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\default_ptr_flip.png
-D\:\\AndroidRel\\CompanyWorkSpace\\uas_mes\\uas_mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\indicator_arrow.png=D\:\\AndroidRel\\CompanyWorkSpace\\uas_mes\\uas_mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\indicator_arrow.png
-D\:\\AndroidRel\\CompanyWorkSpace\\uas_mes\\uas_mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_top.xml=D\:\\AndroidRel\\CompanyWorkSpace\\uas_mes\\uas_mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable\\indicator_bg_top.xml
-D\:\\AndroidRel\\CompanyWorkSpace\\uas_mes\\uas_mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_bottom.xml=D\:\\AndroidRel\\CompanyWorkSpace\\uas_mes\\uas_mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_out_to_bottom.xml
-D\:\\AndroidRel\\CompanyWorkSpace\\uas_mes\\uas_mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_bottom.xml=D\:\\AndroidRel\\CompanyWorkSpace\\uas_mes\\uas_mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable\\indicator_bg_bottom.xml
-D\:\\AndroidRel\\CompanyWorkSpace\\uas_mes\\uas_mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_top.xml=D\:\\AndroidRel\\CompanyWorkSpace\\uas_mes\\uas_mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_out_to_top.xml
-D\:\\AndroidRel\\CompanyWorkSpace\\uas_mes\\uas_mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\indicator_arrow.png=D\:\\AndroidRel\\CompanyWorkSpace\\uas_mes\\uas_mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\indicator_arrow.png
-D\:\\AndroidRel\\CompanyWorkSpace\\uas_mes\\uas_mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_rotate.png=D\:\\AndroidRel\\CompanyWorkSpace\\uas_mes\\uas_mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\default_ptr_rotate.png
-D\:\\AndroidRel\\CompanyWorkSpace\\uas_mes\\uas_mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_flip.png=D\:\\AndroidRel\\CompanyWorkSpace\\uas_mes\\uas_mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\default_ptr_flip.png
-D\:\\AndroidRel\\CompanyWorkSpace\\uas_mes\\uas_mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_bottom.xml=D\:\\AndroidRel\\CompanyWorkSpace\\uas_mes\\uas_mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_in_from_bottom.xml
-D\:\\AndroidRel\\CompanyWorkSpace\\uas_mes\\uas_mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\indicator_arrow.png=D\:\\AndroidRel\\CompanyWorkSpace\\uas_mes\\uas_mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\indicator_arrow.png
+#Tue Apr 12 14:36:16 CST 2022
+D\:\\AndroidData\\uas_mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_flip.png=D\:\\AndroidData\\uas_mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\default_ptr_flip.png
+D\:\\AndroidData\\uas_mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_bottom.xml=D\:\\AndroidData\\uas_mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_out_to_bottom.xml
+D\:\\AndroidData\\uas_mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_top.xml=D\:\\AndroidData\\uas_mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable\\indicator_bg_top.xml
+D\:\\AndroidData\\uas_mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_bottom.xml=D\:\\AndroidData\\uas_mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_in_from_bottom.xml
+D\:\\AndroidData\\uas_mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_bottom.xml=D\:\\AndroidData\\uas_mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable\\indicator_bg_bottom.xml
+D\:\\AndroidData\\uas_mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_rotate.png=D\:\\AndroidData\\uas_mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\default_ptr_rotate.png
+D\:\\AndroidData\\uas_mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_flip.png=D\:\\AndroidData\\uas_mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\default_ptr_flip.png
+D\:\\AndroidData\\uas_mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_top.xml=D\:\\AndroidData\\uas_mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_in_from_top.xml
+D\:\\AndroidData\\uas_mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\indicator_arrow.png=D\:\\AndroidData\\uas_mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\indicator_arrow.png
+D\:\\AndroidData\\uas_mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_flip.png=D\:\\AndroidData\\uas_mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\default_ptr_flip.png
+D\:\\AndroidData\\uas_mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_top.xml=D\:\\AndroidData\\uas_mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_out_to_top.xml
+D\:\\AndroidData\\uas_mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_rotate.png=D\:\\AndroidData\\uas_mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\default_ptr_rotate.png
+D\:\\AndroidData\\uas_mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_rotate.png=D\:\\AndroidData\\uas_mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\default_ptr_rotate.png
+D\:\\AndroidData\\uas_mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\indicator_arrow.png=D\:\\AndroidData\\uas_mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\indicator_arrow.png
+D\:\\AndroidData\\uas_mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_vertical.xml=D\:\\AndroidData\\uas_mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\layout\\pull_to_refresh_header_vertical.xml
+D\:\\AndroidData\\uas_mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\indicator_arrow.png=D\:\\AndroidData\\uas_mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\indicator_arrow.png
+D\:\\AndroidData\\uas_mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_horizontal.xml=D\:\\AndroidData\\uas_mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\layout\\pull_to_refresh_header_horizontal.xml

Різницю між файлами не показано, бо вона завелика
+ 0 - 0
pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageDebugResources/merger.xml


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

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

Деякі файли не було показано, через те що забагато файлів було змінено