修改蓝牙搜索不到问题

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

@@ -424,9 +424,9 @@ public class BlueToothPrintFragment extends BaseFragment {
 
     @Override
     public void onDestroyView() {
-//        if (connectHelper != null) {
-//            connectHelper.onDestroy();
-//        }
+        if (connectHelper != null) {
+            connectHelper.onDestroy();
+        }
         ((FunctionActivity) getActivity()).setSubmitBtnVisible(false);
         super.onDestroyView();
     }

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

@@ -90,6 +90,7 @@ import com.uas.xmx_uas_mes_standard.util.JsonTools;
 import com.uas.xmx_uas_mes_standard.util.JsonUtils;
 import com.uas.xmx_uas_mes_standard.util.LogUtil;
 import com.uas.xmx_uas_mes_standard.util.PrintUtils;
+import com.uas.xmx_uas_mes_standard.util.StringUtil;
 import com.uas.xmx_uas_mes_standard.util.VolleyRequest;
 import com.uas.xmx_uas_mes_standard.view.ClearableEditText;
 import com.uuzuche.lib_zxing.activity.CaptureActivity;
@@ -442,6 +443,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
     private Button btn_print,btn_clean;
     private PrintListBean printListBean;
     private TextView text_add;
+    private TextView tv_accumulative;
 
     @Override
     protected int getLayout() {
@@ -480,6 +482,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
         btn_print = mActivity.findViewById(R.id.btn_print);
         btn_clean = mActivity.findViewById(R.id.btn_clean);
         text_add = mActivity.findViewById(R.id.text_add);
+        tv_accumulative = mActivity.findViewById(R.id.tv_accumulative);
 
         ((TextView) (getActivity().findViewById(R.id.tv_actionbar_withback))).setText(getString(R.string.out_material_collect));
 //        ((FunctionActivity) getActivity()).fragment = new IOCOutMakeMaterialOper();
@@ -580,7 +583,9 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                             public void onClick(DialogInterface dialog, int which) {
                                 mFilterStorageInBeans.clear();
                                 setFilterTableData(mFilterStorageInBeans);
-                                text_add.setText(mFilterStorageInBeans.size()+"");
+                                text_add.setText("0");
+                                tv_accumulative.setText(mFilterStorageInBeans.size()+"");
+
                             }
                         }).show();
             }
@@ -638,6 +643,9 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
 //                    setFilterTableData(mFilterStorageInBeans);
 //                    text_add.setText(mFilterStorageInBeans.size()+"");
 
+
+
+
                     return true;
                 }
                 return false;
@@ -875,6 +883,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
     /**
      * 在线模式确认按钮提交事件
      */
+    double resuadd = 0;
     private void barcodeEnterEvent(boolean msdcheck, boolean datecheck) {
         progressDialog.show();
         boolean checkeds = special_check.isChecked();
@@ -1032,13 +1041,19 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
 
                             mCollectBarcodeTv.setText(mResult1);
                             mCollectBarRemainTv.setText(mResult2);
+                            if (!StringUtil.isEmpty(mResult2)){
+                                resuadd=Double.parseDouble(mResult2)+Double.parseDouble(text_add.getText().toString().trim());
+                                text_add.setText(resuadd+"");
+                            }
+
+
                             mCollectBarProdcodeTv.setText(mResult3);
                             PrintListBean printListBean=new PrintListBean();
                             if (!etBarCode.getText().toString().trim().isEmpty()){
                                 printListBean.setBar_code(etBarCode.getText().toString().trim());
                                 mFilterStorageInBeans.add(printListBean);
                                 setFilterTableData(mFilterStorageInBeans);
-                                text_add.setText(mFilterStorageInBeans.size()+"");
+                                tv_accumulative.setText(mFilterStorageInBeans.size()+"");
                             }
                             etBarCode.setText(null);
                             PdaApplication.putDataCache2Map(Constants.FLAG.MATERIAL_COLLECT_BARCODE_RESULT + pi_inoutno, mResults);
@@ -1084,6 +1099,11 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
 
                             mCollectBoxTv.setText(mResult1);
                             mCollectBoxNumTv.setText(mResult2);
+                            if (!StringUtil.isEmpty(mResult2)){
+                                resuadd=Double.parseDouble(mResult2)+Double.parseDouble(text_add.getText().toString().trim());
+                                text_add.setText(resuadd+"");
+                            }
+
                             mCollectBoxrProdcodeTv.setText(mResult3);
                             mCollectBoxWhcodeTv.setText(mResult4);
                             PrintListBean printListBean=new PrintListBean();
@@ -1091,7 +1111,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()+"");
+                                tv_accumulative.setText(mFilterStorageInBeans.size()+"");
                             }
                             etBarCode.setText(null);
                             PdaApplication.putDataCache2Map(Constants.FLAG.MATERIAL_COLLECT_BOX_RESULT + pi_inoutno, mResults);
@@ -2272,7 +2292,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()+"");
+                        tv_accumulative.setText(mFilterStorageInBeans.size()+"");
                     }
 
 

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

@@ -369,22 +369,54 @@
         android:layout_height="0dp"
         android:layout_weight="1">
         <LinearLayout
-            android:layout_width="wrap_content"
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content">
-            <TextView
-                android:text="累加："
-                android:textColor="@color/black_blue"
-                android:layout_width="wrap_content"
+            <LinearLayout
+                android:layout_marginLeft="@dimen/dp_10"
+                android:orientation="horizontal"
+                android:layout_gravity="center"
+                android:layout_width="0dp"
+                android:layout_weight="1"
                 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"
+                <TextView
+                    android:text="累计盘数："
+                    android:textColor="@color/black_blue"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content">
+                </TextView>
+                <TextView
+                    android:id="@+id/tv_accumulative"
+                    android:textColor="@color/black_blue"
+                    android:text="0"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content">
+                </TextView>
+            </LinearLayout>
+            <LinearLayout
+                android:layout_gravity="center"
+                android:orientation="horizontal"
+                android:layout_width="0dp"
+                android:layout_weight="1"
                 android:layout_height="wrap_content">
-            </TextView>
+                <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>
+
+
         </LinearLayout>
+
         <com.bin.david.form.core.SmartTable
             android:id="@+id/jlt_storage_in_filter_list_st"
             android:layout_width="match_parent"

build.gradle

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