增加蓝牙展示过滤条件，调整条码信息采集界面

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

@@ -85,6 +85,7 @@ public class BarcodeInfoCollectFragment extends BaseFragment {
         location_check = root.findViewById(R.id.location_check);
 
         mBarcodeEditText.requestFocus();
+        jsonObject=new org.json.JSONObject();
     }
 
     @Override
@@ -492,7 +493,7 @@ public class BarcodeInfoCollectFragment extends BaseFragment {
         String barcode = mBarcodeEditText.getText().toString();
         String lotno = mLotEditText.getText().toString().trim();
         String date = mDateEditText.getText().toString().trim();
-          String warehouse = mLocationEditText.getText().toString().trim();
+        String warehouse = mLocationEditText.getText().toString().trim();
         if (TextUtils.isEmpty(barcode)) {
             CommonUtil.toastNoRepeat(mActivity, "请采集条码");
             mBarcodeEditText.requestFocus();
@@ -708,9 +709,6 @@ public class BarcodeInfoCollectFragment extends BaseFragment {
     }
 
     private void saveBarAcceptCode(String lotno, String date, String barcode) {
-        if (jsonObject==null){
-            jsonObject=new org.json.JSONObject();
-        }
         progressDialog.show();
         VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
                 .url(GloableParams.ADDRESS_INMATERIAL_SAVEBARACCEPTCODE)

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

@@ -107,6 +107,7 @@ public class BlueToothPrintFragment extends BaseFragment {
                     mRefreshImageView.setAnimation(getImgAnimation());
                     mRefreshImageView.startAnimation(getImgAnimation());
                     connectHelper.searchDevices();
+                    mBluetoothAdapter.notifyDataSetChanged();
 
                 }
             }
@@ -339,9 +340,7 @@ public class BlueToothPrintFragment extends BaseFragment {
         if (!ListUtils.isEmpty(models)) {
             for (int i = 0; i < models.size(); i++) {
                 BluetoothDevice bluetoothDevice = models.get(i);
-                if (bluetoothDevice != null
-//                        && bluetoothDevice.getBluetoothClass().getDeviceClass() == ConnectHelper.PRINT_TYPE
-                ) {
+                if (bluetoothDevice != null&&bluetoothDevice.getName().startsWith("HM")) {//&& bluetoothDevice.getBluetoothClass().getDeviceClass() == ConnectHelper.PRINT_TYPE
                     printDevices.add(bluetoothDevice);
                 }
             }

app/src/main/java/com/uas/uas_mes_standard/fragment/MaterialInCollectFragment.java

@@ -376,7 +376,9 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
                         mLotNoEditText.requestFocus();
                     } else if (mDateCodeCheck) {
                         mDateCodeEditText.requestFocus();
-                    } else if (mLocationCheck) {
+                    } else if (mOldCheck){
+                        mOldEditText.requestFocus();
+                    }else if (mLocationCheck) {
                         mLocationEditText.requestFocus();
                     } else if (mDcCheck) {
                         mDcEditText.requestFocus();
@@ -398,7 +400,10 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
                         confirmEvent();
                     } else if (mDateCodeCheck) {
                         mDateCodeEditText.requestFocus();
-                    } else if (mLocationCheck) {
+                    } else if (mOldCheck){
+                        mOldEditText.requestFocus();
+                        mOldEditText.setSelection(mNumEditText.getText().toString().length());
+                    }else if (mLocationCheck) {
                         mLocationEditText.requestFocus();
                     } else if (mDcCheck) {
                         mDcEditText.requestFocus();
@@ -544,17 +549,41 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
         }
         mResultTextView.setText(null);
         PdaApplication.mRequestQueue.cancelAll(TAG + "codedata");
-        mNumEditText.requestFocus();
+//        mNumEditText.requestFocus();
         mStringRequest = new StringRequest(Request.Method.GET, url,
                 new Response.Listener<String>() {
                     @Override
                     public void onResponse(String s) {
-//                        new Handler().postDelayed(new Runnable() {
-//                            @Override
-//                            public void run() {
-//
-//                            }
-//                        }, 100);
+                        if (mNumCheck)
+//                            && !TextUtils.isEmpty(mNumEditText.getText().toString().trim())
+//                            && !mNumEditText.getText().toString().trim().equals(mCheckProdcode))
+                        {
+//                        CommonUtil.toastNoRepeat(mActivity, "料号校验不一致");
+//                        mNumEditText.setText(null);
+                            mNumEditText.postDelayed(new Runnable() {
+                                @Override
+                                public void run() {
+                                    mNumEditText.requestFocus();
+                                    mNumEditText.setSelection(mNumEditText.getText().toString().length());
+
+                                }
+                            }, 100);
+                        } else if (mLotnoCheck) {
+                            mLotNoEditText.requestFocus();
+                            mLotNoEditText.setSelection(mNumEditText.getText().toString().length());
+                        } else if (mDateCodeCheck) {
+                            mDateCodeEditText.requestFocus();
+                            mDateCodeEditText.setSelection(mNumEditText.getText().toString().length());
+                        } else if (mOldCheck){
+                            mOldEditText.requestFocus();
+                            mOldEditText.setSelection(mNumEditText.getText().toString().length());
+                        }else if (mLocationCheck) {
+                            mLocationEditText.requestFocus();
+                            mLocationEditText.setSelection(mNumEditText.getText().toString().length());
+                        } else if (mDcCheck) {
+                            mDcEditText.requestFocus();
+                            mDcEditText.setSelection(mNumEditText.getText().toString().length());
+                        }
 
                     }
                 },

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

@@ -222,6 +222,7 @@
                     android:enabled="false"
                     android:focusable="true"
                     android:focusableInTouchMode="true"
+                    android:lines="1"
                     android:hint="请采集旧条码"
                     android:textColor="@color/black" />
             </TableRow>