feat(servicing): 新增快速登录功能并优化用户信息处理- 新增 FastLoginRequest 数据类用于快速登录
- 添加 iaiCompareFace API 接口用于人脸识别比较 - 更新 DriverInfo 数据类,增加 loginLogId 字段- 重构 GlobalData 中的用户信息存储逻辑,使用 MMKV替代数据库 - 优化 InServicingBottomView 中的订单放弃和拨打电话功能 - 更新 JpushBean,增加 userOrderId 字段 - 修改 AndroidManifest.xml 中的权限声明,使用动态应用ID
This commit is contained in:
@ -37,12 +37,14 @@ import com.za.bean.request.CustomerPaymentCreateRequest
|
||||
import com.za.bean.request.DriverFaceCompareBean
|
||||
import com.za.bean.request.DriverFaceCompareRequest
|
||||
import com.za.bean.request.ElectronOrderResponse
|
||||
import com.za.bean.request.FastLoginRequest
|
||||
import com.za.bean.request.FetchVehicleMaintenanceSubmitHistoryRequestBean
|
||||
import com.za.bean.request.GeneralInfoRequest
|
||||
import com.za.bean.request.GiveUpTaskRequest
|
||||
import com.za.bean.request.HistoryDetailRequest
|
||||
import com.za.bean.request.HistoryPhotoTemplateRequest
|
||||
import com.za.bean.request.HistoryTasksRequest
|
||||
import com.za.bean.request.IaiCompareFaceBean
|
||||
import com.za.bean.request.LoginRequest
|
||||
import com.za.bean.request.OrderListRequest
|
||||
import com.za.bean.request.OrderPhotoOcrRecognizeRequest
|
||||
@ -116,6 +118,9 @@ interface ApiService {
|
||||
@POST("/driverApp/task/login")
|
||||
fun login(@Body info : LoginRequest) : Observable<BaseResponse<DriverInfo?>>
|
||||
|
||||
@POST("/driverApp/supplier/fastLogin")
|
||||
fun fastLogin(@Body info : FastLoginRequest) : Observable<BaseResponse<DriverInfo?>>
|
||||
|
||||
//获取该手机号下面服务商列表
|
||||
@POST("/driverApp/supplier/getDriverListInfo")
|
||||
fun getDriverListInfo(@Body info : VerifyCodeRequest) : Observable<BaseResponse<List<AppNewDriverInfoDTO>>>
|
||||
@ -271,4 +276,7 @@ interface ApiService {
|
||||
|
||||
@POST("driverApp/base/getVoiceUrl")
|
||||
fun getVoiceUrl(@Body info : AppNewOrderVoiceRequest) : Observable<BaseResponse<String>>
|
||||
}
|
||||
|
||||
@POST("driverApp/supplier/iaiCompareFace")
|
||||
fun iaiCompareFace(@Body info : DriverFaceCompareRequest) : Observable<BaseResponse<IaiCompareFaceBean>>
|
||||
}
|
||||
|
@ -2,7 +2,6 @@ package com.za.net
|
||||
|
||||
import android.net.ParseException
|
||||
import com.blankj.utilcode.util.ActivityUtils
|
||||
import com.blankj.utilcode.util.NetworkUtils
|
||||
import com.blankj.utilcode.util.ToastUtils
|
||||
import com.google.gson.JsonParseException
|
||||
import com.za.base.Const
|
||||
@ -105,21 +104,6 @@ abstract class BaseObserver<T> : Observer<BaseResponse<T>> {
|
||||
GlobalData.clearUserCache()
|
||||
ZdLocationManager.stopContinuousLocation()
|
||||
ActivityUtils.finishAllActivities()
|
||||
// val oldLoginInfo: LoginInfo = DbManager.getInstance(context).queryLoginInfo()
|
||||
// val loginInfo: LoginInfo = LoginInfo()
|
||||
// loginInfo.setSupplierId(oldLoginInfo.getSupplierId())
|
||||
// loginInfo.setSupplierCode(oldLoginInfo.getSupplierCode())
|
||||
// loginInfo.setJobNumber(oldLoginInfo.getJobNumber())
|
||||
// loginInfo.setPassword(oldLoginInfo.getPassword())
|
||||
// DbManager.getInstance(context).deleteLoginInfo()
|
||||
// DbManager.getInstance(context).saveLoginInfo(loginInfo)
|
||||
// SPKit.saveString(context, "userId", "-1")
|
||||
// SPKit.saveString(context, "vehicleId", "-1")
|
||||
//
|
||||
// LBSManager.getInstance().cancel()
|
||||
// DaemonService.stopService()
|
||||
// //跳转
|
||||
// RsaRouter.navigateNoFlag(context, "/page/login")
|
||||
} catch (e: Exception) {
|
||||
LogUtil.print("handlerTokenExpired", e)
|
||||
}
|
||||
|
@ -27,6 +27,7 @@ import com.za.common.util.DeviceUtil
|
||||
import com.za.ext.toJson
|
||||
import com.za.offline.OfflineManager
|
||||
import com.za.room.RoomHelper
|
||||
import com.za.room.db.user.DriverInfoBean
|
||||
import com.za.ui.new_order.NewOrderActivity
|
||||
import com.za.ui.order_report.ReportFloatingManager
|
||||
import com.za.water_marker.WaterMarkerTemplateManager
|
||||
@ -113,6 +114,8 @@ object CommonMethod {
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
private var lastFetchGenerateInfoTime : Long = 0L
|
||||
fun getGenerateInfo(vehicleId : Int? = null,
|
||||
userId : Int? = null,
|
||||
success : (GeneralInfo) -> Unit = {},
|
||||
@ -130,22 +133,46 @@ object CommonMethod {
|
||||
LogUtil.print("getGenerateInfo", "获取车辆信息失败")
|
||||
return
|
||||
}
|
||||
val driverInfoBean = GlobalData.driverInfoBean
|
||||
GlobalData.driverInfoBean = driverInfoBean?.copy(vehicleId = it.vehicleId,
|
||||
vehicleName = it.vehicleName,
|
||||
userName = it.userName,
|
||||
userPhone = it.userPhone,
|
||||
plateNumber = it.plateNumber,
|
||||
vehicleState = it.vehicleState,
|
||||
supplierType = it.supplierType,
|
||||
userPortrait = it.userPortrait,
|
||||
userId = it.userId,
|
||||
supplierId = it.supplierId,
|
||||
deviceId = it.deviceId,
|
||||
supplierName = it.supplierName,
|
||||
authStatus = it.authStatus,
|
||||
serviceList = it.serviceList?.toString())
|
||||
|
||||
if (GlobalData.driverInfoBean != null && (System.currentTimeMillis() - lastFetchGenerateInfoTime < 1000 * 10)) {
|
||||
LogUtil.print("getGenerateInfo", "获取车辆信息成功,但是时间间隔小于10秒,不更新车辆信息")
|
||||
success(it)
|
||||
return
|
||||
}
|
||||
if (GlobalData.driverInfoBean == null) {
|
||||
GlobalData.driverInfoBean = DriverInfoBean(vehicleId = it.vehicleId,
|
||||
vehicleName = it.vehicleName,
|
||||
userName = it.userName,
|
||||
loginLogId = it.loginLogId,
|
||||
userPhone = it.userPhone,
|
||||
plateNumber = it.plateNumber,
|
||||
vehicleState = it.vehicleState,
|
||||
supplierType = it.supplierType,
|
||||
userPortrait = it.userPortrait,
|
||||
userId = it.userId,
|
||||
supplierId = it.supplierId,
|
||||
deviceId = it.deviceId,
|
||||
supplierName = it.supplierName,
|
||||
authStatus = it.authStatus,
|
||||
serviceList = it.serviceList?.toString())
|
||||
} else {
|
||||
GlobalData.driverInfoBean =
|
||||
GlobalData.driverInfoBean?.copy(vehicleId = it.vehicleId,
|
||||
vehicleName = it.vehicleName,
|
||||
userName = it.userName,
|
||||
userPhone = it.userPhone,
|
||||
plateNumber = it.plateNumber,
|
||||
vehicleState = it.vehicleState,
|
||||
supplierType = it.supplierType,
|
||||
userPortrait = it.userPortrait,
|
||||
userId = it.userId,
|
||||
loginLogId = it.loginLogId,
|
||||
supplierId = it.supplierId,
|
||||
deviceId = it.deviceId,
|
||||
supplierName = it.supplierName,
|
||||
authStatus = it.authStatus,
|
||||
serviceList = it.serviceList?.toString())
|
||||
}
|
||||
lastFetchGenerateInfoTime = System.currentTimeMillis()
|
||||
LogUtil.print("GlobalData.driverInfoBean",
|
||||
"${GlobalData.driverInfoBean?.toJson()}}")
|
||||
|
||||
|
Reference in New Issue
Block a user