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-04-25 09:06:44 +08:00
parent e161aed122
commit 0bcf04f33b
3 changed files with 185 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
app/src/main/java/com/dahe/gldriver/ui/account/LoginActivity.kt
View File

@ -16,6 +16,7 @@ import com.dahe.gldriver.net.RxHttpCallBack
import com.dahe.gldriver.temp.AuthPageConfig
import com.dahe.gldriver.temp.FullPortConfig
import com.dahe.gldriver.ui.HomeActivity
import com.dahe.gldriver.utils.CommonPopUtils
import com.dahe.gldriver.utils.OneKeyLoginUtils
import com.dahe.glex.bean.UserBean
import com.dahe.mylibrary.base.BaseActivity
@ -151,27 +152,36 @@ class LoginActivity : BaseActivity<ActivityLoginBinding>(), View.OnClickListener
private fun login() {
if (!binding.cb.isChecked) {
ToastUtils.showToast(mContext, "请勾选用户隐私协议")
return
}
if ("获取验证码" == binding.ok.text) {
var phone = binding.etPhone.text.toString().trim()
if (phone.length == 11) {
ActivityUtils.startActivityForResult(
LoginActivity@ this,
CodeLoginActivity::class.java,
Bundle().apply { putString(AppConfig.PHONE, binding.etPhone.text.toString()) },
1
)
} else {
ToastUtils.showToast(mContext, "请输入正确手机号")
}
CommonPopUtils.getInstance()
.showCommCenterPop(mContext, content = "是否同意隐私协议？") {
if ("获取验证码" == binding.ok.text) {
var phone = binding.etPhone.text.toString().trim()
if (phone.length == 11) {
ActivityUtils.startActivityForResult(
LoginActivity@ this,
CodeLoginActivity::class.java,
Bundle().apply {
putString(
AppConfig.PHONE,
binding.etPhone.text.toString()
)
},
1
)
} else {
ToastUtils.showToast(mContext, "请输入正确手机号")
}
} else {
OneKeyLoginUtils.getInstance().oneLogin(mContext, this)
} else {
OneKeyLoginUtils.getInstance().oneLogin(mContext, this)
// ActivityUtils.startActivity(mContext, SelectRoleActivity::class.java)
}
}
// ToastUtils.showToast(mContext, "请勾选用户隐私协议")
// return
}
}
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {

10
app/src/main/java/com/dahe/gldriver/ui/waybill/WaybillFragment.kt
View File

@ -12,6 +12,7 @@ import com.dahe.gldriver.ui.waybill.fragment.AllWaybillFragment
import com.dahe.gldriver.ui.waybill.fragment.CancelWaybillFragment
import com.dahe.gldriver.ui.waybill.fragment.WaitAppraiseFragment
import com.dahe.gldriver.ui.waybill.fragment.WaitLoadFragment
import com.dahe.gldriver.ui.waybill.fragment.WaitSignFragment
import com.dahe.gldriver.ui.waybill.fragment.WaitUnLoadFragment
import com.dahe.mylibrary.base.BaseFragment
import com.dahe.mylibrary.callback.RefreshCallBack
@ -41,6 +42,7 @@ class WaybillFragment : BaseFragment<FragmentWaybillBinding>(), RefreshCallBack
AllWaybillFragment(),
WaitLoadFragment(),
WaitUnLoadFragment(),
WaitSignFragment(),
WaitAppraiseFragment(),
CancelWaybillFragment()
)
@ -48,6 +50,7 @@ class WaybillFragment : BaseFragment<FragmentWaybillBinding>(), RefreshCallBack
"全部",
"待装货",
"待卸货",
"待签收",
"待结算",
"已完成"
)
@ -76,8 +79,9 @@ class WaybillFragment : BaseFragment<FragmentWaybillBinding>(), RefreshCallBack
0 -> (mFragments[currIndex] as AllWaybillFragment).onSearchClick(search)
1 -> (mFragments[currIndex] as WaitLoadFragment).onSearchClick(search)
2 -> (mFragments[currIndex] as WaitUnLoadFragment).onSearchClick(search)
3 -> (mFragments[currIndex] as WaitAppraiseFragment).onSearchClick(search)
4 -> (mFragments[currIndex] as CancelWaybillFragment).onSearchClick(search)
3 -> (mFragments[currIndex] as WaitSignFragment).onSearchClick(search)
4 -> (mFragments[currIndex] as WaitAppraiseFragment).onSearchClick(search)
5 -> (mFragments[currIndex] as CancelWaybillFragment).onSearchClick(search)
}
@ -89,7 +93,7 @@ class WaybillFragment : BaseFragment<FragmentWaybillBinding>(), RefreshCallBack
var commonNavigator = CommonNavigator(mContext)
commonNavigator.run {
isAdjustMode = true
// isAdjustMode = true
adapter = object : CommonNavigatorAdapter() {
override fun getCount(): Int {
return titles.size

151
app/src/main/java/com/dahe/gldriver/ui/waybill/fragment/WaitSignFragment.kt Normal file
View File

@ -0,0 +1,151 @@
package com.dahe.gldriver.ui.waybill.fragment
import android.content.Context
import android.graphics.Color
import android.os.Bundle
import android.widget.LinearLayout
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.dahe.gldriver.R
import com.dahe.gldriver.adapter.WaybillListAdapter
import com.dahe.gldriver.base.AppConfig
import com.dahe.gldriver.callback.OnSearchListener
import com.dahe.gldriver.databinding.FragmentWaybillListBinding
import com.dahe.gldriver.event.RefreshEvent
import com.dahe.gldriver.net.BaseObserver
import com.dahe.gldriver.net.DataManager
import com.dahe.gldriver.net.RxHttpCallBack
import com.dahe.gldriver.ui.waybill.activity.WaybillAppraiseActivity
import com.dahe.gldriver.ui.waybill.activity.WaybillRateActivity
import com.dahe.gldriver.utils.SPUtils
import com.dahe.glex.bean.OrderBean
import com.dahe.mylibrary.base.BaseFragment
import com.dahe.mylibrary.callback.RefreshCallBack
import com.dahe.mylibrary.net.CommonResponseBean
import com.dahe.mylibrary.recycleviewswipe.RecycleViewDivider
import com.dahe.mylibrary.utils.ActivityUtils
import com.dahe.mylibrary.utils.ConvertUtils
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
import io.reactivex.rxjava3.schedulers.Schedulers
import org.greenrobot.eventbus.EventBus
import org.greenrobot.eventbus.Subscribe
/**
* @ClassName AllWaybillFragment
* @Author 用户
* @Date 2024/1/24 14:06
* @Description 待签收
*/
class WaitSignFragment : BaseFragment<FragmentWaybillListBinding>(), RefreshCallBack,
OnSearchListener {
lateinit var adapter: WaybillListAdapter
override fun onFragmentVisibleChange(isVisible: Boolean) {
}
override fun onFragmentFirstVisible() {
EventBus.getDefault().register(this);
binding.run {
setRefresh(refresh, this@WaitSignFragment)
adapter = recyclerView.run {
layoutManager = LinearLayoutManager(mContext, RecyclerView.VERTICAL, false)
addItemDecoration(
RecycleViewDivider(
LinearLayout.VERTICAL,
ConvertUtils.dp2px(8.0f),
Color.TRANSPARENT
)
)
adapter = WaybillListAdapter(SPUtils.instance.getUserInfo(mContext)?.isCarCaptain=="1")
adapter as WaybillListAdapter
}.apply {
// 打开空布局功能
isStateViewEnable = true
setOnItemClickListener { _, _, position ->
val orderBean = items[position]
ActivityUtils.startActivity(mContext,
WaybillAppraiseActivity::class.java,
Bundle().apply { putString(AppConfig.ORDER_ID, orderBean.orderId) })
}
addOnItemChildClickListener(R.id.btnOk) { _, _, position ->
val orderBean = items[position]
ActivityUtils.startActivity(
mContext,
WaybillRateActivity::class.java,
Bundle().apply {
putString(AppConfig.ORDER_ID, orderBean.orderId)
})
}
}
}
initData()
}
override fun getRefreshDate(stat: Int, page: Int, count: Int) {
initData()
}
override fun onSearchClick(search: String) {
initData(search)
}
private fun initData(search: String = "") {
DataManager.getInstance().selectMyWaybillList(mRefreshPage, mRefreshCount, "102060", search)
.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread())
.subscribe(BaseObserver(mContext, object : RxHttpCallBack<MutableList<OrderBean>>() {
override fun onSuccess(t: CommonResponseBean<MutableList<OrderBean>>) {
super.onSuccess(t)
if (mRefreshPage === 1) {
if (t.data.size == 0) {
adapter.submitList(null)
adapter.setStateViewLayout(mContext, R.layout.empty_view)
} else {
adapter?.submitList(t.data)
}
} else {
adapter?.addAll(t.data)
}
setFinishRefresh(
binding.refresh,
t.total > mRefreshPage * mRefreshCount
)
}
override fun onCodeError(
mContext: Context?,
t: CommonResponseBean<MutableList<OrderBean>>
) {
super.onCodeError(mContext, t)
setFinishRefresh(
binding.refresh,
true
)
mContext?.let { adapter.setStateViewLayout(it, R.layout.empty_view) }
}
override fun onFailure(mContext: Context?, e: Throwable) {
super.onFailure(mContext, e)
setFinishRefresh(
binding.refresh,
true
)
mContext?.let { adapter.setStateViewLayout(it, R.layout.empty_view) }
}
}))
}
@Subscribe
fun eventStatu(event: RefreshEvent) {
if (event.statu == 3) {
initData()
}
}
override fun onDestroy() {
super.onDestroy()
EventBus.getDefault().unregister(this);
}
}