diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index bfe2479..fa5ba56 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -100,7 +100,7 @@ android:name="com.arpa.hndahesudintocctmsdriver.ui.auth.VehicleAuthActivity" android:screenOrientation="portrait" /> @@ -114,7 +114,7 @@ @@ -129,7 +129,7 @@ @@ -142,7 +142,7 @@ 5) {//大于五分钟可以接单 - Intent in = new Intent(con, ShangChuangImgActivity.class); + Intent in = new Intent(con, ShangChuangImgActivityBC.class); in.putExtra("type", 1); in.putExtra("wid", xData.getId() + ""); in.putExtra("sob", gson.toJson(sob)); @@ -753,7 +754,7 @@ public class HomeFragment extends BaseFragment { } } else if (zStatus == 3 && xStatus == 2) {//已卸货，未上传卸货回单 - Intent in = new Intent(con, ShangChuangImgActivity.class); + Intent in = new Intent(con, ShangChuangImgActivityBC.class); in.putExtra("type", 2); in.putExtra("wid", xData.getId() + ""); in.putExtra("h_type", 1); @@ -869,8 +870,8 @@ public class HomeFragment extends BaseFragment { orderNum.setText("运单号:" + sob.getData().getShippingNoteNumber()); order_state.setText("" + sob.getData().getWaybillStatus()); try { - Intent serviceIn = new Intent(con, TrackService.class); - getActivity().startService(serviceIn); +// Intent serviceIn = new Intent(con, TrackService.class); +// getActivity().startService(serviceIn); } catch (Exception e) { e.printStackTrace(); } diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HuoYuanFragmengt.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HuoYuanFragmengt.java index 9d05a79..6090cc7 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HuoYuanFragmengt.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HuoYuanFragmengt.java @@ -231,8 +231,8 @@ public class HuoYuanFragmengt extends BaseFragment { if(sob!=null && sob.getData()!=null && sob.getData().getWayChildren().size()>0){ SPUtil.insSP(con,"order","ShippingNoteNumber",sob.getData().getShippingNoteNumber()); Log.e("开始轨迹上传服务","-----"); - Intent serviceIn=new Intent(con,TrackService.class); - getActivity().startService(serviceIn); +// Intent serviceIn=new Intent(con,TrackService.class); +// getActivity().startService(serviceIn); list.add(new ManyBean(sob.getData(),R.layout.huoyuan_yundan)); }else{ SPUtil.insSP(con,"order","ShippingNoteNumber",""); diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/StartYunDanActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/StartYunDanActivity.java index c3f090c..b782b15 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/StartYunDanActivity.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/StartYunDanActivity.java @@ -41,6 +41,7 @@ import com.amap.api.services.route.DriveStep; import com.amap.api.services.route.RideRouteResult; import com.amap.api.services.route.RouteSearch; import com.amap.api.services.route.WalkRouteResult; +import com.arpa.hndahesudintocctmsdriver.ui.home.shangchuan.ShangChuangImgActivityBC; import com.arpa.hndahesudintocctmsdriver.util.alert.CustomDialog; import com.arpa.hndahesudintocctmsdriver.util.alert.ToastUtil; import com.bumptech.glide.Glide; @@ -385,7 +386,7 @@ public class StartYunDanActivity extends BaseActivity { String wid = sdw.getId() + ""; if (sdw.getStatus() == 0) { if (type == 0) { - Intent in = new Intent(con, ShangChuangImgActivity.class); + Intent in = new Intent(con, ShangChuangImgActivityBC.class); in.putExtra("type", type); in.putExtra("wid", wid); in.putExtra("sob", gson.toJson(sob)); @@ -395,14 +396,14 @@ public class StartYunDanActivity extends BaseActivity { Toast.makeText(con, "您还没有装货", Toast.LENGTH_SHORT).show(); } } else if (sdw.getStatus() == 1) {//装货回单 - Intent in = new Intent(con, ShangChuangImgActivity.class); + Intent in = new Intent(con, ShangChuangImgActivityBC.class); in.putExtra("type", 2); in.putExtra("wid", wid); in.putExtra("h_type", type); in.putExtra("sob", gson.toJson(sob)); startActivity(in); } else if (sdw.getStatus() == 2) {//上传收货单(卸货回单) - Intent in = new Intent(con, ShangChuangImgActivity.class); + Intent in = new Intent(con, ShangChuangImgActivityBC.class); in.putExtra("type", 2); in.putExtra("wid", wid); in.putExtra("h_type", type); @@ -410,7 +411,7 @@ public class StartYunDanActivity extends BaseActivity { in.putExtra("keys", key); startActivity(in); } else if (sdw.getStatus() == 3) { - Intent in = new Intent(con, GetShangChuanActivity.class); + Intent in = new Intent(con, ShangChuangImgActivityBC.class); in.putExtra("sdwStr", gson.toJson(sdw)); startActivity(in); } else {//卸货照片 @@ -421,7 +422,7 @@ public class StartYunDanActivity extends BaseActivity { if (zInfo.getReceiptUrl() != null && zInfo.getReceiptUrl().size() > 0) { int dis = TimeUtil.compareNowDate(TimeUtil.string2Millis(zInfo.getImageTakenDate(), TimeUtil.DEFAULT_FORMAT4)); if (dis > 5) {//大于五分钟可以接单 - Intent in = new Intent(con, ShangChuangImgActivity.class); + Intent in = new Intent(con, ShangChuangImgActivityBC.class); in.putExtra("type", type); in.putExtra("wid", wid); in.putExtra("sob", gson.toJson(sob)); 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 6ba1079..8740e24 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 @@ -18,6 +18,7 @@ import android.widget.Toast; import androidx.annotation.Nullable; import com.alct.mdp.MDPLocationCollectionManager; +import com.alct.mdp.callback.OnDownloadResultListener; import com.alct.mdp.callback.OnResultListener; import com.alct.mdp.model.Goods; import com.alct.mdp.model.Image; @@ -504,7 +505,7 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity implements I } } } - + private boolean isFinish = false; public void initLocation() { address.setText(lgdu.getAddress()); } @@ -525,10 +526,29 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity implements I Log.e("--装货信息", gson.toJson(lub)); if (locationKey) {//高德定位 if (keys) { - nfc(); - loadInfo(); -// up_traffic_start(); -// up_image_z(); + MDPLocationCollectionManager.getShipmentStatus(con, sob.getData().getShippingNoteNumber(), new OnDownloadResultListener() { + @Override + public void onSuccess(Object o) { + + String string = o.toString(); + if (string.equals("PICKUPED")) {//安联装货，单平台未装货 + isFinish = true; + //平台确认装货 + hyr.loading(lub); + } else { + nfc(); + loadInfo(); + } + } + + @Override + public void onFailure(String s, String s1) { + if (!isFinishing() && customDialog != null && customDialog.isShowing()) { + customDialog.dismiss(); + } + ToastUtils.showToast(con, s1); + } + }); } } else { Toast.makeText(con, "定位异常，请重新定位", Toast.LENGTH_SHORT).show(); @@ -550,8 +570,32 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity implements I Log.e("--卸货信息", gson.toJson(lub)); if (locationKey&&!TextUtils.isEmpty(tempLoca.address)) { if (keys) { - nfc(); - uploadInfo(); + MDPLocationCollectionManager.getShipmentStatus(con, sob.getData().getShippingNoteNumber(), new OnDownloadResultListener() { + @Override + public void onSuccess(Object o) { + if (o.toString().equals("UNLOADED")) {//安联装货，单平台未装货 + //卸货状态-平台 + isFinish = true; + hyr.dischargeCargo(lub); + } else { + nfc(); + uploadInfo(); + } + } + + @Override + public void onFailure(String s, String s1) { + if (!isFinishing() && customDialog != null && customDialog.isShowing()) { + customDialog.dismiss(); + } + ToastUtils.showToast(con, s1); + } + }); + + + +// nfc(); +// uploadInfo(); } diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/BillLocationUtils.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/BillLocationUtils.java index 1db003d..c9744cd 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/BillLocationUtils.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/BillLocationUtils.java @@ -102,8 +102,8 @@ public class BillLocationUtils { //order_start.setVisibility(View.VISIBLE); SPUtil.insSP(con, "order", "ShippingNoteNumber", sob.getData().getShippingNoteNumber()); Log.e("开始轨迹上传服务", "-----"); - Intent serviceIn = new Intent(con, TrackService.class); - con.startService(serviceIn); +// Intent serviceIn = new Intent(con, TrackService.class); +// con.startService(serviceIn); } else { SPUtil.insSP(con, "order", "ShippingNoteNumber", ""); }