diff --git a/app/build.gradle b/app/build.gradle index d0d6c9f..93830b2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -179,10 +179,10 @@ dependencies { //安联 //当引入的与之前引入的库有重复冲突部分的时候，使用compileOnly - implementation files('libs\\mdp_sdk.jar') - implementation 'com.loopj.android:android-async-http:1.4.9' - implementation 'com.j256.ormlite:ormlite-android:4.48' - implementation 'com.j256.ormlite:ormlite-core:4.48' +// implementation files('libs\\mdp_sdk.jar') +// implementation 'com.loopj.android:android-async-http:1.4.9' +// implementation 'com.j256.ormlite:ormlite-android:4.48' +// implementation 'com.j256.ormlite:ormlite-core:4.48' implementation 'com.github.hotchemi:permissionsdispatcher:2.3.1' annotationProcessor 'com.github.hotchemi:permissionsdispatcher-processor:2.3.1' diff --git a/app/libs/EsignSDK.aar b/app/libs/EsignSDK.aar deleted file mode 100644 index 6fdd9a2..0000000 Binary files a/app/libs/EsignSDK.aar and /dev/null differ diff --git a/app/libs/arm64-v8a/libBaiduMapSDK_base_v5_1_0.so b/app/libs/arm64-v8a/libBaiduMapSDK_base_v5_1_0.so deleted file mode 100644 index 4d7ea83..0000000 Binary files a/app/libs/arm64-v8a/libBaiduMapSDK_base_v5_1_0.so and /dev/null differ diff --git a/app/libs/arm64-v8a/libBaiduMapSDK_map_v5_1_0.so b/app/libs/arm64-v8a/libBaiduMapSDK_map_v5_1_0.so deleted file mode 100644 index 0bdae20..0000000 Binary files a/app/libs/arm64-v8a/libBaiduMapSDK_map_v5_1_0.so and /dev/null differ diff --git a/app/libs/arm64-v8a/libindoor.so b/app/libs/arm64-v8a/libindoor.so deleted file mode 100644 index f8e8ca8..0000000 Binary files a/app/libs/arm64-v8a/libindoor.so and /dev/null differ diff --git a/app/libs/arm64-v8a/liblocSDK7b.so b/app/libs/arm64-v8a/liblocSDK7b.so deleted file mode 100644 index 6bab09a..0000000 Binary files a/app/libs/arm64-v8a/liblocSDK7b.so and /dev/null differ diff --git a/app/libs/armeabi-v7a/libBaiduMapSDK_base_v5_1_0.so b/app/libs/armeabi-v7a/libBaiduMapSDK_base_v5_1_0.so deleted file mode 100644 index 6366af7..0000000 Binary files a/app/libs/armeabi-v7a/libBaiduMapSDK_base_v5_1_0.so and /dev/null differ diff --git a/app/libs/armeabi-v7a/libBaiduMapSDK_map_v5_1_0.so b/app/libs/armeabi-v7a/libBaiduMapSDK_map_v5_1_0.so deleted file mode 100644 index 312c582..0000000 Binary files a/app/libs/armeabi-v7a/libBaiduMapSDK_map_v5_1_0.so and /dev/null differ diff --git a/app/libs/armeabi-v7a/libindoor.so b/app/libs/armeabi-v7a/libindoor.so deleted file mode 100644 index 177ad25..0000000 Binary files a/app/libs/armeabi-v7a/libindoor.so and /dev/null differ diff --git a/app/libs/armeabi-v7a/liblocSDK7b.so b/app/libs/armeabi-v7a/liblocSDK7b.so deleted file mode 100644 index dd040ea..0000000 Binary files a/app/libs/armeabi-v7a/liblocSDK7b.so and /dev/null differ diff --git a/app/libs/mdp_sdk.jar b/app/libs/mdp_sdk.jar deleted file mode 100644 index 20ebea2..0000000 Binary files a/app/libs/mdp_sdk.jar and /dev/null differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 407b878..8481148 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -91,13 +91,13 @@ android:name="android.notch_support" android:value="true" /> - + + + - + + + () { //安联初始化 if (packageName == getCurrentProcessName(this)) { //Log.e("--使用的测试环境--",BuildConfig.OPEN_API_URL); - MDPLocationCollectionManager.initialize( - applicationContext, - BuildConfig.OPEN_AL_URL - ) + } //初始化交通厅 JTTProcess.init(application) diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.kt index 8c3edf9..f37951e 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.kt @@ -20,7 +20,6 @@ import com.arpa.hndahesudintocctmsdriver.event.GoWaybillEvent import com.arpa.hndahesudintocctmsdriver.net.BaseObserver import com.arpa.hndahesudintocctmsdriver.net.DataManager import com.arpa.hndahesudintocctmsdriver.net.RxHttpCallBack -import com.arpa.hndahesudintocctmsdriver.third.ALProcess import com.arpa.hndahesudintocctmsdriver.ui.home.activity.BusinessActivity import com.arpa.hndahesudintocctmsdriver.ui.mine.activity.PersonInfoActivity import com.arpa.hndahesudintocctmsdriver.ui.waybill.activity.WaybillDetailActivity @@ -207,7 +206,8 @@ class HomeFragment : BaseFragment(), RefreshCallBack { // getLocation() - ALProcess.verification(mContext) + //安联认证 +// ALProcess.verification(mContext) //证件过期判断+轨迹上传判断 DataManager.getInstance().getUserInfo() .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()) @@ -220,7 +220,7 @@ class HomeFragment : BaseFragment(), RefreshCallBack { //初始化安联 if (t.data.auditStatus == "100003") { - ALProcess.verification(mContext) + } //执行中运单轨迹上传 diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/waybill/activity/WaybillUpPicActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/waybill/activity/WaybillUpPicActivity.kt index 5748590..7cee06a 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/waybill/activity/WaybillUpPicActivity.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/waybill/activity/WaybillUpPicActivity.kt @@ -5,11 +5,6 @@ import android.util.Log import android.view.View import android.widget.Toast import androidx.recyclerview.widget.GridLayoutManager -import com.alct.mdp.MDPLocationCollectionManager -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.amap.api.maps.model.LatLng import com.arpa.hndahesudintocctmsdriver.base.AppConfig import com.arpa.hndahesudintocctmsdriver.bean.LUInputBean @@ -271,17 +266,17 @@ class WaybillUpPicActivity : BaseActivity() { } } - val l = Location() - l.baiduLongitude = bdLatLng.longitude - l.baiduLatitude = bdLatLng.latitude - l.location = binding.tvLoca.text.toString() - l.time = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss").format(Date()) +// val l = Location() +// l.baiduLongitude = bdLatLng.longitude +// l.baiduLatitude = bdLatLng.latitude +// l.location = binding.tvLoca.text.toString() +// l.time = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss").format(Date()) - if (orderType == 1) {//装货 - load(l) - } else {//卸货 - unLoad(l) - } +// if (orderType == 1) {//装货 +// load(l) +// } else {//卸货 +// unLoad(l) +// } // DataManager.getInstance().driverLoadOrUnload(upBean) @@ -311,273 +306,122 @@ class WaybillUpPicActivity : BaseActivity() { } - private fun load(location: Location) { - MDPLocationCollectionManager.pickup( - mContext, - orderBean.orderNum, - location, - object : OnResultListener { - override fun onSuccess() { - Log.e("上报安联", "装货上传成功") - - //上传安联和交通厅,平台-装货 - //交通厅 - if (orderBean.report === "1") { - JTTProcess.start(mContext, orderBean, "") - } - - upLoadImage() - - DataManager.getInstance().driverLoadOrUnload(upBean) - .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()) - .subscribe(BaseObserver(mContext, object : RxHttpCallBack() { - override fun onSuccess(t: CommonResponseBean) { - super.onSuccess(t) - //装货成功-开启轨迹上传 - OrderUtils.getInstance().upLocation(mContext) - } - })) - - } - - override fun onFailure(p0: String?, p1: String?) { - Log.e("上报安联失败(装货):", p0 + p1) - ToastUtils.showToast(mContext, """${p1},${p0}""") - } - }) - } - - private fun unLoad(location: Location) { - showLoading() - MDPLocationCollectionManager.unload(mContext, orderBean.orderNum, location, - object : OnResultListener { - override fun onSuccess() { - Log.e("上报安联", "卸货上传成功") - // 交通厅 - if (orderBean.report === "1") { - JTTProcess.stop(mContext, orderBean, "") - } - //卸货状态-平台 -// hyr.dischargeCargo(lub) - //卸货照片-安联 - upUnloadImage() - - //卸货回单 - upTrafficSign(location) - upTrafficReceipt(location) - receiptImage() - - //todo 平台更换运单状态 暂时注释 - DataManager.getInstance().driverLoadOrUnload(upBean) - .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()) - .subscribe(BaseObserver(mContext, object : RxHttpCallBack() { - override fun onSuccess(t: CommonResponseBean) { - super.onSuccess(t) - - } - })) - - } - - override fun onFailure(s: String, s1: String) { - Log.e("上报安联失败(卸货):", s + s1) -// MessageUtils().showCenMessage(con, s1) - } - }) - } +// private fun load(location: Location) { +// MDPLocationCollectionManager.pickup( +// mContext, +// orderBean.orderNum, +// location, +// object : OnResultListener { +// override fun onSuccess() { +// Log.e("上报安联", "装货上传成功") +// +// //上传安联和交通厅,平台-装货 +// //交通厅 +// if (orderBean.report === "1") { +// JTTProcess.start(mContext, orderBean, "") +// } +// +// upLoadImage() +// +// DataManager.getInstance().driverLoadOrUnload(upBean) +// .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()) +// .subscribe(BaseObserver(mContext, object : RxHttpCallBack() { +// override fun onSuccess(t: CommonResponseBean) { +// super.onSuccess(t) +// //装货成功-开启轨迹上传 +// OrderUtils.getInstance().upLocation(mContext) +// } +// })) +// +// } +// +// override fun onFailure(p0: String?, p1: String?) { +// Log.e("上报安联失败(装货):", p0 + p1) +// ToastUtils.showToast(mContext, """${p1},${p0}""") +// } +// }) +// } +// +// private fun unLoad(location: Location) { +// showLoading() +// MDPLocationCollectionManager.unload(mContext, orderBean.orderNum, location, +// object : OnResultListener { +// override fun onSuccess() { +// Log.e("上报安联", "卸货上传成功") +// // 交通厅 +// if (orderBean.report === "1") { +// JTTProcess.stop(mContext, orderBean, "") +// } +// //卸货状态-平台 +//// hyr.dischargeCargo(lub) +// //卸货照片-安联 +// upUnloadImage() +// +// //卸货回单 +// upTrafficSign(location) +// upTrafficReceipt(location) +// receiptImage() +// +// //todo 平台更换运单状态 暂时注释 +// DataManager.getInstance().driverLoadOrUnload(upBean) +// .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()) +// .subscribe(BaseObserver(mContext, object : RxHttpCallBack() { +// override fun onSuccess(t: CommonResponseBean) { +// super.onSuccess(t) +// +// } +// })) +// +// } +// +// override fun onFailure(s: String, s1: String) { +// Log.e("上报安联失败(卸货):", s + s1) +//// MessageUtils().showCenMessage(con, s1) +// } +// }) +// } //上传安联装货 - fun upLoadImage() { - ///storage/emulated/0/Android/data/com.oneclouds.wangluohuoyun/files/Pictures/163124593063154.jpg - - var photoPaht = upBean.waybillPhotoList.find { it.type == "1" }?.localPhotoUrl - val file = File(photoPaht) - val image = Image() - val base: String = BitmapUtil.imageToBase64(photoPaht) - image.fileData = "data:image/" + FileUtil.lastName(file) + ";base64," + base - image.fileExt = FileUtil.lastName(file) - image.fileName = FileUtil.fileName(file) - image.imageTakenDate = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss").format(Date()) - image.baiduLongitude = bdLatLng.longitude - image.baiduLatitude = bdLatLng.latitude - image.location = binding.tvLoca.text.toString() - MDPLocationCollectionManager.uploadPickupImage( - mContext, - orderBean.orderNum, - image, - object : OnResultListener { - override fun onSuccess() { - Log.e("上报安联", "装货照片上传成功") - Toast.makeText(mContext, "上传成功", Toast.LENGTH_SHORT).show() - ActivityUtils.startActivity( - mContext, - WaybillSuccActivity::class.java, - intent.extras - ) - } - - override fun onFailure(s: String, s1: String) { - Log.e("上报安联失败(装货照片):", s + s1) - } - }) - } +// fun upLoadImage() { +// ///storage/emulated/0/Android/data/com.oneclouds.wangluohuoyun/files/Pictures/163124593063154.jpg +// +// var photoPaht = upBean.waybillPhotoList.find { it.type == "1" }?.localPhotoUrl +// val file = File(photoPaht) +// val image = Image() +// val base: String = BitmapUtil.imageToBase64(photoPaht) +// image.fileData = "data:image/" + FileUtil.lastName(file) + ";base64," + base +// image.fileExt = FileUtil.lastName(file) +// image.fileName = FileUtil.fileName(file) +// image.imageTakenDate = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss").format(Date()) +// image.baiduLongitude = bdLatLng.longitude +// image.baiduLatitude = bdLatLng.latitude +// image.location = binding.tvLoca.text.toString() +// MDPLocationCollectionManager.uploadPickupImage( +// mContext, +// orderBean.orderNum, +// image, +// object : OnResultListener { +// override fun onSuccess() { +// Log.e("上报安联", "装货照片上传成功") +// Toast.makeText(mContext, "上传成功", Toast.LENGTH_SHORT).show() +// ActivityUtils.startActivity( +// mContext, +// WaybillSuccActivity::class.java, +// intent.extras +// ) +// } +// +// override fun onFailure(s: String, s1: String) { +// Log.e("上报安联失败(装货照片):", s + s1) +// } +// }) +// } //上传安联卸货 - fun upUnloadImage() { - var photoPaht = upBean.waybillPhotoList.find { it.type == "2" }?.localPhotoUrl - val file = File(photoPaht) - val image = Image() - val base = BitmapUtil.imageToBase64(photoPaht) - image.fileData = "data:image/" + FileUtil.lastName(file) + ";base64," + base - image.fileExt = FileUtil.lastName(file) - image.fileName = FileUtil.fileName(file) - image.imageTakenDate = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss").format(Date()) - image.baiduLongitude = bdLatLng.longitude - image.baiduLatitude = bdLatLng.latitude - image.location = binding.tvLoca.text.toString() - MDPLocationCollectionManager.uploadUnloadImage( - mContext, - orderBean.orderNum, - image, - object : OnResultListener { - override fun onSuccess() { - Log.e("上报安联", "卸货照片上传成功") -// Toast.makeText(mContext, "上传成功", Toast.LENGTH_SHORT).show() -// finish() - } - - override fun onFailure(s: String, s1: String) { - 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); -// startService(serviceIn); - } - }) - } - - - //上传安联-签收 - fun upTrafficSign(location: Location) { - //安联 - val gs = mutableListOf() - orderBean.goodsList.forEach { - var g = Goods() - g.goodsName = it.goodName - g.unit = it.packName - g.itemNo = it.orderGoodsId.toInt() - //实收 - g.quantity = 1 - //应收 - g.receivedQuantity = 1 - //破损 - g.damageQuantity = 1 - //丢失 - g.quantity = 1 - gs.add(g) - } - MDPLocationCollectionManager.sign( - mContext, - orderBean.orderNum, - location, - gs, - object : OnResultListener { - override fun onSuccess() { - Log.e("上报安联", "签收成功") - } - - override fun onFailure(s: String, s1: String) { - Log.e("上报安联失败(签收):", s + s1) - } - }) - } - - //上传安联-回单 - fun upTrafficReceipt(location: Location) { - //安联 - MDPLocationCollectionManager.pod( - mContext, - orderBean.orderNum, - location, - object : OnResultListener { - override fun onSuccess() { - Log.e("上报安联", "回单上传成功") - } - - override fun onFailure(s: String, s1: String) { - Log.e("上报安联失败(回单):", s + s1) - } - }) - } - - //卸货回单照片 - fun receiptImage() { - ///storage/emulated/0/Android/data/com.oneclouds.wangluohuoyun/files/Pictures/163124593063154.jpg - var upCount = 0 - upBean.waybillPhotoList.filter { it.type == "3" && it.receiptType == "5" }.forEach { it -> - var photoPaht = it.localPhotoUrl - val file: File = File(photoPaht) - val image = Image() - val base = BitmapUtil.imageToBase64(photoPaht) - image.fileData = "data:image/" + FileUtil.lastName(file) + ";base64," + base - image.fileExt = FileUtil.lastName(file) - image.fileName = FileUtil.fileName(file) - image.imageTakenDate = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss").format(Date()) - image.baiduLongitude = bdLatLng.longitude - image.baiduLatitude = bdLatLng.latitude - image.location = binding.tvLoca.text.toString() - MDPLocationCollectionManager.uploadPODImage( - mContext, - orderBean.orderNum, - image, - object : OnResultListener { - override fun onSuccess() { - Log.e("上报安联", "回单照片上传成功") - upCount++ - dissLoading() - if (upCount==upBean.waybillPhotoList.filter { it.type == "3" && it.receiptType == "5" }.size){ - //跳转成功页面，停止上传轨迹 - OrderUtils.getInstance().stopUpLocation(mContext) - ActivityUtils.startActivity( - mContext, - WaybillSuccActivity::class.java, - intent.extras - ) - Toast.makeText(mContext, "上传成功", Toast.LENGTH_SHORT).show() - } - -// finish() - } - - override fun onFailure(s: String, s1: String) { - upCount++ - if (upCount==upBean.waybillPhotoList.filter { it.type == "3" && it.receiptType == "5" }.size){ - //跳转成功页面，停止上传轨迹 - OrderUtils.getInstance().stopUpLocation(mContext) - ActivityUtils.startActivity( - mContext, - WaybillSuccActivity::class.java, - intent.extras - ) - Toast.makeText(mContext, "上传成功", Toast.LENGTH_SHORT).show() - } - 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); -//// startService(serviceIn); - } - }) - - - - - } - -// var photoPaht = -// upBean.waybillPhotoList.find { it.type == "3" && it.receiptType == "5" }?.localPhotoUrl -// val file: File = File(photoPaht) +// fun upUnloadImage() { +// var photoPaht = upBean.waybillPhotoList.find { it.type == "2" }?.localPhotoUrl +// val file = File(photoPaht) // val image = Image() // val base = BitmapUtil.imageToBase64(photoPaht) // image.fileData = "data:image/" + FileUtil.lastName(file) + ";base64," + base @@ -587,34 +431,185 @@ class WaybillUpPicActivity : BaseActivity() { // image.baiduLongitude = bdLatLng.longitude // image.baiduLatitude = bdLatLng.latitude // image.location = binding.tvLoca.text.toString() -// MDPLocationCollectionManager.uploadPODImage( +// MDPLocationCollectionManager.uploadUnloadImage( // mContext, // orderBean.orderNum, // image, // object : OnResultListener { // override fun onSuccess() { -// Log.e("上报安联", "回单照片上传成功") -// dissLoading() -// //跳转成功页面，停止上传轨迹 -// OrderUtils.getInstance().stopUpLocation(mContext) -// ActivityUtils.startActivity( -// mContext, -// WaybillSuccActivity::class.java, -// intent.extras -// ) -// Toast.makeText(mContext, "上传成功", Toast.LENGTH_SHORT).show() +// Log.e("上报安联", "卸货照片上传成功") +//// Toast.makeText(mContext, "上传成功", Toast.LENGTH_SHORT).show() //// finish() // } // // override fun onFailure(s: String, s1: String) { -// Log.e("上报安联失败(回单照片):", s + s1) -// // SPUtil.insSP(con,"make","回单",sob.getData().getShippingNoteNumber()); +// 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); +//// startService(serviceIn); +// } +// }) +// } + + + //上传安联-签收 +// fun upTrafficSign(location: Location) { +// //安联 +// val gs = mutableListOf() +// orderBean.goodsList.forEach { +// var g = Goods() +// g.goodsName = it.goodName +// g.unit = it.packName +// g.itemNo = it.orderGoodsId.toInt() +// //实收 +// g.quantity = 1 +// //应收 +// g.receivedQuantity = 1 +// //破损 +// g.damageQuantity = 1 +// //丢失 +// g.quantity = 1 +// gs.add(g) +// } +// MDPLocationCollectionManager.sign( +// mContext, +// orderBean.orderNum, +// location, +// gs, +// object : OnResultListener { +// override fun onSuccess() { +// Log.e("上报安联", "签收成功") +// } +// +// override fun onFailure(s: String, s1: String) { +// Log.e("上报安联失败(签收):", s + s1) +// } +// }) +// } + + //上传安联-回单 +// fun upTrafficReceipt(location: Location) { +// //安联 +// MDPLocationCollectionManager.pod( +// mContext, +// orderBean.orderNum, +// location, +// object : OnResultListener { +// override fun onSuccess() { +// Log.e("上报安联", "回单上传成功") +// } +// +// override fun onFailure(s: String, s1: String) { +// Log.e("上报安联失败(回单):", s + s1) +// } +// }) +// } + + //卸货回单照片 +// fun receiptImage() { +// ///storage/emulated/0/Android/data/com.oneclouds.wangluohuoyun/files/Pictures/163124593063154.jpg +// var upCount = 0 +// upBean.waybillPhotoList.filter { it.type == "3" && it.receiptType == "5" }.forEach { it -> +// var photoPaht = it.localPhotoUrl +// val file: File = File(photoPaht) +// val image = Image() +// val base = BitmapUtil.imageToBase64(photoPaht) +// image.fileData = "data:image/" + FileUtil.lastName(file) + ";base64," + base +// image.fileExt = FileUtil.lastName(file) +// image.fileName = FileUtil.fileName(file) +// image.imageTakenDate = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss").format(Date()) +// image.baiduLongitude = bdLatLng.longitude +// image.baiduLatitude = bdLatLng.latitude +// image.location = binding.tvLoca.text.toString() +// MDPLocationCollectionManager.uploadPODImage( +// mContext, +// orderBean.orderNum, +// image, +// object : OnResultListener { +// override fun onSuccess() { +// Log.e("上报安联", "回单照片上传成功") +// upCount++ +// dissLoading() +// if (upCount==upBean.waybillPhotoList.filter { it.type == "3" && it.receiptType == "5" }.size){ +// //跳转成功页面，停止上传轨迹 +// OrderUtils.getInstance().stopUpLocation(mContext) +// ActivityUtils.startActivity( +// mContext, +// WaybillSuccActivity::class.java, +// intent.extras +// ) +// Toast.makeText(mContext, "上传成功", Toast.LENGTH_SHORT).show() +// } +// +//// finish() +// } +// +// override fun onFailure(s: String, s1: String) { +// upCount++ +// if (upCount==upBean.waybillPhotoList.filter { it.type == "3" && it.receiptType == "5" }.size){ +// //跳转成功页面，停止上传轨迹 +// OrderUtils.getInstance().stopUpLocation(mContext) +// ActivityUtils.startActivity( +// mContext, +// WaybillSuccActivity::class.java, +// intent.extras +// ) +// Toast.makeText(mContext, "上传成功", Toast.LENGTH_SHORT).show() +// } +// 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); ////// startService(serviceIn); -// } -// }) - } +// } +// }) +// +// +// +// +// } +// +//// var photoPaht = +//// upBean.waybillPhotoList.find { it.type == "3" && it.receiptType == "5" }?.localPhotoUrl +//// val file: File = File(photoPaht) +//// val image = Image() +//// val base = BitmapUtil.imageToBase64(photoPaht) +//// image.fileData = "data:image/" + FileUtil.lastName(file) + ";base64," + base +//// image.fileExt = FileUtil.lastName(file) +//// image.fileName = FileUtil.fileName(file) +//// image.imageTakenDate = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss").format(Date()) +//// image.baiduLongitude = bdLatLng.longitude +//// image.baiduLatitude = bdLatLng.latitude +//// image.location = binding.tvLoca.text.toString() +//// MDPLocationCollectionManager.uploadPODImage( +//// mContext, +//// orderBean.orderNum, +//// image, +//// object : OnResultListener { +//// override fun onSuccess() { +//// Log.e("上报安联", "回单照片上传成功") +//// dissLoading() +//// //跳转成功页面，停止上传轨迹 +//// OrderUtils.getInstance().stopUpLocation(mContext) +//// ActivityUtils.startActivity( +//// mContext, +//// WaybillSuccActivity::class.java, +//// intent.extras +//// ) +//// Toast.makeText(mContext, "上传成功", Toast.LENGTH_SHORT).show() +////// finish() +//// } +//// +//// override fun onFailure(s: String, s1: String) { +//// 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); +//////// startService(serviceIn); +//// } +//// }) +// } private val mData: List = ArrayList()