功能优化

app/src/main/java/com/fxy/detection/BoxPutInDetailsMainActivity.java

@@ -763,8 +763,11 @@ public class BoxPutInDetailsMainActivity extends  BaseActivity implements StoJNI
 
     private void initFinish(){
         isRequiredShow = false;
-        etUnitCode.setText("");
-        etUnitCode.requestFocus();
+        if (!trackingBoxBean.getBusinessType().equals("1")){
+            etUnitCode.setText("");
+            etUnitCode.requestFocus();
+        }
+
 
         if (!trackingBoxBean.getNoClear().equals("Y")){
             for (int n=0;n<takePictureBeanList.size();n++){

app/src/main/java/com/fxy/detection/BoxPutInMainActivity.java

@@ -629,8 +629,13 @@ public class BoxPutInMainActivity extends  BaseActivity implements StoJNI.ScanCa
 
                             if(bean.code == 1){
                                 showSuccessToast(bean.msg,voiceName);
-                                etOrderNumber.setEnabled(true);
-                                etOrderNumber.requestFocus();
+                                if (!needCustomer && trackingBoxBean.getBusinessType().equals("1")){
+                                    mapPictureSelector.get(currentPictureType).authCamera();
+                                }else{
+                                    etOrderNumber.setEnabled(true);
+                                    etOrderNumber.requestFocus();
+                                }
+
                             }else{
                                 showWarningToast(bean.msg,voiceName);
                             }
@@ -832,20 +837,20 @@ public class BoxPutInMainActivity extends  BaseActivity implements StoJNI.ScanCa
             showErrorToast(etTrackingNumber.getHint().toString());
             return;
         }
-
         if (customerTrackingBoxBean != null){
             if (!customerTrackingBoxBean.getBusinessType().equals("1") && etOrderNumber.getText().toString().isEmpty()){
-                showErrorToast(etOrderNumber.getHint().toString());
-                return;
+                //showErrorToast(etOrderNumber.getHint().toString());
+               // return;
             }
         }else{
             if (etOrderNumber.getText().toString().isEmpty()){
-                showErrorToast(etOrderNumber.getHint().toString());
-                return;
+                //showErrorToast(etOrderNumber.getHint().toString());
+                //return;
             }
         }
 
 
+
         Gson gson = new Gson();
         Map<String,Object> math = new HashMap<>();
         math.put("tracking_number",trackingBoxBean.getTrackingNumber().trim());

config.gradle

@@ -8,7 +8,7 @@ ext {
             minSdkVersion    : 21,
             targetSdkVersion : 23,
             versionCode      : 1,
-            versionName      : "2.9.3",
+            versionName      : "2.9.4",
             versionApi       : "2.9",
             versionRealm     : 2,
     ]