装卸货添加定位上传

app/build.gradle

@@ -127,6 +127,21 @@ android {
             //APP名称，可以在androidMainfest中引用
             resValue "string", "appName", "大河好运司机"
         }
+        productbc {
+            applicationId "com.arpa.hndahesudintocctmsdriver.bc"
+            manifestPlaceholders = [CHANNEL_VALUE: "大河好运司机",
+                                    app_icon     : "@drawable/diver_logo",
+                                    GAODEKEY     : "f960bc6d14788238918bd014fa08a870",
+                                    JPUSH_PKGNAME: applicationId,
+                                    JPUSH_APPKEY : "fba6f55621c670d8c1fe9191", //JPush 上注册的包名对应的 Appkey.
+                                    JPUSH_CHANNEL: "developer-default"//暂时填写默认值即可.
+            ]
+            buildConfigField("String", "OPEN_AL_URL", "\"https://oapi.alct56.com\"")
+            buildConfigField("String", "BASE_URL", "\"http://app.dahehuoyun.com/api/\"")
+            buildConfigField "boolean", "isTest", "false"
+            //APP名称，可以在androidMainfest中引用
+            resValue "string", "appName", "大河好运司机"
+        }
 
     }
 //    productFlavors.all { flavor ->

app/src/main/AndroidManifest.xml

@@ -51,11 +51,11 @@
         android:required="true" />
     <uses-permission android:name="android.permission.NFC" />
     <application
-        android:name="com.arpa.hndahesudintocctmsdriver.App"
+        android:name=".App"
         android:allowBackup="true"
         android:excludeFromRecents="true"
         android:icon="@mipmap/diver_logo"
-        android:label="@string/appName"
+        android:label="运营端"
         android:largeHeap="true"
         android:requestLegacyExternalStorage="true"
         android:supportsRtl="true"
@@ -100,7 +100,7 @@
             android:name="com.arpa.hndahesudintocctmsdriver.ui.auth.VehicleAuthActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.arpa.hndahesudintocctmsdriver.ui.home.shangchuan.ShangChuangImgActivity"
+            android:name=".ui.home.shangchuan.ShangChuangImgActivity"
             android:screenOrientation="portrait">
 
             <intent-filter>
@@ -114,7 +114,7 @@
         </activity>
 
         <activity
-            android:name="com.arpa.hndahesudintocctmsdriver.ui.home.shangchuan.ShangChuangImgActivityBC"
+            android:name=".ui.home.shangchuan.ShangChuangImgActivityBC"
             android:screenOrientation="portrait">
 
             <intent-filter>
@@ -129,7 +129,7 @@
 
 
         <activity
-            android:name="com.arpa.hndahesudintocctmsdriver.ui.home.shangchuan.ShangChuangImgActivity2"
+            android:name=".ui.home.shangchuan.ShangChuangImgActivity2"
             android:screenOrientation="portrait">
 
             <intent-filter>
@@ -142,7 +142,7 @@
 
         </activity>
         <activity
-            android:name="com.arpa.hndahesudintocctmsdriver.ui.home.shangchuan.GetShangChuanActivity"
+            android:name=".ui.home.shangchuan.GetShangChuanActivity"
             android:screenOrientation="portrait" />
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.auth.AuthQualificationActivity"

app/src/main/java/com/arpa/hndahesudintocctmsdriver/service/TrackService.java

@@ -69,18 +69,18 @@ public class TrackService extends Service {
         con = this;
         hyr = new HuoYuanRequset(con, hd);
         Log.e("开始循环上传，等待100ms", "-----");
-        new Timer().schedule(new TimerTask() {
+//        new Timer().schedule(new TimerTask() {
-            @Override
+//            @Override
-            public void run() {
+//            public void run() {
-                snn = SPUtil.getSP(con, "order", "ShippingNoteNumber");
+//                snn = SPUtil.getSP(con, "order", "ShippingNoteNumber");
-                if (!snn.equals("")) {
+//                if (!snn.equals("")) {
-                    l = new LocationGDUtil(con, hd);
+//                    l = new LocationGDUtil(con, hd);
-                    l.onCreate();
+//                    l.onCreate();
-                } else {
+//                } else {
-                    onDestroy();
+//                    onDestroy();
-                }
+//                }
-            }
+//            }
-        }, 100, timeSum);
+//        }, 100, timeSum);
     }
 
     //开始
@@ -97,18 +97,18 @@ public class TrackService extends Service {
     }
 
     public void genzong() {
-        if (l == null || l.getLatitude() == 0d) {
+//        if (l == null || l.getLatitude() == 0d) {
-            return;
+//            return;
-        }
+//        }
-        //经度
+//        //经度
-        tib.setLatitude(l.getLatitude() + "");
+//        tib.setLatitude(l.getLatitude() + "");
-        //纬度
+//        //纬度
-        tib.setLongitude(l.getLongitude() + "");
+//        tib.setLongitude(l.getLongitude() + "");
-        Log.e("经度", l.getLatitude() + "");
+//        Log.e("经度", l.getLatitude() + "");
-        Log.e("维度", l.getLongitude() + "");
+//        Log.e("维度", l.getLongitude() + "");
-        //单号
+//        //单号
-        tib.setShippingNoteNumber(snn);
+//        tib.setShippingNoteNumber(snn);
-        hyr.trackTracking(tib);
+//        hyr.trackTracking(tib);
     }
 
 }

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.java

@@ -54,6 +54,7 @@ import com.arpa.hndahesudintocctmsdriver.report.JTTProcess;
 import com.arpa.hndahesudintocctmsdriver.request.WalletRequest;
 import com.arpa.hndahesudintocctmsdriver.ui.auth.CertificatesActivity;
 import com.arpa.hndahesudintocctmsdriver.ui.home.shangchuan.ShangChuangImgActivity;
+import com.arpa.hndahesudintocctmsdriver.ui.home.shangchuan.ShangChuangImgActivityBC;
 import com.arpa.hndahesudintocctmsdriver.ui.news.NewActivity;
 import com.arpa.hndahesudintocctmsdriver.ui.wallet.UpBankActivity;
 import com.arpa.hndahesudintocctmsdriver.ui.web.WebOnlyOneActivity;
@@ -726,14 +727,14 @@ public class HomeFragment extends BaseFragment {
             int zStatus = zData.getStatus();
             int xStatus = xData.getStatus();
             if (zStatus == 0) {//未装货
-                Intent in = new Intent(con, ShangChuangImgActivity.class);
+                Intent in = new Intent(con, ShangChuangImgActivityBC.class);
                 in.putExtra("type", 0);
                 in.putExtra("wid", zData.getId() + "");
                 in.putExtra("sob", gson.toJson(sob));
                 in.putExtra("keys", true);
                 startActivity(in);
             } else if (zStatus == 1 && xStatus == 4) {//已装货未上传回单
-                Intent in = new Intent(con, ShangChuangImgActivity.class);
+                Intent in = new Intent(con, ShangChuangImgActivityBC.class);
                 in.putExtra("type", 2);
                 in.putExtra("wid", zData.getId() + "");
                 in.putExtra("h_type", 0);
@@ -742,7 +743,7 @@ public class HomeFragment extends BaseFragment {
             } else if (zStatus == 3 && xStatus == 4) {//已上传装货回单，未卸货
                 int dis = TimeUtil.compareNowDate(TimeUtil.string2Millis(zData.getImageTakenDate(), TimeUtil.DEFAULT_FORMAT4));
                 if (dis > 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);
+//                    Intent serviceIn = new Intent(con, TrackService.class);
-                    getActivity().startService(serviceIn);
+//                    getActivity().startService(serviceIn);
                 } catch (Exception e) {
                     e.printStackTrace();
                 }

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);
+//            Intent serviceIn=new Intent(con,TrackService.class);
-            getActivity().startService(serviceIn);
+//            getActivity().startService(serviceIn);
             list.add(new ManyBean(sob.getData(),R.layout.huoyuan_yundan));
         }else{
             SPUtil.insSP(con,"order","ShippingNoteNumber","");

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);
@@ -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));

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;
@@ -42,6 +43,7 @@ import com.arpa.hndahesudintocctmsdriver.report.JTTProcess;
 import com.arpa.hndahesudintocctmsdriver.request.HuoYuanRequset;
 import com.arpa.hndahesudintocctmsdriver.request.OCRRequest;
 import com.arpa.hndahesudintocctmsdriver.request.bean.LUInputBean;
+import com.arpa.hndahesudintocctmsdriver.request.bean.TrackInputBean;
 import com.arpa.hndahesudintocctmsdriver.request.bean.UploadReceiptInputBean;
 import com.arpa.hndahesudintocctmsdriver.util.BitmapUtil;
 import com.arpa.hndahesudintocctmsdriver.util.MessageUtils;
@@ -259,6 +261,15 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity implements I
                         break;
                     }
                 }
+                if (CacheGroup.cacheList.get("genzong") != null) {
+                    BaseBean bb = gson.fromJson(CacheGroup.cacheList.get("genzong"), BaseBean.class);
+                    if (bb.getCode() == 200) {
+                        Log.e("--轨迹上传--", "成功");
+                    } else {
+                        Log.e("--轨迹上传失败:--", bb.getMsg());
+                    }
+                    CacheGroup.cacheList.remove("genzong");
+                }
                 if (CacheGroup.cacheList.get("carName") != null) {
                     BaseBean bb = gson.fromJson(CacheGroup.cacheList.get("carName"), BaseBean.class);
                     if (bb.getCode() == 200) {
@@ -376,14 +387,14 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity implements I
         initView(null);
         customDialog = new CustomDialog(con, "正在定位当前位置...");
         customDialog.show();
-        lgdu = new LocationGDUtil(con, hd);
+//        lgdu = new LocationGDUtil(con, hd);
-        //启动定位
+//        //启动定位
-        lgdu.onCreate();
+//        lgdu.onCreate();
         tv_loaction.setOnClickListener(v -> {
-            if (!locationKey) {
+//            if (!locationKey) {
-                customDialog.show();
+//                customDialog.show();
-                lgdu.onCreate();
+//                lgdu.onCreate();
-            }
+//            }
         });
 
         btnOk.setOnClickListener(v -> {
@@ -504,7 +515,7 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity implements I
             }
         }
     }
-
+    private boolean isFinish = false;
     public void initLocation() {
         address.setText(lgdu.getAddress());
     }
@@ -523,16 +534,37 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity implements I
                     lub.setImageId(imgIds);
                     lub.setWaybillId(wid);
                     Log.e("--装货信息", gson.toJson(lub));
-                    if (locationKey) {//高德定位
+//                    if (locationKey) {//高德定位
                         if (keys) {
-                            nfc();
+                            MDPLocationCollectionManager.getShipmentStatus(con, sob.getData().getShippingNoteNumber(), new OnDownloadResultListener() {
-                            loadInfo();
+                                @Override
-//                            up_traffic_start();
+                                public void onSuccess(Object o) {
-//                            up_image_z();
+
+                                    String string = o.toString();
+                                    if (string.equals("PICKUPED")) {//安联装货，单平台未装货
+                                        isFinish = true;
+                                        //平台确认装货
+                                        hyr.loading(lub);
+                                    } else {
+                                        nfc();
+                                        loadInfo();
+                                    }
+
+                                    upLocation(tempLoca.getLatitude()+"",tempLoca.getLongitude()+"",sob.getData().getShippingNoteNumber());
+                                }
+
+                                @Override
+                                public void onFailure(String s, String s1) {
+                                    if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                                        customDialog.dismiss();
+                                    }
+                                    ToastUtils.showToast(con, s1);
+                                }
+                            });
                         }
-                    } else {
+//                    } else {
-                        Toast.makeText(con, "定位异常，请重新定位", Toast.LENGTH_SHORT).show();
+//                        Toast.makeText(con, "定位异常，请重新定位", Toast.LENGTH_SHORT).show();
-                    }
+//                    }
 
                 } else {
                     Toast.makeText(con, "图片上传异常，请重新上传", Toast.LENGTH_SHORT).show();
@@ -548,10 +580,36 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity implements I
                     lub.setWaybillId(wid);
                     lub.setRealLoadTime(tempLoca.getTime());
                     Log.e("--卸货信息", gson.toJson(lub));
-                    if (locationKey&&!TextUtils.isEmpty(tempLoca.address)) {
+//                    if (locationKey&&!TextUtils.isEmpty(tempLoca.address)) {
+                    if (!TextUtils.isEmpty(tempLoca.address)) {
                         if (keys) {
-                            nfc();
+                            MDPLocationCollectionManager.getShipmentStatus(con, sob.getData().getShippingNoteNumber(), new OnDownloadResultListener() {
-                            uploadInfo();
+                                @Override
+                                public void onSuccess(Object o) {
+                                    if (o.toString().equals("UNLOADED")) {//安联装货，单平台未装货
+                                        //卸货状态-平台
+                                        isFinish = true;
+                                        hyr.dischargeCargo(lub);
+                                    } else {
+                                        nfc();
+                                        uploadInfo();
+                                    }
+                                    upLocation(tempLoca.getLatitude()+"",tempLoca.getLongitude()+"",sob.getData().getShippingNoteNumber());
+                                }
+
+                                @Override
+                                public void onFailure(String s, String s1) {
+                                    if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                                        customDialog.dismiss();
+                                    }
+                                    ToastUtils.showToast(con, s1);
+                                }
+                            });
+
+
+
+//                            nfc();
+//                            uploadInfo();
 
                         }
 
@@ -566,9 +624,9 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity implements I
             case 2:
                 if (imgIds != null && imgIds.size() > 0) {//卸货回单
                     //上传回单
-                    urib.setLatitude(lgdu.getLatitude() + "");
+                    urib.setLatitude(tempLoca.getLatitude() + "");
-                    urib.setLongitude(lgdu.getLongitude() + "");
+                    urib.setLongitude(tempLoca.getLongitude() + "");
-                    urib.setLocationAddress(lgdu.getAddress());
+                    urib.setLocationAddress(tempLoca.getAddress());
                     //装卸货类型
                     urib.setType(h_type + 1);
                     //回单id 数组
@@ -576,16 +634,16 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity implements I
                     //子运运单ID
                     urib.setWaybillId(wid);
                     Log.e("--回单信息", gson.toJson(urib));
-                    if (locationKey) {
+//                    if (locationKey) {
                         if (index == 2 && keys && !TextUtils.isEmpty(tempLoca.address)) {
                             up_trafficSign();
                             up_trafficReceipt();
                             receipt_image();
                         }
                         hyr.receipt(urib);
-                    } else {
+//                    } else {
-                        Toast.makeText(con, "定位异常，请重新定位", Toast.LENGTH_SHORT).show();
+//                        Toast.makeText(con, "定位异常，请重新定位", Toast.LENGTH_SHORT).show();
-                    }
+//                    }
                 } else {
                     Toast.makeText(con, "图片上传异常，请重新上传", Toast.LENGTH_SHORT).show();
                 }
@@ -827,9 +885,9 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity implements I
                 public void onSuccess() {
                     Log.e("上报安联", "装货上传成功");
                     //交通厅
-                    if (sob.getData().getReport() == 1) {
+//                    if (sob.getData().getReport() == 1) {
-                        JTTProcess.start(con, sob, "");
+//                        JTTProcess.start(con, sob, "");
-                    }
+//                    }
                     //装货状态
                     hyr.loading(lub);
                     //装货照片
@@ -864,9 +922,9 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity implements I
                 public void onSuccess() {
                     Log.e("上报安联", "卸货上传成功");
                     //交通厅
-                    if (sob.getData().getReport() == 1) {
+//                    if (sob.getData().getReport() == 1) {
-                        JTTProcess.stop(con, sob, "");
+//                        JTTProcess.stop(con, sob, "");
-                    }
+//                    }
                     //卸货状态-平台
                     hyr.dischargeCargo4(lub);
                     //卸货照片-安联
@@ -885,5 +943,11 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity implements I
 
 
     }
-
+    private void upLocation(String lat,String lon,String shippingNoteNumber){
+        TrackInputBean tib = new TrackInputBean();
+        tib.setLatitude(lat);
+        tib.setLongitude(lon);
+        tib.setShippingNoteNumber(shippingNoteNumber);
+        hyr.trackTracking(tib);
+    }
 }

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);
+//                Intent serviceIn = new Intent(con, TrackService.class);
-                con.startService(serviceIn);
+//                con.startService(serviceIn);
             } else {
                 SPUtil.insSP(con, "order", "ShippingNoteNumber", "");
             }