Pārlūkot izejas kodu

增加规格内容显示

songw 11 mēneši atpakaļ
vecāks
revīzija
675d94c253
29 mainītis faili ar 136 papildinājumiem un 122 dzēšanām
  1. 1 1
      .idea/misc.xml
  2. 10 0
      app/src/main/java/com/uas/hycollection/bean/LinecodeBean.java
  3. 80 77
      app/src/main/java/com/uas/hycollection/fragment/BreakdownRepairFragment.java
  4. 4 3
      app/src/main/java/com/uas/hycollection/fragment/StorageRechargeListFragment.java
  5. 2 2
      build.gradle
  6. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/anim_slide_in_from_bottom.xml.flat
  7. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/anim_slide_in_from_top.xml.flat
  8. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/anim_slide_out_to_bottom.xml.flat
  9. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/anim_slide_out_to_top.xml.flat
  10. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/drawable-hdpi-v4_default_ptr_flip.png.flat
  11. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/drawable-hdpi-v4_default_ptr_rotate.png.flat
  12. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/drawable-hdpi-v4_indicator_arrow.png.flat
  13. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/drawable-mdpi-v4_default_ptr_flip.png.flat
  14. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/drawable-mdpi-v4_default_ptr_rotate.png.flat
  15. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/drawable-mdpi-v4_indicator_arrow.png.flat
  16. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/drawable-xhdpi-v4_default_ptr_flip.png.flat
  17. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/drawable-xhdpi-v4_default_ptr_rotate.png.flat
  18. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/drawable-xhdpi-v4_indicator_arrow.png.flat
  19. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/drawable_indicator_bg_bottom.xml.flat
  20. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/drawable_indicator_bg_top.xml.flat
  21. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/layout_pull_to_refresh_header_horizontal.xml.flat
  22. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/layout_pull_to_refresh_header_vertical.xml.flat
  23. 1 1
      pda_libs/pulltoreflashlibrary/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
  24. 1 1
      pda_libs/pulltoreflashlibrary/build/intermediates/incremental/mergeDebugShaders/merger.xml
  25. 1 1
      pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageDebugAssets/merger.xml
  26. 12 12
      pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
  27. 0 0
      pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageDebugResources/merger.xml
  28. 3 3
      pda_libs/pulltoreflashlibrary/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
  29. 21 21
      pda_libs/pulltoreflashlibrary/build/outputs/logs/manifest-merger-debug-report.txt

+ 1 - 1
.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="false" 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$/build/classes" />
   </component>
   <component name="ProjectType">

+ 10 - 0
app/src/main/java/com/uas/hycollection/bean/LinecodeBean.java

@@ -12,6 +12,16 @@ public class LinecodeBean {
     private String SR_LINECODE;
     private String SR_BADNAME;
 
+    public String getPR_SPEC() {
+        return PR_SPEC;
+    }
+
+    public void setPR_SPEC(String PR_SPEC) {
+        this.PR_SPEC = PR_SPEC;
+    }
+
+    private String PR_SPEC;   //规格
+
     private String SR_NGQTY;    //不良数量
     private boolean checked;
 

+ 80 - 77
app/src/main/java/com/uas/hycollection/fragment/BreakdownRepairFragment.java

@@ -12,7 +12,6 @@ import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.Editable;
 import android.text.InputType;
-import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.util.Base64;
 import android.util.Log;
@@ -73,7 +72,6 @@ import com.uas.hycollection.util.StringUtil;
 import com.uas.hycollection.util.VolleyRequest;
 import com.uas.hycollection.util.VollyRequest;
 import com.uas.hycollection.view.ClearableEditText;
-import com.umeng.commonsdk.debug.E;
 
 import org.jetbrains.annotations.NotNull;
 import org.json.JSONException;
@@ -91,12 +89,12 @@ import razerdp.basepopup.BasePopupWindow;
  * Created by cjh-sail on 2023-005-28
  * 性能维修
  */
-public class BreakdownRepairFragment extends BaseFragment{
+public class BreakdownRepairFragment extends BaseFragment {
 
     private ArrayList<StorageRechargeAloneBean> mFeededListone;
-    private ArrayList<StorageRechargeAloneBean>  mFeededListthree;
-    private ArrayList<StorageRechargeAloneBean>  mFeededListtwo;
-    private RecyclerView rv_one,rv_two,rv_three;
+    private ArrayList<StorageRechargeAloneBean> mFeededListthree;
+    private ArrayList<StorageRechargeAloneBean> mFeededListtwo;
+    private RecyclerView rv_one, rv_two, rv_three;
     private SelectAdapterone myAdapterone;
     private SelectAdapterthree myAdapterthree;
     private SelectAdaptertwo myAdaptertwo;
@@ -134,7 +132,7 @@ public class BreakdownRepairFragment extends BaseFragment{
     private String ma_bomversion;
     private SmartTable mSmartTable;
     private List<TestcollectDataBean> listSama;
-    private Column<String> va_classColumn,va_sr_reasonColumn,va_qtyColumn,va_timeColumn,va_sr_badnameremark,va_sr_ngqty;
+    private Column<String> va_classColumn, va_sr_reasonColumn, va_qtyColumn, va_timeColumn, va_sr_badnameremark, va_sr_ngqty;
     private TableData<TestcollectDataBean> mTableData;
     private List<TestcollectDataBean> mFilterStorageInBeans;
     private RecyclerView rv_datapassqty;
@@ -200,9 +198,9 @@ public class BreakdownRepairFragment extends BaseFragment{
         iv_number_search_for = root.findViewById(R.id.iv_number_search_for);
         ce_wuli = root.findViewById(R.id.ce_wuli);
         iv_wuli = root.findViewById(R.id.iv_wuli);
-//        ce_length.setEnabled(false);
-//        ce_length.setFocusable(false);
-//        ce_length.setKeyListener(null);//重点
+        //        ce_length.setEnabled(false);
+        //        ce_length.setFocusable(false);
+        //        ce_length.setKeyListener(null);//重点
 
     }
 
@@ -212,7 +210,7 @@ public class BreakdownRepairFragment extends BaseFragment{
         listSama = new ArrayList<>();
         personnelList = new ArrayList<>();
         WindowManager wm = mActivity.getWindowManager();
-        int screenWith = wm.getDefaultDisplay().getWidth()/5;
+        int screenWith = wm.getDefaultDisplay().getWidth() / 5;
         mSmartTable.getConfig().setMinTableWidth(screenWith)
                 .setShowXSequence(false)
                 .setShowYSequence(false)
@@ -252,18 +250,18 @@ public class BreakdownRepairFragment extends BaseFragment{
         getclassify();  //不良归类
         getqty();   //不良数量
 
-/**--------------------------------工单号----------------------------**/
+        /**--------------------------------工单号----------------------------**/
         linecodeBeanList = new ArrayList<>();
         ce_work_code.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-//                if (actionId == EditorInfo.IME_ACTION_DONE
-//                        || actionId == EditorInfo.IME_ACTION_SEND
-//                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    String va_code = ce_work_code.getText().toString().trim();
-                    getfuzzySearchData(va_code,"");
-//                    return true;
-//                }
+                //                if (actionId == EditorInfo.IME_ACTION_DONE
+                //                        || actionId == EditorInfo.IME_ACTION_SEND
+                //                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                String va_code = ce_work_code.getText().toString().trim();
+                getfuzzySearchData(va_code, "");
+                //                    return true;
+                //                }
                 return false;
             }
         });
@@ -311,7 +309,7 @@ public class BreakdownRepairFragment extends BaseFragment{
 
 
         /**--------------------------------岗位资源----------------------------**/
-        if (!at_station.getText().toString().isEmpty()){
+        if (!at_station.getText().toString().isEmpty()) {
             at_station.setFocusable(false);
         }
         resourcesBeanList = new ArrayList<>();
@@ -322,7 +320,7 @@ public class BreakdownRepairFragment extends BaseFragment{
                         || actionId == EditorInfo.IME_ACTION_SEND
                         || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
                     String va_code = at_station.getText().toString().trim();
-                    getfuzzySearchSourceData(va_code,"");
+                    getfuzzySearchSourceData(va_code, "");
                     return true;
                 }
                 return false;
@@ -348,37 +346,37 @@ public class BreakdownRepairFragment extends BaseFragment{
                 }
             }
         });
-//        ce_product_bar_code.addTextChangedListener(new TextWatcher() {
-//            private CharSequence temp;
-//            @Override
-//            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-//
-//            }
-//
-//            @Override
-//            public void onTextChanged(CharSequence s, int start, int before, int count) {
-//                temp = s;
-//            }
-//
-//            @Override
-//            public void afterTextChanged(Editable s) {
-//                int selectionStart = ce_product_bar_code.getSelectionStart();
-//                int selectionEnd = ce_product_bar_code.getSelectionEnd();
-//                ce_product_bar_code.getSelectionStart();
-//                Log.e("gongbiao1", "" + selectionStart);
-//                if (temp.length() > Integer.parseInt(ce_length.getText().toString().trim())) {
-//                    s.delete(selectionStart - 1, selectionEnd);
-//                    ce_product_bar_code.setText(s);
-//                }
-//            }
-//        });
+        //        ce_product_bar_code.addTextChangedListener(new TextWatcher() {
+        //            private CharSequence temp;
+        //            @Override
+        //            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+        //
+        //            }
+        //
+        //            @Override
+        //            public void onTextChanged(CharSequence s, int start, int before, int count) {
+        //                temp = s;
+        //            }
+        //
+        //            @Override
+        //            public void afterTextChanged(Editable s) {
+        //                int selectionStart = ce_product_bar_code.getSelectionStart();
+        //                int selectionEnd = ce_product_bar_code.getSelectionEnd();
+        //                ce_product_bar_code.getSelectionStart();
+        //                Log.e("gongbiao1", "" + selectionStart);
+        //                if (temp.length() > Integer.parseInt(ce_length.getText().toString().trim())) {
+        //                    s.delete(selectionStart - 1, selectionEnd);
+        //                    ce_product_bar_code.setText(s);
+        //                }
+        //            }
+        //        });
 
         iv_station.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 at_station.setFocusableInTouchMode(true);
                 at_station.setText("");
-                getReapirInfo(at_station.getText().toString().trim(),tv_macode.getText().toString().trim(),ce_wuli.getText().toString().trim());
+                getReapirInfo(at_station.getText().toString().trim(), tv_macode.getText().toString().trim(), ce_wuli.getText().toString().trim());
                 at_station.requestFocus();
             }
         });
@@ -414,13 +412,13 @@ public class BreakdownRepairFragment extends BaseFragment{
         tv_dc_emcode.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-//                if (actionId == EditorInfo.IME_ACTION_DONE
-//                        || actionId == EditorInfo.IME_ACTION_SEND
-//                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    String dc_emcode = tv_dc_emcode.getText().toString().trim();
-                    getOrImage(dc_emcode);
-//                    return true;
-//                }
+                //                if (actionId == EditorInfo.IME_ACTION_DONE
+                //                        || actionId == EditorInfo.IME_ACTION_SEND
+                //                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                String dc_emcode = tv_dc_emcode.getText().toString().trim();
+                getOrImage(dc_emcode);
+                //                    return true;
+                //                }
                 return false;
             }
         });
@@ -488,18 +486,18 @@ public class BreakdownRepairFragment extends BaseFragment{
             }
         });
 
-//        mFeededListone = new ArrayList<>();
-//        myAdapterone = new SelectAdapterone(mFeededListone);
+        //        mFeededListone = new ArrayList<>();
+        //        myAdapterone = new SelectAdapterone(mFeededListone);
 
         sc_codecollethree = SharedPreUtil.getString(mActivity, "sc_codecollethree", null);
         at_station.setText(sc_codecollethree);
-        getReapirInfo(sc_codecollethree,tv_macode.getText().toString().trim(),ce_wuli.getText().toString().trim());
-        getfuzzySearchSourceData(sc_codecollethree,"");
+        getReapirInfo(sc_codecollethree, tv_macode.getText().toString().trim(), ce_wuli.getText().toString().trim());
+        getfuzzySearchSourceData(sc_codecollethree, "");
 
 
-/**
- * -----------------------------------物理线别-------------------------------------------------------------
- */
+        /**
+         * -----------------------------------物理线别-------------------------------------------------------------
+         */
         wulilist = new ArrayList<>();
         iv_wuli.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -509,22 +507,22 @@ public class BreakdownRepairFragment extends BaseFragment{
         });
 
 
-//        String work_order_flow = SharedPreUtil.getString(mActivity, SharedPreUtil.XN_WORK_ORDER_FLOW, "");
-//        String plan_number = SharedPreUtil.getString(mActivity, SharedPreUtil.XN_PLAN_NUMBER, "");
-//        String product_code = SharedPreUtil.getString(mActivity, SharedPreUtil.XN_PRODUCT_CODE, "");
-//        String product_name = SharedPreUtil.getString(mActivity, SharedPreUtil.XN_PRODUCT_NAME, "");
-//
-//        Log.e("aaa", "记录最后一次存的工单流水:" + work_order_flow);
-//        Log.e("aaa", "记录最后一次存的计划单号:" + plan_number);
-//        Log.e("aaa", "记录最后一次存的 PRODUCT_CODE:" + product_code);
-//        Log.e("aaa", "记录最后一次存的 PRODUCT_NAME:" + product_name);
-//
-//        if (!TextUtils.isEmpty(work_order_flow)) {
-//            ce_work_code.setText(work_order_flow);
-//            tv_macode.setText(""+plan_number);
-//            tv_pr_code.setText(""+product_code);//pr_code ma_bomversion
-//            tv_pr_detail.setText(""+product_name);
-//        }
+        //        String work_order_flow = SharedPreUtil.getString(mActivity, SharedPreUtil.XN_WORK_ORDER_FLOW, "");
+        //        String plan_number = SharedPreUtil.getString(mActivity, SharedPreUtil.XN_PLAN_NUMBER, "");
+        //        String product_code = SharedPreUtil.getString(mActivity, SharedPreUtil.XN_PRODUCT_CODE, "");
+        //        String product_name = SharedPreUtil.getString(mActivity, SharedPreUtil.XN_PRODUCT_NAME, "");
+        //
+        //        Log.e("aaa", "记录最后一次存的工单流水:" + work_order_flow);
+        //        Log.e("aaa", "记录最后一次存的计划单号:" + plan_number);
+        //        Log.e("aaa", "记录最后一次存的 PRODUCT_CODE:" + product_code);
+        //        Log.e("aaa", "记录最后一次存的 PRODUCT_NAME:" + product_name);
+        //
+        //        if (!TextUtils.isEmpty(work_order_flow)) {
+        //            ce_work_code.setText(work_order_flow);
+        //            tv_macode.setText(""+plan_number);
+        //            tv_pr_code.setText(""+product_code);//pr_code ma_bomversion
+        //            tv_pr_detail.setText(""+product_name);
+        //        }
 
     }
 
@@ -821,6 +819,9 @@ public class BreakdownRepairFragment extends BaseFragment{
                         ipAndResourcesPortAdapter.setmList(resourcesBeanList);
                         ipAndResourcesPortAdapter.notifyDataSetChanged();
 
+
+
+
                     }
                     else {
                         if (dataArray != null) {
@@ -1108,6 +1109,7 @@ public class BreakdownRepairFragment extends BaseFragment{
             }
         }
 
+
         object_1.put("SR_ID", "");
         object_1.put("SR_LOCATION", "");//不良位号
         object_1.put("SR_MAKECODE", ce_work_codetrim);//工单号
@@ -1147,6 +1149,8 @@ public class BreakdownRepairFragment extends BaseFragment{
                     stringList.add(finalInput_alonedatathree+"\n");
                 }
 
+
+
 //                if (!finalInput_AlonedaTwo.isEmpty()){
 //                    stringList.add(finalInput_Aloneda+"\n");
 //                }
@@ -1435,7 +1439,6 @@ public class BreakdownRepairFragment extends BaseFragment{
                 tv_dc_emcode.requestFocus();
                 ce_work_code.setFocusable(false);
 
-                recycleDataone(sr_badname);
                 getReapirInfo(at_station.getText().toString().trim(),ma_code,ce_wuli.getText().toString().trim());
                 closeListPopupWindow();
                 selectAdapterQty.notifyDataSetChanged();

+ 4 - 3
app/src/main/java/com/uas/hycollection/fragment/StorageRechargeListFragment.java

@@ -12,7 +12,6 @@ import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.Editable;
 import android.text.InputType;
-import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.util.Base64;
 import android.util.Log;
@@ -705,7 +704,6 @@ public class StorageRechargeListFragment extends BaseFragment{
     }
 
     public void getReapirInfo(String bgcode,String ma_code,String li_code){
-
         if (ce_work_code.getText().toString().trim().isEmpty()){
             CommonUtil.toastNoRepeat(mActivity, "请选择工单流水");
             return;
@@ -1010,6 +1008,7 @@ public class StorageRechargeListFragment extends BaseFragment{
                             bean.setSR_LINECODE(data.getString("SR_LINECODE"));
                             bean.setSR_BADNAME(data.getString("SR_BADNAME"));
                             bean.setSR_NGQTY(data.getString("SR_NGQTY"));
+                            bean.setPR_SPEC(data.getString("PR_SPEC"));
                             linecodeBeanList.add(bean);
                         }
                         ipAndlinecodePortAdapter.setmList(linecodeBeanList);
@@ -1390,7 +1389,9 @@ public class StorageRechargeListFragment extends BaseFragment{
                 ma_id = ipAndPortBeans.get(position).getMA_ID();
                 pr_code = ipAndPortBeans.get(position).getPR_CODE();
                 pr_detail = ipAndPortBeans.get(position).getPR_DETAIL();
-                ma_bomversion = ipAndPortBeans.get(position).getMA_BOMVERSION();
+                //修改取值
+//                ma_bomversion = ipAndPortBeans.get(position).getMA_BOMVERSION();
+                ma_bomversion = ipAndPortBeans.get(position).getPR_SPEC();
                 sr_linecode = ipAndPortBeans.get(position).getSR_LINECODE();
                 sr_badname = ipAndPortBeans.get(position).getSR_BADNAME();
                 SR_NGQTY = ipAndPortBeans.get(position).getSR_NGQTY();   //刷新不良品

+ 2 - 2
build.gradle

@@ -63,8 +63,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 35,
-            versionName      : "v1.2.6"
+            versionCode      : 37,
+            versionName      : "v1.3.1"
     ]
 
     depsVersion = [

BIN
pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/anim_slide_in_from_bottom.xml.flat


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/anim_slide_in_from_top.xml.flat


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/anim_slide_out_to_bottom.xml.flat


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/anim_slide_out_to_top.xml.flat


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/drawable-hdpi-v4_default_ptr_flip.png.flat


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/drawable-hdpi-v4_default_ptr_rotate.png.flat


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/drawable-hdpi-v4_indicator_arrow.png.flat


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/drawable-mdpi-v4_default_ptr_flip.png.flat


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/drawable-mdpi-v4_default_ptr_rotate.png.flat


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/drawable-mdpi-v4_indicator_arrow.png.flat


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/drawable-xhdpi-v4_default_ptr_flip.png.flat


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/drawable-xhdpi-v4_default_ptr_rotate.png.flat


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/drawable-xhdpi-v4_indicator_arrow.png.flat


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/drawable_indicator_bg_bottom.xml.flat


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/drawable_indicator_bg_top.xml.flat


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/layout_pull_to_refresh_header_horizontal.xml.flat


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/compiled_local_resources/debug/out/layout_pull_to_refresh_header_vertical.xml.flat


+ 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" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\GongSi\AS_XiangMu\HUAYUN-DATA-COLLETION\HUAYUN-DATA-COLLETION\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\HUAYUN-DATA-COLLETION\HUAYUN-DATA-COLLETION\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\HUAYUN-DATA-COLLETION\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\HUAYUN-DATA-COLLETION\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" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\GongSi\AS_XiangMu\HUAYUN-DATA-COLLETION\HUAYUN-DATA-COLLETION\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\HUAYUN-DATA-COLLETION\HUAYUN-DATA-COLLETION\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\HUAYUN-DATA-COLLETION\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\HUAYUN-DATA-COLLETION\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" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\GongSi\AS_XiangMu\HUAYUN-DATA-COLLETION\HUAYUN-DATA-COLLETION\pda_libs\pulltoreflashlibrary\src\main\assets"/><source path="D:\GongSi\AS_XiangMu\HUAYUN-DATA-COLLETION\HUAYUN-DATA-COLLETION\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\HUAYUN-DATA-COLLETION\HUAYUN-DATA-COLLETION\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\HUAYUN-DATA-COLLETION\pda_libs\pulltoreflashlibrary\src\main\assets"/><source path="D:\AndroidData\HUAYUN-DATA-COLLETION\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\HUAYUN-DATA-COLLETION\pda_libs\pulltoreflashlibrary\src\debug\assets"/></dataSet></merger>

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

@@ -1,18 +1,18 @@
-#Fri Oct 25 15:02:43 CST 2024
-D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_bottom.xml=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_in_from_bottom.xml
+#Mon Aug 19 15:21:26 CST 2024
+D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_horizontal.xml=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\layout\\pull_to_refresh_header_horizontal.xml
+D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\indicator_arrow.png=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\indicator_arrow.png
+D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_flip.png=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\default_ptr_flip.png
 D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\indicator_arrow.png=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\indicator_arrow.png
 D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\indicator_arrow.png=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\indicator_arrow.png
-D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_horizontal.xml=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\layout\\pull_to_refresh_header_horizontal.xml
-D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_bottom.xml=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_out_to_bottom.xml
-D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_vertical.xml=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\layout\\pull_to_refresh_header_vertical.xml
-D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_rotate.png=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\default_ptr_rotate.png
+D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_bottom.xml=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable\\indicator_bg_bottom.xml
 D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_top.xml=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_in_from_top.xml
-D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_rotate.png=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\default_ptr_rotate.png
 D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_rotate.png=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\default_ptr_rotate.png
-D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_bottom.xml=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable\\indicator_bg_bottom.xml
-D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_top.xml=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_out_to_top.xml
-D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_flip.png=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\default_ptr_flip.png
-D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\indicator_arrow.png=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\indicator_arrow.png
 D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_top.xml=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable\\indicator_bg_top.xml
-D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_flip.png=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\default_ptr_flip.png
+D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_top.xml=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_out_to_top.xml
 D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_flip.png=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\default_ptr_flip.png
+D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_bottom.xml=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_out_to_bottom.xml
+D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_rotate.png=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\default_ptr_rotate.png
+D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_flip.png=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\default_ptr_flip.png
+D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_bottom.xml=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_in_from_bottom.xml
+D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_rotate.png=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\default_ptr_rotate.png
+D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_vertical.xml=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\layout\\pull_to_refresh_header_vertical.xml

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageDebugResources/merger.xml


+ 3 - 3
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="16"
-8-->D:\GongSi\AS_XiangMu\HUAYUN-DATA-COLLETION\HUAYUN-DATA-COLLETION\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
+8-->D:\AndroidData\HUAYUN-DATA-COLLETION\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
 9        android:targetSdkVersion="28" />
-9-->D:\GongSi\AS_XiangMu\HUAYUN-DATA-COLLETION\HUAYUN-DATA-COLLETION\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
+9-->D:\AndroidData\HUAYUN-DATA-COLLETION\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
 10
 11    <application />
-11-->D:\GongSi\AS_XiangMu\HUAYUN-DATA-COLLETION\HUAYUN-DATA-COLLETION\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:8:5-20
+11-->D:\AndroidData\HUAYUN-DATA-COLLETION\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:8:5-20
 12
 13</manifest>

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

Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels