Browse Source

增加预加工报工界面

ChengJH 7 months ago
parent
commit
18b7f65af9
42 changed files with 1185 additions and 165 deletions
  1. 25 0
      .idea/jarRepositories.xml
  2. 4 0
      app/src/main/java/com/uas/ruiziuasmes/activity/FunctionActivity.java
  3. 65 1
      app/src/main/java/com/uas/ruiziuasmes/bean/MaintainitemBean.java
  4. 630 0
      app/src/main/java/com/uas/ruiziuasmes/fragment/PreProcessingReportFragment.java
  5. 21 12
      app/src/main/java/com/uas/ruiziuasmes/global/GloableParams.java
  6. 114 0
      app/src/main/res/layout/fragment_pre_processing_report.xml
  7. 55 0
      app/src/main/res/layout/recyclerview_item2.xml
  8. BIN
      app/src/main/res/mipmap-xhdpi/iv_processing.png
  9. 11 4
      build.gradle
  10. 3 2
      gradle/wrapper/gradle-wrapper.properties
  11. 1 4
      pda_libs/pulltoreflashlibrary/build/generated/source/buildConfig/debug/com/handmark/pulltorefresh/library/BuildConfig.java
  12. 2 2
      pda_libs/pulltoreflashlibrary/build/generated/source/buildConfig/release/com/handmark/pulltorefresh/library/BuildConfig.java
  13. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/classes/debug/com/handmark/pulltorefresh/library/BuildConfig.class
  14. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/classes/release/com/handmark/pulltorefresh/library/BuildConfig.class
  15. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/incremental/debug-mergeJniLibs/merge-state
  16. 1 1
      pda_libs/pulltoreflashlibrary/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
  17. 1 1
      pda_libs/pulltoreflashlibrary/build/intermediates/incremental/mergeDebugShaders/merger.xml
  18. 1 1
      pda_libs/pulltoreflashlibrary/build/intermediates/incremental/mergeReleaseJniLibFolders/merger.xml
  19. 1 1
      pda_libs/pulltoreflashlibrary/build/intermediates/incremental/mergeReleaseShaders/merger.xml
  20. 1 1
      pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageDebugAssets/merger.xml
  21. 18 18
      pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
  22. 75 14
      pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageDebugResources/merged.dir/values/values.xml
  23. 0 0
      pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageDebugResources/merger.xml
  24. 1 1
      pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageReleaseAssets/merger.xml
  25. 18 18
      pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties
  26. 0 0
      pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageReleaseResources/merger.xml
  27. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/incremental/release-mergeJniLibs/merge-state
  28. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/intermediate-jars/debug/classes.jar
  29. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/intermediate-jars/debug/full.jar
  30. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/intermediate-jars/release/classes.jar
  31. BIN
      pda_libs/pulltoreflashlibrary/build/intermediates/intermediate-jars/release/full.jar
  32. 2 2
      pda_libs/pulltoreflashlibrary/build/intermediates/manifests/aapt/debug/AndroidManifest.xml
  33. 1 1
      pda_libs/pulltoreflashlibrary/build/intermediates/manifests/aapt/debug/output.json
  34. 2 2
      pda_libs/pulltoreflashlibrary/build/intermediates/manifests/aapt/release/AndroidManifest.xml
  35. 1 1
      pda_libs/pulltoreflashlibrary/build/intermediates/manifests/aapt/release/output.json
  36. 2 2
      pda_libs/pulltoreflashlibrary/build/intermediates/manifests/full/debug/AndroidManifest.xml
  37. 1 1
      pda_libs/pulltoreflashlibrary/build/intermediates/manifests/full/debug/output.json
  38. 2 2
      pda_libs/pulltoreflashlibrary/build/intermediates/manifests/full/release/AndroidManifest.xml
  39. 1 1
      pda_libs/pulltoreflashlibrary/build/intermediates/manifests/full/release/output.json
  40. 75 14
      pda_libs/pulltoreflashlibrary/build/intermediates/packaged_res/debug/values/values.xml
  41. 21 29
      pda_libs/pulltoreflashlibrary/build/outputs/logs/manifest-merger-debug-report.txt
  42. 29 29
      pda_libs/pulltoreflashlibrary/build/outputs/logs/manifest-merger-release-report.txt

+ 25 - 0
.idea/jarRepositories.xml

@@ -46,5 +46,30 @@
       <option name="name" value="D:\AndroidRel\AndroidSdk\extras\google\m2repository" />
       <option name="url" value="file:/$PROJECT_DIR$/../../AndroidRel/AndroidSdk/extras/google/m2repository/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven4" />
+      <option name="name" value="maven4" />
+      <option name="url" value="http://maven.aliyun.com/nexus/content/repositories/gradle-plugin" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenRepo" />
+      <option name="name" value="MavenRepo" />
+      <option name="url" value="https://repo.maven.apache.org/maven2/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven3" />
+      <option name="name" value="maven3" />
+      <option name="url" value="http://maven.aliyun.com/nexus/content/repositories/google" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven2" />
+      <option name="name" value="maven2" />
+      <option name="url" value="http://maven.aliyun.com/nexus/content/repositories/jcenter" />
+    </remote-repository>
   </component>
 </project>

+ 4 - 0
app/src/main/java/com/uas/ruiziuasmes/activity/FunctionActivity.java

@@ -31,6 +31,7 @@ import com.uas.ruiziuasmes.fragment.LabeLreprintingFragment;
 import com.uas.ruiziuasmes.fragment.NotGoodCaiJiFragment;
 import com.uas.ruiziuasmes.fragment.PackageAcquisitionFragment;
 import com.uas.ruiziuasmes.fragment.PostPunchFragment;
+import com.uas.ruiziuasmes.fragment.PreProcessingReportFragment;
 import com.uas.ruiziuasmes.fragment.PutintoAdd_Fragment;
 import com.uas.ruiziuasmes.fragment.QualityManageFragment;
 import com.uas.ruiziuasmes.fragment.ReportDetailFragment;
@@ -131,6 +132,9 @@ public class FunctionActivity extends BaseActivity implements View.OnClickListen
                 case GloableParams.GRIDNAME_COME_IN_SITE:
                     mFragment = new ComeInSiteFragment();
                     break;
+                case GloableParams.GRIDNAME_BAD_PRE_PROCESSING_REPORT://预加工报工
+                    mFragment = new PreProcessingReportFragment();
+                    break;
                 //接料
                 case GloableParams.GRIDNAME_IN_MATERIAL:
                     mFragment = new GdMaterialInFragment();

+ 65 - 1
app/src/main/java/com/uas/ruiziuasmes/bean/MaintainitemBean.java

@@ -4,11 +4,75 @@ package com.uas.ruiziuasmes.bean;
  * Created by cjh-sail on 2023-01-31
  */
 public class MaintainitemBean {
-
+    private String MM_PRODCODE;
+    private String PR_DETAIL;
+    private String PR_SPEC;
+    private String PR_UNIT;
+    private String MM_ONEUSEQTY;
+    private String MM_QTY;
     private String mi_item;
     private boolean isChecked;
+    public MaintainitemBean(String MM_PRODCODE, String PR_DETAIL, String PR_SPEC) {
+        this.MM_PRODCODE = MM_PRODCODE;
+        this.PR_DETAIL = PR_DETAIL;
+        this.PR_SPEC = PR_SPEC;
+    }
+    public MaintainitemBean(){}
+    public String getMM_PRODCODE() {
+        return MM_PRODCODE;
+    }
+
+    public void setMM_PRODCODE(String MM_PRODCODE) {
+        this.MM_PRODCODE = MM_PRODCODE;
+    }
+
+    public String getPR_DETAIL() {
+        return PR_DETAIL;
+    }
 
+    public void setPR_DETAIL(String PR_DETAIL) {
+        this.PR_DETAIL = PR_DETAIL;
+    }
+
+    public String getPR_SPEC() {
+        return PR_SPEC;
+    }
+
+    public void setPR_SPEC(String PR_SPEC) {
+        this.PR_SPEC = PR_SPEC;
+    }
+
+    public String getPR_UNIT() {
+        return PR_UNIT;
+    }
 
+    public void setPR_UNIT(String PR_UNIT) {
+        this.PR_UNIT = PR_UNIT;
+    }
+
+    public String getMM_ONEUSEQTY() {
+        return MM_ONEUSEQTY;
+    }
+
+    public void setMM_ONEUSEQTY(String MM_ONEUSEQTY) {
+        this.MM_ONEUSEQTY = MM_ONEUSEQTY;
+    }
+
+    public String getMM_QTY() {
+        return MM_QTY;
+    }
+
+    public void setMM_QTY(String MM_QTY) {
+        this.MM_QTY = MM_QTY;
+    }
+
+    public String getMi_item() {
+        return mi_item;
+    }
+
+    public void setMi_item(String mi_item) {
+        this.mi_item = mi_item;
+    }
 
     public boolean isChecked() {
         return isChecked;

+ 630 - 0
app/src/main/java/com/uas/ruiziuasmes/fragment/PreProcessingReportFragment.java

@@ -0,0 +1,630 @@
+package com.uas.ruiziuasmes.fragment;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.drawable.BitmapDrawable;
+import android.os.Bundle;
+import android.support.v7.widget.DefaultItemAnimator;
+import android.support.v7.widget.DividerItemDecoration;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.util.Log;
+import android.util.SparseBooleanArray;
+import android.view.Gravity;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.LinearLayout;
+import android.widget.ListView;
+import android.widget.PopupWindow;
+import android.widget.TextView;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.android.volley.Request;
+import com.android.volley.toolbox.StringRequest;
+import com.uas.ruiziuasmes.R;
+import com.uas.ruiziuasmes.activity.FunctionActivity;
+import com.uas.ruiziuasmes.bean.CaiPiBlueBean;
+import com.uas.ruiziuasmes.bean.MaintainitemBean;
+import com.uas.ruiziuasmes.global.GloableParams;
+import com.uas.ruiziuasmes.tools.SharedPreUtil;
+import com.uas.ruiziuasmes.util.CommonUtil;
+import com.uas.ruiziuasmes.util.Constants;
+import com.uas.ruiziuasmes.util.FastjsonUtil;
+import com.uas.ruiziuasmes.util.FragmentUtils;
+import com.uas.ruiziuasmes.util.HttpCallback;
+import com.uas.ruiziuasmes.util.HttpParams;
+import com.uas.ruiziuasmes.util.LogUtil;
+import com.uas.ruiziuasmes.util.PrintUtils;
+import com.uas.ruiziuasmes.util.StringUtil;
+import com.uas.ruiziuasmes.util.VolleyRequest;
+import com.uas.ruiziuasmes.util.VollyRequest;
+import com.uas.ruiziuasmes.view.ClearableEditText;
+import com.vincent.filepicker.ToastUtil;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by RaoMeng on 2024/05/27
+ * Desc: 预加工报工
+ */
+public class PreProcessingReportFragment extends BaseFragment implements View.OnClickListener{
+
+    private RecyclerView mRecyclerView;
+    private ArrayList<MaintainitemBean> mFeededList;
+    private SelectAdapter myAdapter;
+    private Button jlt_storage_in_barcode_save_btn;
+    private StringRequest mStringRequest;
+    private String ma_code;
+    private String sc_code;
+    private TextView tv_ma_code;
+    private ClearableEditText ct_qty;
+    private ClearableEditText ct_sum;
+    private List<CaiPiBlueBean.DataBean> messages = new ArrayList<>();
+    private PopupWindow splitPop;
+    private boolean isConnected = false;
+    private boolean isPrinting = false;
+    private int mPrintDpi = 203;
+    private JSONArray dataArray;
+    private Button btn_oneprint;
+
+    @Override
+    protected int getLayout() {
+        return R.layout.fragment_pre_processing_report;
+    }
+
+    @Override
+    protected void initViews() {
+        setTitle("预加工报工");
+        ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
+        mRecyclerView = root.findViewById(R.id.feeded_rv);
+        tv_ma_code = root.findViewById(R.id.tv_ma_code);
+        ct_qty = root.findViewById(R.id.ct_qty);
+        ct_sum = root.findViewById(R.id.ct_sum);
+        btn_oneprint = root.findViewById(R.id.btn_oneprint);
+        jlt_storage_in_barcode_save_btn = root.findViewById(R.id.jlt_storage_in_barcode_save_btn);
+    }
+
+
+    public static String removeBrackets(String input) {
+        // 去除前后的中括号
+        if (input.startsWith("[") && input.endsWith("]")) {
+            input = input.substring(1, input.length() - 1);
+        }
+        return input;
+    }
+    @Override
+    protected void initEvents() {
+        getPrintTemplate();
+        btn_oneprint.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+
+                if (dataArray != null && dataArray.size() > 0) {
+                    printEvent(dataArray);
+                }else {
+                    CommonUtil.toastNoRepeat(mActivity, "数据为空");
+                }
+            }
+        });
+
+
+
+
+        jlt_storage_in_barcode_save_btn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (StringUtil.isEmpty(ct_sum.getText().toString().trim())){
+                    CommonUtil.toastNoRepeat(mActivity, "请输入报工数");
+                    return;
+                }
+                ArrayList<MaintainitemBean> selectedItem = myAdapter.getSelectedItem();
+                if (selectedItem==null||selectedItem.size()==0){
+                    CommonUtil.toastNoRepeat(mActivity, "请选择料号");
+                    return;
+                }
+                String sunmdata = "";
+                for (int i=0;i<selectedItem.size();i++){
+                    MaintainitemBean maintainitemBean = selectedItem.get(i);
+                    sunmdata+=maintainitemBean.getMM_PRODCODE()+",";
+                }
+                Log.e("liao_code",sunmdata);
+
+                getNewsave(sunmdata);
+            }
+        });
+        ma_code = SharedPreUtil.getString(mActivity, "MA_CODE", null);
+        sc_code = SharedPreUtil.getString(mActivity, "SC_CODE", null);
+        tv_ma_code.setText(ma_code);
+    }
+
+    @Override
+    protected void initDatas() {
+        mFeededList = new ArrayList<>();
+        myAdapter = new SelectAdapter(mFeededList);
+        mRecyclerView = root.findViewById(R.id.feeded_rv);
+        mRecyclerView.addItemDecoration(new DividerItemDecoration(mActivity, LinearLayout.VERTICAL));
+        mRecyclerView.setLayoutManager(new LinearLayoutManager(mActivity));
+        //设置Item增加、移除动画
+        mRecyclerView.setItemAnimator(new DefaultItemAnimator());
+        setAdapter(mFeededList);
+        mRecyclerView.setAdapter(myAdapter);
+        getNewVersionMsg();
+    }
+
+    private void getNewVersionMsg() {
+        progressDialog.show();
+        VollyRequest.getInstance().stringRequest(mStringRequest,
+                new HttpParams.Builder()
+                        .url(GloableParams.ADDRESS_GETMAKEMATERIAL)
+                        .method(Request.Method.GET)
+                        .addParam("ma_code",ma_code)
+                        .addParam("sc_code",sc_code)
+                        .build(), new HttpCallback() {
+                    @Override
+                    public void onSuccess(int flag, Object o) throws Exception {
+                        progressDialog.dismiss();
+                        String result = o.toString();
+                        JSONArray dataArray = FastjsonUtil.getJSONArray(result, "data");
+                        handleFeededData(dataArray);
+
+                    }
+
+                    @Override
+                    public void onFail(int flag, String failStr) throws Exception {
+                        progressDialog.dismiss();
+                        CommonUtil.toastNoRepeat(mActivity, failStr);
+
+                    }
+
+                });
+
+
+
+
+
+    }
+    private void handleFeededData(JSONArray dataArray) {
+        MaintainitemBean bean;
+        mFeededList.clear();
+        for (Object index : dataArray) {
+            JSONObject data = (JSONObject) index;
+            bean= new MaintainitemBean(
+                    data.getString("MM_PRODCODE"),
+                    data.getString("PR_DETAIL"),
+                    data.getString("PR_SPEC"));
+            mFeededList.add(bean);
+        }
+        setAdapter(mFeededList);
+    }
+    private void setAdapter(ArrayList<MaintainitemBean> mList) {
+        LogUtil.i("mList", JSON.toJSONString(mList));
+        myAdapter = new SelectAdapter(mList);
+        mRecyclerView.setAdapter(myAdapter);
+    }
+
+    /**
+     * 保存
+     */
+    private void getNewsave(String prods) {
+        progressDialog.show();
+        VollyRequest.getInstance().stringRequest(mStringRequest,
+                new HttpParams.Builder()
+                        .url(GloableParams.ADDRESS_MODIFYMAPRODS)
+                        .method(Request.Method.GET)
+                        .addParam("ma_code",ma_code)
+                        .addParam("sc_code",sc_code)
+                        .addParam("prods",prods)
+                        .addParam("decode",ct_qty.getText().toString().trim())
+                        .addParam("reportqty",ct_sum.getText().toString().trim())
+                        .build(), new HttpCallback() {
+                    @Override
+                    public void onSuccess(int flag, Object o) throws Exception {
+                        progressDialog.dismiss();
+
+                        dataArray = FastjsonUtil.getJSONArray(o.toString(), "data");
+
+                        ToastUtil.getInstance(mActivity).showToast("报工成功");
+//                        initBreakPopupWindow(dataArray);
+                        printEvent(dataArray);
+                    }
+
+                    @Override
+                    public void onFail(int flag, String failStr) throws Exception {
+                        progressDialog.dismiss();
+                        CommonUtil.toastNoRepeat(mActivity, failStr);
+
+                    }
+
+                });
+
+
+
+
+
+    }
+    //org.json.
+    protected void initBreakPopupWindow(JSONArray listArray) {
+        messages.clear();
+        for (int i = 1; i < listArray.size(); i++) {
+            try {
+                JSONObject barcodeObject = listArray.getJSONObject(i);
+
+                if (barcodeObject != null) {
+                    CaiPiBlueBean.DataBean dataBean=new CaiPiBlueBean.DataBean();
+//                    dataBean.setLotno(JsonUtils.optStringNotNull(barcodeObject, "LOTNO"));
+//                    dataBean.setQty(JsonUtils.optStringNotNull(barcodeObject, "QTY"));
+                    dataBean.setLotno(barcodeObject.getString("LOTNO"));
+                    dataBean.setQty(barcodeObject.getString("QTY"));
+                    messages.add(dataBean);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+
+
+        View popView = LayoutInflater.from(getActivity()).inflate(R.layout.popupwindow_whbreaking_batch, null);
+        ListView listView = (ListView) popView.findViewById(R.id.list_view);
+        Button btnPrintf = (Button) popView.findViewById(R.id.btn_print);
+        Button btnPrintfSet = (Button) popView.findViewById(R.id.btn_print_setting);
+        Button btnClose = (Button) popView.findViewById(R.id.btn_close);
+        Button btnBack = (Button) popView.findViewById(R.id.btn_back);
+
+        btnBack.setVisibility(View.GONE);
+        btnClose.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                closeSplitPopupWindow();
+//                }
+            }
+        });
+        btnPrintf.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (isConnected) {
+                    progressDialog.show();
+                    listArray.remove(0);
+                    printEvent(listArray);
+                } else {
+                    closeSplitPopupWindow();
+                    BlueToothPrintFragment blueToothPrintFragment = new BlueToothPrintFragment();
+
+                    Bundle bundle = new Bundle();
+                    bundle.putString(Constants.KEY.BARCODE_PRINT_ARRAY, listArray.toString());
+                    Log.e("listArrayone",listArray.toString());
+                    blueToothPrintFragment.setArguments(bundle);
+                    FragmentUtils.switchFragment(PreProcessingReportFragment.this, blueToothPrintFragment);
+                }
+            }
+        });
+
+        btnPrintfSet.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                closeSplitPopupWindow();
+                BlueToothPrintFragment blueToothPrintFragment = new BlueToothPrintFragment();
+
+                Bundle bundle = new Bundle();
+                bundle.putString(Constants.KEY.BARCODE_PRINT_ARRAY, listArray.toString());
+                Log.e("listArraytwo",listArray.toString());
+                blueToothPrintFragment.setArguments(bundle);
+                FragmentUtils.switchFragment(PreProcessingReportFragment.this, blueToothPrintFragment);
+            }
+        });
+        MyAdapter adapter = new MyAdapter(getActivity(), R.layout.item_list_whbreakingbatchfragment, messages);
+        listView.setAdapter(adapter);
+        //当只有一条数据的时候可以加上
+        /*
+        if (messages.size()>1){
+            btnBack.setVisibility(View.GONE);
+        }*/
+        // PopupWindow实例化,参数的意思是 view,长(不包括状态栏),高(不包括状态栏),是否聚焦
+        splitPop = new PopupWindow(popView, LinearLayout.LayoutParams.WRAP_CONTENT,
+                LinearLayout.LayoutParams.WRAP_CONTENT, true);
+        splitPop.setAnimationStyle(R.style.MenuAnimationFade);
+        splitPop.setBackgroundDrawable(new BitmapDrawable());
+        // 弹出窗口显示内容视图,默认以锚定视图的左下角为起点,这里为点击按钮
+        splitPop.showAtLocation(getActivity().getWindow().getDecorView(), Gravity.CENTER, 0, 0);
+        splitPop.setOnDismissListener(new PopupWindow.OnDismissListener() {
+            @Override
+            public void onDismiss() {
+                closeSplitPopupWindow();
+//                specialOut();
+            }
+        });
+        CommonUtil.setBackgroundAlpha(mActivity, 0.5f);
+
+    }
+    private void closeSplitPopupWindow() {
+        if (splitPop != null) {
+            splitPop.dismiss();
+            splitPop = null;
+            CommonUtil.setBackgroundAlpha(mActivity, 1f);
+        }
+    }
+    private void getPrintTemplate() {
+        VolleyRequest.getInstance().stringRequest(mStringRequest,
+                new HttpParams.Builder()
+                        .url(GloableParams.ADDRESS_BARINFO_PRINTMODEL)
+                        .method(Request.Method.GET)
+                        .flag(0)
+                        .tag("barinfoPrint")
+                        .addParam("caller", "PreBarcode")//Barcode!PDAPrint仓库
+                        .build(), new HttpCallback() {
+                    @Override
+                    public void onSuccess(int flag, Object o) throws Exception {
+                        try {
+                            String result = o.toString();
+                            Log.e("prints", result);
+                            if (FastjsonUtil.validate(result)) {
+                                JSONObject resultObject = JSON.parseObject(result);
+                                JSONArray dataArray = resultObject.getJSONArray("data");
+                                if (dataArray != null && dataArray.size() > 0) {
+                                    SharedPreUtil.saveString(mActivity, Constants.FLAG.PRINT_TEMPLATE_CACHE, dataArray.toJSONString());
+                                }
+                            }
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+
+                    }
+
+                    @Override
+                    public void onFail(int flag, String failStr) throws Exception {
+                        Log.e("printf", failStr);
+                    }
+                });
+    }
+
+    private void printEvent(JSONArray printArray) {
+        if (isPrinting) {
+            CommonUtil.toastNoRepeat(mActivity, "正在打印中,请勿重复操作");
+            return;
+        }
+        isPrinting = true;
+        if (printArray != null && printArray.size() > 0) {
+            boolean isFail = false;
+            for (int i = 0; i < printArray.size(); i++) {
+                try {
+                    JSONObject printObject = printArray.getJSONObject(i);
+                    int printResult = PrintUtils.printBar(mActivity, printObject.toString(), mPrintDpi, null);
+                    if (printResult <= 0) {
+                        isFail = true;
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+            closeSplitPopupWindow();
+            progressDialog.dismiss();
+            if (isFail) {
+                isConnected = false;
+                SharedPreUtil.saveInt(mActivity, "printConnect", 0);
+                CommonUtil.toastNoRepeat(mActivity, "打印失败,请重新连接打印机");
+
+                BlueToothPrintFragment blueToothPrintFragment = new BlueToothPrintFragment();
+
+                Bundle bundle = new Bundle();
+                bundle.putString(Constants.KEY.BARCODE_PRINT_ARRAY, printArray.toString());
+                Log.e("listArraythree",printArray.toString());
+                blueToothPrintFragment.setArguments(bundle);
+                FragmentUtils.switchFragment(PreProcessingReportFragment.this, blueToothPrintFragment);
+            } else {
+                CommonUtil.toastNoRepeat(mActivity, "打印成功");
+            }
+        } else {
+            CommonUtil.toastNoRepeat(mActivity, "打印失败,条码数据为空");
+        }
+        isPrinting = false;
+    }
+
+
+
+
+
+    private class MyAdapter extends ArrayAdapter<CaiPiBlueBean.DataBean> {
+        private int resourceId;
+
+        public MyAdapter(Context context, int resource, List<CaiPiBlueBean.DataBean> objects) {
+            super(context, resource, objects);
+            resourceId = resource;
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            CaiPiBlueBean.DataBean person = getItem(position);
+            convertView = LayoutInflater.from(getContext()).inflate(resourceId,
+                    null);
+            TextView tv_bar_code = (TextView) convertView.findViewById(R.id.tv_bar_code);
+            TextView tv_bar_remain = (TextView) convertView.findViewById(R.id.tv_bar_remain);
+            tv_bar_code.setText(person.getLotno());
+            tv_bar_remain.setText(person.getQty());
+            return convertView;
+        }
+    }
+    @Override
+    public void onHiddenChanged(boolean hidden) {
+        super.onHiddenChanged(hidden);
+        if (!hidden) {
+            setTitle("预加工报工");
+            ((FunctionActivity) getActivity()).setMoreBtnVisible(true);
+        } else {
+            ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
+        }
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        return false;
+    }
+
+    @Override
+    public boolean onFragmentBackPressed() {
+        return false;
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
+    }
+
+    @SuppressLint("NonConstantResourceId")
+    @Override
+    public void onClick(View v) {
+
+    }
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (resultCode != Activity.RESULT_OK) {
+            return;
+        }
+
+    }
+    public class SelectAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+
+        private ArrayList<MaintainitemBean> mList = new ArrayList<>();
+        private SparseBooleanArray mSelectedPositions = new SparseBooleanArray();
+        private boolean mIsSelectable = false;
+
+
+        public SelectAdapter(ArrayList<MaintainitemBean> list) {
+            if (list == null) {
+                throw new IllegalArgumentException("model Data must not be null");
+            }
+            mList = list;
+        }
+
+        //更新adpter的数据和选择状态
+        public void updateDataSet(ArrayList<MaintainitemBean> list) {
+            this.mList = list;
+            mSelectedPositions = new SparseBooleanArray();
+//            ab.setTitle("已选择" + 0 + "项");
+        }
+
+
+        //获得选中条目的结果
+        public ArrayList<MaintainitemBean> getSelectedItem() {
+            ArrayList<MaintainitemBean> selectList = new ArrayList<>();
+            for (int i = 0; i < mList.size(); i++) {
+                if (isItemChecked(i)) {
+                    selectList.add(mList.get(i));
+                }
+            }
+            return selectList;
+        }
+
+
+        @Override
+        public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
+            View itemView = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.recyclerview_item2, viewGroup, false);
+            return new ListItemViewHolder(itemView);
+        }
+
+        //设置给定位置条目的选择状态
+        private void setItemChecked(int position, boolean isChecked) {
+            mSelectedPositions.put(position, isChecked);
+        }
+
+        //根据位置判断条目是否选中
+        private boolean isItemChecked(int position) {
+            return mSelectedPositions.get(position);
+        }
+
+        //根据位置判断条目是否可选
+        private boolean isSelectable() {
+            return mIsSelectable;
+        }
+        //设置给定位置条目的可选与否的状态
+        private void setSelectable(boolean selectable) {
+            mIsSelectable = selectable;
+        }
+
+        //绑定界面,设置监听
+        @Override
+        public void onBindViewHolder(final RecyclerView.@NotNull ViewHolder holder, @SuppressLint("RecyclerView") int i) {
+            //设置条目状态
+            ((ListItemViewHolder) holder).tv_liaocode.setText("物料编号:"+mList.get(i).getMM_PRODCODE());
+            ((ListItemViewHolder) holder).tv_liaotetall.setText("物料名称:"+mList.get(i).getPR_DETAIL());
+            ((ListItemViewHolder) holder).tv_liaospec.setText("物料规格:"+mList.get(i).getPR_SPEC());
+
+
+            ((ListItemViewHolder) holder).checkBox.setChecked(isItemChecked(i));
+//            if (i%2==0){
+//                ((ListItemViewHolder) holder).line_color.setBackgroundColor(getResources().getColor(R.color.button_normal));
+//            }else {
+//                ((ListItemViewHolder) holder).line_color.setBackgroundColor(Color.WHITE);
+//            }
+            //checkBox的监听
+            ((ListItemViewHolder) holder).checkBox.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (isItemChecked(i)) {
+                        setItemChecked(i, false);
+                    } else {
+                        setItemChecked(i, true);
+                    }
+//                    for (int i2=0;i2<mList.size();i2++){
+//                        setItemChecked(i2, true);
+//                    }
+
+//                    ab.setTitle("已选择" + getSelectedItem().size() + "项");
+                }
+            });
+
+            //条目view的监听
+            ((ListItemViewHolder) holder).itemView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (isItemChecked(i)) {
+                        setItemChecked(i, false);
+                    } else {
+                        setItemChecked(i, true);
+                    }
+//                    notifyItemChanged(i);
+//                    if (!StringUtil.isEmpty(mList.get(i).getDI_REMARK())){
+//                        ((ListItemViewHolder) holder).tv_remark.setText("点检值:"+mList.get(i).getDI_REMARK());
+//                    }
+
+//                    ab.setTitle("已选择" + getSelectedItem().size() + "项");
+                }
+            });
+
+        }
+
+        @Override
+        public int getItemCount() {
+            return mList == null ? 0 : mList.size();
+        }
+
+        public class ListItemViewHolder extends RecyclerView.ViewHolder{
+            //ViewHolder
+            CheckBox checkBox;
+            TextView tv_liaocode;
+            TextView tv_liaotetall;
+            TextView tv_liaospec;
+            ListItemViewHolder(View view) {
+                super(view);
+                this.tv_liaocode = (TextView) view.findViewById(R.id.tv_liaocode);
+                this.tv_liaotetall = (TextView) view.findViewById(R.id.tv_liaotetall);
+                this.tv_liaospec = (TextView) view.findViewById(R.id.tv_liaospec);
+                this.checkBox = (CheckBox) view.findViewById(R.id.select_checkbox);
+
+            }
+        }
+    }
+}

+ 21 - 12
app/src/main/java/com/uas/ruiziuasmes/global/GloableParams.java

@@ -345,6 +345,8 @@ public class GloableParams {
     public static String ADDRESS_GETOPRLOG;
     public static String ADDRESS_STARTMAS;
     public static String ADDRESS_REPRINT;
+    public static String ADDRESS_GETMAKEMATERIAL;
+    public static String ADDRESS_MODIFYMAPRODS;
     /**
      * 高登
      */
@@ -1012,7 +1014,8 @@ public class GloableParams {
 
     private static final String ADDRESSTAIL_REPRINT = "/api/pdashop/report/reprint.action";
 
-
+    private static final String ADDRESSTAIL_GETMAKEMATERIAL = "/api/pdashop/start/getMakeMaterial.action";
+    private static final String ADDRESSTAIL_MODIFYMAPRODS = "/api/pdashop/start/modifyMaProds.action";
 
     /***********************************************************************************************/
     /*界面文字和图片资源,控制后续数据一致*/
@@ -1075,6 +1078,7 @@ public class GloableParams {
     public static final String GRIDNAME_ROLLOUT= "工序转出";
     public static final String GRIDNAME_PACKAGE= "包装采集";
     public static final String GRIDNAME_BAD_EXCHANGE = "不良换票";
+    public static final String GRIDNAME_BAD_PRE_PROCESSING_REPORT = "预加工报工";
    // public static final String GRIDNAME_STAFF_CHANGE = "人员换岗";
     //public static final String GRIDNAME_STAFF_UP = "人员上线";
   //  public static final String GRIDNAME_STAFF_DOWN = "人员下线";
@@ -1083,28 +1087,30 @@ public class GloableParams {
            GRIDNAME_WORK_PAUSE, GRIDNAME_WORK_SWITCH,
            GRIDNAME_IN_MATERIAL,
 
-//           GRIDNAME__PUTINTO,GRIDNAME_ROLLOUT,
+           GRIDNAME__PUTINTO,GRIDNAME_ROLLOUT,
 
-//           GRIDNAME_PACKAGE,
+           GRIDNAME_PACKAGE,
            GRIDNAME_TIME_REPORT_DETAIL,GRIDNAME_TIME_METRIAL_DETAIL,
 
            GRIDNAME_TIME_REPORT,
-           GRIDNAME_CHAI_PI
-//           GRIDNAME_TIAO_ZHAN,
-//           GRIDNAME_BAD_EXCHANGE
+           GRIDNAME_CHAI_PI,
+           GRIDNAME_TIAO_ZHAN,
+           GRIDNAME_BAD_EXCHANGE,
+           GRIDNAME_BAD_PRE_PROCESSING_REPORT
    };
 
     public static int[] indexMainGridImgs = {
             R.drawable.start, R.drawable.pause, R.drawable.swich,
             R.drawable.feeded,
-//            R.drawable.ic_staff_down,
-//            R.drawable.ic_staff_up,
-//            R.drawable.acquisition,
+            R.drawable.ic_staff_down,
+            R.drawable.ic_staff_up,
+            R.drawable.acquisition,
             R.drawable.iv_rollout,R.drawable.report,
             R.drawable.baogong,
-            R.drawable.storage_bach_operation
-//            R.drawable.index_smt_up,
-//            R.mipmap.badchange
+            R.drawable.storage_bach_operation,
+            R.drawable.index_smt_up,
+            R.mipmap.badchange,
+            R.mipmap.iv_processing,
     };
 
     //INDEX:出入库管理Index
@@ -1589,5 +1595,8 @@ public class GloableParams {
         GloableParams.ADDRESS_GETOPRLOG = uriHead + GloableParams.ADDRESSTAIL_GETOPRLOG;
         GloableParams.ADDRESS_STARTMAS = uriHead + GloableParams.ADDRESSTAIL_STARTMAS;
         GloableParams.ADDRESS_REPRINT = uriHead + GloableParams.ADDRESSTAIL_REPRINT;
+
+        GloableParams.ADDRESS_GETMAKEMATERIAL = uriHead + GloableParams.ADDRESSTAIL_GETMAKEMATERIAL;
+        GloableParams.ADDRESS_MODIFYMAPRODS = uriHead + GloableParams.ADDRESSTAIL_MODIFYMAPRODS;
     }
 }

+ 114 - 0
app/src/main/res/layout/fragment_pre_processing_report.xml

@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+    <Button
+        android:id="@+id/btn_oneprint"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="打印">
+    </Button>
+    <LinearLayout
+        android:layout_weight="1"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <LinearLayout
+            android:padding="@dimen/sp_16"
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <TextView
+                android:layout_gravity="center"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@color/red"
+                android:text="单据编号"
+                android:layout_marginRight="@dimen/dp_10"
+                android:gravity="right">
+            </TextView>
+            <TextView
+                android:id="@+id/tv_ma_code"
+                android:layout_gravity="center"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@color/black"
+                android:text=""
+                android:layout_marginRight="@dimen/dp_10"
+                android:gravity="left">
+            </TextView>
+        </LinearLayout>
+
+        <LinearLayout
+            android:padding="@dimen/sp_16"
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <TextView
+                android:layout_gravity="center"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@color/red"
+                android:text="机台号"
+                android:layout_marginRight="@dimen/dp_10"
+                android:gravity="right">
+            </TextView>
+            <com.uas.ruiziuasmes.view.ClearableEditText
+                android:id="@+id/ct_qty"
+                style="@style/EditTextStyle"
+                android:layout_weight="1"
+                android:background="@drawable/bg_line_edittext"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:hint="请输入机台号"
+                android:imeOptions="actionSend"
+                android:textColor="@color/black"
+                />
+        </LinearLayout>
+        <LinearLayout
+            android:padding="@dimen/sp_16"
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <TextView
+                android:layout_gravity="center"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@color/red"
+                android:text="报工数"
+                android:layout_marginRight="@dimen/dp_10"
+                android:gravity="right">
+            </TextView>
+            <com.uas.ruiziuasmes.view.ClearableEditText
+                android:id="@+id/ct_sum"
+                style="@style/EditTextStyle"
+                android:layout_weight="1"
+                android:background="@drawable/bg_line_edittext"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:hint="请输入报工数量"
+                android:imeOptions="actionSend"
+                android:textColor="@color/black"
+                />
+        </LinearLayout>
+        <android.support.v7.widget.RecyclerView
+            android:layout_marginLeft="@dimen/dp_10"
+            android:layout_marginRight="@dimen/dp_10"
+            android:id="@+id/feeded_rv"
+            android:layout_width="match_parent"
+            android:layout_height="300dp"
+            />
+    </LinearLayout>
+    <Button
+        android:id="@+id/jlt_storage_in_barcode_save_btn"
+        style="@style/ButtonStyle"
+        android:layout_width="match_parent"
+        android:layout_margin="12dp"
+        android:layout_alignParentBottom="true"
+        android:text="报工" />
+
+</LinearLayout>

+ 55 - 0
app/src/main/res/layout/recyclerview_item2.xml

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <CheckBox
+            android:id="@+id/select_checkbox"
+            android:layout_width="@dimen/dp_40"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center">
+        </CheckBox>
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_gravity="center"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <TextView
+                android:id="@+id/tv_liaocode"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="@dimen/dp_10"
+                android:layout_marginRight="@dimen/dp_10"
+                android:text="11234123ee21234er"
+                android:gravity="center">
+            </TextView>
+            <TextView
+                android:id="@+id/tv_liaotetall"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="@dimen/dp_10"
+                android:layout_marginRight="@dimen/dp_10"
+                android:text="11234123ee21234er"
+                android:gravity="center">
+            </TextView>
+            <TextView
+                android:id="@+id/tv_liaospec"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="@dimen/dp_10"
+                android:layout_marginRight="@dimen/dp_10"
+                android:text="11234123ee21234er"
+                android:gravity="center">
+            </TextView>
+        </LinearLayout>
+
+    </LinearLayout>
+
+
+
+</LinearLayout>

BIN
app/src/main/res/mipmap-xhdpi/iv_processing.png


+ 11 - 4
build.gradle

@@ -3,6 +3,8 @@
 buildscript {
 //    ext.kotlin_version = '1.2.30'
     repositories {
+        maven { url "https://jitpack.io" }
+        mavenCentral()
         google()
         jcenter()
         maven {
@@ -11,7 +13,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.3'
+        classpath 'com.android.tools.build:gradle:4.2.1'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'
 //        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -23,13 +25,18 @@ buildscript {
 
 allprojects {
     repositories {
+        maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' }
+        maven { url 'http://maven.aliyun.com/nexus/content/repositories/jcenter' }
+        maven { url 'http://maven.aliyun.com/nexus/content/repositories/google' }
+        maven { url 'http://maven.aliyun.com/nexus/content/repositories/gradle-plugin' }
+        maven { url "https://jitpack.io" }
+        mavenCentral()
         google()
         jcenter()
         maven {
             url 'https://maven.google.com/'
             name 'Google'
         }
-        maven { url "https://jitpack.io" }
     }
 }
 
@@ -44,8 +51,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 31,
-            versionName      : "v1.2.1"
+            versionCode      : 10,
+            versionName      : "v1.0"
     ]
 
     depsVersion = [

+ 3 - 2
gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Fri Jul 19 16:36:08 CST 2024
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME

+ 1 - 4
pda_libs/pulltoreflashlibrary/build/generated/source/buildConfig/debug/com/handmark/pulltorefresh/library/BuildConfig.java

@@ -5,9 +5,6 @@ package com.handmark.pulltorefresh.library;
 
 public final class BuildConfig {
   public static final boolean DEBUG = Boolean.parseBoolean("true");
-  public static final String APPLICATION_ID = "com.handmark.pulltorefresh.library";
+  public static final String LIBRARY_PACKAGE_NAME = "com.handmark.pulltorefresh.library";
   public static final String BUILD_TYPE = "debug";
-  public static final String FLAVOR = "";
-  public static final int VERSION_CODE = 30;
-  public static final String VERSION_NAME = "v1.2.0";
 }

+ 2 - 2
pda_libs/pulltoreflashlibrary/build/generated/source/buildConfig/release/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 = "release";
   public static final String FLAVOR = "";
-  public static final int VERSION_CODE = 31;
-  public static final String VERSION_NAME = "v1.2.1";
+  public static final int VERSION_CODE = 10;
+  public static final String VERSION_NAME = "v1.0";
 }

BIN
pda_libs/pulltoreflashlibrary/build/intermediates/classes/debug/com/handmark/pulltorefresh/library/BuildConfig.class


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/classes/release/com/handmark/pulltorefresh/library/BuildConfig.class


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:\AndroidData\HUAYUN-UAE-MES\pda_libs\pulltoreflashlibrary\src\main\jniLibs"/></dataSet><dataSet config="debug"><source path="D:\AndroidData\HUAYUN-UAE-MES\pda_libs\pulltoreflashlibrary\src\debug\jniLibs"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\AndroidData\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\AndroidData\RUIZI-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:\AndroidData\HUAYUN-UAE-MES\pda_libs\pulltoreflashlibrary\src\main\shaders"/></dataSet><dataSet config="debug"><source path="D:\AndroidData\HUAYUN-UAE-MES\pda_libs\pulltoreflashlibrary\src\debug\shaders"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\AndroidData\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\AndroidData\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\debug\shaders"/></dataSet></merger>

+ 1 - 1
pda_libs/pulltoreflashlibrary/build/intermediates/incremental/mergeReleaseJniLibFolders/merger.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main"><source path="D:\AndroidData\HUAYUN-UAE-MES\pda_libs\pulltoreflashlibrary\src\main\jniLibs"/></dataSet><dataSet config="release"><source path="D:\AndroidData\HUAYUN-UAE-MES\pda_libs\pulltoreflashlibrary\src\release\jniLibs"/></dataSet></merger>
+<merger version="3"><dataSet config="main"><source path="D:\AndroidData\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\jniLibs"/></dataSet><dataSet config="release"><source path="D:\AndroidData\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\release\jniLibs"/></dataSet></merger>

+ 1 - 1
pda_libs/pulltoreflashlibrary/build/intermediates/incremental/mergeReleaseShaders/merger.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main"><source path="D:\AndroidData\HUAYUN-UAE-MES\pda_libs\pulltoreflashlibrary\src\main\shaders"/></dataSet><dataSet config="release"><source path="D:\AndroidData\HUAYUN-UAE-MES\pda_libs\pulltoreflashlibrary\src\release\shaders"/></dataSet></merger>
+<merger version="3"><dataSet config="main"><source path="D:\AndroidData\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\shaders"/></dataSet><dataSet config="release"><source path="D:\AndroidData\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\release\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:\AndroidData\HUAYUN-UAE-MES\pda_libs\pulltoreflashlibrary\src\main\assets"/><source path="D:\AndroidData\HUAYUN-UAE-MES\pda_libs\pulltoreflashlibrary\build\generated\assets\shaders\debug"/></dataSet><dataSet config="debug"><source path="D:\AndroidData\HUAYUN-UAE-MES\pda_libs\pulltoreflashlibrary\src\debug\assets"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\AndroidData\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\assets"/><source path="D:\AndroidData\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\AndroidData\RUIZI-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 @@
-#Mon Jun 03 19:50:35 CST 2024
-D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_rotate.png=D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\default_ptr_rotate.png
-D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_top.xml=D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_in_from_top.xml
-D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_top.xml=D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable\\indicator_bg_top.xml
-D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_flip.png=D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\default_ptr_flip.png
-D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_bottom.xml=D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_in_from_bottom.xml
-D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_rotate.png=D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\default_ptr_rotate.png
-D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\indicator_arrow.png=D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\indicator_arrow.png
-D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_flip.png=D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\default_ptr_flip.png
-D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_bottom.xml=D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable\\indicator_bg_bottom.xml
-D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\indicator_arrow.png=D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\indicator_arrow.png
-D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\indicator_arrow.png=D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\indicator_arrow.png
-D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_top.xml=D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_out_to_top.xml
-D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_bottom.xml=D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_out_to_bottom.xml
-D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_horizontal.xml=D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\layout\\pull_to_refresh_header_horizontal.xml
-D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_flip.png=D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\default_ptr_flip.png
-D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_rotate.png=D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\default_ptr_rotate.png
-D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_vertical.xml=D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\layout\\pull_to_refresh_header_vertical.xml
+#Fri Jul 19 16:36:25 CST 2024
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_bottom.xml=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable\\indicator_bg_bottom.xml
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_rotate.png=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\default_ptr_rotate.png
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_rotate.png=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\default_ptr_rotate.png
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_top.xml=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable\\indicator_bg_top.xml
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_horizontal.xml=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\layout\\pull_to_refresh_header_horizontal.xml
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_top.xml=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_in_from_top.xml
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_top.xml=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_out_to_top.xml
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_flip.png=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\default_ptr_flip.png
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_bottom.xml=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_out_to_bottom.xml
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_bottom.xml=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_in_from_bottom.xml
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\indicator_arrow.png=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\indicator_arrow.png
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_flip.png=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\default_ptr_flip.png
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\indicator_arrow.png=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\indicator_arrow.png
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\indicator_arrow.png=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\indicator_arrow.png
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_vertical.xml=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\layout\\pull_to_refresh_header_vertical.xml
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_rotate.png=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\default_ptr_rotate.png
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_flip.png=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\default_ptr_flip.png

+ 75 - 14
pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageDebugResources/merged.dir/values/values.xml

@@ -1,19 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <declare-styleable name="PullToRefresh"><attr format="reference|color" name="ptrRefreshableViewBackground"/><attr format="reference|color" name="ptrHeaderBackground"/><attr format="reference|color" name="ptrHeaderTextColor"/><attr format="reference|color" name="ptrHeaderSubTextColor"/><attr name="ptrMode">
-            <flag name="disabled" value="0x0"/>
-            <flag name="pullFromStart" value="0x1"/>
-            <flag name="pullFromEnd" value="0x2"/>
-            <flag name="both" value="0x3"/>
-            <flag name="manualOnly" value="0x4"/>
-
-            
-            <flag name="pullDownFromTop" value="0x1"/>
-            <flag name="pullUpFromBottom" value="0x2"/>
-        </attr><attr format="reference|boolean" name="ptrShowIndicator"/><attr format="reference" name="ptrDrawable"/><attr format="reference" name="ptrDrawableStart"/><attr format="reference" name="ptrDrawableEnd"/><attr format="reference|boolean" name="ptrOverScroll"/><attr format="reference" name="ptrHeaderTextAppearance"/><attr format="reference" name="ptrSubHeaderTextAppearance"/><attr name="ptrAnimationStyle">
-            <flag name="rotate" value="0x0"/>
-            <flag name="flip" value="0x1"/>
-        </attr><attr format="reference|boolean" name="ptrScrollingWhileRefreshingEnabled"/><attr format="reference|boolean" name="ptrListViewExtrasEnabled"/><attr format="reference|boolean" name="ptrRotateDrawableWhilePulling"/><attr format="reference|color" name="ptrAdapterViewBackground"/><attr format="reference" name="ptrDrawableTop"/><attr format="reference" name="ptrDrawableBottom"/></declare-styleable>
     <dimen name="header_footer_left_right_padding">24dp</dimen>
     <dimen name="header_footer_top_bottom_padding">12dp</dimen>
     <dimen name="indicator_corner_radius">12dp</dimen>
@@ -28,4 +14,79 @@
     <string name="pull_to_refresh_pull_label">Pull to refresh…</string>
     <string name="pull_to_refresh_refreshing_label">Loading…</string>
     <string name="pull_to_refresh_release_label">Release to refresh…</string>
+    <declare-styleable name="PullToRefresh">
+
+        <!-- A drawable to use as the background of the Refreshable View -->
+        <attr format="reference|color" name="ptrRefreshableViewBackground"/>
+
+        <!-- A drawable to use as the background of the Header and Footer Loading Views -->
+        <attr format="reference|color" name="ptrHeaderBackground"/>
+
+        <!-- Text Color of the Header and Footer Loading Views -->
+        <attr format="reference|color" name="ptrHeaderTextColor"/>
+
+        <!-- Text Color of the Header and Footer Loading Views Sub Header -->
+        <attr format="reference|color" name="ptrHeaderSubTextColor"/>
+
+        <!-- Mode of Pull-to-Refresh that should be used -->
+        <attr name="ptrMode">
+            <flag name="disabled" value="0x0"/>
+            <flag name="pullFromStart" value="0x1"/>
+            <flag name="pullFromEnd" value="0x2"/>
+            <flag name="both" value="0x3"/>
+            <flag name="manualOnly" value="0x4"/>
+
+            <!-- These last two are depreacted -->
+            <flag name="pullDownFromTop" value="0x1"/>
+            <flag name="pullUpFromBottom" value="0x2"/>
+        </attr>
+
+        <!-- Whether the Indicator overlay(s) should be used -->
+        <attr format="reference|boolean" name="ptrShowIndicator"/>
+
+        <!-- Drawable to use as Loading Indicator. Changes both Header and Footer. -->
+        <attr format="reference" name="ptrDrawable"/>
+
+        <!-- Drawable to use as Loading Indicator in the Header View. Overrides value set in ptrDrawable. -->
+        <attr format="reference" name="ptrDrawableStart"/>
+
+        <!-- Drawable to use as Loading Indicator in the Footer View. Overrides value set in ptrDrawable. -->
+        <attr format="reference" name="ptrDrawableEnd"/>
+
+        <!-- Whether Android's built-in Over Scroll should be utilised for Pull-to-Refresh. -->
+        <attr format="reference|boolean" name="ptrOverScroll"/>
+
+        <!-- Base text color, typeface, size, and style for Header and Footer Loading Views -->
+        <attr format="reference" name="ptrHeaderTextAppearance"/>
+
+        <!-- Base text color, typeface, size, and style for Header and Footer Loading Views Sub Header -->
+        <attr format="reference" name="ptrSubHeaderTextAppearance"/>
+
+        <!-- Style of Animation should be used displayed when pulling. -->
+        <attr name="ptrAnimationStyle">
+            <flag name="rotate" value="0x0"/>
+            <flag name="flip" value="0x1"/>
+        </attr>
+
+        <!-- Whether the user can scroll while the View is Refreshing -->
+        <attr format="reference|boolean" name="ptrScrollingWhileRefreshingEnabled"/>
+
+        <!--
+        	Whether PullToRefreshListView has it's extras enabled. This allows the user to be 
+        	able to scroll while refreshing, and behaves better. It acheives this by adding
+        	Header and/or Footer Views to the ListView.
+        -->
+        <attr format="reference|boolean" name="ptrListViewExtrasEnabled"/>
+
+        <!--
+        	Whether the Drawable should be continually rotated as you pull. This only
+        	takes effect when using the 'Rotate' Animation Style.
+        -->
+        <attr format="reference|boolean" name="ptrRotateDrawableWhilePulling"/>
+
+        <!-- BELOW HERE ARE DEPRECEATED. DO NOT USE. -->
+        <attr format="reference|color" name="ptrAdapterViewBackground"/>
+        <attr format="reference" name="ptrDrawableTop"/>
+        <attr format="reference" name="ptrDrawableBottom"/>
+    </declare-styleable>
 </resources>

File diff suppressed because it is too large
+ 0 - 0
pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageDebugResources/merger.xml


+ 1 - 1
pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageReleaseAssets/merger.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main"><source path="D:\AndroidData\HUAYUN-UAE-MES\pda_libs\pulltoreflashlibrary\src\main\assets"/><source path="D:\AndroidData\HUAYUN-UAE-MES\pda_libs\pulltoreflashlibrary\build\generated\assets\shaders\release"/></dataSet><dataSet config="release"><source path="D:\AndroidData\HUAYUN-UAE-MES\pda_libs\pulltoreflashlibrary\src\release\assets"/></dataSet></merger>
+<merger version="3"><dataSet config="main"><source path="D:\AndroidData\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\main\assets"/><source path="D:\AndroidData\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\build\generated\assets\shaders\release"/></dataSet><dataSet config="release"><source path="D:\AndroidData\RUIZI-UAS-MES\pda_libs\pulltoreflashlibrary\src\release\assets"/></dataSet></merger>

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

@@ -1,18 +1,18 @@
-#Mon Jun 03 19:39:31 CST 2024
-D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_rotate.png=D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\default_ptr_rotate.png
-D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_top.xml=D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\anim\\slide_in_from_top.xml
-D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_top.xml=D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable\\indicator_bg_top.xml
-D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_flip.png=D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\default_ptr_flip.png
-D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_bottom.xml=D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\anim\\slide_in_from_bottom.xml
-D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_rotate.png=D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-v4\\default_ptr_rotate.png
-D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\indicator_arrow.png=D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\indicator_arrow.png
-D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_flip.png=D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-v4\\default_ptr_flip.png
-D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_bottom.xml=D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable\\indicator_bg_bottom.xml
-D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\indicator_arrow.png=D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-v4\\indicator_arrow.png
-D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\indicator_arrow.png=D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\indicator_arrow.png
-D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_top.xml=D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\anim\\slide_out_to_top.xml
-D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_bottom.xml=D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\anim\\slide_out_to_bottom.xml
-D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_horizontal.xml=D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\layout\\pull_to_refresh_header_horizontal.xml
-D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_flip.png=D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\default_ptr_flip.png
-D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_rotate.png=D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\default_ptr_rotate.png
-D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_vertical.xml=D\:\\AndroidData\\HUAYUN-UAE-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\layout\\pull_to_refresh_header_vertical.xml
+#Thu Jun 27 15:30:42 CST 2024
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_bottom.xml=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable\\indicator_bg_bottom.xml
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_rotate.png=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\default_ptr_rotate.png
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_rotate.png=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-v4\\default_ptr_rotate.png
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_top.xml=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable\\indicator_bg_top.xml
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_horizontal.xml=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\layout\\pull_to_refresh_header_horizontal.xml
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_top.xml=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\anim\\slide_in_from_top.xml
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_top.xml=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\anim\\slide_out_to_top.xml
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_flip.png=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-v4\\default_ptr_flip.png
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_bottom.xml=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\anim\\slide_out_to_bottom.xml
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_bottom.xml=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\anim\\slide_in_from_bottom.xml
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\indicator_arrow.png=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\indicator_arrow.png
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_flip.png=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\default_ptr_flip.png
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\indicator_arrow.png=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-xhdpi-v4\\indicator_arrow.png
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\indicator_arrow.png=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\indicator_arrow.png
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_vertical.xml=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\layout\\pull_to_refresh_header_vertical.xml
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_rotate.png=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\default_ptr_rotate.png
+D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_flip.png=D\:\\AndroidData\\RUIZI-UAS-MES\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\default_ptr_flip.png

File diff suppressed because it is too large
+ 0 - 0
pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageReleaseResources/merger.xml


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


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/intermediate-jars/debug/classes.jar


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/intermediate-jars/debug/full.jar


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/intermediate-jars/release/classes.jar


BIN
pda_libs/pulltoreflashlibrary/build/intermediates/intermediate-jars/release/full.jar


+ 2 - 2
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="30"
-    android:versionName="v1.2.0" >
+    android:versionCode="10"
+    android:versionName="v1.0" >
 
     <uses-sdk
         android:minSdkVersion="16"

+ 1 - 1
pda_libs/pulltoreflashlibrary/build/intermediates/manifests/aapt/debug/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":30,"versionName":"v1.2.0","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":10,"versionName":"v1.0","enabled":true,"outputFile":"pulltoreflashlibrary-debug.aar","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]

+ 2 - 2
pda_libs/pulltoreflashlibrary/build/intermediates/manifests/aapt/release/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="31"
-    android:versionName="v1.2.1" >
+    android:versionCode="10"
+    android:versionName="v1.0" >
 
     <uses-sdk
         android:minSdkVersion="16"

+ 1 - 1
pda_libs/pulltoreflashlibrary/build/intermediates/manifests/aapt/release/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":31,"versionName":"v1.2.1","enabled":true,"outputFile":"pulltoreflashlibrary-release.aar","fullName":"release","baseName":"release"},"path":"AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]
+[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":10,"versionName":"v1.0","enabled":true,"outputFile":"pulltoreflashlibrary-release.aar","fullName":"release","baseName":"release"},"path":"AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]

+ 2 - 2
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="30"
-    android:versionName="v1.2.0" >
+    android:versionCode="10"
+    android:versionName="v1.0" >
 
     <uses-sdk
         android:minSdkVersion="16"

+ 1 - 1
pda_libs/pulltoreflashlibrary/build/intermediates/manifests/full/debug/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":30,"versionName":"v1.2.0","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":10,"versionName":"v1.0","enabled":true,"outputFile":"pulltoreflashlibrary-debug.aar","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]

+ 2 - 2
pda_libs/pulltoreflashlibrary/build/intermediates/manifests/full/release/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="31"
-    android:versionName="v1.2.1" >
+    android:versionCode="10"
+    android:versionName="v1.0" >
 
     <uses-sdk
         android:minSdkVersion="16"

+ 1 - 1
pda_libs/pulltoreflashlibrary/build/intermediates/manifests/full/release/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":31,"versionName":"v1.2.1","enabled":true,"outputFile":"pulltoreflashlibrary-release.aar","fullName":"release","baseName":"release"},"path":"AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]
+[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":10,"versionName":"v1.0","enabled":true,"outputFile":"pulltoreflashlibrary-release.aar","fullName":"release","baseName":"release"},"path":"AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]

+ 75 - 14
pda_libs/pulltoreflashlibrary/build/intermediates/packaged_res/debug/values/values.xml

@@ -1,19 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <declare-styleable name="PullToRefresh"><attr format="reference|color" name="ptrRefreshableViewBackground"/><attr format="reference|color" name="ptrHeaderBackground"/><attr format="reference|color" name="ptrHeaderTextColor"/><attr format="reference|color" name="ptrHeaderSubTextColor"/><attr name="ptrMode">
-            <flag name="disabled" value="0x0"/>
-            <flag name="pullFromStart" value="0x1"/>
-            <flag name="pullFromEnd" value="0x2"/>
-            <flag name="both" value="0x3"/>
-            <flag name="manualOnly" value="0x4"/>
-
-            
-            <flag name="pullDownFromTop" value="0x1"/>
-            <flag name="pullUpFromBottom" value="0x2"/>
-        </attr><attr format="reference|boolean" name="ptrShowIndicator"/><attr format="reference" name="ptrDrawable"/><attr format="reference" name="ptrDrawableStart"/><attr format="reference" name="ptrDrawableEnd"/><attr format="reference|boolean" name="ptrOverScroll"/><attr format="reference" name="ptrHeaderTextAppearance"/><attr format="reference" name="ptrSubHeaderTextAppearance"/><attr name="ptrAnimationStyle">
-            <flag name="rotate" value="0x0"/>
-            <flag name="flip" value="0x1"/>
-        </attr><attr format="reference|boolean" name="ptrScrollingWhileRefreshingEnabled"/><attr format="reference|boolean" name="ptrListViewExtrasEnabled"/><attr format="reference|boolean" name="ptrRotateDrawableWhilePulling"/><attr format="reference|color" name="ptrAdapterViewBackground"/><attr format="reference" name="ptrDrawableTop"/><attr format="reference" name="ptrDrawableBottom"/></declare-styleable>
     <dimen name="header_footer_left_right_padding">24dp</dimen>
     <dimen name="header_footer_top_bottom_padding">12dp</dimen>
     <dimen name="indicator_corner_radius">12dp</dimen>
@@ -28,4 +14,79 @@
     <string name="pull_to_refresh_pull_label">Pull to refresh…</string>
     <string name="pull_to_refresh_refreshing_label">Loading…</string>
     <string name="pull_to_refresh_release_label">Release to refresh…</string>
+    <declare-styleable name="PullToRefresh">
+
+        <!-- A drawable to use as the background of the Refreshable View -->
+        <attr format="reference|color" name="ptrRefreshableViewBackground"/>
+
+        <!-- A drawable to use as the background of the Header and Footer Loading Views -->
+        <attr format="reference|color" name="ptrHeaderBackground"/>
+
+        <!-- Text Color of the Header and Footer Loading Views -->
+        <attr format="reference|color" name="ptrHeaderTextColor"/>
+
+        <!-- Text Color of the Header and Footer Loading Views Sub Header -->
+        <attr format="reference|color" name="ptrHeaderSubTextColor"/>
+
+        <!-- Mode of Pull-to-Refresh that should be used -->
+        <attr name="ptrMode">
+            <flag name="disabled" value="0x0"/>
+            <flag name="pullFromStart" value="0x1"/>
+            <flag name="pullFromEnd" value="0x2"/>
+            <flag name="both" value="0x3"/>
+            <flag name="manualOnly" value="0x4"/>
+
+            <!-- These last two are depreacted -->
+            <flag name="pullDownFromTop" value="0x1"/>
+            <flag name="pullUpFromBottom" value="0x2"/>
+        </attr>
+
+        <!-- Whether the Indicator overlay(s) should be used -->
+        <attr format="reference|boolean" name="ptrShowIndicator"/>
+
+        <!-- Drawable to use as Loading Indicator. Changes both Header and Footer. -->
+        <attr format="reference" name="ptrDrawable"/>
+
+        <!-- Drawable to use as Loading Indicator in the Header View. Overrides value set in ptrDrawable. -->
+        <attr format="reference" name="ptrDrawableStart"/>
+
+        <!-- Drawable to use as Loading Indicator in the Footer View. Overrides value set in ptrDrawable. -->
+        <attr format="reference" name="ptrDrawableEnd"/>
+
+        <!-- Whether Android's built-in Over Scroll should be utilised for Pull-to-Refresh. -->
+        <attr format="reference|boolean" name="ptrOverScroll"/>
+
+        <!-- Base text color, typeface, size, and style for Header and Footer Loading Views -->
+        <attr format="reference" name="ptrHeaderTextAppearance"/>
+
+        <!-- Base text color, typeface, size, and style for Header and Footer Loading Views Sub Header -->
+        <attr format="reference" name="ptrSubHeaderTextAppearance"/>
+
+        <!-- Style of Animation should be used displayed when pulling. -->
+        <attr name="ptrAnimationStyle">
+            <flag name="rotate" value="0x0"/>
+            <flag name="flip" value="0x1"/>
+        </attr>
+
+        <!-- Whether the user can scroll while the View is Refreshing -->
+        <attr format="reference|boolean" name="ptrScrollingWhileRefreshingEnabled"/>
+
+        <!--
+        	Whether PullToRefreshListView has it's extras enabled. This allows the user to be 
+        	able to scroll while refreshing, and behaves better. It acheives this by adding
+        	Header and/or Footer Views to the ListView.
+        -->
+        <attr format="reference|boolean" name="ptrListViewExtrasEnabled"/>
+
+        <!--
+        	Whether the Drawable should be continually rotated as you pull. This only
+        	takes effect when using the 'Rotate' Animation Style.
+        -->
+        <attr format="reference|boolean" name="ptrRotateDrawableWhilePulling"/>
+
+        <!-- BELOW HERE ARE DEPRECEATED. DO NOT USE. -->
+        <attr format="reference|color" name="ptrAdapterViewBackground"/>
+        <attr format="reference" name="ptrDrawableTop"/>
+        <attr format="reference" name="ptrDrawableBottom"/>
+    </declare-styleable>
 </resources>

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

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

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

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

Some files were not shown because too many files changed in this diff