From db9990eec018c8573392e76bd462087d5a63bd54 Mon Sep 17 00:00:00 2001 From: lijia Date: Tue, 22 Oct 2024 17:15:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E8=A1=8C=E4=B8=AD=E8=BF=90=E5=8D=95?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=8A=B6=E6=80=81=E4=BC=98=E5=8C=96=EF=BC=8C?= =?UTF-8?q?=E8=BF=90=E5=8D=95=E8=AF=A6=E6=83=85=E5=81=B6=E5=8F=91=E4=B8=8D?= =?UTF-8?q?=E5=88=B7=E6=96=B0=EF=BC=8C=E7=99=BB=E5=BD=95=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../request/HuoYuanRequset.java | 7 ++++ .../ui/home/HomeFragment.java | 32 +++++++++++++++---- .../ui/home/StartYunDanActivity.java | 22 ++++++++----- app/src/main/res/layout/activity_login.xml | 2 ++ 4 files changed, 48 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/HuoYuanRequset.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/HuoYuanRequset.java index c862f05..7182248 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/HuoYuanRequset.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/HuoYuanRequset.java @@ -79,6 +79,13 @@ public class HuoYuanRequset{ Request re = OkHttpUtil.posts(new OkDate(RequestConstant.getGetStartOrder(),MapUtil.mapJson(map)),getToken(con),con); RequestUtil.start(1, HuoYuanFragmengt.START_ORDER,re,con,hd); } + + public void startOrder2(int id){ + Map map=new HashMap<>(); + map.put("waybillId",id); + Request re = OkHttpUtil.posts(new OkDate(RequestConstant.getGetStartOrder(),MapUtil.mapJson(map)),getToken(con),con); + RequestUtil.start(1, "refreshorderDetail",re,con,hd); + } //装货 public void loading(LUInputBean lub){ Request re = OkHttpUtil.posts(new OkDate(RequestConstant.getLOADING(), gson.toJson(lub)),getToken(con),con); diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.java index 84df1d1..8eafc72 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.java @@ -23,6 +23,7 @@ import android.widget.Toast; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.cardview.widget.CardView; +import androidx.fragment.app.FragmentActivity; import com.alct.mdp.MDPLocationCollectionManager; import com.alct.mdp.callback.OnDownloadResultListener; @@ -198,8 +199,20 @@ public class HomeFragment extends BaseFragment { initStart(); StartOrderParts.setStartOrder(con, sob); if (sob.getData() != null && !sob.getData().getWaybillStatus().equals("已取消")) { - dealCurWay(sob.getData()); - ur.getJtts(sob.getData().getShippingNoteNumber()); + StartOrderBean.DataDTO.WayChildrenDTO xData = null; + for (int i = 0; i < sob.getData().getWayChildren().size(); i++) { + if (2 == sob.getData().getWayChildren().get(i).getType()) { + xData = sob.getData().getWayChildren().get(i); + break; + } + } + if (xData != null && xData.getStatus() == 3) { + SPUtils.remove(con, "curWaybillId"); + llCurWay.setVisibility(View.GONE); + } else { + dealCurWay(sob.getData()); + ur.getJtts(sob.getData().getShippingNoteNumber()); + } } else { SPUtils.remove(con, "curWaybillId"); llCurWay.setVisibility(View.GONE); @@ -280,9 +293,9 @@ public class HomeFragment extends BaseFragment { if (!TextUtils.isEmpty(deb.getData().getDriverLicenseUpdateUrl()) || !TextUtils.isEmpty(deb.getData().getIdCardUpdateUrl()) || !TextUtils.isEmpty(deb.getData().getQualificationUpdateUrl()) || !TextUtils.isEmpty(deb.getData().getRoadLicenseUpdateUrl()) || !TextUtils.isEmpty(deb.getData().getInsuranceUpdateUrl())) { - if (xToast==null){ + if (xToast == null) { xToast = new XToast(act); - }else if (xToast!=null&&xToast.isShow()){ + } else if (xToast != null && xToast.isShow()) { xToast.cancel(); } xToast.setContentView(R.layout.view_bc) @@ -716,7 +729,7 @@ public class HomeFragment extends BaseFragment { qr.getBankCardList(); } ur.getDriverExpire(); - hyr.startOrder(curWaybillId==-1 ? 0 : curWaybillId); + hyr.startOrder(curWaybillId == -1 ? 0 : curWaybillId); // hyr.startOrder(0); ur.driverAuthData(); } @@ -776,8 +789,13 @@ public class HomeFragment extends BaseFragment { Log.e("开始轨迹上传服务", "-----"); orderNum.setText("运单号:" + sob.getData().getShippingNoteNumber()); order_state.setText("" + sob.getData().getWaybillStatus()); - Intent serviceIn = new Intent(con, TrackService.class); - getActivity().startService(serviceIn); + try { + Intent serviceIn = new Intent(con, TrackService.class); + getActivity().startActivity(serviceIn); + } catch (Exception e) { + e.printStackTrace(); + } + } else { SPUtil.insSP(con, "order", "ShippingNoteNumber", ""); order_start.setVisibility(View.GONE); 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 14e1b8c..e2df1a3 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 @@ -107,10 +107,10 @@ public class StartYunDanActivity extends BaseActivity { switch (m.what) { case RequsetCodeConstants.SUCCESS: //获取页面数据 - if (CacheGroup.cacheList.get(HuoYuanFragmengt.START_ORDER) != null && CacheGroup.cacheList.get(GET_EVALUTE) != null) { + if (CacheGroup.cacheList.get("refreshorderDetail") != null && CacheGroup.cacheList.get(GET_EVALUTE) != null) { Log.e("-评论-", CacheGroup.cacheList.get(GET_EVALUTE)); - Log.e("-运单-", CacheGroup.cacheList.get(HuoYuanFragmengt.START_ORDER)); - sob = gson.fromJson(CacheGroup.cacheList.get(HuoYuanFragmengt.START_ORDER), StartOrderBean.class); + Log.e("-运单-", CacheGroup.cacheList.get("refreshorderDetail")); + sob = gson.fromJson(CacheGroup.cacheList.get("refreshorderDetail"), StartOrderBean.class); wnb = gson.fromJson(CacheGroup.cacheList.get(GET_EVALUTE), WNewsBean.class); if (!isFinishing() && customDialog != null && customDialog.isShowing()) { customDialog.dismiss(); @@ -126,7 +126,7 @@ public class StartYunDanActivity extends BaseActivity { } else { Toast.makeText(con, sob.getMsg(), Toast.LENGTH_SHORT).show(); } - CacheGroup.cacheList.remove(HuoYuanFragmengt.START_ORDER); + CacheGroup.cacheList.remove("refreshorderDetail"); CacheGroup.cacheList.remove(GET_EVALUTE); } //保存评价 @@ -484,9 +484,15 @@ public class StartYunDanActivity extends BaseActivity { if (map != null) { map.onResume(); } - customDialog = new CustomDialog(con, "网络请求中..."); - customDialog.show(); - hyr.startOrder(id); + if (customDialog==null){ + customDialog = new CustomDialog(con, "网络请求中..."); + customDialog.show(); + }else{ + if (!customDialog.isShowing()){ + customDialog.show(); + } + } + hyr.startOrder2(id); hyr.getEvaluate(id); } @@ -598,7 +604,7 @@ public class StartYunDanActivity extends BaseActivity { public void search() { String latitude = sob.getData().getWayChildren().get((sob.getData().getWayChildren().size() - 1)).getLatitude(); - if (TextUtils.isEmpty(latitude)){ + if (TextUtils.isEmpty(latitude)) { return; } // try { diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 99ae066..27cbd54 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -47,6 +47,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="请输入手机号码" + android:inputType="phone" android:textColor="#ff000000" android:textSize="@dimen/sp_14" android:maxLength="11" @@ -65,6 +66,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content">