增加出库扫描错误时弹框，增加条码信息绑定回车错误弹框，修改连接打印时的问题(打印类型原因)

app/src/main/java/com/uas/xmx_uas_mes_standard/fragment/BarcodeInfoCollectFragment.java

@@ -1,6 +1,7 @@
 package com.uas.xmx_uas_mes_standard.fragment;
 
 import android.app.Activity;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.text.Editable;
 import android.text.TextUtils;
@@ -600,6 +601,16 @@ public class BarcodeInfoCollectFragment extends BaseFragment {
                     mBarcodeEditText.setText(null);
                     mBarcodeEditText.requestFocus();
                     mIgnoreFocusChange = false;
+                    new android.app.AlertDialog.Builder(mActivity).setTitle("提示").setMessage(failStr)
+                            .setPositiveButton(getString(R.string.confirm), new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int which) {
+                                    mBarcodeEditText.setText(null);
+                                    mBarcodeEditText.requestFocus();
+                                }
+                            }).create().show();
+
+
                 }
             });
         } catch (Exception e) {

app/src/main/java/com/uas/xmx_uas_mes_standard/fragment/IOCOutMakeMaterialOper.java

@@ -441,6 +441,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
     private List<PrintListBean> mFilterStorageInBeans;
     private Button btn_print,btn_clean;
     private PrintListBean printListBean;
+    private TextView text_add;
 
     @Override
     protected int getLayout() {
@@ -478,6 +479,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
         mSmartTable = mActivity.findViewById(R.id.jlt_storage_in_filter_list_st);
         btn_print = mActivity.findViewById(R.id.btn_print);
         btn_clean = mActivity.findViewById(R.id.btn_clean);
+        text_add = mActivity.findViewById(R.id.text_add);
 
         ((TextView) (getActivity().findViewById(R.id.tv_actionbar_withback))).setText(getString(R.string.out_material_collect));
 //        ((FunctionActivity) getActivity()).fragment = new IOCOutMakeMaterialOper();
@@ -578,6 +580,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                             public void onClick(DialogInterface dialog, int which) {
                                 mFilterStorageInBeans.clear();
                                 setFilterTableData(mFilterStorageInBeans);
+                                text_add.setText(mFilterStorageInBeans.size()+"");
                             }
                         }).show();
             }
@@ -629,6 +632,12 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                         || actionId == EditorInfo.IME_ACTION_DONE
                         || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
                     confirmEvent();
+//                    PrintListBean printListBean=new PrintListBean();
+//                    printListBean.setBar_code(etBarCode.getText().toString().trim());
+//                    mFilterStorageInBeans.add(printListBean);
+//                    setFilterTableData(mFilterStorageInBeans);
+//                    text_add.setText(mFilterStorageInBeans.size()+"");
+
                     return true;
                 }
                 return false;
@@ -749,7 +758,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
         progressDialog.dismiss();
         VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
                 .url(GloableParams.ADDRESS_ADDRESSTAIL_PRINTSUMLABEL)
-                .method(Request.Method.GET)
+                .method(Request.Method.POST)
                 .tag(TAG + "getindatalist")
                 .flag(0)
                 .addParam("pi_inoutno",tvPiInoutno.getText().toString().trim())
@@ -1029,6 +1038,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                                 printListBean.setBar_code(etBarCode.getText().toString().trim());
                                 mFilterStorageInBeans.add(printListBean);
                                 setFilterTableData(mFilterStorageInBeans);
+                                text_add.setText(mFilterStorageInBeans.size()+"");
                             }
                             etBarCode.setText(null);
                             PdaApplication.putDataCache2Map(Constants.FLAG.MATERIAL_COLLECT_BARCODE_RESULT + pi_inoutno, mResults);
@@ -1081,6 +1091,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                                 printListBean.setBar_code(etBarCode.getText().toString().trim());
                                 mFilterStorageInBeans.add(printListBean);
                                 setFilterTableData(mFilterStorageInBeans);
+                                text_add.setText(mFilterStorageInBeans.size()+"");
                             }
                             etBarCode.setText(null);
                             PdaApplication.putDataCache2Map(Constants.FLAG.MATERIAL_COLLECT_BOX_RESULT + pi_inoutno, mResults);
@@ -1120,11 +1131,22 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                 progressDialog.dismiss();
                 if (getActivity() != null) {
                     mCollectTypeRadioGroup.setEnabled(true);
+                    etBarCode.setText(null);
                     CommonUtil.editTextGetFocus(etBarCode);
                     String errorToast = CommonUtil.showErrorToast(volleyError, true);
                     mCollectResultTextView.setVisibility(View.VISIBLE);
                     mCollectResultTextView.setTextColor(getResources().getColor(R.color.red));
                     mCollectResultTextView.setText(errorToast);
+                    new AlertDialog.Builder(mActivity).setTitle("提示").setMessage(errorToast)
+                            .setPositiveButton(getString(R.string.confirm), new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int which) {
+                                    etBarCode.setText(null);
+                                    CommonUtil.editTextGetFocus(etBarCode);
+                                }
+                            }).create().show();
+
+
                 }
 
             }
@@ -2250,6 +2272,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                         printListBean.setBar_code(messages.get(i).getBAR_CODE());
                         mFilterStorageInBeans.add(printListBean);
                         setFilterTableData(mFilterStorageInBeans);
+                        text_add.setText(mFilterStorageInBeans.size()+"");
                     }
 
 

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

@@ -752,7 +752,7 @@ public class GloableParams {
     //库存条码绑定
     private static final String ADDRESSTAIL_INVENTORYBINDING="/api/pda/receiving/stocksaveBarcode2Confirm.action";
     private static final String ADDRESSTAIL_RECEIVING_INVENTORYBINDING2 = "/api/pda/receiving/stocksaveBarcode2.action";
-    private static String ADDRESSTAIL_GET_PRINTSUMLABEL="/api/pda/outMaterial/printSumLabel.action";
+    private static final String ADDRESSTAIL_GET_PRINTSUMLABEL="/api/pda/outMaterial/printSumLabel.action";
 
     /***********************************************************************************************/
     /*界面文字和图片资源,控制后续数据一致*/

app/src/main/java/com/uas/xmx_uas_mes_standard/util/ListUtils.java

@@ -3,6 +3,15 @@ package com.uas.xmx_uas_mes_standard.util;
 import java.util.Collection;
 
 public class ListUtils {
+    /**
+     *
+     * @param collection
+     * @return 关于蓝牙打印
+     */
+    public static boolean isEmptyBlue(Collection collection) {
+        return collection == null || collection.size() <= 0;
+    }
+
 
     public static boolean isEmpty(Collection collection) {
         return collection == null || collection.size() <= 0;

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

@@ -41,7 +41,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);
-                        String fontSize = FastjsonUtil.getText(templateObject, "LP_SIZE");
+                        int fontSize = FastjsonUtil.getInt(templateObject, "LP_SIZE");
                         String printKey = FastjsonUtil.getText(templateObject, "LP_NAME");
 
                         String printText = FastjsonUtil.getText(dataJson, printKey);
@@ -62,11 +62,11 @@ public class PrintUtils {
                                     if ("BAR_BATCHCODE".equals(printKey)) {
                                         textFont = 7;
                                     }
-                                    if (StringUtil.isEmpty(fontSize)){
-                                        fontSize="1";
+                                    if (StringUtil.isEmpty(String.valueOf(fontSize))){
+                                        fontSize=1;
                                     }
                                     printHelper = printHelper.printText(printText)
-                                            .setTextAutLine("0","0",100,Integer.parseInt(fontSize),false,false,printText)
+//                                            .setTextAutLine("0","0",100,fontSize,false,false,printText)
                                             .setX(printX)
                                             .setY(printY + (int) ((0.6 * dpi) / 25.4))
                                             .setTextFont(textFont)

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

@@ -368,6 +368,23 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1">
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+            <TextView
+                android:text="累加："
+                android:textColor="@color/black_blue"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
+            </TextView>
+            <TextView
+                android:textColor="@color/black_blue"
+                android:id="@+id/text_add"
+                android:text="0"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
+            </TextView>
+        </LinearLayout>
         <com.bin.david.form.core.SmartTable
             android:id="@+id/jlt_storage_in_filter_list_st"
             android:layout_width="match_parent"
@@ -378,6 +395,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content">
 
+
             <Button
                 android:id="@+id/btn_print"
                 android:text="打印"

build.gradle

@@ -50,8 +50,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 13,
-            versionName      : "v1.3"
+            versionCode      : 15,
+            versionName      : "v1.5"
     ]
 
     depsVersion = [

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

@@ -69,7 +69,7 @@ public class PrintHelper {
 
     public static class TextBuilder extends Builder<TextBuilder> {
         private int textFont = 7;//字体字号
-        private String textSize = "1";//字体大小
+        private int textSize = 1;//字体大小
         private int bold = 0;//加粗系数：0~5
         private String fontType = "黑体";
 
@@ -82,7 +82,7 @@ public class PrintHelper {
             return this;
         }
 
-        public TextBuilder setTextSize(String textSize) {
+        public TextBuilder setTextSize(int textSize) {
             this.textSize = textSize;
             return this;
         }
@@ -204,13 +204,13 @@ public class PrintHelper {
         // 而QRCodeModel2 则是该符号的经过增强后的形式。
         // Model2 提供了附加功能，而且可以自动与 Model1 进行区分。 Model 2 为推荐规范，是默认值。
         private int model = 2;
-        private String textSize = "2";//模块的单位宽度/单位高度
+        private int textSize = 2;//模块的单位宽度/单位高度
 
         public QrBuilder(CharSequence text, PrintHelper mPrintHelper) {
             super(text, mPrintHelper);
         }
 
-        public QrBuilder setTextSize(String textSize) {
+        public QrBuilder setTextSize(int textSize) {
             this.textSize = textSize;
             return this;
         }
@@ -309,7 +309,7 @@ public class PrintHelper {
                 .printText(model)
                 .setAlign(HPRTPrinterHelper.CENTER)
                 .setY(90)
-                .setTextSize(10+"")
+                .setTextSize(10)
                 .build()
                 .printText(company)
                 .setAlign(HPRTPrinterHelper.LEFT)
@@ -318,7 +318,7 @@ public class PrintHelper {
                 .build()
                 .printQr(materialNumber)
                 .setY(150)
-                .setTextSize(3+"")
+                .setTextSize(3)
                 .build()
                 .printText(batchNumber)
                 .setY(160)