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

兼容后台接口不规范

Browse Source
This commit is contained in:
lijia
2024-10-23 15:41:12 +08:00
parent b64a200deb
commit 1dae6c840f
10 changed files with 99 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/dhsd/glowner/bean/CodeBean.kt
+7 -7
View File
@@ -6,13 +6,13 @@ package com.dhsd.glowner.bean
* @Date 2024/10/16 09:58
* @Description TODO
*/
data class CodeBean(
val captchaEnabled: Boolean,
val code: Int,
val img: String,
val msg: String,
val uuid: String
)
//data class CodeBean(
// val captchaEnabled: Boolean,
// val code: Int,
// val img: String,
// val msg: String,
// val uuid: String
//)
data class LoginBean(
var username: String,
app/src/main/java/com/dhsd/glowner/bean/OrderBean.kt
+4
View File
@@ -6,6 +6,10 @@ package com.dahe.glex.bean
* @Date 2023/9/21 10:22
* @Description TODO
*/
data class OrderListBean(
var rows: List<OrderBean>
)
data class OrderBean(
var orderId: String,
var waybillId: String,
app/src/main/java/com/dhsd/glowner/bean/UserBean.kt
+6
View File
@@ -28,4 +28,10 @@ data class UserBean(
var credit :String
)
data class CodeBean(
val captchaEnabled:Boolean,
val img:String,
val uuid:String
)
app/src/main/java/com/dhsd/glowner/net/Api.kt
+4 -1
View File
@@ -37,7 +37,7 @@ interface Api {
* @return Observable<CommonResponseBean<CodeBean>>
*/
@GET(BASE_URL+"devApi/code")
fun getCode(): Observable<CommonResponseBean<Any>>
fun getCode(): Observable<CommonResponseBean<CodeBean>>
/**
* 是否需要验证码登录
@@ -49,5 +49,8 @@ interface Api {
@GET(BASE_URL+"devApi/business/shipper/order/list")
fun getOrderList(): Observable<CommonResponseBean<MutableList<OrderBean>>>
@GET(BASE_URL+"devApi/business/shipper/order/list")
fun getOrderList2(): Observable<CommonResponseBean<OrderListBean>>
}
app/src/main/java/com/dhsd/glowner/ui/account/LoginActivity.kt
+6 -5
View File
@@ -12,6 +12,7 @@ import android.text.style.ClickableSpan
import android.view.View
import android.widget.TextView
import androidx.core.text.toSpannable
import com.dahe.glex.bean.CodeBean
import com.dahe.glex.bean.UserBean
import com.dahe.mylibrary.base.BaseActivity
import com.dahe.mylibrary.net.CommonResponseBean
@@ -138,15 +139,15 @@ class LoginActivity : BaseActivity<ActivityLoginBinding>(), View.OnClickListener
private fun getCode() {
DataManager.getInstance().getCode().subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(BaseObserver(mContext, object : RxHttpCallBack<Any>() {
override fun onSuccess(t: CommonResponseBean<Any>) {
.subscribe(BaseObserver(mContext, object : RxHttpCallBack<CodeBean>() {
override fun onSuccess(t: CommonResponseBean<CodeBean>) {
super.onSuccess(t)
isNeedCode = t.isCaptchaEnabled
isNeedCode = t.data.captchaEnabled
if (isNeedCode) {
binding.run {
ivCode.setImageBitmap(Base64Utils.base64ToBitmap(t.img))
ivCode.setImageBitmap(Base64Utils.base64ToBitmap(t.data.img))
}
uuid = t.uuid
uuid = t.data.uuid
}
binding.llCode.visibility = if (isNeedCode) View.VISIBLE else View.GONE
}
app/src/main/java/com/dhsd/glowner/ui/home/HomeFragment.kt
+36 -4
View File
@@ -3,12 +3,14 @@ package com.dhsd.glowner.ui.home
import BaseObserver
import DataManager
import RxHttpCallBack
import android.content.Context
import android.graphics.Color
import android.widget.LinearLayout
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.dahe.gldriver.bean.GridBean
import com.dahe.glex.bean.OrderBean
import com.dahe.glex.bean.OrderListBean
import com.dahe.glex.bean.WayBillBean
import com.dahe.mylibrary.base.BaseFragment
import com.dahe.mylibrary.callback.RefreshCallBack
@@ -97,13 +99,43 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(), RefreshCallBack {
}
private fun initData() {
DataManager.getInstance().getOrderList()
// DataManager.getInstance().getOrderList()
// .subscribeOn(Schedulers.io())
// .observeOn(AndroidSchedulers.mainThread())
// .subscribe(BaseObserver(mContext,object :RxHttpCallBack<MutableList<OrderBean>>(){
// override fun onSuccess(t: CommonResponseBean<MutableList<OrderBean>>) {
// super.onSuccess(t)
// showToast(t.rows.size.toString())
// }
//
// override fun onCodeError(
// mContext: Context?,
// t: CommonResponseBean<MutableList<OrderBean>>
// ) {
// super.onCodeError(mContext, t)
// binding.refresh.finishRefresh()
// binding.refresh.finishLoadMore()
// }
// }))
DataManager.getInstance().getOrderList2()
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(BaseObserver(mContext,object :RxHttpCallBack<MutableList<OrderBean>>(){
override fun onSuccess(t: CommonResponseBean<MutableList<OrderBean>>) {
.subscribe(BaseObserver(mContext,object :RxHttpCallBack<OrderListBean>(){
override fun onSuccess(t: CommonResponseBean<OrderListBean>) {
super.onSuccess(t)
showToast(t.rows.size.toString())
showToast(t.data.rows.size.toString())
binding.refresh.finishRefresh()
binding.refresh.finishLoadMore()
}
override fun onCodeError(
mContext: Context?,
t: CommonResponseBean<OrderListBean>
) {
super.onCodeError(mContext, t)
binding.refresh.finishRefresh()
binding.refresh.finishLoadMore()
}
}))
}
app/src/main/java/com/dhsd/glowner/ui/home/activtiy/AddressEditActivity.kt
+1 -1
View File
@@ -24,7 +24,7 @@ import com.github.gzuliyujiang.wheelpicker.entity.ProvinceEntity
* @ClassName AddresEditActivity
* @Author john
* @Date 2024/2/4 10:44
* @Description TODO
* @Description 选择地址
*/
class AddressEditActivity : BaseActivity<ActivityAddressEditBinding>(), View.OnClickListener {
override fun initView(savedInstanceState: Bundle?) {