diff --git a/app/src/main/java/com/dahe/gldriver/adapter/InviteRecordAdapter.kt b/app/src/main/java/com/dahe/gldriver/adapter/InviteRecordAdapter.kt index 9bb4dc8..d9848bb 100644 --- a/app/src/main/java/com/dahe/gldriver/adapter/InviteRecordAdapter.kt +++ b/app/src/main/java/com/dahe/gldriver/adapter/InviteRecordAdapter.kt @@ -24,14 +24,9 @@ class InviteRecordAdapter() : item?.let { holder.run { setText(R.id.tvTime,it.createTime) - setText(R.id.tvContent, """${if (it.joinStatus=="0")"邀请" else ""}${it.driverName} ${it.driverPhone} ${if (it.joinStatus=="2") "拒绝加入车队" else "加入车队"}""") + setText(R.id.tvContent, """${if (it.joinStatus=="0")"邀请 " else ""}${it.driverName} ${it.driverPhone} ${if (it.joinStatus=="2") "拒绝加入车队" else "加入车队"}""") setText(R.id.tvReason,it.reason) - - setGone(R.id.tvReason,it.joinStatus!="2") - - - } } } diff --git a/app/src/main/java/com/dahe/gldriver/base/AppConfig.kt b/app/src/main/java/com/dahe/gldriver/base/AppConfig.kt index f6553b0..bf599ed 100644 --- a/app/src/main/java/com/dahe/gldriver/base/AppConfig.kt +++ b/app/src/main/java/com/dahe/gldriver/base/AppConfig.kt @@ -25,6 +25,7 @@ object AppConfig { const val USER_DETAIL = "DA_HE_USER_DETAIL" const val IS_ONLY_SHOW = "DA_HE_IS_ONLY_SHOW" const val IS_SUPPLEMENT = "DA_HE_IS_SUPPLEMENT" + const val IS_GO_MINE = "DA_HE_GO_MINE" const val REFRSH = "DA_HE_REFRSH" const val SUCCESS_TYPE = "DA_HE_SUCCESS_TYPE" const val E_KEY = "19ac0aa74338e487e45057faf7212401" diff --git a/app/src/main/java/com/dahe/gldriver/ui/account/AuthSuccActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/account/AuthSuccActivity.kt index 7a4ef26..b7ad583 100644 --- a/app/src/main/java/com/dahe/gldriver/ui/account/AuthSuccActivity.kt +++ b/app/src/main/java/com/dahe/gldriver/ui/account/AuthSuccActivity.kt @@ -9,6 +9,7 @@ import com.dahe.gldriver.ui.account.authperson.AuthDrivingActivity import com.dahe.gldriver.ui.mine.activity.CarsManActivity import com.dahe.mylibrary.base.BaseActivity import com.dahe.mylibrary.utils.ActivityUtils +import com.dahe.mylibrary.utils.BaseSPUtils import com.dahe.mylibrary.utils.BaseUtils import com.dahe.mylibrary.utils.TimeUtil @@ -23,8 +24,10 @@ class AuthSuccActivity : BaseActivity() { setStatusBarColor(R.color.white) val type = intent.extras?.getInt(AppConfig.SUCCESS_TYPE) setTitleBar("提交成功", true) + val get = BaseSPUtils.get(mContext, AppConfig.IS_GO_MINE, false) as Boolean binding.run { + btnLeft.text = if (BaseSPUtils.get(mContext, AppConfig.IS_GO_MINE, false) as Boolean) "回到个人中心" else "跳转首页" btnLeft.setOnClickListener { goLeftOrRight(type, true) } diff --git a/app/src/main/java/com/dahe/gldriver/ui/mine/activity/CarsManActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/mine/activity/CarsManActivity.kt index 223b92d..c94d94c 100644 --- a/app/src/main/java/com/dahe/gldriver/ui/mine/activity/CarsManActivity.kt +++ b/app/src/main/java/com/dahe/gldriver/ui/mine/activity/CarsManActivity.kt @@ -15,10 +15,12 @@ import com.dahe.gldriver.net.DataManager import com.dahe.gldriver.net.RxHttpCallBack import com.dahe.gldriver.ui.account.authperson.AuthDrivingActivity import com.dahe.gldriver.utils.CommonPopUtils +import com.dahe.gldriver.utils.SPUtils import com.dahe.mylibrary.base.BaseActivity import com.dahe.mylibrary.net.CommonResponseBean import com.dahe.mylibrary.recycleviewswipe.RecycleViewDivider import com.dahe.mylibrary.utils.ActivityUtils +import com.dahe.mylibrary.utils.BaseSPUtils import com.dahe.mylibrary.utils.ConvertUtils import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers import io.reactivex.rxjava3.schedulers.Schedulers @@ -81,6 +83,7 @@ class CarsManActivity : BaseActivity() { } btnOk.setOnClickListener { + BaseSPUtils.put(mContext,AppConfig.IS_GO_MINE,true) ActivityUtils.startActivity(mContext, AuthDrivingActivity::class.java) } }