diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/base/App.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/base/App.kt index dd3fd1b..ca57c30 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/base/App.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/base/App.kt @@ -105,9 +105,9 @@ class App : Application() { //初始化交通厅 JTTProcess.init(this) - SPUtil.insSP(this, "state_data", "authorization_state", "1") +// SPUtil.insSP(this, "state_data", "authorization_state", "1") } catch (e: Exception) { - SPUtil.insSP(this, "state_data", "authorization_state", "0") +// SPUtil.insSP(this, "state_data", "authorization_state", "0") } } } diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/bean/MyJtt.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/bean/MyJtt.kt new file mode 100644 index 0000000..3bda509 --- /dev/null +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/bean/MyJtt.kt @@ -0,0 +1,17 @@ +package com.arpa.hndahesudintocctmsdriver.bean + +/** + * @ClassName Jtt + * @Author john + * @Date 2024/4/27 16:19 + * @Description TODO + */ +data class MyJtt( + val orderNum: String, + val trafficCode: String, + val trafficId: String, + val trafficName: String, + val trafficNum: String, + val orderId: String, + val trafficType: String +) \ No newline at end of file diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/bean/UpInfoBean.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/bean/UpInfoBean.kt index 2c917d2..963d350 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/bean/UpInfoBean.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/bean/UpInfoBean.kt @@ -142,7 +142,7 @@ data class AuthTeamBean( var idcardEffectiveStart: String="", var idcardEthnicity: String="", var idcardFrontUrl: String="", - var idcardIsEndless: String="", + var idcardIsEndless: String="0", var idcardName: String="", var idcardNo: String="", var roadLicensePhotoUrl: String="", diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/callback/OnCarInfoInterface.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/callback/OnCarInfoInterface.kt new file mode 100644 index 0000000..48724f0 --- /dev/null +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/callback/OnCarInfoInterface.kt @@ -0,0 +1,13 @@ +package com.arpa.hndahesudintocctmsdriver.callback + +import com.arpa.hndahesudintocctmsdriver.bean.UpDrivingInfoBean + +/** + * @ClassName OnCarInfoInterface + * @Author john + * @Date 2024/4/27 15:48 + * @Description TODO + */ +open interface OnCarInfoInterface { + fun onResutl(upDrivingInfoBean: UpDrivingInfoBean) +} \ No newline at end of file diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/net/Api.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/net/Api.kt index b06baa7..aa6c881 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/net/Api.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/net/Api.kt @@ -33,6 +33,7 @@ import com.arpa.hndahesudintocctmsdriver.bean.UpQualiInfoBean import com.arpa.hndahesudintocctmsdriver.bean.UpRate import com.arpa.hndahesudintocctmsdriver.bean.UpRoadInfoBean import com.arpa.glex.bean.* +import com.arpa.hndahesudintocctmsdriver.bean.MyJtt import com.arpa.mylibrary.net.CommonResponseBean import io.reactivex.rxjava3.core.Observable import okhttp3.MultipartBody @@ -283,6 +284,16 @@ interface Api { ): Observable>> + /** + * 根据货源ID查询交通厅账号信息 + * + * @param orderId String + * @return Observable> + */ + @GET(BASE_URL+"driver/driverWaybill/getTrafficConfigByWaybillId") + fun getTrafficConfigByWaybillId(@Query("orderId") orderId: String): Observable> + + /** * 货源详情 * */ diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/third/JTTProcess.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/third/JTTProcess.kt index d5234e9..ad92654 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/third/JTTProcess.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/third/JTTProcess.kt @@ -4,7 +4,7 @@ import android.app.Application import android.content.Context import android.content.Intent import android.util.Log -import com.arpa.hndahesudintocctmsdriver.bean.JTT +import com.arpa.hndahesudintocctmsdriver.bean.MyJtt import com.arpa.hndahesudintocctmsdriver.bean.OrderDetailBean import com.arpa.hndahesudintocctmsdriver.utils.SPUtils import com.arpa.hndahesudintocctmsdriver.utils.StringUtil @@ -35,14 +35,14 @@ object JTTProcess { } //获取授权 - fun auth(con: Context) { - val jttStr: String = SPUtil.getSP(con, "data", "jtt") - val jtt = gson.fromJson(jttStr, JTT::class.java) - if (jtt.data == null) { + fun auth(con: Context, data: MyJtt) { +// val jttStr: String = SPUtil.getSP(con, "data", "jtt") +// val jtt = gson.fromJson(jttStr, JTT::class.java) + if (data == null) { return } - LocationOpenApi.auth(con, APPID, StringUtil.isNull(jtt.data.trafficCode, APP_SECURITY), - StringUtil.isNull(jtt.data.trafficId, CODE), + LocationOpenApi.auth(con, APPID, StringUtil.isNull(data.trafficCode, APP_SECURITY), + StringUtil.isNull(data.trafficId, CODE), ENVIRONMENT, object : OnResultListener { override fun onFailure(s: String, s1: String) { Log.e("交通厅-获取授权", s + s1) diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthDrivingActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthDrivingActivity.kt index 7c298ac..94f1ee4 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthDrivingActivity.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthDrivingActivity.kt @@ -3,8 +3,10 @@ package com.arpa.hndahesudintocctmsdriver.ui.account.authperson import android.os.Bundle import com.arpa.hndahesudintocctmsdriver.R import com.arpa.hndahesudintocctmsdriver.base.AppConfig +import com.arpa.hndahesudintocctmsdriver.bean.CarBean import com.arpa.hndahesudintocctmsdriver.bean.DiCarColor import com.arpa.hndahesudintocctmsdriver.bean.UpDrivingInfoBean +import com.arpa.hndahesudintocctmsdriver.callback.OnCarInfoInterface import com.arpa.hndahesudintocctmsdriver.databinding.ActivityAuthDrivingBinding import com.arpa.hndahesudintocctmsdriver.net.BaseObserver import com.arpa.hndahesudintocctmsdriver.net.DataManager @@ -157,7 +159,7 @@ class AuthDrivingActivity : BaseActivity() { //识别车辆类型后，调用接口匹配code值！！！？？？ DicUtils.getInstance() - .getCarTypeByValue(mContext, it.vehicleType,"0") { position, item -> + .getCarTypeByValue(mContext, it.vehicleType, "0") { position, item -> if (item != null) { var data = item as DiCarColor upDrivingInfoBean.run { @@ -198,10 +200,14 @@ class AuthDrivingActivity : BaseActivity() { recordNumber = it.recordNumber barcodeNumber = it.barcodeNumber passengerCapacity = it.passengerCapacity - totalWeight = if (it.totalWeight.contains("kg")) it.totalWeight.split("kg")[0] else ""//总质量 - curbWeight = if (it.curbWeight.contains("kg")) it.curbWeight.split("kg")[0] else ""//整备质量 - approvedLoad = if (it.permittedWeight.contains("kg")) it.permittedWeight.split("kg")[0] else ""//核定载质量 - tractionWeight = if (it.tractionWeight.contains("kg")) it.tractionWeight.split("kg")[0] else ""//牵引总质量 + totalWeight = + if (it.totalWeight.contains("kg")) it.totalWeight.split("kg")[0] else ""//总质量 + curbWeight = + if (it.curbWeight.contains("kg")) it.curbWeight.split("kg")[0] else ""//整备质量 + approvedLoad = + if (it.permittedWeight.contains("kg")) it.permittedWeight.split("kg")[0] else ""//核定载质量 + tractionWeight = + if (it.tractionWeight.contains("kg")) it.tractionWeight.split("kg")[0] else ""//牵引总质量 } if (it.inspectionRecord.length > 13) { @@ -228,9 +234,12 @@ class AuthDrivingActivity : BaseActivity() { var overall = it.overallDimension.replace("mm", "") var splits = overall.split("×") if (splits.size == 3) { - upDrivingInfoBean.carLong = if (splits[0].toIntOrNull()!=null) splits[0] else "" - upDrivingInfoBean.carWidth = if (splits[1].toIntOrNull()!=null) splits[1] else "" - upDrivingInfoBean.carHeight = if (splits[2].toIntOrNull()!=null) splits[2] else "" + upDrivingInfoBean.carLong = + if (splits[0].toIntOrNull() != null) splits[0] else "" + upDrivingInfoBean.carWidth = + if (splits[1].toIntOrNull() != null) splits[1] else "" + upDrivingInfoBean.carHeight = + if (splits[2].toIntOrNull() != null) splits[2] else "" } } @@ -267,45 +276,82 @@ class AuthDrivingActivity : BaseActivity() { owner = binding.etOwner.text.trim().toString() useNature = binding.etUseNature.text.trim().toString() } - if (upDrivingInfoBean.licenseBackUrl.isNullOrEmpty()){ + if (upDrivingInfoBean.licenseBackUrl.isNullOrEmpty()) { showToast("请完善车辆信息") return@subMit } - if (upDrivingInfoBean.vehicleNum!=backLicCarNum){ - CommonPopUtils.getInstance().showCommCenterPop(mContext, content = "检测到主副页识别车牌号内容不一致,是否继续上传？"){ - upApi() + if (upDrivingInfoBean.vehicleNum != backLicCarNum) { + CommonPopUtils.getInstance().showCommCenterPop( + mContext, + content = "检测到主副页识别车牌号内容不一致,是否继续上传？" + ) { + upApi() } - }else{ + } else { upApi() } } - fun upApi(){ - DataManager.getInstance().addCar(upDrivingInfoBean) + fun upApi() { + + DataManager.getInstance().getCarByCarVehicleNum(upDrivingInfoBean.vehicleNum) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(BaseObserver(mContext, object : RxHttpCallBack() { override fun onSuccess(t: CommonResponseBean) { super.onSuccess(t) - if (upDrivingInfoBean.isTrailer == "1") { - finish() - ActivityUtils.startActivity( - mContext, - AuthTrailerActivity::class.java, - Bundle().apply { - putString(AppConfig.CAR_ID, t.data.carId) - putBoolean(AppConfig.IS_GO_MINE,true) - }) - } else { - ActivityUtils.startActivity(mContext, AuthSuccActivity::class.java,Bundle().apply { - putBoolean(AppConfig.IS_GO_MINE,true) - }) + if (t.data==null){ + DataManager.getInstance().addCar(upDrivingInfoBean) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe( + BaseObserver( + mContext, + object : RxHttpCallBack() { + override fun onSuccess(t: CommonResponseBean) { + super.onSuccess(t) + if (upDrivingInfoBean.isTrailer == "1") { + finish() + ActivityUtils.startActivity( + mContext, + AuthTrailerActivity::class.java, + Bundle().apply { + putString(AppConfig.CAR_ID, t.data.carId) + putBoolean(AppConfig.IS_GO_MINE, true) + }) + } else { + ActivityUtils.startActivity( + mContext, + AuthSuccActivity::class.java, + Bundle().apply { + putBoolean(AppConfig.IS_GO_MINE, true) + }) + } + } + }) + ) + }else{ + DataManager.getInstance().bindCar(CarBean(carId = upDrivingInfoBean.carId)) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(BaseObserver(mContext, object : RxHttpCallBack() { + override fun onSuccess(t: CommonResponseBean) { + super.onSuccess(t) + ActivityUtils.startActivity( + mContext, + AuthSuccActivity::class.java, + Bundle().apply { + putBoolean(AppConfig.IS_GO_MINE, true) + }) + } + })) } } })) + } @@ -313,36 +359,15 @@ class AuthDrivingActivity : BaseActivity() { * 根据车牌号查询车辆信任 * @param carNum String */ - private fun getCarInfoByCarNum(carNum: String) { + private fun getCarInfoByCarNum(carNum: String, onCarInfoInterface: OnCarInfoInterface) { DataManager.getInstance().getCarByCarVehicleNum(carNum) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(BaseObserver(mContext, object : RxHttpCallBack() { override fun onSuccess(t: CommonResponseBean) { super.onSuccess(t) - t.data.let { - binding.run { - ImageLoader.getInstance() - .loadRoundImage(mContext, it.licenseFaceUrl, 12, ivFront) - ImageLoader.getInstance() - .loadRoundImage(mContext, it.licenseBackUrl, 12, ivBack) - ImageLoader.getInstance() - .loadRoundImage(mContext, it.carUrl, 12, ivCar) - ImageLoader.getInstance() - .loadRoundImage(mContext, it.roadLicensePhotoUrl, 12, ivRoadFront) - - etCarNum.setText(it.vehicleNum) - etOwner.setText(it.owner) - tvCarType.text = it.vehicleType - etUseNature.setText(it.useNature) - etID.setText(it.roadLicense) - tvDate.text = it.roadLicenseValidity - } - } - + onCarInfoInterface.onResutl(t.data) } })) } - - } \ No newline at end of file diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthFaceActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthFaceActivity.kt index 5689705..0cc9a7c 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthFaceActivity.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthFaceActivity.kt @@ -1,6 +1,7 @@ package com.arpa.hndahesudintocctmsdriver.ui.account.authperson import android.os.Bundle +import com.arpa.glex.bean.UserDetail import com.arpa.hndahesudintocctmsdriver.R import com.arpa.hndahesudintocctmsdriver.base.AppConfig import com.arpa.hndahesudintocctmsdriver.bean.FaceBean @@ -68,6 +69,18 @@ class AuthFaceActivity : BaseActivity() { } override fun initDate() { + DataManager.getInstance().getDriverDocIntegrity() + .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()) + .subscribe(BaseObserver(mContext, object : RxHttpCallBack() { + override fun onSuccess(t: CommonResponseBean) { + super.onSuccess(t) + if (t == null || t.data == null) + return + if (t.data?.isRealName != "0") { + ActivityUtils.startActivity(mContext, HomeActivity::class.java) + } + } + })) } override fun onStart() { diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthPersonActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthPersonActivity.kt index ccdd7a4..84a2877 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthPersonActivity.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthPersonActivity.kt @@ -1,6 +1,7 @@ package com.arpa.hndahesudintocctmsdriver.ui.account.authperson import android.os.Bundle +import com.alibaba.idst.nui.DateUtil.DEFAULT_FORMAT_DATE import com.arpa.hndahesudintocctmsdriver.R import com.arpa.hndahesudintocctmsdriver.bean.UpPersonInfoBean import com.arpa.hndahesudintocctmsdriver.databinding.ActivityAuthPersonBinding @@ -18,6 +19,8 @@ import com.arpa.mylibrary.utils.TimeUtil import com.arpa.mylibrary.utils.ToastUtils import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers import io.reactivex.rxjava3.schedulers.Schedulers +import java.text.SimpleDateFormat +import java.util.Locale /** * @ClassName AuthRoleActivity @@ -33,8 +36,8 @@ class AuthPersonActivity : BaseActivity() { var perInfoBean: UpPersonInfoBean = UpPersonInfoBean() override fun initView(savedInstanceState: Bundle?) { setStatusBarColor(R.color.white) - setTitleBar("实名认证"){ - ActivityUtils.startActivity(mContext,HomeActivity::class.java) + setTitleBar("实名认证") { + ActivityUtils.startActivity(mContext, HomeActivity::class.java) } // isOnlyShow = intent.extras?.getBoolean(AppConfig.IS_ONLY_SHOW, false) == true @@ -60,6 +63,13 @@ class AuthPersonActivity : BaseActivity() { return@setOnClickListener } + if (!tvEnd.text.toString().contains("长期")) { + if (TimeUtil.compareDate(tvEnd.text.toString(), SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()))) { + ToastUtils.showToast(mContext, "身份证已过期,请及时更换最新证件") + } + } + + DataManager.getInstance().setUpDriverIdCard(perInfoBean) .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()) .subscribe(BaseObserver(mContext, object : RxHttpCallBack() { @@ -159,7 +169,7 @@ class AuthPersonActivity : BaseActivity() { override fun onBackPressed() { super.onBackPressed() - ActivityUtils.startActivity(mContext,HomeActivity::class.java) + ActivityUtils.startActivity(mContext, HomeActivity::class.java) } override fun initDate() { diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthTrailerActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthTrailerActivity.kt index 0bced0d..aa0c855 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthTrailerActivity.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthTrailerActivity.kt @@ -38,6 +38,11 @@ class AuthTrailerActivity : BaseActivity() { carId = intent.extras?.getString(AppConfig.CAR_ID, "").toString() binding.run { + tvCarColor.text = "黄色" + upDrivingInfoBean.run { + plateColorCode = "2" + plateColor = "黄色" + } ivFront.setOnClickListener { selFrontPic() } diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/EditPersonActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/EditPersonActivity.kt index 7cc3899..7dc077b 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/EditPersonActivity.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/EditPersonActivity.kt @@ -2,6 +2,7 @@ package com.arpa.hndahesudintocctmsdriver.ui.account.authperson import android.os.Bundle import android.view.View +import com.arpa.glex.bean.UserDetail import com.arpa.hndahesudintocctmsdriver.R import com.arpa.hndahesudintocctmsdriver.base.AppConfig import com.arpa.hndahesudintocctmsdriver.databinding.ActivityAuthPersonBinding @@ -10,7 +11,6 @@ import com.arpa.hndahesudintocctmsdriver.net.DataManager import com.arpa.hndahesudintocctmsdriver.net.RxHttpCallBack import com.arpa.hndahesudintocctmsdriver.utils.OcrUtils import com.arpa.hndahesudintocctmsdriver.utils.UserUtils -import com.arpa.glex.bean.UserDetail import com.arpa.mylibrary.base.BaseActivity import com.arpa.mylibrary.net.CommonResponseBean import com.arpa.mylibrary.utils.ActivityUtils @@ -20,6 +20,8 @@ import com.arpa.mylibrary.utils.TimeUtil import com.arpa.mylibrary.utils.ToastUtils import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers import io.reactivex.rxjava3.schedulers.Schedulers +import java.text.SimpleDateFormat +import java.util.Locale /** * @ClassName AuthRoleActivity @@ -38,6 +40,8 @@ class EditPersonActivity : BaseActivity() { setResult(RESULT_OK) finish() } + var isOnlyShow = + intent.extras?.getBoolean(AppConfig.IS_ONLY_SHOW, false) == true binding.run { btnOk.text = "确定" @@ -62,6 +66,13 @@ class EditPersonActivity : BaseActivity() { return@setOnClickListener } + if (!tvEnd.text.toString().contains("长期")) { + if (TimeUtil.compareDate(tvEnd.text.toString(), + SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()))) { + ToastUtils.showToast(mContext, "身份证已过期,请及时更换最新证件") + } + } + DataManager.getInstance().reUpDriverIdCard(perInfoBean) .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()) .subscribe(BaseObserver(mContext, object : RxHttpCallBack() { diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/EditTrailerActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/EditTrailerActivity.kt index 5beb72f..e593253 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/EditTrailerActivity.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/EditTrailerActivity.kt @@ -38,6 +38,11 @@ class EditTrailerActivity : BaseActivity() { binding.run { btnOk.text = "确定" + tvCarColor.text = "黄色" + upDrivingInfoBean.run { + plateColorCode = "2" + plateColor = "黄色" + } ivFront.setOnClickListener { selFrontPic() } 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 56fca06..dab1dae 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 @@ -29,6 +29,7 @@ import com.arpa.glex.bean.CardInfo import com.arpa.glex.bean.OrderBean import com.arpa.glex.bean.UserBean import com.arpa.glex.bean.UserDetail +import com.arpa.hndahesudintocctmsdriver.bean.MyJtt import com.arpa.mylibrary.base.BaseFragment import com.arpa.mylibrary.callback.RefreshCallBack import com.arpa.mylibrary.net.CommonResponseBean @@ -190,6 +191,7 @@ class HomeFragment : BaseFragment(), RefreshCallBack { }) ) + DataManager.getInstance().getUserInfo() .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()) .subscribe(BaseObserver(mContext, object : RxHttpCallBack() { @@ -207,6 +209,7 @@ class HomeFragment : BaseFragment(), RefreshCallBack { //执行中运单轨迹上传 OrderUtils.getInstance().upLocation(mContext) + val userInfo = SPUtils.instance.getUserInfo(mContext) if (userInfo?.isCarCaptain == "1") {//是否是车队长（0=否,1=是,9=未选择） binding.llNotic.visibility = View.GONE diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/InviteDriverActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/InviteDriverActivity.kt index b53ec8b..9ad0251 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/InviteDriverActivity.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/InviteDriverActivity.kt @@ -83,7 +83,7 @@ class InviteDriverActivity : BaseActivity(), Refres } override fun getRefreshDate(stat: Int, page: Int, count: Int) { - + getDrivers() } private fun getDrivers() { diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/MineFragment.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/MineFragment.kt index 4383e26..9bcb400 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/MineFragment.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/MineFragment.kt @@ -225,7 +225,7 @@ class MineFragment : BaseFragment(), View.OnClickListener, 6 -> { ActivityUtils.startActivity(mContext, WebActivity::class.java, Bundle().apply { putString("title", "关于我们") - putString("url", "www.baidu.com") + putString("url", "http://www.dahehuoyun.com/index.html") }) } diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/activity/CarDetailActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/activity/CarDetailActivity.kt index f3dc748..a3054b4 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/activity/CarDetailActivity.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/activity/CarDetailActivity.kt @@ -168,8 +168,8 @@ class CarDetailActivity : BaseActivity(), View.OnClick if (t.data != null && t.data.size > 0) { t.data.find { it.carId == carId }.let { binding.run { - tvNotic1.visibility = - if (it?.licenseValidityOverdue == "1") View.VISIBLE else View.GONE +// tvNotic1.visibility = +// if (it?.licenseValidityOverdue == "1") View.VISIBLE else View.GONE tvNotic3.visibility = if (it?.roadLicenseValidityOverdue == "1") View.VISIBLE else View.GONE } diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/activity/CarTeamManActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/activity/CarTeamManActivity.kt index 65283d2..fa48460 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/activity/CarTeamManActivity.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/activity/CarTeamManActivity.kt @@ -3,6 +3,7 @@ package com.arpa.hndahesudintocctmsdriver.ui.mine.activity import android.content.Context import android.graphics.Color import android.os.Bundle +import android.view.View import androidx.fragment.app.Fragment import androidx.viewpager2.widget.ViewPager2.OnPageChangeCallback import com.arpa.hndahesudintocctmsdriver.adapter.PagersAdapter @@ -138,6 +139,7 @@ class CarTeamManActivity : BaseActivity() { val data = t.data binding.run { tvCapName.text = data.captainName + tvStatu.visibility = if (data.auditStatus == "100003") View.GONE else View.VISIBLE tvStatu.text = if (data.auditStatus == "100002") "审核中" else if (data.auditStatus == "100003") "审核通过" else if (data.auditStatus == "100001") "待认证" else "待认证" ImageLoader.getInstance().loadCircleImage(mContext, data.avatar, ivHead) diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/activity/SettingActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/activity/SettingActivity.kt index 67b1afe..da7ca0e 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/activity/SettingActivity.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/activity/SettingActivity.kt @@ -2,6 +2,10 @@ package com.arpa.hndahesudintocctmsdriver.ui.mine.activity import android.os.Bundle import android.view.View +import cn.jpush.android.api.JPushInterface +import cn.jpush.android.ups.JPushUPSManager +import cn.jpush.android.ups.TokenResult +import cn.jpush.android.ups.UPSTurnCallBack import com.arpa.hndahesudintocctmsdriver.R import com.arpa.hndahesudintocctmsdriver.databinding.ActivitySettingBinding import com.arpa.hndahesudintocctmsdriver.push.PushHelper @@ -34,23 +38,13 @@ class SettingActivity : BaseActivity(), View.OnClickList when (view?.id) { binding.rlOne.id -> { if (binding.svTog.isOpened) { - PushHelper.delete(mContext, object : PushAliasListener { - override fun onResult(isSuccess: Boolean) { - binding.svTog.toggleSwitch(false) - } - }) - + JPushUPSManager.turnOffPush(mContext) { + binding.svTog.toggleSwitch(false) + } } else { - PushHelper.setAlias(mContext, object : PushAliasListener { - override fun onResult(isSuccess: Boolean) { - if (isSuccess){ - binding.svTog.toggleSwitch(true) - }else{ - showToast("开启失败,请登录重试") - } - - } - }) + JPushUPSManager.turnOnPush( + mContext + ) { binding.svTog.toggleSwitch(true) } } } diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/waybill/activity/WaybillDetailActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/waybill/activity/WaybillDetailActivity.kt index 401fe1f..86827f6 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/waybill/activity/WaybillDetailActivity.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/waybill/activity/WaybillDetailActivity.kt @@ -28,10 +28,13 @@ import com.arpa.mylibrary.utils.ActivityUtils import com.arpa.mylibrary.utils.BaseUtils import com.arpa.mylibrary.utils.ConvertUtils import com.arpa.mylibrary.utils.LoadingUtils +import com.arpa.mylibrary.utils.TimeUtil import com.arpa.mylibrary.utils.ToastUtils import com.permissionx.guolindev.PermissionX import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers import io.reactivex.rxjava3.schedulers.Schedulers +import java.text.SimpleDateFormat +import java.util.Locale /** * @ClassName WaybillDetailActivity @@ -98,7 +101,10 @@ class WaybillDetailActivity : BaseActivity() { |${s}""".trimMargin() } binding.run { - tvTime.text = t.data.receiverDeadline + + tvTime.text = """${TimeUtil.changeDateNoneFormat(t.data.receiverDeadline, + "yyyy-MM-dd" + )} 卸货""" tvCom.text = t.data.receiverBusinessName tvUnloadDis.text = t.data.distance + "km" tvCarType.text = """${t.data.vehicleLength} ${t.data.vehicleType}""" diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/utils/OrderUtils.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/utils/OrderUtils.kt index 7b68987..742d093 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/utils/OrderUtils.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/utils/OrderUtils.kt @@ -7,6 +7,7 @@ import android.os.Bundle import com.arpa.hndahesudintocctmsdriver.base.AppConfig import com.arpa.hndahesudintocctmsdriver.base.AppConfig.NEED_UP_ORDER import com.arpa.hndahesudintocctmsdriver.bean.CarBean +import com.arpa.hndahesudintocctmsdriver.bean.MyJtt import com.arpa.hndahesudintocctmsdriver.bean.OrderDetailBean import com.arpa.hndahesudintocctmsdriver.bean.UpDriverCar import com.arpa.hndahesudintocctmsdriver.callback.OnResultListener @@ -14,6 +15,7 @@ import com.arpa.hndahesudintocctmsdriver.net.BaseObserver import com.arpa.hndahesudintocctmsdriver.net.DataManager import com.arpa.hndahesudintocctmsdriver.net.RxHttpCallBack import com.arpa.hndahesudintocctmsdriver.service.UpLocationService2 +import com.arpa.hndahesudintocctmsdriver.third.JTTProcess import com.arpa.hndahesudintocctmsdriver.ui.waybill.activity.WaybillLoadActivity import com.arpa.mylibrary.base.SingletonNoPHolder import com.arpa.mylibrary.net.CommonResponseBean @@ -112,7 +114,7 @@ class OrderUtils private constructor() { return } CommonPopUtils.getInstance() - .showCarList(context, t.data, true,selDriverId,selCarId) { + .showCarList(context, t.data, true, selDriverId, selCarId) { //分配车辆redeliveryOrder DataManager.getInstance() .redeliveryOrder(UpDriverCar(orderId, it.driverId, it.carId)) @@ -146,7 +148,7 @@ class OrderUtils private constructor() { return } CommonPopUtils.getInstance() - .showCarList(context, t.data, false,selDriverId,selCarId) { + .showCarList(context, t.data, false, selDriverId, selCarId) { //接单接口 receivingOrders(context, orderId, it, listener) } @@ -210,7 +212,7 @@ class OrderUtils private constructor() { */ fun upLocation(context: Context) { val userInfo = SPUtils.instance.getUserInfo(context) - if (userInfo!=null && userInfo.isCarCaptain == "1")//车队长角色不需要上传轨迹 + if (userInfo != null && userInfo.isCarCaptain == "1")//车队长角色不需要上传轨迹 return DataManager.getInstance().orderDetail("") .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()) @@ -229,6 +231,20 @@ class OrderUtils private constructor() { } else { context.startService(Intent(context, UpLocationService2::class.java)) } +// //初始化交通厅 +// DataManager.getInstance().getTrafficConfigByWaybillId(t.data.orderId) + DataManager.getInstance().getTrafficConfigByWaybillId("98") + .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()) + .subscribe(BaseObserver(context, object : RxHttpCallBack() { + override fun onSuccess(t: CommonResponseBean) { + super.onSuccess(t) + if (t.data != null && !t.data.trafficCode.isNullOrEmpty()) { + JTTProcess.auth(context,t.data) + } + } + })) + + } else { context.stopService(Intent(context, UpLocationService2::class.java)) BaseSPUtils.remove(context, NEED_UP_ORDER) diff --git a/app/src/main/res/layout/activity_car_team.xml b/app/src/main/res/layout/activity_car_team.xml index 87f9961..f3ec67f 100644 --- a/app/src/main/res/layout/activity_car_team.xml +++ b/app/src/main/res/layout/activity_car_team.xml @@ -45,6 +45,9 @@ android:background="@drawable/head_defaut" /> + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml index 4dc0a9a..bace90e 100644 --- a/app/src/main/res/layout/fragment_mine.xml +++ b/app/src/main/res/layout/fragment_mine.xml @@ -8,9 +8,9 @@ app:srlEnableLoadMore="false"> + android:layout_height="match_parent" + android:fillViewport="true"> + android:textStyle="bold" + tools:text="张学友" /> @@ -111,168 +111,174 @@ - - - -