增加标签补打界面,报工界面修改

app/src/main/AndroidManifest.xml

@@ -77,7 +77,9 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACTION_SCAN_START_EVENT" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.BLUETOOTH" />

app/src/main/java/com/uas/huayunuasmes/activity/FunctionActivity.java

@@ -27,6 +27,7 @@ import com.uas.huayunuasmes.fragment.HePiFragment;
 import com.uas.huayunuasmes.fragment.IndexSettingFragment;
 import com.uas.huayunuasmes.fragment.IndexWareHouseContentFragment;
 import com.uas.huayunuasmes.fragment.JumpSiteFragment;
+import com.uas.huayunuasmes.fragment.LabeLreprintingFragment;
 import com.uas.huayunuasmes.fragment.NotGoodCaiJiFragment;
 import com.uas.huayunuasmes.fragment.PackageAcquisitionFragment;
 import com.uas.huayunuasmes.fragment.PostPunchFragment;
@@ -193,6 +194,9 @@ public class FunctionActivity extends BaseActivity implements View.OnClickListen
                 case GloableParams.MACHINESTARTSANDSTOPS://机台操作
                     mFragment = new StartsAndStopsFragment();
                     break;
+                case GloableParams.LABELREPRINTING://标签补打
+                    mFragment = new LabeLreprintingFragment();
+                    break;
                 case GloableParams.GRIDNAME_SETTING://设置
                     mFragment = new IndexSettingFragment();
                     break;

app/src/main/java/com/uas/huayunuasmes/activity/HomeActivity.java

@@ -155,6 +155,10 @@ public class HomeActivity extends BaseActivity implements AdapterView.OnItemClic
                 intent.putExtra(DataSourceManager.KEY_GRID_ITEMNAME, itemName);
                 startActivity(intent);
                 break;
+            case GloableParams.LABELREPRINTING://标签补打
+                intent.putExtra(DataSourceManager.KEY_GRID_ITEMNAME, itemName);
+                startActivity(intent);
+                break;
 
             case GloableParams.GRIDNAME_SETTING://设置
                 intent.putExtra(DataSourceManager.KEY_GRID_ITEMNAME, itemName);

app/src/main/java/com/uas/huayunuasmes/fragment/BlueToothPrintFragment.java

@@ -8,6 +8,7 @@ import android.os.Bundle;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.animation.Animation;
@@ -85,6 +86,7 @@ public class BlueToothPrintFragment extends BaseFragment {
         Bundle arguments = getArguments();
         if (arguments != null) {
             mPrintJson = arguments.getString(Constants.KEY.BARCODE_PRINT_ARRAY);
+            Log.e("listArraytwo",mPrintJson);
         }
 
         mRefreshImageView = root.findViewById(R.id.bluetooth_print_refresh_iv);

app/src/main/java/com/uas/huayunuasmes/fragment/GdTimeReportFragment.java

@@ -1,27 +1,38 @@
 package com.uas.huayunuasmes.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.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.util.Log;
+import android.view.Gravity;
 import android.view.KeyEvent;
+import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.ListView;
+import android.widget.PopupWindow;
 import android.widget.Spinner;
 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.huayunuasmes.R;
 import com.uas.huayunuasmes.activity.FunctionActivity;
+import com.uas.huayunuasmes.bean.CaiPiBlueBean;
 import com.uas.huayunuasmes.global.GloableParams;
 import com.uas.huayunuasmes.listener.MyEditorActionListener;
 import com.uas.huayunuasmes.tools.SharedPreUtil;
@@ -29,9 +40,11 @@ import com.uas.huayunuasmes.util.CameraUtil;
 import com.uas.huayunuasmes.util.CommonUtil;
 import com.uas.huayunuasmes.util.Constants;
 import com.uas.huayunuasmes.util.FastjsonUtil;
+import com.uas.huayunuasmes.util.FragmentUtils;
 import com.uas.huayunuasmes.util.HttpCallback;
 import com.uas.huayunuasmes.util.HttpParams;
 import com.uas.huayunuasmes.util.LogUtil;
+import com.uas.huayunuasmes.util.PrintUtils;
 import com.uas.huayunuasmes.util.StringUtil;
 import com.uas.huayunuasmes.util.VollyRequest;
 import com.uas.huayunuasmes.view.ClearableEditText;
@@ -72,7 +85,12 @@ public class GdTimeReportFragment extends BaseFragment {
     private Integer integer;
     private Integer charSequenceNumber;
     private TextView material_in_collect_result_tv;
-
+    private boolean isPrinting = false;
+    private int mPrintDpi = 203;
+    private boolean isConnected = false;
+    private PopupWindow splitPop;
+    private Button printjson;
+    private JSONArray dataArrayjson;
 
     @Override
     protected int getLayout() {
@@ -92,11 +110,12 @@ public class GdTimeReportFragment extends BaseFragment {
         mOlRemarkEt = root.findViewById(R.id.ol_remark_et);
         mOlExChangeBtn = root.findViewById(R.id.ol_pause_btn);
         ed_pichi=root.findViewById(R.id.ed_pichi);
+        printjson = root.findViewById(R.id.printjson);
         tv_report_name=root.findViewById(R.id.tv_report_name);
         material_in_collect_result_tv = root.findViewById(R.id.material_in_collect_result_tv);
         String name = SharedPreUtil.getString(mActivity, Constants.FLAG.CACHE_USER_EMNAME,null);
         mOlNameTv.setText(name);
-        ed_pichi.requestFocus();
+        mOlNumbersEt.requestFocus();
     }
 
     @Override
@@ -134,6 +153,19 @@ public class GdTimeReportFragment extends BaseFragment {
                 dosubmitClick();
             }
         });
+        printjson.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+//                initBreakPopupWindow(dataArrayjson);
+                if (dataArrayjson==null){
+                    CommonUtil.toastNoRepeat(mActivity, "条码数据为空");
+                    return;
+                }
+//                dataArrayjson.remove(0);
+//                printEvent(dataArrayjson);
+                initBreakPopupWindow(dataArrayjson);
+            }
+        });
 
         mUnitspinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
@@ -425,10 +457,10 @@ public class GdTimeReportFragment extends BaseFragment {
         String madeqty = mOlNumbersEt.getText().toString().trim();//报工数
         String scrapqty = mOlUnuseEt.getText().toString().trim();//报废数
         String remark = mOlRemarkEt.getText().toString().trim();//备注
-        if(TextUtils.isEmpty(pici)){
-            CommonUtil.toastNoRepeat(mActivity,"生产批次不能为空");
-            return;
-        }
+//        if(TextUtils.isEmpty(pici)){
+//            CommonUtil.toastNoRepeat(mActivity,"生产批次不能为空");
+//            return;
+//        }
         if(TextUtils.isEmpty(madeqty)){//madeqty.length() == 0 || madeqty == ""
             CommonUtil.toastNoRepeat(mActivity,"报工数不能为空");
             return;
@@ -457,6 +489,7 @@ public class GdTimeReportFragment extends BaseFragment {
                     public void onSuccess(int flag, Object o) throws Exception {
                         progressDialog.dismiss();
                         Boolean isSuccess = FastjsonUtil.getBoolean(o.toString(),"success");
+                        dataArrayjson = FastjsonUtil.getJSONArray(o.toString(), "data");
                         if (isSuccess){
                             material_in_collect_result_tv.setVisibility(View.VISIBLE);
                             material_in_collect_result_tv.setTextColor(getResources().getColor(R.color.green));
@@ -465,7 +498,9 @@ public class GdTimeReportFragment extends BaseFragment {
                             mOlNumbersEt.setText("");//报工数
                             mOlUnuseEt.setText("");//报废数
                             mOlRemarkEt.setText("");//备注
-                            ed_pichi.requestFocus();
+                            mOlNumbersEt.requestFocus();
+                            initBreakPopupWindow(dataArrayjson);
+
                         }
 
                     }
@@ -480,16 +515,157 @@ public class GdTimeReportFragment extends BaseFragment {
                         mOlNumbersEt.setText("");//报工数
                         mOlUnuseEt.setText("");//报废数
                         mOlRemarkEt.setText("");//备注
-                        ed_pichi.requestFocus();
+                        mOlNumbersEt.requestFocus();
+                    }
+                });
+    }
 
+    private void printEvent(com.alibaba.fastjson.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 {
+                    int printResult = PrintUtils.printBar(mActivity, printArray.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(GdTimeReportFragment.this, blueToothPrintFragment);
+            } else {
+                CommonUtil.toastNoRepeat(mActivity, "打印成功");
+            }
+        } else {
+            CommonUtil.toastNoRepeat(mActivity, "打印失败，条码数据为空");
+        }
+        isPrinting = false;
+    }
 
+    private void closeSplitPopupWindow() {
+        if (splitPop != null) {
+            splitPop.dismiss();
+            splitPop = null;
+            CommonUtil.setBackgroundAlpha(mActivity, 1f);
+        }
+    }
+    private List<CaiPiBlueBean.DataBean> messages = new ArrayList<>();
+    //org.json.
+    protected void initBreakPopupWindow(com.alibaba.fastjson.JSONArray listArray) {
+        for (int i = 0; i < listArray.size(); i++) {
+            messages.clear();
+            try {
+                com.alibaba.fastjson.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"));
+                    Log.e("BAR_CODE",barcodeObject.getString("BAR_CODE"));//PR_CODE
+                    dataBean.setLotno("新条码号:"+barcodeObject.getString("BAR_CODE"));
+                    dataBean.setQty("数量:"+barcodeObject.getString("BAR_REMAIN")
+                            +"\n产品名称:"+barcodeObject.getString("PR_DETAIL")
+                            +"\n工单号:"+barcodeObject.getString("MA_CODE")
+                            +"\n料号:"+barcodeObject.getString("PR_CODE")
+                            +"\n打印时间:"+barcodeObject.getString("PRINTDATE"));
+                    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(GdTimeReportFragment.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(GdTimeReportFragment.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);
 
+    }
 
 
     @Override
@@ -527,4 +703,24 @@ public class GdTimeReportFragment extends BaseFragment {
             }
         }
     }
+    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;
+        }
+
+        @SuppressLint("ViewHolder")
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            CaiPiBlueBean.DataBean person = getItem(position);
+            convertView = LayoutInflater.from(getContext()).inflate(resourceId, null);
+            TextView tv_gone1 = (TextView) convertView.findViewById(R.id.tv_bar_code);
+            TextView tv_gone2 = (TextView) convertView.findViewById(R.id.tv_bar_remain);
+            tv_gone1.setText(person.getLotno());
+            tv_gone2.setText(person.getQty());
+            return convertView;
+        }
+    }
 }

app/src/main/java/com/uas/huayunuasmes/fragment/LabeLreprintingFragment.java

@@ -0,0 +1,256 @@
+package com.uas.huayunuasmes.fragment;
+
+import android.annotation.SuppressLint;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.inputmethod.EditorInfo;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.alibaba.fastjson.JSONArray;
+import com.android.volley.Request;
+import com.android.volley.toolbox.StringRequest;
+import com.uas.huayunuasmes.R;
+import com.uas.huayunuasmes.activity.FunctionActivity;
+import com.uas.huayunuasmes.global.GloableParams;
+import com.uas.huayunuasmes.tools.SharedPreUtil;
+import com.uas.huayunuasmes.util.CommonUtil;
+import com.uas.huayunuasmes.util.Constants;
+import com.uas.huayunuasmes.util.FastjsonUtil;
+import com.uas.huayunuasmes.util.FragmentUtils;
+import com.uas.huayunuasmes.util.HttpCallback;
+import com.uas.huayunuasmes.util.HttpParams;
+import com.uas.huayunuasmes.util.PrintUtils;
+import com.uas.huayunuasmes.util.VollyRequest;
+import com.uas.huayunuasmes.view.ClearableEditText;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Created by cjh 2024/06/03
+ * Desc: 标签补打
+ */
+public class LabeLreprintingFragment extends BaseFragment implements View.OnClickListener{
+    private StringRequest mStringRequest;
+    private ClearableEditText storage_recharge_collect_ets;
+    private LinearLayout line_hint;
+    private TextView tv_hint1;
+    private JSONArray dataArray;
+    private Button btn_starts;
+
+    @Override
+    protected int getLayout() {
+        return R.layout.fragment_labe_lreprnting;
+    }
+
+    @Override
+    protected void initViews() {
+        setTitle("标签补打");
+        ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
+        storage_recharge_collect_ets = root.findViewById(R.id.storage_recharge_collect_ets);
+        line_hint = root.findViewById(R.id.line_hint);
+        tv_hint1 = root.findViewById(R.id.tv_hint1);
+        btn_starts = root.findViewById(R.id.btn_starts);
+        storage_recharge_collect_ets.requestFocus();
+
+    }
+
+
+    @Override
+    protected void initEvents() {
+
+        storage_recharge_collect_ets.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+            @Override
+            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+                if (actionId == EditorInfo.IME_ACTION_DONE
+                        || actionId == EditorInfo.IME_ACTION_SEND
+                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    String data = storage_recharge_collect_ets.getText().toString().trim();
+                    getgetinfo(data);
+                    return true;
+                }
+                return false;
+            }
+        });
+        btn_starts.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                getgetinfo(storage_recharge_collect_ets.getText().toString().trim());
+            }
+        });
+
+
+    }
+
+    @Override
+    protected void initDatas() {
+
+
+
+    }
+
+
+    /**
+     * 批次号enter事件
+     */
+    private void getgetinfo(String lotno) {
+        if (lotno.isEmpty()){
+            CommonUtil.toastNoRepeat(mActivity, "请输入批次号");
+            return;
+        }
+        progressDialog.show();
+        VollyRequest.getInstance().stringRequest(mStringRequest,
+                new HttpParams.Builder()
+                        .url(GloableParams.ADDRESS_REPRINT)
+                        .method(Request.Method.GET)
+                        .tag(TAG + "getMaCode")
+                        .flag(0)
+                        .addParam("lotno",lotno)//原生产批号 ，必填
+                        .build(), new HttpCallback() {
+                    @Override
+                    public void onSuccess(int flag, Object o) throws Exception {
+                        progressDialog.dismiss();
+                        storage_recharge_collect_ets.setText("");
+                        storage_recharge_collect_ets.requestFocus();
+                        dataArray = FastjsonUtil.getJSONArray(o.toString(), "data");
+                        if (dataArray==null){
+                            CommonUtil.toastNoRepeat(mActivity, "数据为空");
+                            return;
+                        }
+                        printEvent(dataArray);
+                    }
+                    @Override
+                    public void onFail(int flag, String failStr) throws Exception {
+                        progressDialog.dismiss();
+                        storage_recharge_collect_ets.setText("");
+                        storage_recharge_collect_ets.requestFocus();
+                        CommonUtil.toastNoRepeat(mActivity, failStr);
+                    }
+                });
+
+
+    }
+    public static String removeBrackets(String input) {
+        return input.replaceAll("\\[", "").replaceAll("\\]", "");
+    }
+    public static void main(String[] args) {
+        String s="sxc[[123]sc]dv";
+        String regex = "\\[(.*?)]";
+        Pattern pattern= Pattern.compile(regex);
+        Matcher matcher=pattern.matcher(s);
+        System.out.println(matcher.find());
+    }
+
+    private boolean isPrinting = false;
+    private boolean isConnected = false;
+    private int mPrintDpi = 203;
+    private void printEvent(com.alibaba.fastjson.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 {
+                    String stingdata = removeBrackets(printArray.toString());
+                    int printResult = PrintUtils.printBar(mActivity, stingdata.toString(), mPrintDpi, null);
+                    if (printResult <= 0) {
+                        isFail = true;
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+            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());
+                blueToothPrintFragment.setArguments(bundle);
+                FragmentUtils.switchFragment(LabeLreprintingFragment.this, blueToothPrintFragment);
+            } else {
+                CommonUtil.toastNoRepeat(mActivity, "打印成功");
+            }
+        } else {
+            CommonUtil.toastNoRepeat(mActivity, "打印失败，条码数据为空");
+        }
+        isPrinting = false;
+    }
+
+
+
+    /**
+     * 当前时间
+     * @return
+     */
+    public static String geNowTime() {
+        String timeString = null;
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR));
+        Date today = calendar.getTime();
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+        String result = format.format(today);
+        timeString=result+":00";
+        return timeString;
+    }
+
+
+
+
+    @Override
+    public void onHiddenChanged(boolean hidden) {
+        super.onHiddenChanged(hidden);
+        if (!hidden) {
+            setTitle("标签补打");
+            ((FunctionActivity) getActivity()).setMoreBtnVisible(true);
+        } else {
+            ((FunctionActivity) getActivity()).setMoreBtnVisible(true);
+        }
+    }
+
+    @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);
+    }
+
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+//        if (resultCode != Activity.RESULT_OK) {
+//            return;
+//        }
+
+
+    }
+
+    @SuppressLint("NonConstantResourceId")
+    @Override
+    public void onClick(View v) {
+    }
+}

app/src/main/java/com/uas/huayunuasmes/fragment/ReportDetailFragment.java

@@ -1,8 +1,12 @@
 package com.uas.huayunuasmes.fragment;
 
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
 import android.os.Bundle;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
 import android.widget.TextView;
@@ -11,6 +15,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.android.volley.Request;
 import com.android.volley.toolbox.StringRequest;
+import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.uas.huayunuasmes.R;
 import com.uas.huayunuasmes.activity.FunctionActivity;
 import com.uas.huayunuasmes.adapter.ReportDetailAdapter;
@@ -66,6 +71,21 @@ public class ReportDetailFragment extends BaseFragment {
             }
         });
 
+        reportDetailAdapter.setOnItemLongClickListener(new BaseQuickAdapter.OnItemLongClickListener() {
+            @Override
+            public boolean onItemLongClick(BaseQuickAdapter baseQuickAdapter, View view, int i) {
+
+                ReportDetailBean reportDetailBean = mList.get(i);
+                Log.e("reportDetailBean",reportDetailBean.getSp_lotno());
+                ClipboardManager clipboard = (ClipboardManager) mActivity.getSystemService(Context.CLIPBOARD_SERVICE);
+                ClipData clip = ClipData.newPlainText("text", reportDetailBean.getSp_lotno());
+                clipboard.setPrimaryClip(clip);
+                CommonUtil.toastNoRepeat(mActivity, "已复制"+reportDetailBean.getSp_lotno());
+
+                return false;
+            }
+        });
+
     }
 
     @Override

app/src/main/java/com/uas/huayunuasmes/global/GloableParams.java

@@ -344,6 +344,7 @@ public class GloableParams {
     public static String ADDRESS_GETPUNCHINGDATA;
     public static String ADDRESS_GETOPRLOG;
     public static String ADDRESS_STARTMAS;
+    public static String ADDRESS_REPRINT;
     /**
      * 高登
      */
@@ -1009,6 +1010,10 @@ public class GloableParams {
 
 
 
+    private static final String ADDRESSTAIL_REPRINT = "/api/pdashop/report/reprint.action";
+
+
+
     /***********************************************************************************************/
     /*界面文字和图片资源,控制后续数据一致*/
     //home主页面
@@ -1021,28 +1026,31 @@ public class GloableParams {
     public static final String QUERYSTATIONINFORMATION = "过站信息";
     public static final String POSTPUNCH = "岗位打卡";
     public static final String MACHINESTARTSANDSTOPS = "机台操作";
+    public static final String LABELREPRINTING = "标签补打";
     public static final String GRIDNAME_INOUT_STORAGE = "入库采集";
     public static String[] homeMenuNames = {
 //            WAREHOUSINGMANAGEMENT,
 //            OUTBOUNDMANAGEMENT,
 //            WAREHOUSEMANAGEMENT,
             POSTPUNCH,
-            MACHINESTARTSANDSTOPS,
+//            MACHINESTARTSANDSTOPS,
             HOME_DISPATCH_MANAGE,
             HOME_QUALITY_MANAGE,
             GRIDNAME_INOUT_STORAGE,
+            LABELREPRINTING,
             GRIDNAME_SETTING
 //            QUERYSTATIONINFORMATION
     };
     public static int[] homeMenuIcons = {
 //            R.drawable.ic_storage_in,
             R.drawable.iv_postpunch,
-            R.drawable.iv_touch,
-//            R.drawable.ic_storage_out,
+//            R.drawable.iv_touch,
+
 //            R.drawable.mainmenu_storehousemanager,
             R.drawable.ic_dispatch_manage,
             R.drawable.ic_quality_manage,
             R.drawable.mainmenu_outinstorage,
+            R.drawable.pjbd,
             R.drawable.mainmenu_usersetting
 //            R.drawable.astation
     };
@@ -1075,27 +1083,28 @@ 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_CHAI_PI,
-           GRIDNAME_TIAO_ZHAN,
-           GRIDNAME_BAD_EXCHANGE
+           GRIDNAME_TIME_REPORT,
+           GRIDNAME_CHAI_PI
+//           GRIDNAME_TIAO_ZHAN,
+//           GRIDNAME_BAD_EXCHANGE
    };
 
     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.storage_bach_operation,
-            R.drawable.index_smt_up,
-            R.mipmap.badchange
+            R.drawable.baogong,
+            R.drawable.storage_bach_operation
+//            R.drawable.index_smt_up,
+//            R.mipmap.badchange
     };
 
     //INDEX:出入库管理Index
@@ -1579,5 +1588,6 @@ public class GloableParams {
         GloableParams.ADDRESS_GETPUNCHINGDATA = uriHead + GloableParams.ADDRESSTAIL_COUNTING_GETPUNCHINGDATA;
         GloableParams.ADDRESS_GETOPRLOG = uriHead + GloableParams.ADDRESSTAIL_GETOPRLOG;
         GloableParams.ADDRESS_STARTMAS = uriHead + GloableParams.ADDRESSTAIL_STARTMAS;
+        GloableParams.ADDRESS_REPRINT = uriHead + GloableParams.ADDRESSTAIL_REPRINT;
     }
 }

app/src/main/java/com/uas/huayunuasmes/tools/RegexUtil.java

@@ -10,7 +10,7 @@ public class RegexUtil {
     //正则表达式
 //    public static String IP_FORMAT = "((2[0-4]\\d|25[0-5]|[01]?\\d\\d?)\\.){3}(2[0-4]\\d|25[0-5]|[01]?\\d\\d?)";
     public static String IP_FORMAT = "^((25[0-5])|(2[0-4]\\d)|(1\\d\\d)|([1-9]\\d)|\\d)(\\.((25[0-5])|(2[0-4]\\d)|(1\\d\\d)|([1-9]\\d)|\\d)){3}$|^([a-zA-Z0-9]([a-zA-Z0-9\\-]{0,61}[a-zA-Z0-9])?\\.)+[a-zA-Z]{2,6}$";
-    public static String PORT_FORMAT = "^[0-9]$|(^[0-9][0-9]$)|(^[0-9][0-9][0-9]$)|(^[0-9][0-9][0-9][0-9]$)|(^[0-6][0-9][0-9][0-9][0-9]$)";
+    public static String PORT_FORMAT = "^[0-9]$|(^[0-9][0-9]$)|(^[0-9][0-9][0-9]$)|(^[0-9][0-9][0-9][0-9]$)|(^[0-9][0-9][0-9][0-9][0-9]$)";
     // public static String PORT_FORMAT = "(\\d)+";
 
     public static boolean checkString(String str, String regx) {

app/src/main/java/com/uas/huayunuasmes/util/PrintUtils.java

@@ -2,6 +2,7 @@ package com.uas.huayunuasmes.util;
 
 import android.content.Context;
 import android.text.TextUtils;
+import android.util.Log;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -14,6 +15,7 @@ public class PrintUtils {
 
     public static int printBar(Context context, String dataJson, int dpi, String printTemplate) {
         try {
+            Log.e("listArraythree",dataJson);
             if (dpi <= 0) {
                 dpi = 203;
             }
@@ -27,6 +29,10 @@ public class PrintUtils {
                     v = 800,
                     height = 400,
                     qty = 1;
+//                    h = 200,
+//                    v = 200,
+//                    height = 200,
+//                    qty = 1;
 
             JSONArray templateArray = JSON.parseArray(printTemplate);
             if (templateArray != null && templateArray.size() > 0) {
@@ -42,6 +48,7 @@ public class PrintUtils {
                         int printY = (int) (toprate * dpi / 25.4);
                         double barHeight = FastjsonUtil.getDouble(templateObject, "LP_HEIGHT");
                         int barHeightInt = (int) (barHeight * dpi / 25.4);
+                        int  lp_width = FastjsonUtil.getInt(templateObject, "LP_WIDTH");
                         int fontSize = FastjsonUtil.getInt(templateObject, "LP_SIZE");
                         String printKey = FastjsonUtil.getText(templateObject, "LP_NAME");
 
@@ -63,11 +70,16 @@ public class PrintUtils {
                                     if ("BAR_BATCHCODE".equals(printKey)) {
                                         textFont = 7;
                                     }
-                                    printHelper = printHelper.printText(printText)
-                                            .setX(printX)
-                                            .setY(printY)
-                                            .setBold(2)
-                                            .setTextFont(textFont)
+                                    if (StringUtil.isEmpty(String.valueOf(fontSize))){
+                                        fontSize=1;
+                                    }
+                                    printHelper = printHelper.printText("")
+                                            .setTextAutLine(printX+"",printY + (int) ((0.6 * dpi) / 25.4)+"",lp_width,fontSize,false,false,printText)
+//                                            .setX(printX)
+//                                            .setY(printY + (int) ((0.6 * dpi) / 25.4))
+//                                            .setBold(2)
+//                                            .setTextFont(textFont)
+//                                            .setTextFont(fontSize)
                                             .build();
                                     break;
                                 case "qrcode"://打印二维码

app/src/main/res/layout/fragment_gd_time_report.xml

@@ -93,11 +93,17 @@
             android:textSize="14sp"
             tools:text="成型" />
     </LinearLayout>
+    <Button
+        android:id="@+id/printjson"
+        android:layout_width="60dp"
+        android:layout_height="wrap_content"
+        android:text="打印">
+    </Button>
 
     <LinearLayout
+        android:visibility="gone"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="14dp"
 
         android:orientation="horizontal">
 
@@ -108,7 +114,7 @@
             android:gravity="center"
             android:padding="10dp"
             android:text="生产批次"
-            android:textColor="@color/red"
+            android:textColor="@color/body_text_1"
             android:textSize="14sp" />
 
         <com.uas.huayunuasmes.view.ClearableEditText

app/src/main/res/layout/fragment_labe_lreprnting.xml

@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout 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">
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+
+        <LinearLayout
+            android:paddingTop="@dimen/sp_16"
+            android:paddingLeft="@dimen/sp_16"
+            android:paddingRight="@dimen/sp_16"
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <TextView
+                style="@style/inputItemCaption"
+                android:textColor="@color/red"
+                android:text="批次号">
+            </TextView>
+            <LinearLayout
+                android:layout_weight="1"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@drawable/bg_line_edittext">
+                <com.uas.huayunuasmes.view.ClearableEditText
+                    android:id="@+id/storage_recharge_collect_ets"
+                    style="@style/EditTextStyle"
+                    android:layout_weight="1"
+                    android:background="@null"
+                    android:hint="请输入批次号"
+                    android:imeOptions="actionSend"
+                    android:textColor="@color/black" />
+            </LinearLayout>
+
+        </LinearLayout>
+        <LinearLayout
+            android:visibility="gone"
+            android:id="@+id/line_hint"
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:background="@drawable/shape_msg_block"
+            android:layout_height="wrap_content"
+            android:padding="@dimen/sp_16"
+            android:layout_marginLeft="@dimen/dp_10"
+            android:layout_marginRight="@dimen/dp_10"
+            android:layout_marginTop="@dimen/dp_10">
+            <TextView
+                android:id="@+id/tv_hint1"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textColor="@color/black"
+                android:text="提示">
+            </TextView>
+
+
+
+        </LinearLayout>
+
+
+
+
+    </LinearLayout>
+    <LinearLayout
+        android:layout_alignParentBottom="true"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <Button
+            android:id="@+id/btn_starts"
+            style="@style/ButtonStyle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="12dp"
+            android:text="打印" />
+
+    </LinearLayout>
+
+
+
+</RelativeLayout>

app/src/main/res/layout/item_list_whbreakingbatchfragment.xml

@@ -9,19 +9,19 @@
 
     <TableRow
         android:layout_margin="5dp">
-        <TextView
-            style="@style/tl_tv_style"
-            android:text="@string/new_bar_code"/>
+<!--        <TextView-->
+<!--            style="@style/tl_tv_style"-->
+<!--            android:text="@string/new_bar_code"/>-->
         <TextView
             android:id="@+id/tv_bar_code"
             style="@style/tl_tv_content_style" />
     </TableRow>
     <TableRow
         android:layout_margin="5dp">
-        <TextView
-            style="@style/tl_tv_style"
-            android:text="@string/bar_remain"
-          />
+<!--        <TextView-->
+<!--            style="@style/tl_tv_style"-->
+<!--            android:text="@string/bar_remain"-->
+<!--          />-->
         <TextView
             android:id="@+id/tv_bar_remain"
             style="@style/tl_tv_content_style" />

build.gradle

@@ -44,8 +44,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 22,
-            versionName      : "v1.1.2"
+            versionCode      : 31,
+            versionName      : "v1.2.1"
     ]
 
     depsVersion = [

pda_libs/bluetooth/src/main/java/com/uas/bluetooth/PrintHelper.java

@@ -86,7 +86,10 @@ public class PrintHelper {
             this.textSize = textSize;
             return this;
         }
-
+        public TextBuilder setTextAutLine(String x,String y,int width,int size,boolean isbole,boolean isdouble,String str) throws Exception {
+            HPRTPrinterHelper .AutLine(x,y,width,size,isbole,isdouble,str);
+            return this;
+        }
         public TextBuilder setBold(int bold) {
             if (bold < 0) {
                 bold = 0;

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

@@ -8,6 +8,6 @@ public final class BuildConfig {
   public static final String APPLICATION_ID = "com.handmark.pulltorefresh.library";
   public static final String BUILD_TYPE = "debug";
   public static final String FLAVOR = "";
-  public static final int VERSION_CODE = 22;
-  public static final String VERSION_NAME = "v1.1.2";
+  public static final int VERSION_CODE = 30;
+  public static final String VERSION_NAME = "v1.2.0";
 }

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 = 22;
-  public static final String VERSION_NAME = "v1.1.2";
+  public static final int VERSION_CODE = 31;
+  public static final String VERSION_NAME = "v1.2.1";
 }

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

@@ -1,4 +1,4 @@
-#Mon May 13 17:03:14 CST 2024
+#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

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

@@ -1,4 +1,4 @@
-#Mon May 13 17:00:36 CST 2024
+#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

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

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

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

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="22"
-    android:versionName="v1.1.2" >
+    android:versionCode="31"
+    android:versionName="v1.2.1" >
 
     <uses-sdk
         android:minSdkVersion="16"

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

@@ -1 +1 @@
-[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":22,"versionName":"v1.1.2","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":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":""}}]

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

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

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

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="22"
-    android:versionName="v1.1.2" >
+    android:versionCode="31"
+    android:versionName="v1.2.1" >
 
     <uses-sdk
         android:minSdkVersion="16"

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

@@ -1 +1 @@
-[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":22,"versionName":"v1.1.2","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":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":""}}]