diff --git a/app/src/main/java/com/dahe/gldriver/bean/UpInfoBean.kt b/app/src/main/java/com/dahe/gldriver/bean/UpInfoBean.kt index 67579b8..46143a3 100644 --- a/app/src/main/java/com/dahe/gldriver/bean/UpInfoBean.kt +++ b/app/src/main/java/com/dahe/gldriver/bean/UpInfoBean.kt @@ -166,3 +166,38 @@ data class UpCaptain( var reason: String="" ) +/** + * 提交党员认证资料 + * @property address String + * @property area String + * @property areaCode String + * @property city String + * @property cityCode String + * @property materialList List + * @property partyMembershipTime String + * @property province String + * @property provinceCityArea String + * @property provinceCode String + * @constructor + */ +data class UpPart( + var address: String = "", + var area: String = "", + var areaCode: String = "", + var city: String = "", + var cityCode: String = "", + var materialList: MutableList = mutableListOf(), + var partyMembershipTime: String = "", + var province: String = "", + var provinceCityArea: String = "", + var provinceCode: String = "" +) + +data class Material( + var isDel: String="", + var materialId: String="", + var materialUrl: String="", + var sortValue: String="" +) + + diff --git a/app/src/main/java/com/dahe/gldriver/bean/UserBean.kt b/app/src/main/java/com/dahe/gldriver/bean/UserBean.kt index 4977af9..1f7fc71 100644 --- a/app/src/main/java/com/dahe/gldriver/bean/UserBean.kt +++ b/app/src/main/java/com/dahe/gldriver/bean/UserBean.kt @@ -13,6 +13,7 @@ data class UserBean( var token :String, var id :String, var roleId :String, + var contactPhone :String, var uname :String, var registerPhone :String, var companyName :String, @@ -32,6 +33,9 @@ data class UserBean( var isCarCaptain :String, var contactName :String, var idcardName :String, + var avatar :String, + var approvedType :String,//准驾类型 + var partyMemberCertification :String,//党员认证(0=未认证,1=已认证) var captainId :String ) diff --git a/app/src/main/java/com/dahe/gldriver/net/Api.kt b/app/src/main/java/com/dahe/gldriver/net/Api.kt index 1c352c7..da39041 100644 --- a/app/src/main/java/com/dahe/gldriver/net/Api.kt +++ b/app/src/main/java/com/dahe/gldriver/net/Api.kt @@ -15,6 +15,7 @@ import com.dahe.gldriver.bean.UpBankInfoBean import com.dahe.gldriver.bean.UpCaptain import com.dahe.gldriver.bean.UpDriverInfoBean import com.dahe.gldriver.bean.UpDrivingInfoBean +import com.dahe.gldriver.bean.UpPart import com.dahe.gldriver.bean.UpPersonInfoBean import com.dahe.gldriver.bean.UpPicBean import com.dahe.gldriver.bean.UpQualiInfoBean @@ -168,6 +169,23 @@ interface Api { fun authenticationCaptain(@Body bankBean: AuthTeamBean): Observable> + /** + * 提交党员认证资料 + * @param upPart UpPart + * @return Observable> + */ + @POST(BASE_URL+"driver/driver/submitToCpcAuthentication") + fun submitToCpcAuthentication(@Body upPart: UpPart): Observable> + + /** + * 查询党员认证资料 + * @param upPart UpPart + * @return Observable> + */ + @POST(BASE_URL+"driver/driver/getCpcAuthenticationInfo") + fun getCpcAuthenticationInfo(): Observable> + + /** * 货源列表 * */ diff --git a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthPartyActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthPartyActivity.kt index da41a6d..56973d3 100644 --- a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthPartyActivity.kt +++ b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthPartyActivity.kt @@ -2,9 +2,21 @@ package com.dahe.gldriver.ui.account.authperson import android.os.Bundle import com.dahe.gldriver.R +import com.dahe.gldriver.bean.Material +import com.dahe.gldriver.bean.UpDrivingInfoBean +import com.dahe.gldriver.bean.UpPart import com.dahe.gldriver.databinding.ActivityAuthPartyBinding +import com.dahe.gldriver.net.BaseObserver +import com.dahe.gldriver.net.DataManager +import com.dahe.gldriver.net.RxHttpCallBack +import com.dahe.gldriver.utils.OcrUtils import com.dahe.mylibrary.base.BaseActivity +import com.dahe.mylibrary.net.CommonResponseBean +import com.dahe.mylibrary.utils.ImageLoader +import com.dahe.mylibrary.utils.PickerUtils +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers +import io.reactivex.rxjava3.schedulers.Schedulers /** * @ClassName AuthPartyActivity @@ -13,11 +25,68 @@ import com.dahe.mylibrary.base.BaseActivity * @Description 党员认证 */ class AuthPartyActivity : BaseActivity() { + + var upPart = UpPart() override fun initView(savedInstanceState: Bundle?) { setStatusBarColor(R.color.white) setTitleBar("党员认证", true) + binding.run { + tvData.setOnClickListener { + PickerUtils.getInstance().showDate(this@AuthPartyActivity) { + upPart.partyMembershipTime = it + tvData.text = it + } + } + tvAddress.setOnClickListener { + PickerUtils.getInstance() + .showAddress(this@AuthPartyActivity) { province, city, county -> + upPart.run { + this.province = province.name + this.city = city.name + this.area = county.name + this.provinceCode = county.code + this.cityCode = city.code + this.areaCode = county.code + this.provinceCityArea = + """${province.name}-${city.name}-${county.name}""" + } + tvAddress.text = """${province.name}-${city.name}-${county.name}""" + } + } + ivUp.setOnClickListener { + OcrUtils.getInstance().noOcrUpPic(mContext, this@AuthPartyActivity) { picPath, _ -> + upPart.materialList.add(0,Material(materialUrl = picPath.picPath)) + ImageLoader.getInstance() + .loadRoundImage(mContext, picPath.locPic, 12, ivUp) + } + } + btnOk.setOnClickListener { + subMit() + } + } } override fun initDate() { } + + private fun subMit() { + if (binding.tvData.text.isNullOrEmpty() || + binding.tvAddress.text.isNullOrEmpty() || + binding.etAddress.text.isNullOrEmpty()|| + upPart.materialList.size==0 + ) { + showToast("请完善信息") + return + } + + DataManager.getInstance().submitToCpcAuthentication(upPart) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(BaseObserver(mContext, object : RxHttpCallBack() { + override fun onSuccess(t: CommonResponseBean) { + super.onSuccess(t) + finish() + } + })) + } } \ No newline at end of file diff --git a/app/src/main/java/com/dahe/gldriver/ui/mine/MineFragment.kt b/app/src/main/java/com/dahe/gldriver/ui/mine/MineFragment.kt index 6354a72..6b621ad 100644 --- a/app/src/main/java/com/dahe/gldriver/ui/mine/MineFragment.kt +++ b/app/src/main/java/com/dahe/gldriver/ui/mine/MineFragment.kt @@ -16,6 +16,9 @@ import com.dahe.gldriver.ui.mine.activity.WalletActivity import com.dahe.gldriver.utils.SPUtils import com.dahe.mylibrary.base.BaseFragment import com.dahe.mylibrary.utils.ActivityUtils +import com.dahe.mylibrary.utils.BaseUtils +import com.dahe.mylibrary.utils.ImageLoader +import com.dahe.mylibrary.utils.PhoneFormatCheckUtils import com.dahe.mylibrary.utils.ToastUtils class MineFragment : BaseFragment(), View.OnClickListener { @@ -46,9 +49,20 @@ class MineFragment : BaseFragment(), View.OnClickListener { override fun onFragmentFirstVisible() { -// val userInfo = SPUtils.instance.getUserInfo(mContext) -// if (null==userInfo) -// return + val userInfo = SPUtils.instance.getUserInfo(mContext) + if (userInfo != null) { + binding.run { + tvName.text = userInfo.idcardName + tvCarType.text = userInfo.approvedType + tvPhone.text = PhoneFormatCheckUtils.hintPhone(userInfo.contactPhone) + tvCarType.visibility = + if (userInfo.approvedType.isNullOrEmpty()) View.GONE else View.VISIBLE + ivPart.visibility = + if (userInfo.partyMemberCertification == "1") View.VISIBLE else View.GONE + ImageLoader.getInstance() + .loadCircleImage(mContext, userInfo.avatar, ivHead, R.drawable.head_defaut) + } + } binding.run { //初始化常用工具 diff --git a/app/src/main/java/com/dahe/gldriver/utils/OneKeyLoginUtils.kt b/app/src/main/java/com/dahe/gldriver/utils/OneKeyLoginUtils.kt index e842f6d..fadd4c0 100644 --- a/app/src/main/java/com/dahe/gldriver/utils/OneKeyLoginUtils.kt +++ b/app/src/main/java/com/dahe/gldriver/utils/OneKeyLoginUtils.kt @@ -3,14 +3,15 @@ package com.dahe.gldriver.utils import android.content.Context import android.widget.Toast import androidx.appcompat.app.AppCompatActivity +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.temp.AuthPageConfig import com.dahe.gldriver.temp.FullPortConfig import com.dahe.gldriver.ui.HomeActivity -import com.dahe.gldriver.ui.account.CodeLoginActivity import com.dahe.gldriver.ui.account.LoginActivity +import com.dahe.gldriver.ui.account.SelectRoleActivity import com.dahe.glex.bean.UserBean import com.dahe.mylibrary.base.SingletonNoPHolder import com.dahe.mylibrary.net.CommonResponseBean @@ -22,6 +23,7 @@ import com.umeng.umverify.listener.UMTokenResultListener import com.umeng.umverify.model.UMTokenRet import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers import io.reactivex.rxjava3.schedulers.Schedulers +import org.greenrobot.eventbus.EventBus /** * @ClassName OneKeyLoginUtils @@ -89,10 +91,7 @@ class OneKeyLoginUtils private constructor() { Toast.LENGTH_SHORT ).show() //获取token失败,去获取验证码页面 - ActivityUtils.startActivity( - context, - CodeLoginActivity::class.java - ) + EventBus.getDefault().post(RefreshEvent(1)) } } catch (e: java.lang.Exception) { e.printStackTrace() @@ -116,7 +115,7 @@ class OneKeyLoginUtils private constructor() { Toast.LENGTH_SHORT ).show() //获取token失败,去获取验证码页面 - ActivityUtils.startActivity(context, CodeLoginActivity::class.java) + EventBus.getDefault().post(RefreshEvent(1)) } } catch (e: java.lang.Exception) { e.printStackTrace() @@ -153,7 +152,7 @@ class OneKeyLoginUtils private constructor() { Toast.LENGTH_SHORT ).show() //获取token失败,去获取验证码页面 - ActivityUtils.startActivity(context, CodeLoginActivity::class.java) + EventBus.getDefault().post(RefreshEvent(1)) } } catch (e: java.lang.Exception) { e.printStackTrace() diff --git a/app/src/main/res/drawable-xxhdpi/welcome_bg_default.jpg b/app/src/main/res/drawable-xxhdpi/welcome_bg_default.jpg new file mode 100644 index 0000000..8e7953f Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/welcome_bg_default.jpg differ diff --git a/app/src/main/res/drawable-xxhdpi/welcome_bg_default.png b/app/src/main/res/drawable-xxhdpi/welcome_bg_default.png deleted file mode 100644 index 2de19c6..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/welcome_bg_default.png and /dev/null differ diff --git a/app/src/main/res/layout/activity_auth_party.xml b/app/src/main/res/layout/activity_auth_party.xml index fadd657..67f6a0d 100644 --- a/app/src/main/res/layout/activity_auth_party.xml +++ b/app/src/main/res/layout/activity_auth_party.xml @@ -57,6 +57,9 @@ android:textSize="@dimen/sp_15" /> - diff --git a/app/src/main/res/layout/activity_person_info.xml b/app/src/main/res/layout/activity_person_info.xml index 5147525..71c5194 100644 --- a/app/src/main/res/layout/activity_person_info.xml +++ b/app/src/main/res/layout/activity_person_info.xml @@ -277,6 +277,7 @@ - - - - - - - - - - - - - -