修改了出库>>>出库扫描界面数据显示问题 并更新了版本号

.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\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\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\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>

.idea/runConfigurations.xml

@@ -3,6 +3,7 @@
   <component name="RunConfigurationProducerService">
     <option name="ignoredProducers">
       <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />

app/build.gradle

@@ -84,6 +84,7 @@ dependencies {
     implementation  'com.umeng.umsdk:common:9.4.0'// 必选
     implementation  'com.umeng.umsdk:asms:1.2.3'// 必选
     implementation 'com.umeng.umsdk:apm:1.4.0' // 错误分析升级为独立SDK，看crash数据请一定集成，可选
+    implementation 'org.greenrobot:eventbus:3.1.1'
 }
 
 def getVersionName() {

app/src/main/AndroidManifest.xml

@@ -18,7 +18,7 @@
         android:name=".application.PdaApplication"
         android:allowBackup="true"
         android:icon="@mipmap/icon"
-        android:label="@string/my_app_name_test"
+        android:label="@string/my_app_name"
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"
         tools:replace="android:allowBackup">

app/src/main/java/com/uas/keg_storage/bean/MessageWrap.java

@@ -0,0 +1,17 @@
+package com.uas.keg_storage.bean;
+
+/**
+ * Created by jsxiaoshui on 2022-05-18
+ */
+public class MessageWrap {
+    public final String message;
+
+    public static MessageWrap getInstance(String message) {
+        return new MessageWrap(message);
+    }
+
+    private MessageWrap(String message) {
+        this.message = message;
+    }
+
+}

app/src/main/java/com/uas/keg_storage/fragment/JLTPickMaterialOutScanFragment.java

@@ -213,6 +213,7 @@ public class JLTPickMaterialOutScanFragment extends BaseFragment implements View
             @Override
             public void MyEditorAction(String text, int actionId, KeyEvent event) {
                 barcodeParse();
+
             }
         });
 
@@ -426,6 +427,9 @@ public class JLTPickMaterialOutScanFragment extends BaseFragment implements View
                 CommonUtil.toastNoRepeat(mActivity, failStr);
             }
         });
+
+
+
     }
 
     private void setMaterial(JSONObject listObject) {
@@ -467,6 +471,9 @@ public class JLTPickMaterialOutScanFragment extends BaseFragment implements View
         }
     }
 
+    /**
+     * 获取条码信息
+     */
     private void barcodeParse() {
         String barcode = mBarcodeEditText.getText().toString().trim();
         if (TextUtils.isEmpty(barcode)) {
@@ -523,6 +530,9 @@ public class JLTPickMaterialOutScanFragment extends BaseFragment implements View
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
+
+
+                getPickModel();
             }
 
             @Override
@@ -812,6 +822,8 @@ public class JLTPickMaterialOutScanFragment extends BaseFragment implements View
         });
     }
 
+
+
     private void confirmRequest(boolean exist, int mulInt, double zxbzs, String enclosure) {
         progressDialog.show();
 
@@ -883,6 +895,9 @@ public class JLTPickMaterialOutScanFragment extends BaseFragment implements View
                         } else {
                             if (mMenuRadioGroup.getCheckedRadioButtonId() == R.id.pick_material_out_scan_sign_rb) {
                                 getLocpickList();
+                                getPickModel();
+
+
                             } else {
                                 mMenuRadioGroup.check(R.id.pick_material_out_scan_sign_rb);
                             }

app/src/main/java/com/uas/keg_storage/fragment/LocationTransferFragment.java

@@ -14,7 +14,6 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.android.volley.Request;
 import com.bin.david.form.core.SmartTable;
-import com.bin.david.form.data.column.ArrayColumn;
 import com.bin.david.form.data.column.Column;
 import com.bin.david.form.data.table.TableData;
 import com.scwang.smartrefresh.layout.api.RefreshLayout;
@@ -147,6 +146,7 @@ public class LocationTransferFragment extends BaseFragment {
     }
 
     private void transferToNewLocation() {
+        String trim = mNewLocationEditText.getText().toString().trim();//
         if (TextUtils.isEmpty(mLocation)) {
             CommonUtil.toastNoRepeat(mActivity, "请采集旧库位");
             return;
@@ -156,6 +156,13 @@ public class LocationTransferFragment extends BaseFragment {
             CommonUtil.toastNoRepeat(mActivity, "请采集新库位");
             return;
         }
+        if (TextUtils.isEmpty(trim)) {
+            CommonUtil.toastNoRepeat(mActivity, "请采集新库位");
+            return;
+        }
+
+
+
         progressDialog.show();
         VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
                 .url(GloableParams.ADDRESS_TRANSFER_TRANSFERTONEWLOCATION)

build.gradle

@@ -44,8 +44,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 4,
-            versionName      : "v2.2"
+            versionCode      : 5,
+            versionName      : "v2.3"
     ]
 
     depsVersion = [

pda_libs/pulltoreflashlibrary/build/generated/source/buildConfig/debug/com/handmark/pulltorefresh/library/BuildConfig.java

@@ -8,6 +8,6 @@ public final class BuildConfig {
   public static final String APPLICATION_ID = "com.handmark.pulltorefresh.library";
   public static final String BUILD_TYPE = "debug";
   public static final String FLAVOR = "";
-  public static final int VERSION_CODE = 4;
-  public static final String VERSION_NAME = "v2.2";
+  public static final int VERSION_CODE = 5;
+  public static final String VERSION_NAME = "v2.3";
 }

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="E:\Projects\CompayProjects\keg_storage\pda_libs\pulltoreflashlibrary\src\main\jniLibs"/></dataSet><dataSet config="debug"><source path="E:\Projects\CompayProjects\keg_storage\pda_libs\pulltoreflashlibrary\src\debug\jniLibs"/></dataSet></merger>
+<merger version="3"><dataSet config="main"><source path="D:\AndroidData\uaswarehouse\pda_libs\pulltoreflashlibrary\src\main\jniLibs"/></dataSet><dataSet config="debug"><source path="D:\AndroidData\uaswarehouse\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"><source path="E:\Projects\CompayProjects\keg_storage\pda_libs\pulltoreflashlibrary\src\main\shaders"/></dataSet><dataSet config="debug"><source path="E:\Projects\CompayProjects\keg_storage\pda_libs\pulltoreflashlibrary\src\debug\shaders"/></dataSet></merger>
+<merger version="3"><dataSet config="main"><source path="D:\AndroidData\uaswarehouse\pda_libs\pulltoreflashlibrary\src\main\shaders"/></dataSet><dataSet config="debug"><source path="D:\AndroidData\uaswarehouse\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"><source path="E:\Projects\CompayProjects\keg_storage\pda_libs\pulltoreflashlibrary\src\main\assets"/><source path="E:\Projects\CompayProjects\keg_storage\pda_libs\pulltoreflashlibrary\build\generated\assets\shaders\debug"/></dataSet><dataSet config="debug"><source path="E:\Projects\CompayProjects\keg_storage\pda_libs\pulltoreflashlibrary\src\debug\assets"/></dataSet></merger>
+<merger version="3"><dataSet config="main"><source path="D:\AndroidData\uaswarehouse\pda_libs\pulltoreflashlibrary\src\main\assets"/><source path="D:\AndroidData\uaswarehouse\pda_libs\pulltoreflashlibrary\build\generated\assets\shaders\debug"/></dataSet><dataSet config="debug"><source path="D:\AndroidData\uaswarehouse\pda_libs\pulltoreflashlibrary\src\debug\assets"/></dataSet></merger>

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

@@ -1,18 +1,18 @@
-#Fri Nov 06 10:27:14 CST 2020
-E\:\\Projects\\CompayProjects\\keg_storage\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_bottom.xml=E\:\\Projects\\CompayProjects\\keg_storage\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable\\indicator_bg_bottom.xml
-E\:\\Projects\\CompayProjects\\keg_storage\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_flip.png=E\:\\Projects\\CompayProjects\\keg_storage\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\default_ptr_flip.png
-E\:\\Projects\\CompayProjects\\keg_storage\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\indicator_arrow.png=E\:\\Projects\\CompayProjects\\keg_storage\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\indicator_arrow.png
-E\:\\Projects\\CompayProjects\\keg_storage\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_bottom.xml=E\:\\Projects\\CompayProjects\\keg_storage\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_out_to_bottom.xml
-E\:\\Projects\\CompayProjects\\keg_storage\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_flip.png=E\:\\Projects\\CompayProjects\\keg_storage\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\default_ptr_flip.png
-E\:\\Projects\\CompayProjects\\keg_storage\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_bottom.xml=E\:\\Projects\\CompayProjects\\keg_storage\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_in_from_bottom.xml
-E\:\\Projects\\CompayProjects\\keg_storage\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_top.xml=E\:\\Projects\\CompayProjects\\keg_storage\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_out_to_top.xml
-E\:\\Projects\\CompayProjects\\keg_storage\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\indicator_arrow.png=E\:\\Projects\\CompayProjects\\keg_storage\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\indicator_arrow.png
-E\:\\Projects\\CompayProjects\\keg_storage\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_rotate.png=E\:\\Projects\\CompayProjects\\keg_storage\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\default_ptr_rotate.png
-E\:\\Projects\\CompayProjects\\keg_storage\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_rotate.png=E\:\\Projects\\CompayProjects\\keg_storage\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\default_ptr_rotate.png
-E\:\\Projects\\CompayProjects\\keg_storage\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_top.xml=E\:\\Projects\\CompayProjects\\keg_storage\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_in_from_top.xml
-E\:\\Projects\\CompayProjects\\keg_storage\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_horizontal.xml=E\:\\Projects\\CompayProjects\\keg_storage\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\layout\\pull_to_refresh_header_horizontal.xml
-E\:\\Projects\\CompayProjects\\keg_storage\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_rotate.png=E\:\\Projects\\CompayProjects\\keg_storage\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\default_ptr_rotate.png
-E\:\\Projects\\CompayProjects\\keg_storage\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_vertical.xml=E\:\\Projects\\CompayProjects\\keg_storage\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\layout\\pull_to_refresh_header_vertical.xml
-E\:\\Projects\\CompayProjects\\keg_storage\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\indicator_arrow.png=E\:\\Projects\\CompayProjects\\keg_storage\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\indicator_arrow.png
-E\:\\Projects\\CompayProjects\\keg_storage\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_top.xml=E\:\\Projects\\CompayProjects\\keg_storage\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable\\indicator_bg_top.xml
-E\:\\Projects\\CompayProjects\\keg_storage\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_flip.png=E\:\\Projects\\CompayProjects\\keg_storage\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\default_ptr_flip.png
+#Mon May 16 15:35:15 CST 2022
+D\:\\AndroidData\\uaswarehouse\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\indicator_arrow.png=D\:\\AndroidData\\uaswarehouse\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\indicator_arrow.png
+D\:\\AndroidData\\uaswarehouse\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_top.xml=D\:\\AndroidData\\uaswarehouse\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_out_to_top.xml
+D\:\\AndroidData\\uaswarehouse\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_rotate.png=D\:\\AndroidData\\uaswarehouse\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\default_ptr_rotate.png
+D\:\\AndroidData\\uaswarehouse\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_horizontal.xml=D\:\\AndroidData\\uaswarehouse\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\layout\\pull_to_refresh_header_horizontal.xml
+D\:\\AndroidData\\uaswarehouse\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_top.xml=D\:\\AndroidData\\uaswarehouse\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable\\indicator_bg_top.xml
+D\:\\AndroidData\\uaswarehouse\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_top.xml=D\:\\AndroidData\\uaswarehouse\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_in_from_top.xml
+D\:\\AndroidData\\uaswarehouse\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_bottom.xml=D\:\\AndroidData\\uaswarehouse\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable\\indicator_bg_bottom.xml
+D\:\\AndroidData\\uaswarehouse\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_rotate.png=D\:\\AndroidData\\uaswarehouse\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\default_ptr_rotate.png
+D\:\\AndroidData\\uaswarehouse\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_bottom.xml=D\:\\AndroidData\\uaswarehouse\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_in_from_bottom.xml
+D\:\\AndroidData\\uaswarehouse\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_flip.png=D\:\\AndroidData\\uaswarehouse\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\default_ptr_flip.png
+D\:\\AndroidData\\uaswarehouse\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\indicator_arrow.png=D\:\\AndroidData\\uaswarehouse\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\indicator_arrow.png
+D\:\\AndroidData\\uaswarehouse\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_bottom.xml=D\:\\AndroidData\\uaswarehouse\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_out_to_bottom.xml
+D\:\\AndroidData\\uaswarehouse\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_flip.png=D\:\\AndroidData\\uaswarehouse\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\default_ptr_flip.png
+D\:\\AndroidData\\uaswarehouse\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_vertical.xml=D\:\\AndroidData\\uaswarehouse\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\layout\\pull_to_refresh_header_vertical.xml
+D\:\\AndroidData\\uaswarehouse\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\indicator_arrow.png=D\:\\AndroidData\\uaswarehouse\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\indicator_arrow.png
+D\:\\AndroidData\\uaswarehouse\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_rotate.png=D\:\\AndroidData\\uaswarehouse\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\default_ptr_rotate.png
+D\:\\AndroidData\\uaswarehouse\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_flip.png=D\:\\AndroidData\\uaswarehouse\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\default_ptr_flip.png

pda_libs/pulltoreflashlibrary/build/intermediates/manifests/aapt/debug/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.handmark.pulltorefresh.library"
-    android:versionCode="4"
-    android:versionName="v2.2" >
+    android:versionCode="5"
+    android:versionName="v2.3" >
 
     <uses-sdk
         android:minSdkVersion="16"

pda_libs/pulltoreflashlibrary/build/intermediates/manifests/aapt/debug/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":4,"versionName":"v2.2","enabled":true,"outputFile":"pulltoreflashlibrary-debug.aar","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]
+[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":5,"versionName":"v2.3","enabled":true,"outputFile":"pulltoreflashlibrary-debug.aar","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]

pda_libs/pulltoreflashlibrary/build/intermediates/manifests/full/debug/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.handmark.pulltorefresh.library"
-    android:versionCode="4"
-    android:versionName="v2.2" >
+    android:versionCode="5"
+    android:versionName="v2.3" >
 
     <uses-sdk
         android:minSdkVersion="16"

pda_libs/pulltoreflashlibrary/build/intermediates/manifests/full/debug/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":4,"versionName":"v2.2","enabled":true,"outputFile":"pulltoreflashlibrary-debug.aar","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]
+[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":5,"versionName":"v2.3","enabled":true,"outputFile":"pulltoreflashlibrary-debug.aar","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]

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

@@ -1,39 +1,39 @@
 -- Merging decision tree log ---
 manifest
-ADDED from E:\Projects\CompayProjects\keg_storage\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:2:1-11:12
-INJECTED from E:\Projects\CompayProjects\keg_storage\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:2:1-11:12
-INJECTED from E:\Projects\CompayProjects\keg_storage\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:2:1-11:12
-INJECTED from E:\Projects\CompayProjects\keg_storage\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:2:1-11:12
-INJECTED from E:\Projects\CompayProjects\keg_storage\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:2:1-11:12
-INJECTED from E:\Projects\CompayProjects\keg_storage\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:2:1-11:12
-INJECTED from E:\Projects\CompayProjects\keg_storage\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:2:1-11:12
+ADDED from D:\AndroidData\uaswarehouse\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:2:1-11:12
+INJECTED from D:\AndroidData\uaswarehouse\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:2:1-11:12
+INJECTED from D:\AndroidData\uaswarehouse\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:2:1-11:12
+INJECTED from D:\AndroidData\uaswarehouse\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:2:1-11:12
+INJECTED from D:\AndroidData\uaswarehouse\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:2:1-11:12
+INJECTED from D:\AndroidData\uaswarehouse\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:2:1-11:12
+INJECTED from D:\AndroidData\uaswarehouse\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:2:1-11:12
 	package
-		ADDED from E:\Projects\CompayProjects\keg_storage\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:3:5-49
-		INJECTED from E:\Projects\CompayProjects\keg_storage\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
-		INJECTED from E:\Projects\CompayProjects\keg_storage\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
+		ADDED from D:\AndroidData\uaswarehouse\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:3:5-49
+		INJECTED from D:\AndroidData\uaswarehouse\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
+		INJECTED from D:\AndroidData\uaswarehouse\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
 	android:versionName
-		ADDED from E:\Projects\CompayProjects\keg_storage\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:5:5-32
-		INJECTED from E:\Projects\CompayProjects\keg_storage\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
-		INJECTED from E:\Projects\CompayProjects\keg_storage\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
+		ADDED from D:\AndroidData\uaswarehouse\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:5:5-32
+		INJECTED from D:\AndroidData\uaswarehouse\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
+		INJECTED from D:\AndroidData\uaswarehouse\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
 	xmlns:android
-		ADDED from E:\Projects\CompayProjects\keg_storage\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:2:11-69
+		ADDED from D:\AndroidData\uaswarehouse\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:2:11-69
 	android:versionCode
-		ADDED from E:\Projects\CompayProjects\keg_storage\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:4:5-31
-		INJECTED from E:\Projects\CompayProjects\keg_storage\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
-		INJECTED from E:\Projects\CompayProjects\keg_storage\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
+		ADDED from D:\AndroidData\uaswarehouse\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:4:5-31
+		INJECTED from D:\AndroidData\uaswarehouse\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
+		INJECTED from D:\AndroidData\uaswarehouse\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
 uses-sdk
-ADDED from E:\Projects\CompayProjects\keg_storage\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:7:5-44
-INJECTED from E:\Projects\CompayProjects\keg_storage\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:7:5-44
-INJECTED from E:\Projects\CompayProjects\keg_storage\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:7:5-44
-INJECTED from E:\Projects\CompayProjects\keg_storage\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:7:5-44
-INJECTED from E:\Projects\CompayProjects\keg_storage\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:7:5-44
+ADDED from D:\AndroidData\uaswarehouse\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:7:5-44
+INJECTED from D:\AndroidData\uaswarehouse\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:7:5-44
+INJECTED from D:\AndroidData\uaswarehouse\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:7:5-44
+INJECTED from D:\AndroidData\uaswarehouse\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:7:5-44
+INJECTED from D:\AndroidData\uaswarehouse\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:7:5-44
 	android:targetSdkVersion
-		INJECTED from E:\Projects\CompayProjects\keg_storage\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
-		ADDED from E:\Projects\CompayProjects\keg_storage\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:7:5-44
-		INJECTED from E:\Projects\CompayProjects\keg_storage\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
+		INJECTED from D:\AndroidData\uaswarehouse\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
+		ADDED from D:\AndroidData\uaswarehouse\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:7:5-44
+		INJECTED from D:\AndroidData\uaswarehouse\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
 	android:minSdkVersion
-		ADDED from E:\Projects\CompayProjects\keg_storage\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:7:15-41
-		INJECTED from E:\Projects\CompayProjects\keg_storage\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
-		INJECTED from E:\Projects\CompayProjects\keg_storage\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
+		ADDED from D:\AndroidData\uaswarehouse\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:7:15-41
+		INJECTED from D:\AndroidData\uaswarehouse\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
+		INJECTED from D:\AndroidData\uaswarehouse\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
 application
-ADDED from E:\Projects\CompayProjects\keg_storage\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:9:5-20
+ADDED from D:\AndroidData\uaswarehouse\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:9:5-20