diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/ShangChuangImgActivityBC.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/ShangChuangImgActivityBC.java index 11cec81..75baeb8 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/ShangChuangImgActivityBC.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/ShangChuangImgActivityBC.java @@ -118,6 +118,8 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity implements I private GetCarImageAlert gia = new GetCarImageAlert(); private CustomDialog customDialog; private int id = 0; + + private int reportAlct = 1;//是否上报(安联城通) 0否 1是' private boolean key = true; private boolean keys = false; private boolean locationKey = false; @@ -394,6 +396,7 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity implements I tips_x = findViewById(R.id.tips_x); Bundle ins = getIntent().getExtras(); index = ins.getInt("type"); + reportAlct = ins.getInt("reportAlct"); wid = ins.getString("wid"); h_type = ins.getInt("h_type"); keys = ins.getBoolean("keys"); @@ -556,31 +559,38 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity implements I Log.e("--装货信息", gson.toJson(lub)); // if (locationKey) {//高德定位 if (keys) { - - NewLJUtils.getInstance().getShipmentStatus(con, sob.getData().getShippingNoteNumber(), new OnGDDownloadResultListener() { - @Override - public void onSuccess(String var1) { - String string = var1; - if (string.equals("30")) {//安联装货,单平台未装货 - isFinish = true; - //平台确认装货 - hyr.loading(lub); - } else { + if (1==reportAlct){ + NewLJUtils.getInstance().getShipmentStatus(con, sob.getData().getShippingNoteNumber(), new OnGDDownloadResultListener() { + @Override + public void onSuccess(String var1) { + String string = var1; + if (string.equals("30")) {//安联装货,单平台未装货 + isFinish = true; + //平台确认装货 + hyr.loading(lub); + } else { // nfc(); - loadInfo(); - } - upLocation(tempLoca.getLatitude() + "", tempLoca.getLongitude() + "",sob.getData().getShippingNoteNumber()); + loadInfo(); + } + upLocation(tempLoca.getLatitude() + "", tempLoca.getLongitude() + "",sob.getData().getShippingNoteNumber()); // NewLJUtils.getInstance().startLocationService(ShangChuangImgActivity.this); - } - - @Override - public void onFailure(String var1, String var2) { - if (!isFinishing() && customDialog != null && customDialog.isShowing()) { - customDialog.dismiss(); } - ToastUtils.showToast(con, var2); - } - }); + + @Override + public void onFailure(String var1, String var2) { + if (!isFinishing() && customDialog != null && customDialog.isShowing()) { + customDialog.dismiss(); + } + ToastUtils.showToast(con, var2); + } + }); + }else{ + isFinish = true; + //平台确认装货 + upLocation(tempLoca.getLatitude() + "", tempLoca.getLongitude() + "",sob.getData().getShippingNoteNumber()); + hyr.loading(lub); + } + } // } else { // if (!isFinishing() && customDialog != null && customDialog.isShowing()) { @@ -607,30 +617,37 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity implements I Log.e("--卸货信息", gson.toJson(lub)); // if (locationKey) { if (keys) { - - NewLJUtils.getInstance().getShipmentStatus(con, sob.getData().getShippingNoteNumber(), new OnGDDownloadResultListener() { - @Override - public void onSuccess(String var1) { - if (var1.equals("40")) {//安联装货,单平台未装货 - //卸货状态-平台 - isFinish = true; - hyr.dischargeCargo(lub); - } else { - nfc(); - uploadInfo(); - } - upLocation(tempLoca.getLatitude() + "", tempLoca.getLongitude() + "",sob.getData().getShippingNoteNumber()); + if (1==reportAlct){ + NewLJUtils.getInstance().getShipmentStatus(con, sob.getData().getShippingNoteNumber(), new OnGDDownloadResultListener() { + @Override + public void onSuccess(String var1) { + if (var1.equals("40")) {//安联装货,单平台未装货 + //卸货状态-平台 + isFinish = true; + hyr.dischargeCargo(lub); + } else { + nfc(); + uploadInfo(); + } + upLocation(tempLoca.getLatitude() + "", tempLoca.getLongitude() + "",sob.getData().getShippingNoteNumber()); // NewLJUtils.getInstance().stopLocationService(); - } - - @Override - public void onFailure(String var1, String var2) { - if (!isFinishing() && customDialog != null && customDialog.isShowing()) { - customDialog.dismiss(); } - ToastUtils.showToast(con, var2); - } - }); + + @Override + public void onFailure(String var1, String var2) { + if (!isFinishing() && customDialog != null && customDialog.isShowing()) { + customDialog.dismiss(); + } + ToastUtils.showToast(con, var2); + } + }); + }else{ + //卸货状态-平台 + isFinish = true; + upLocation(tempLoca.getLatitude() + "", tempLoca.getLongitude() + "",sob.getData().getShippingNoteNumber()); + hyr.dischargeCargo(lub); + } + } @@ -663,7 +680,9 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity implements I Log.e("--回单信息", gson.toJson(urib)); // if (locationKey) { if (index == 2 && keys) { - up_trafficSign(); + if (1==reportAlct){ + up_trafficSign(); + } // up_trafficReceipt(); // receipt_image(); }