From 934562130990002b47abe8e88c2ce70913685969 Mon Sep 17 00:00:00 2001 From: lijia Date: Thu, 17 Aug 2023 15:18:24 +0800 Subject: [PATCH] =?UTF-8?q?3.2.3=E5=8F=B8=E6=9C=BA=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 5 +- app/src/main/AndroidManifest.xml | 1 + .../arpa/hndahesudintocctmsdriver/App.java | 1 - .../cuspop/MessagePop.kt | 69 +++ .../report/ALProcess.java | 33 ++ .../ui/home/HomeFragment.java | 1 + .../ui/home/HuoYunDelActivity.java | 44 +- .../shangchuan/ShangChuangImgActivity.java | 460 ++++++++++-------- .../util/MessageUtils.kt | 35 ++ .../util/msg/MsgUtil.java | 4 +- .../main/res/layout/pop_message_center.xml | 99 ++++ 11 files changed, 542 insertions(+), 210 deletions(-) create mode 100644 app/src/main/java/com/arpa/hndahesudintocctmsdriver/cuspop/MessagePop.kt create mode 100644 app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/MessageUtils.kt create mode 100644 app/src/main/res/layout/pop_message_center.xml diff --git a/app/build.gradle b/app/build.gradle index 6ea0e3a..e48b9a9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,6 +3,7 @@ plugins { id 'kotlin-android' id 'kotlin-kapt' id 'com.huawei.agconnect' + id 'kotlin-android-extensions' } android { @@ -34,8 +35,8 @@ android { applicationId "com.arpa.hndahesudintocctmsdriver" minSdkVersion 23 targetSdkVersion 30 - versionCode 53 - versionName "3.2.2" + versionCode 54 + versionName "3.2.3" flavorDimensions "CHANNEL_VALUE" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" javaCompileOptions { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index da45e40..a56c1ef 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,6 +2,7 @@ + diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/App.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/App.java index 0ef0b04..3a06120 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/App.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/App.java @@ -40,7 +40,6 @@ public class App extends Application { public static int APP_STATUS = APP_STATUS_KILLED; // 记录App的启动状态 private Context con; public static App mApplication = null; - @Override public void onCreate() { super.onCreate(); diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/cuspop/MessagePop.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/cuspop/MessagePop.kt new file mode 100644 index 0000000..75d0e5c --- /dev/null +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/cuspop/MessagePop.kt @@ -0,0 +1,69 @@ +package com.arpa.hndahesudintocctmsdriver.cuspop + +import android.app.Activity +import android.content.Context +import android.content.Intent +import android.net.Uri +import android.view.View +import com.arpa.hndahesudintocctmsdriver.R +import com.dahe.mylibrary.utils.BaseUtils +import com.dahe.mylibrary.utils.ToastUtils +import com.lxj.xpopup.core.CenterPopupView +import kotlinx.android.synthetic.main.load.view.* +import kotlinx.android.synthetic.main.pop_message_center.view.* + + +/** + * @ClassName MessagePop + * @Author 用户 + * @Date 2023/8/14 18:01 + * @Description TODO + */ +class MessagePop(context: Context) : CenterPopupView(context), View.OnClickListener { + + lateinit var content :String + + constructor(context: Context,message : String) :this(context) { + content = message + } + + override fun getImplLayoutId() = R.layout.pop_message_center + + override fun onCreate() { + super.onCreate() + tvCancel.setOnClickListener(this) + tvOk.setOnClickListener(this) + tvPhone.setOnClickListener(this) + tvContent.text = "$content" + } + + override fun onClick(v: View?) { + when(v?.id){ + R.id.tvCancel -> { + dismiss() + } + R.id.tvOk,R.id.tvPhone -> { + dismiss() + val toString = tvPhone.text.toString() + val intent = Intent(Intent.ACTION_CALL) + val data = Uri.parse("tel:$toString") + intent.data = data + context.startActivity(intent) + dismiss() +// BaseUtils.callPhone(content as Activity, tvPhone.text.toString()) + } + } + } + + + private var listener: OnMyItemClickListener? = null + fun setOnMyItemClickListener(listener: OnMyItemClickListener?): MessagePop { + this.listener = listener + return this + } + + interface OnMyItemClickListener { + fun onItemClick(startTime: String, endTime: String) + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/report/ALProcess.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/report/ALProcess.java index a91e501..e95cbb7 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/report/ALProcess.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/report/ALProcess.java @@ -8,7 +8,10 @@ import com.alct.mdp.MDPLocationCollectionManager; import com.alct.mdp.callback.OnDownloadResultListener; import com.alct.mdp.callback.OnResultListener; import com.alct.mdp.model.Identity; +import com.arpa.hndahesudintocctmsdriver.App; import com.arpa.hndahesudintocctmsdriver.parts.AuthParts; +import com.arpa.hndahesudintocctmsdriver.util.MessageUtils; +import com.arpa.hndahesudintocctmsdriver.util.msg.MsgUtil; import com.google.gson.Gson; import com.arpa.hndahesudintocctmsdriver.bean.DriverAuthDataBean; import com.arpa.hndahesudintocctmsdriver.bean.FqBean; @@ -50,6 +53,7 @@ public class ALProcess { @Override public void onFailure(java.lang.String s, java.lang.String s1) { Log.e("--error--",s+s1+""); + new MessageUtils().showCenMessage(con,s1); } }); } @@ -113,4 +117,33 @@ public class ALProcess { } + public static void verification(Context con,Handler hd){ + DriverAuthDataBean auth= AuthParts.getAuth(con); + Identity idy=new Identity(); + //企业代码 + idy.setEnterpriseCode(ENTERPRISE_CODE); + //企业app的身份码 + idy.setAppIdentity(APP_IDENTITY); + //企业app验证码 + idy.setAppKey(APP_KEY); + //司机身份证 + idy.setDriverIdentity(auth.getData().getIdcard()); + //idy.setDriverIdentity("410725198311042012"); + MDPLocationCollectionManager.register(con, idy, new OnResultListener() { + @Override + public void onSuccess() { + MsgUtil.addHdMsgWatBody(hd, 1111,"认证成功"); + Log.e("--success--","验证成功"); + getFq(con); + } + + @Override + public void onFailure(java.lang.String s, java.lang.String s1) { + Log.e("--error--",s+s1+""); + MsgUtil.addHdMsgWatBody(hd, 2222,s1); + new MessageUtils().showCenMessage(con,s1); + } + }); + } + } 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 304b2a3..d22cc00 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 @@ -123,6 +123,7 @@ public class HomeFragment extends BaseFragment { private ImageConfig ic; private DriverExpireBean deb; + @Override public void msgMethod(Message m) { super.msgMethod(m); diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HuoYunDelActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HuoYunDelActivity.java index ed9fa67..32bb753 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HuoYunDelActivity.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HuoYunDelActivity.java @@ -21,8 +21,10 @@ import com.alibaba.fastjson.JSONObject; import com.arpa.hndahesudintocctmsdriver.bean.JTT; import com.arpa.hndahesudintocctmsdriver.parts.ConfigParts; import com.arpa.hndahesudintocctmsdriver.parts.UserParts; +import com.arpa.hndahesudintocctmsdriver.report.ALProcess; import com.arpa.hndahesudintocctmsdriver.report.JTTProcess; import com.arpa.hndahesudintocctmsdriver.ui.auth.PersonalAuthActivity; +import com.arpa.hndahesudintocctmsdriver.util.MessageUtils; import com.arpa.hndahesudintocctmsdriver.util.img.ImageGetUtil; import com.arpa.hndahesudintocctmsdriver.util.sp.SPUtil; import com.arpa.hndahesudintocctmsdriver.util.string.StringUtil; @@ -32,6 +34,7 @@ import com.esign.esignsdk.data.AuthEvent; import com.google.gson.Gson; import com.lxj.xpopup.XPopup; import com.lxj.xpopup.core.BasePopupView; +import com.lxj.xpopup.interfaces.OnCancelListener; import com.lxj.xpopup.interfaces.OnConfirmListener; import com.arpa.hndahesudintocctmsdriver.R; import com.arpa.hndahesudintocctmsdriver.bean.BaseBean; @@ -120,6 +123,21 @@ public class HuoYunDelActivity extends BaseAppCompatActivity { car.setText("选择车辆:" + clb.getData().get(index).getCarNumber()); cid = clb.getData().get(index).getCarId(); break; + case 1111://安联用户验证通过，接单 + new XPopup.Builder(con) + .isDestroyOnDismiss(true) //对于只使用一次的弹窗，推荐设置这个 + .asConfirm("请确认接单", "是否确定承运此运单？", + "取消", "确认", + () -> { + Log.e("--id--", "cid:" + cid + "---wid:" + id); + hyr.confirm(cid, id); + }, () -> customDialog.dismiss(), false, R.layout.alert_ok_cancel) //最后一个参数绑定已有布局 + .show(); + break; + case 2222://安联用户验证不通过 + customDialog.dismiss(); + new MessageUtils().showCenMessage(con, (String) m.obj); + break; } } @@ -236,20 +254,7 @@ public class HuoYunDelActivity extends BaseAppCompatActivity { if (cid != null) { // if (fpKey){ if (key) { - new XPopup.Builder(con) - .isDestroyOnDismiss(true) //对于只使用一次的弹窗，推荐设置这个 - .asConfirm("请确认接单", "是否确定承运此运单？", - "取消", "确认", - new OnConfirmListener() { - @Override - public void onConfirm() { - Log.e("--id--", "cid:" + cid + "---wid:" + id); - customDialog = new CustomDialog(con, "正在接单..."); - customDialog.show(); - hyr.confirm(cid, id); - } - }, null, false, R.layout.alert_ok_cancel) //最后一个参数绑定已有布局 - .show(); + reOrder(); } else { Toast.makeText(con, "请先同意并签署运输合同", Toast.LENGTH_SHORT).show(); } @@ -350,4 +355,15 @@ public class HuoYunDelActivity extends BaseAppCompatActivity { } } + /** + * 接单 + * 先判断安联用户信息验证，随后接单 + */ + private void reOrder() { + customDialog = new CustomDialog(con, "正在接单..."); + customDialog.show(); + //验证安联用户是否通过 + ALProcess.verification(con, hd); + } + } diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/ShangChuangImgActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/ShangChuangImgActivity.java index d29eb9f..f22f860 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/ShangChuangImgActivity.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/ShangChuangImgActivity.java @@ -19,8 +19,10 @@ import com.alct.mdp.callback.OnResultListener; import com.alct.mdp.model.Goods; import com.alct.mdp.model.Image; import com.alct.mdp.model.Location; +import com.arpa.hndahesudintocctmsdriver.report.ALProcess; import com.arpa.hndahesudintocctmsdriver.report.JTTProcess; import com.arpa.hndahesudintocctmsdriver.util.BitmapUtil; +import com.arpa.hndahesudintocctmsdriver.util.MessageUtils; import com.arpa.hndahesudintocctmsdriver.util.NfcUtils; import com.arpa.hndahesudintocctmsdriver.util.alert.ToastUtil; import com.arpa.hndahesudintocctmsdriver.util.img.GetCarImageAlert; @@ -57,89 +59,89 @@ import java.util.List; public class ShangChuangImgActivity extends BaseAppCompatActivity { - private TextView submit,name_top,name_body,address,tips,tips_x; + private TextView submit, name_top, name_body, address, tips, tips_x; private RelativeLayout getImg; - private ImageView res_img,img_icon,img_delete; - private String[] names={"装货","卸货","回单"}; - public static String[] TYPE_NAME={"zhuanghuo","xiehuo","huidan"}; - private int index=0; + private ImageView res_img, img_icon, img_delete; + private String[] names = {"装货", "卸货", "回单"}; + public static String[] TYPE_NAME = {"zhuanghuo", "xiehuo", "huidan"}; + private int index = 0; // - private Gson gson=new Gson(); + private Gson gson = new Gson(); // - private LUInputBean lub=new LUInputBean(); - private UploadReceiptInputBean urib=new UploadReceiptInputBean(); + private LUInputBean lub = new LUInputBean(); + private UploadReceiptInputBean urib = new UploadReceiptInputBean(); private LocationGDUtil lgdu; - public LocationUtil lu; - private List imgIds=new ArrayList<>(); + public LocationUtil lu; + private List imgIds = new ArrayList<>(); private UploadBean ub; private HuoYuanRequset hyr; // - private GetCarImageAlert gia=new GetCarImageAlert(); + private GetCarImageAlert gia = new GetCarImageAlert(); private CustomDialog customDialog; - private int id=0; - private boolean key=true; - private boolean keys=false; - private boolean locationKey=false; + private int id = 0; + private boolean key = true; + private boolean keys = false; + private boolean locationKey = false; private TextView tv_loaction; @Override public void msgMethod(Message m) { super.msgMethod(m); - switch (m.what){ + switch (m.what) { case RequsetCodeConstants.SUCCESS: - if (CacheGroup.cacheList.get("upload")!=null) { - Log.e("upload",CacheGroup.cacheList.get("upload")); - ub=gson.fromJson(CacheGroup.cacheList.remove("upload"),UploadBean.class); - if(ub.getCode()==200){ + if (CacheGroup.cacheList.get("upload") != null) { + Log.e("upload", CacheGroup.cacheList.get("upload")); + ub = gson.fromJson(CacheGroup.cacheList.remove("upload"), UploadBean.class); + if (ub.getCode() == 200) { imgIds.add(ub.getData().getId()); Glide.with(con).load(ub.getData().getUrl()).into(res_img); res_img.setVisibility(View.VISIBLE); img_delete.setVisibility(View.VISIBLE); img_icon.setVisibility(View.GONE); - key=false; - }else{ - Toast.makeText(con,ub.getMsg(),Toast.LENGTH_SHORT).show(); + key = false; + } else { + Toast.makeText(con, ub.getMsg(), Toast.LENGTH_SHORT).show(); } CacheGroup.cacheList.remove("upload"); } - for(int i=0;i { - if (!locationKey){ + if (!locationKey) { customDialog.show(); lgdu.onCreate(); } }); - hyr=new HuoYuanRequset(con,hd); + hyr = new HuoYuanRequset(con, hd); // if (!NfcUtils.hasNfc(con)) { // Toast.makeText(con,"请先开启nfc",Toast.LENGTH_LONG).show(); // }else{ @@ -223,42 +226,42 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { @Override public void initView(Object obj) { super.initView(obj); - name_top.setText("上传"+names[index]+"照片"); - name_body.setText(names[index]+"照片"); - if(index==1){ + name_top.setText("上传" + names[index] + "照片"); + name_body.setText(names[index] + "照片"); + if (index == 1) { tips.setVisibility(View.VISIBLE); tips_x.setVisibility(View.VISIBLE); } submit.setOnClickListener(v -> { - if(imgIds.size()!=0){ + if (imgIds.size() != 0) { typeRequest(); - }else{ - Toast.makeText(con,"请先上传一张图片",Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(con, "请先上传一张图片", Toast.LENGTH_SHORT).show(); } }); getImg.setOnClickListener(v -> { - if(key){ - Log.e("--imgIds.size()--",imgIds.size()+""); - gia.showPopueWindow(this,index==2); - }else{ + if (key) { + Log.e("--imgIds.size()--", imgIds.size() + ""); + gia.showPopueWindow(this, index == 2); + } else { new XPopup.Builder(con) .asImageViewer(res_img, ub.getData().getUrl(), new SmartGlideImageLoader(R.mipmap.ic_launcher)) .show(); // new XPopup.Builder(con) // .asImageViewer(res_img, ub.getData().getUrl(), true, -1, -1, 50, false,new CertificatesActivity.ImageLoader()) // .show(); - Toast.makeText(con,"查看了照片", Toast.LENGTH_SHORT).show(); + Toast.makeText(con, "查看了照片", Toast.LENGTH_SHORT).show(); } }); img_delete.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - imgIds=new ArrayList<>(); - ub=new UploadBean(); + imgIds = new ArrayList<>(); + ub = new UploadBean(); res_img.setVisibility(View.GONE); img_delete.setVisibility(View.GONE); img_icon.setVisibility(View.VISIBLE); - key=true; + key = true; } }); } @@ -268,15 +271,15 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); - if (requestCode == 12 && resultCode == RESULT_OK) { - if (null==gia.getFile()){ - new ToastUtil(con, Gravity.CENTER,"图片选择失败").show(Toast.LENGTH_SHORT); - return; - } - path=gia.getFile().getPath(); - Log.e("图片地址:",path); + if (requestCode == 12 && resultCode == RESULT_OK) { + if (null == gia.getFile()) { + new ToastUtil(con, Gravity.CENTER, "图片选择失败").show(Toast.LENGTH_SHORT); + return; + } + path = gia.getFile().getPath(); + Log.e("图片地址:", path); gia.dis(); - ImageFileCompressUtil.imageFileCompress(con,new File(path),hd); + ImageFileCompressUtil.imageFileCompress(con, new File(path), hd); } else if (requestCode == PictureConfig.CHOOSE_REQUEST && resultCode == RESULT_OK) { List imgs = PictureSelector.obtainMultipleResult(data); if (imgs != null && imgs.size() > 0) { @@ -286,49 +289,50 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { if (TextUtils.isEmpty(paths)) { paths = image.getPath(); } - path=paths; - Log.e("图片地址:",path); + path = paths; + Log.e("图片地址:", path); gia.dis(); - ImageFileCompressUtil.imageFileCompress(con,new File(path),hd); + ImageFileCompressUtil.imageFileCompress(con, new File(path), hd); } } } - public void initLocation(){ + public void initLocation() { address.setText(lgdu.getAddress()); } - public void typeRequest(){ + public void typeRequest() { // for(int i=0;i0) { + if (imgIds != null && imgIds.size() > 0) { lub.setLatitude(lgdu.getLatitude() + ""); lub.setLongitude(lgdu.getLongitude() + ""); lub.setLocationAddress(lgdu.getAddress()); lub.setImageId(imgIds); lub.setWaybillId(wid); Log.e("--装货信息", gson.toJson(lub)); - if(locationKey){ - hyr.loading(lub); - if(keys){ + if (locationKey) { + + if (keys) { nfc(); - up_traffic_start(); - up_image_z(); + loadInfo(); +// up_traffic_start(); +// up_image_z(); } - }else{ - Toast.makeText(con,"定位异常，请重新定位",Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(con, "定位异常，请重新定位", Toast.LENGTH_SHORT).show(); } - }else{ - Toast.makeText(con,"图片上传异常，请重新上传",Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(con, "图片上传异常，请重新上传", Toast.LENGTH_SHORT).show(); } break; case 1: - if(imgIds!=null && imgIds.size()>0) { + if (imgIds != null && imgIds.size() > 0) { //卸货 lub.setLatitude(lgdu.getLatitude() + ""); lub.setLongitude(lgdu.getLongitude() + ""); @@ -336,64 +340,65 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { lub.setImageId(imgIds); lub.setWaybillId(wid); Log.e("--卸货信息", gson.toJson(lub)); - if(locationKey){ - if(keys){ + if (locationKey) { + if (keys) { nfc(); - up_traffic_end(); - up_image(); + uploadInfo(); + } - hyr.dischargeCargo(lub); - }else{ - Toast.makeText(con,"定位异常，请重新定位",Toast.LENGTH_SHORT).show(); + + } else { + Toast.makeText(con, "定位异常，请重新定位", Toast.LENGTH_SHORT).show(); } - }else{ - Toast.makeText(con,"图片上传异常，请重新上传",Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(con, "图片上传异常，请重新上传", Toast.LENGTH_SHORT).show(); } break; case 2: - if(imgIds!=null && imgIds.size()>0){//卸货回单 + if (imgIds != null && imgIds.size() > 0) {//卸货回单 //上传回单 - urib.setLatitude(lgdu.getLatitude()+""); - urib.setLongitude(lgdu.getLongitude()+""); + urib.setLatitude(lgdu.getLatitude() + ""); + urib.setLongitude(lgdu.getLongitude() + ""); urib.setLocationAddress(lgdu.getAddress()); //装卸货类型 - urib.setType(h_type+1); + urib.setType(h_type + 1); //回单id 数组 urib.setReceiptId(imgIds); //子运运单ID urib.setWaybillId(wid); - Log.e("--回单信息",gson.toJson(urib)); - if(locationKey) { + Log.e("--回单信息", gson.toJson(urib)); + if (locationKey) { if (index == 2 && keys) { up_trafficSign(); up_trafficReceipt(); receipt_image(); } hyr.receipt(urib); - }else{ - Toast.makeText(con,"定位异常，请重新定位",Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(con, "定位异常，请重新定位", Toast.LENGTH_SHORT).show(); } - }else{ - Toast.makeText(con,"图片上传异常，请重新上传",Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(con, "图片上传异常，请重新上传", Toast.LENGTH_SHORT).show(); } break; - default:break; + default: + break; } } private StartOrderBean sob; //上传安联和交通厅-装货 - public void up_traffic_start(){ - //安联 - if(sob.getData().getReportAlct()==1) { + public void up_traffic_start() { + //安联 + if (sob.getData().getReportAlct() == 1) { Location l = new Location(); l.setBaiduLongitude(lu.getLongitude()); l.setBaiduLatitude(lu.getLatitude()); l.setLocation(lu.getAddress()); l.setTime(Timer.getTimerT()); - MDPLocationCollectionManager.pickup(con,sob.getData().getShippingNoteNumber(), l, new com.alct.mdp.callback.OnResultListener() { + MDPLocationCollectionManager.pickup(con, sob.getData().getShippingNoteNumber(), l, new com.alct.mdp.callback.OnResultListener() { @Override public void onSuccess() { Log.e("上报安联", "装货上传成功"); @@ -402,77 +407,78 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { @Override public void onFailure(String s, String s1) { Log.e("上报安联失败(装货):", s + s1); + new MessageUtils().showCenMessage(con, s1); } }); } //交通厅 - if(sob.getData().getReport()==1){ - JTTProcess.start(con,sob,""); + if (sob.getData().getReport() == 1) { + JTTProcess.start(con, sob, ""); } } - public void nfc(){ + public void nfc() { // if(sob.getData().getNfcId().equals(nfcStr)){ // Toast.makeText(con,"nfcId匹配失败",Toast.LENGTH_LONG).show(); // } - if("".equals(sob.getData().getNfcId()) || sob.getData().getNfcId()==null){ + if ("".equals(sob.getData().getNfcId()) || sob.getData().getNfcId() == null) { return; } MDPLocationCollectionManager.checkNfc(con, sob.getData().getShippingNoteNumber(), sob.getData().getNfcId(), new OnResultListener() { - @Override - public void onSuccess() { - Toast.makeText(con,"nfcId匹配成功",Toast.LENGTH_LONG).show(); - } + @Override + public void onSuccess() { + Toast.makeText(con, "nfcId匹配成功", Toast.LENGTH_LONG).show(); + } - @Override - public void onFailure(String s, String s1) { - Log.e("不匹配",""+s+s1); - } - }); + @Override + public void onFailure(String s, String s1) { + Log.e("不匹配", "" + s + s1); + } + }); } //上传安联和交通厅-卸货 - public void up_traffic_end(){ + public void up_traffic_end() { //安联 - if(sob.getData().getReportAlct()==1){ - Location l=new Location(); + if (sob.getData().getReportAlct() == 1) { + Location l = new Location(); l.setBaiduLongitude(lu.getLongitude()); l.setBaiduLatitude(lu.getLatitude()); l.setLocation(lu.getAddress()); l.setTime(Timer.getTimerT()); - Log.e("-安联卸货信息-",gson.toJson(l)); + Log.e("-安联卸货信息-", gson.toJson(l)); MDPLocationCollectionManager.unload(con, sob.getData().getShippingNoteNumber(), l, new com.alct.mdp.callback.OnResultListener() { @Override public void onSuccess() { - Log.e("上报安联","卸货上传成功"); + Log.e("上报安联", "卸货上传成功"); } @Override public void onFailure(String s, String s1) { - Log.e("上报安联失败(卸货):",s+s1); + Log.e("上报安联失败(卸货):", s + s1); } }); } //交通厅 - if(sob.getData().getReport()==1){ - JTTProcess.stop(con,sob,""); + if (sob.getData().getReport() == 1) { + JTTProcess.stop(con, sob, ""); } } //上传安联-签收 - public void up_trafficSign(){ + public void up_trafficSign() { //安联 - Location l=new Location(); + Location l = new Location(); l.setBaiduLongitude(lu.getLongitude()); l.setBaiduLatitude(lu.getLatitude()); l.setLocation(lu.getAddress()); l.setTime(Timer.getTimerT()); - List gs=new ArrayList<>(); + List gs = new ArrayList<>(); for (StartOrderBean.DataDTO.WayChildrenDTO wayChild : sob.getData().getWayChildren()) { - if(wid.equals(wayChild.getId()+"")){ + if (wid.equals(wayChild.getId() + "")) { for (StartOrderBean.DataDTO.WayChildrenDTO.GoodsDTO good : wayChild.getGoods()) { - Goods g=new Goods(); + Goods g = new Goods(); g.setGoodsName(good.getGoodName()); g.setUnit(good.getGoodUnit()); g.setItemNo(good.getId()); @@ -487,23 +493,23 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { } } } - MDPLocationCollectionManager.sign(con, sob.getData().getShippingNoteNumber(), l,gs, new com.alct.mdp.callback.OnResultListener() { + MDPLocationCollectionManager.sign(con, sob.getData().getShippingNoteNumber(), l, gs, new com.alct.mdp.callback.OnResultListener() { @Override public void onSuccess() { - Log.e("上报安联","签收成功"); + Log.e("上报安联", "签收成功"); } @Override public void onFailure(String s, String s1) { - Log.e("上报安联失败(签收):",s+s1); + Log.e("上报安联失败(签收):", s + s1); } }); } //上传安联-回单 - public void up_trafficReceipt(){ + public void up_trafficReceipt() { //安联 - Location l=new Location(); + Location l = new Location(); l.setBaiduLongitude(lu.getLongitude()); l.setBaiduLatitude(lu.getLatitude()); l.setLocation(lu.getAddress()); @@ -512,23 +518,23 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { @Override public void onSuccess() { - Log.e("上报安联","回单上传成功"); + Log.e("上报安联", "回单上传成功"); } @Override public void onFailure(String s, String s1) { - Log.e("上报安联失败(回单):",s+s1); + Log.e("上报安联失败(回单):", s + s1); } }); } - public void up_image_z(){ + public void up_image_z() { ///storage/emulated/0/Android/data/com.oneclouds.wangluohuoyun/files/Pictures/163124593063154.jpg - File file=new File(path); - Image image=new Image(); - String base= BitmapUtil.imageToBase64(path); - image.setFileData("data:image/"+ FileUtil.lastName(file) +";base64,"+base); + File file = new File(path); + Image image = new Image(); + String base = BitmapUtil.imageToBase64(path); + image.setFileData("data:image/" + FileUtil.lastName(file) + ";base64," + base); image.setFileExt(FileUtil.lastName(file)); image.setFileName(FileUtil.fileName(file)); image.setImageTakenDate(Timer.getTimerT()); @@ -539,12 +545,12 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { @Override public void onSuccess() { - Log.e("上报安联","装货照片上传成功"); + Log.e("上报安联", "装货照片上传成功"); } @Override public void onFailure(String s, String s1) { - Log.e("上报安联失败(装货照片):",s+s1); + Log.e("上报安联失败(装货照片):", s + s1); // SPUtil.insSP(con,"make","装货",sob.getData().getShippingNoteNumber()); // SPUtil.insSP(con,"make","装货-"+sob.getData().getShippingNoteNumber(),gson.toJson(image)); // Intent serviceIn=new Intent(con, MakeUpAlService.class); @@ -554,11 +560,11 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { }); } - public void up_image(){ - File file=new File(path); - Image image=new Image(); - String base= BitmapUtil.imageToBase64(path); - image.setFileData("data:image/"+ FileUtil.lastName(file) +";base64,"+base); + public void up_image() { + File file = new File(path); + Image image = new Image(); + String base = BitmapUtil.imageToBase64(path); + image.setFileData("data:image/" + FileUtil.lastName(file) + ";base64," + base); image.setFileExt(FileUtil.lastName(file)); image.setFileName(FileUtil.fileName(file)); image.setImageTakenDate(Timer.getTimerT()); @@ -569,12 +575,12 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { @Override public void onSuccess() { - Log.e("上报安联","卸货照片上传成功"); + Log.e("上报安联", "卸货照片上传成功"); } @Override public void onFailure(String s, String s1) { - Log.e("上报安联失败(卸货照片):",s+s1); + Log.e("上报安联失败(卸货照片):", s + s1); // SPUtil.insSP(con,"make","卸货",sob.getData().getShippingNoteNumber()); // SPUtil.insSP(con,"make","卸货-"+sob.getData().getShippingNoteNumber(),gson.toJson(image)); // Intent serviceIn=new Intent(con, MakeUpAlService.class); @@ -584,12 +590,12 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { }); } - public void receipt_image(){ + public void receipt_image() { ///storage/emulated/0/Android/data/com.oneclouds.wangluohuoyun/files/Pictures/163124593063154.jpg - File file=new File(path); - Image image=new Image(); - String base= BitmapUtil.imageToBase64(path); - image.setFileData("data:image/"+ FileUtil.lastName(file) +";base64,"+base); + File file = new File(path); + Image image = new Image(); + String base = BitmapUtil.imageToBase64(path); + image.setFileData("data:image/" + FileUtil.lastName(file) + ";base64," + base); image.setFileExt(FileUtil.lastName(file)); image.setFileName(FileUtil.fileName(file)); image.setImageTakenDate(Timer.getTimerT()); @@ -600,12 +606,12 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { @Override public void onSuccess() { - Log.e("上报安联","回单照片上传成功"); + Log.e("上报安联", "回单照片上传成功"); } @Override public void onFailure(String s, String s1) { - Log.e("上报安联失败(回单照片):",s+s1); + Log.e("上报安联失败(回单照片):", s + s1); // SPUtil.insSP(con,"make","回单",sob.getData().getShippingNoteNumber()); //// SPUtil.insSP(con,"make","回单-"+sob.getData().getShippingNoteNumber(),gson.toJson(image)); //// Intent serviceIn=new Intent(con, MakeUpAlService.class); @@ -629,7 +635,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { //NfcUtils.mNfcAdapter.disableForegroundDispatch(this); } - String nfcStr=""; + String nfcStr = ""; @Override protected void onNewIntent(Intent intent) { @@ -641,8 +647,80 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { } catch (UnsupportedEncodingException e) { e.printStackTrace(); } - Log.e("nfc",nfcStr); + Log.e("nfc", nfcStr); } + /** + * 上传安联和交通厅,平台-装货 + */ + private void loadInfo() { + //安联 + if (sob.getData().getReportAlct() == 1) { + Location l = new Location(); + l.setBaiduLongitude(lu.getLongitude()); + l.setBaiduLatitude(lu.getLatitude()); + l.setLocation(lu.getAddress()); + l.setTime(Timer.getTimerT()); + MDPLocationCollectionManager.pickup(con, sob.getData().getShippingNoteNumber(), l, new com.alct.mdp.callback.OnResultListener() { + @Override + public void onSuccess() { + Log.e("上报安联", "装货上传成功"); + //交通厅 + if (sob.getData().getReport() == 1) { + JTTProcess.start(con, sob, ""); + } + //装货照片 + up_image_z(); + //装货状态 + hyr.loading(lub); + } + + @Override + public void onFailure(String s, String s1) { + Log.e("上报安联失败(装货):", s + s1); + new MessageUtils().showCenMessage(con, s1); + } + }); + } + + } + + /** + * 上传安联和交通厅，平台-卸货 + */ + private void uploadInfo() { + + //安联 + if (sob.getData().getReportAlct() == 1) { + Location l = new Location(); + l.setBaiduLongitude(lu.getLongitude()); + l.setBaiduLatitude(lu.getLatitude()); + l.setLocation(lu.getAddress()); + l.setTime(Timer.getTimerT()); + Log.e("-安联卸货信息-", gson.toJson(l)); + MDPLocationCollectionManager.unload(con, sob.getData().getShippingNoteNumber(), l, new com.alct.mdp.callback.OnResultListener() { + @Override + public void onSuccess() { + Log.e("上报安联", "卸货上传成功"); + //交通厅 + if (sob.getData().getReport() == 1) { + JTTProcess.stop(con, sob, ""); + } + //卸货照片-安联 + up_image(); + //卸货状态-平台 + hyr.dischargeCargo(lub); + } + + @Override + public void onFailure(String s, String s1) { + Log.e("上报安联失败(卸货):", s + s1); + new MessageUtils().showCenMessage(con, s1); + } + }); + } + + + } } diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/MessageUtils.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/MessageUtils.kt new file mode 100644 index 0000000..73966c1 --- /dev/null +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/MessageUtils.kt @@ -0,0 +1,35 @@ +package com.arpa.hndahesudintocctmsdriver.util + +import android.content.Context +import com.arpa.hndahesudintocctmsdriver.cuspop.MessagePop +import com.ct.auth.communication.request.Content +import com.lxj.xpopup.XPopup + +/** + * @ClassName MessageUtils + * @Author 用户 + * @Date 2023/8/15 09:51 + * @Description TODO + */ +class MessageUtils { + + companion object { + fun getInstance() = InstanceHelper.sSingle + } + + object InstanceHelper { + val sSingle = MessageUtils() + } + + fun showCenMessage(ctx: Context, message: String) { + XPopup.Builder(ctx) // + .hasNavigationBar(false) + .isDestroyOnDismiss(true) //对于只使用一次的弹窗对象，推荐设置这个 + .asCustom(MessagePop(ctx, message).setOnMyItemClickListener(object : MessagePop.OnMyItemClickListener{ + override fun onItemClick(startTime: String, endTime: String) { + } + })) + .show() + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/msg/MsgUtil.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/msg/MsgUtil.java index df297f8..5ce1b08 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/msg/MsgUtil.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/msg/MsgUtil.java @@ -12,12 +12,12 @@ import android.os.Message; public class MsgUtil { public static void addHdMsgWat(Handler hd,int what){ - Message msg=new Message(); + Message msg=Message.obtain(); msg.what=what; hd.sendMessage(msg); } public static void addHdMsgWatBody(Handler hd,int what,String body){ - Message msg=new Message(); + Message msg=Message.obtain(); msg.what=what; msg.obj=body; hd.sendMessage(msg); diff --git a/app/src/main/res/layout/pop_message_center.xml b/app/src/main/res/layout/pop_message_center.xml new file mode 100644 index 0000000..aba598a --- /dev/null +++ b/app/src/main/res/layout/pop_message_center.xml @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file