SMT接料增加扫站位后的勾选校验原料盘限制

app/src/main/java/com/uas/huiyan/fragment/SCSMTFragment.java

@@ -253,6 +253,7 @@ public class SCSMTFragment extends BaseFragment implements View.OnClickListener,
                 }
             }
         });
+
     }
 
     private void getPasteBarcodeData(String wo, String isPasteBarcode) {
@@ -730,10 +731,6 @@ public class SCSMTFragment extends BaseFragment implements View.OnClickListener,
                 getNameData(liceCode, jobCode, mDlTable);
                 break;
             case R.id.btn_device_ok_smt:
-                //String trim = etJobCode.getText().toString().trim();
-                //        getPasteBarcodeData(trim,isPasteBarcode);
-                //        disposeClick();
-                //        confirmDevice();
                 String lineCode = etLineCode.getText().toString().trim();
                 getLineInfo(lineCode);
                 break;

app/src/main/java/com/uas/huiyan/fragment/SCSMTJointFragment.java

@@ -12,6 +12,7 @@ import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.CheckBox;
+import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
@@ -33,6 +34,7 @@ import com.uas.huiyan.tools.VolleyUtil;
 import com.uas.huiyan.util.CommonUtil;
 import com.uas.huiyan.util.Constants;
 import com.uas.huiyan.util.JsonUtils;
+import com.uas.huiyan.util.MyLog;
 import com.uas.huiyan.view.ClearableEditText;
 import com.uas.huiyan.view.TextViewWithButton;
 
@@ -70,6 +72,9 @@ public class SCSMTJointFragment extends BaseFragment implements View.OnClickList
     private StringRequest mStringRequest;
     private CheckBox cb_xiaoyan;
 
+    private boolean isScanLocation = false;     //判断是否已扫了站位
+    private boolean isLocationState = false;     //记录站位的状态
+
     @Override
     protected int getLayout() {
         return R.layout.fragment_scmake_smtfeederchild_jointchange;
@@ -128,6 +133,7 @@ public class SCSMTJointFragment extends BaseFragment implements View.OnClickList
         //        VolleyUtil.getVolleyUtil().requestJsonObject(getActivity(), GloableParams.ADDRESS_SMTDETAIL_APPLY,VolleyUtil.METHOD_POST,
         //                requestType,paramJson);
 
+        mLocationTextView.setOnClearIconVisible(false);
     }
 
     @Override
@@ -167,6 +173,21 @@ public class SCSMTJointFragment extends BaseFragment implements View.OnClickList
             }
         });
 
+        cb_xiaoyan.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                MyLog.e("aaa","勾选框的值：" + isChecked + ",是否输入了站位：" + isScanLocation);
+                if (isScanLocation) {
+                    cb_xiaoyan.setChecked(isLocationState);
+                }
+            }
+        });
+
+    }
+
+    private void setCbState(boolean isState) {
+        isScanLocation = isState;
+        isLocationState = cb_xiaoyan.isChecked();
     }
 
     private void confirmEvent(String collect) {
@@ -237,6 +258,7 @@ public class SCSMTJointFragment extends BaseFragment implements View.OnClickList
                         if (!cb_xiaoyan.isChecked()) {
                             joinForcast(collect);
                         }
+                        setCbState(true);
                         break;
                     }
                 }
@@ -315,6 +337,7 @@ public class SCSMTJointFragment extends BaseFragment implements View.OnClickList
                         tvMsgNotice.setTextColor(getResources().getColor(R.color.red));
                         tvMsgNotice.setText(errorToast);
                         mLocationTextView.setText(null);
+                        setCbState(false);
                     }
                 }) {
             @Override
@@ -357,6 +380,7 @@ public class SCSMTJointFragment extends BaseFragment implements View.OnClickList
                         mCollectEditText.setText("");
                         tvMsgNotice.setTextColor(getResources().getColor(R.color.red));
                         tvMsgNotice.setText(errorToast);
+                        setCbState(false);
                     }
                 }) {
             @Override
@@ -745,6 +769,7 @@ public class SCSMTJointFragment extends BaseFragment implements View.OnClickList
             case VolleyUtil.FRAGMENT_SCMAKE_SMTJOINT_BARREMAIN:
                 tmpJson = (JSONObject) msg.obj;
                 disposeBarcodeSuccess(tmpJson);
+                setCbState(false);
                 break;
             //接料成功
             case VolleyUtil.FRAGMENT_SCMAKE_SMTJOINT_JOINT:

app/src/main/java/com/uas/huiyan/view/TextViewWithButton.java

@@ -187,4 +187,8 @@ public class TextViewWithButton extends AppCompatTextView implements View.OnTouc
     public void setOnTextClearListener(OnTextClearListener onTextClearListener) {
         this.onTextClearListener = onTextClearListener;
     }
+
+    public void setOnClearIconVisible(boolean isVisible){
+        setClearIconVisible(isVisible);
+    }
 }

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

@@ -178,8 +178,8 @@
                     android:background="@drawable/bg_button"
                     android:src="@drawable/search_48" />
 
-
             </TableRow>
+
         </TableLayout>
 
         <TextView

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

@@ -146,9 +146,19 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="20dp"
-                        android:layout_marginEnd="20dp"
+                        android:layout_marginEnd="2dp"
                         android:checked="true"
-                        android:text="是否校验原料盘" />
+                        android:text="是否校验原料盘"
+                        android:textSize="16sp"
+                        />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="（扫站位后不能修改此属性）"
+                        android:textColor="@color/red"
+                        android:textSize="12sp"
+                        />
 
                 </TableRow>
 

build.gradle

@@ -64,8 +64,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 7,
-            versionName      : "v1.0.6"
+            versionCode      : 9,
+            versionName      : "v1.0.8"
     ]
 
     depsVersion = [