denghuan/GLDriver
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

运单流程优化

Browse Source
This commit is contained in:
lijia 2024-03-08 14:49:25 +08:00
parent 0999a99eb7
commit 14dde2eb20
5 changed files with 98 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/dahe/gldriver/adapter/CarsAdapter.kt
View File

@ -23,7 +23,7 @@ class CarsAdapter :
holder.run { holder.run {
setText(R.id.tvCarNum, item?.vehicleNum) setText(R.id.tvCarNum, item?.vehicleNum)
setText(R.id.tvCarType, item?.vehicleType) setText(R.id.tvCarType, item?.vehicleType)
setText(R.id.tvCarLen, """${item?.carLong}米""") setText(R.id.tvCarLen, """${item?.carLong}mm""")
setText(R.id.tvCarWei, """${item?.approvedLoad?.toFloat()?.div(1000)}吨""") setText(R.id.tvCarWei, """${item?.approvedLoad?.toFloat()?.div(1000)}吨""")
ImageLoader.getInstance() ImageLoader.getInstance()

12
app/src/main/java/com/dahe/gldriver/ui/home/HomeFragment.kt
View File

@ -78,13 +78,13 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(), RefreshCallBack {
ivMyWaybill.setOnClickListener { ivMyWaybill.setOnClickListener {
// TODO: 调试图片上传todo // TODO: 调试图片上传
ActivityUtils.startActivity(mContext,WaybillUpPicActivity::class.java,Bundle().apply { // ActivityUtils.startActivity(mContext,WaybillUpPicActivity::class.java,Bundle().apply {
putInt(AppConfig.SUCCESS_TYPE,1) // putInt(AppConfig.SUCCESS_TYPE,1)
}) // })
// if (this@HomeFragment.mListener != null) if (this@HomeFragment.mListener != null)
// this@HomeFragment?.mListener?.invoke(2) this@HomeFragment?.mListener?.invoke(2)
} }
} }
initData() initData()

109
app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillUpPicActivity.kt
View File

@ -84,36 +84,56 @@ class WaybillUpPicActivity : BaseActivity<ActivityWaybillUppicBinding>() {
) )
var myAdapter = GridImageAdapter(mContext, mData) var myAdapter = GridImageAdapter(mContext, mData)
myAdapter.selectMax = 6 myAdapter.selectMax = 1
myAdapter.setOnItemClickListener(object : OnItemClickListener { myAdapter.setOnItemClickListener(object : OnItemClickListener {
override fun onItemClick(v: View?, position: Int) { override fun onItemClick(v: View?, position: Int) {
// 预览图片、视频、音频 PopsUtils.getInstance().showSelPic(mContext, myAdapter) {
PictureSelector.create(this@WaybillUpPicActivity) OssServiceUtil.getInstance().run {
.openPreview() asyncPutImage(it[0].realPath, this@WaybillUpPicActivity)
.setImageEngine(GlideEngine.createGlideEngine()) setResultCallBack { data, oldPath ->
.isHidePreviewDownload(true) picBean = WaybillPhoto()
.startActivityPreview(position, false, myAdapter.data) picBean.run {
photoUrl = oldPath
this.type = if (type == 1) "1" else "2"
}
if (upBean.waybillPhotoList.find { it.type == if (type == 1) "1" else "2" } == null) {
upBean.waybillPhotoList.add(picBean)
} else {
upBean.waybillPhotoList.find { it.type == if (type == 1) "1" else "2" }!!.photoUrl = oldPath
}
}
}
myAdapter.data.run {
clear()
addAll(it)
}
myAdapter.notifyDataSetChanged()
}
} }
override fun openPicture() { override fun openPicture() {
PopsUtils.getInstance().showSelPic(mContext, myAdapter) { PopsUtils.getInstance().showSelPic(mContext, myAdapter) {
OssServiceUtil.getInstance().run {
// TODO: 暂时注释 // TODO: 暂时注释
// asyncPutImage(it[0].realPath, this@WaybillUpPicActivity) OssServiceUtil.getInstance().run {
// setResultCallBack { data, oldPath -> asyncPutImage(it[0].realPath, this@WaybillUpPicActivity)
// picBean = WaybillPhoto() setResultCallBack { data, oldPath ->
// picBean.run { picBean = WaybillPhoto()
// photoUrl = oldPath picBean.run {
// this.type = if (type == 1) "1" else "2" photoUrl = oldPath
// } this.type = if (type == 1) "1" else "2"
// }
// upBean.waybillPhotoList.add(picBean) if (upBean.waybillPhotoList.find { it.type == if (type == 1) "1" else "2" } == null) {
// } upBean.waybillPhotoList.add(picBean)
} else {
upBean.waybillPhotoList.find { it.type == if (type == 1) "1" else "2" }!!.photoUrl = oldPath
}
}
}
myAdapter.data.run {
clear()
addAll(it)
} }
myAdapter.data.addAll(it)
myAdapter.notifyDataSetChanged() myAdapter.notifyDataSetChanged()
} }
@ -138,9 +158,30 @@ class WaybillUpPicActivity : BaseActivity<ActivityWaybillUppicBinding>() {
myAdapter.selectMax = 1 myAdapter.selectMax = 1
myAdapter.setOnItemClickListener(object : OnItemClickListener { myAdapter.setOnItemClickListener(object : OnItemClickListener {
override fun onItemClick(v: View?, position: Int) { override fun onItemClick(v: View?, position: Int) {
// 预览图片、视频、音频 PopsUtils.getInstance().showSelPic(mContext, myAdapter) {
PictureSelector.create(this@WaybillUpPicActivity) OssServiceUtil.getInstance().run {
.openPreview() asyncPutImage(it[0].realPath, this@WaybillUpPicActivity)
setResultCallBack { data, oldPath ->
picBean = WaybillPhoto()
picBean.run {
photoUrl = oldPath
receiptType =
if (type == 1) "4" else if (type == 2) "5" else "6"
this.type = "3"
}
if (upBean.waybillPhotoList.find { it.type == "3" } == null) {
upBean.waybillPhotoList.add(picBean)
} else {
upBean.waybillPhotoList.find { it.type == "3" }!!.photoUrl = oldPath
}
}
}
myAdapter.data.run {
clear()
addAll(it)
}
myAdapter.notifyDataSetChanged()
}
} }
override fun openPicture() { override fun openPicture() {
@ -155,10 +196,17 @@ class WaybillUpPicActivity : BaseActivity<ActivityWaybillUppicBinding>() {
if (type == 1) "4" else if (type == 2) "5" else "6" if (type == 1) "4" else if (type == 2) "5" else "6"
this.type = "3" this.type = "3"
} }
if (upBean.waybillPhotoList.find { it.type == "3" } == null) {
upBean.waybillPhotoList.add(picBean) upBean.waybillPhotoList.add(picBean)
} else {
upBean.waybillPhotoList.find { it.type == "3" }!!.photoUrl = oldPath
} }
} }
myAdapter.data.addAll(it) }
myAdapter.data.run {
clear()
addAll(it)
}
myAdapter.notifyDataSetChanged() myAdapter.notifyDataSetChanged()
} }
@ -178,7 +226,18 @@ class WaybillUpPicActivity : BaseActivity<ActivityWaybillUppicBinding>() {
this.type = if (type == 1) "1" else "2" this.type = if (type == 1) "1" else "2"
} }
if (type == 1) {
if (upBean.waybillPhotoList.find { it.type == "1" } == null) {
showToast("请上传装货照片")
return@setOnClickListener
}
}
if (type == 2) { if (type == 2) {
if (upBean.waybillPhotoList.find { it.type == "3" } == null) {
showToast("请上传卸货照片")
return@setOnClickListener
}
if (upBean.waybillPhotoList.find { it.receiptType == "4" || it.receiptType == "5" } == null) { if (upBean.waybillPhotoList.find { it.receiptType == "4" || it.receiptType == "5" } == null) {
showToast("卸货请上传卸货回单照片") showToast("卸货请上传卸货回单照片")
return@setOnClickListener return@setOnClickListener

4
mylibrary/src/main/java/com/dahe/mylibrary/adapter/GridImageAdapter.kt
View File

@ -104,7 +104,9 @@ class GridImageAdapter(context: Context?, result: List<LocalMedia>?) :
} }
viewHolder.mIvDel.visibility = View.INVISIBLE viewHolder.mIvDel.visibility = View.INVISIBLE
} else { } else {
viewHolder.mIvDel.visibility = View.VISIBLE
//删除按钮隐藏
viewHolder.mIvDel.visibility = View.GONE
viewHolder.mIvDel.setOnClickListener { view: View? -> viewHolder.mIvDel.setOnClickListener { view: View? ->
val index = viewHolder.absoluteAdapterPosition val index = viewHolder.absoluteAdapterPosition
if (index != RecyclerView.NO_POSITION && data.size > index) { if (index != RecyclerView.NO_POSITION && data.size > index) {

4
mylibrary/src/main/java/com/dahe/mylibrary/pop/PopBottomPic.kt
View File

@ -91,9 +91,9 @@ class PopBottomPic(
.setCompressEngine(ImageFileCompressEngine()) .setCompressEngine(ImageFileCompressEngine())
.isPreviewImage(true) .isPreviewImage(true)
.isMaxSelectEnabledMask(true) .isMaxSelectEnabledMask(true)
.setMaxSelectNum(6) .setMaxSelectNum(1)
.isGif(false) .isGif(false)
// .setSelectionMode(SelectModeConfig.SINGLE) .setSelectionMode(SelectModeConfig.SINGLE)
.setSelectedData(myAdapter.data) .setSelectedData(myAdapter.data)
selectionModel.forResult(object : OnResultCallbackListener<LocalMedia> { selectionModel.forResult(object : OnResultCallbackListener<LocalMedia> {
override fun onResult(result: ArrayList<LocalMedia>) { override fun onResult(result: ArrayList<LocalMedia>) {