From bd6a8872438a35d47821c5d5da7fe149e5fed3ab Mon Sep 17 00:00:00 2001 From: lmw <125975490@qq.com> Date: 星期三, 21 六月 2023 09:53:36 +0800 Subject: [PATCH] 处理收不到广播 --- app/src/main/java/com/okgoincar/slab/SlabLoginActivity.kt | 53 ++++++++++++++++++++++++++--------------------------- 1 files changed, 26 insertions(+), 27 deletions(-) diff --git a/app/src/main/java/com/okgoincar/slab/SlabLoginActivity.kt b/app/src/main/java/com/okgoincar/slab/SlabLoginActivity.kt index b176cf3..9dfe808 100644 --- a/app/src/main/java/com/okgoincar/slab/SlabLoginActivity.kt +++ b/app/src/main/java/com/okgoincar/slab/SlabLoginActivity.kt @@ -11,13 +11,19 @@ import com.okgoincar.netUtls.getMapByAny import com.okgoincar.utils.Cache.CacheKey import com.okgoincar.R +import com.okgoincar.base.MyApplication import com.okgoincar.bean.LoginBean import com.okgoincar.netUtls.Api +import com.okgoincar.slab.util.DialogUtil import kotlinx.android.synthetic.main.slab_activity_login.* import org.jetbrains.anko.startActivity -import org.jetbrains.anko.toast class SlabLoginActivity : MySlabBaseActivity() { + + val isMoreLogin by lazy { + intent.getBooleanExtra("IsMoreLogin",false) + } + override fun setContentView() { setContentView(R.layout.slab_activity_login) } @@ -25,40 +31,33 @@ override fun initView() { showTitle(false) showHeader(false) + + if (isMoreLogin){ + window.decorView.post { + var pop = DialogUtil.getSlabDelAndSurePopWindow(false,this,"确定","取消","您的账号在其他车载端登录,或者在本机长时间未登录,需要重新登签!",{}){ + + } + pop.showCenter(window.decorView) + } + } } override fun setOnclick() { tv_login.clickDelay { - if (et_number.getContent().isNullOrEmpty()) { - toast("请输入工号") - return@clickDelay - } - var map = getMapByAny() - map["jobNum"] = et_number.getContent().trim() - callNet(true, Api.loginByJobNumber, map) { - toast("登录成功") - var bean = gson.fromJson<LoginBean>(it, LoginBean::class.java) - CacheKey.putKeyStr("jobNum",et_number.getContent().trim()) - CacheKey.putKeyStr("appid", bean.data.appid) - CacheKey.putKeyStr("token", bean.data.token) - CacheKey.putKeyStr("userId", bean.data.id.toString()) - CacheKey.putKeyStr("serverId", bean.data.serverId.toString()) - CacheKey.putKeyStr("terminalName", bean.data.terminalId.toString()) - finish() - startActivity<SlabMainActivity>() - } -// toLoginActivity(this,"452229198204010012") - + // 51168119911111447X 15928265276 11111q +// 450211198101280848 黄桥账号 +// toLoginActivity(this, "450211198101280848") + toLoginActivity(this, et_number.getContent()) } } - override fun setBlackMode(b:Boolean) { + override fun setBlackMode(b: Boolean) { super.setBlackMode(b) - if (b){ + if (b) { iv_back_login.setBackgroundResource(R.mipmap.bg_black) ll_center.setBackgroundResource(R.color.black_mode_383838) et_number.setBackgroundResource(R.drawable.bg_gray_4_line_black) - }else{ + } else { iv_back_login.setBackgroundResource(R.mipmap.bg_lab_login) ll_center.setBackgroundResource(R.color.write) et_number.setBackgroundResource(R.drawable.bg_gray_4_line) @@ -80,8 +79,9 @@ private fun toLoginActivity(context: Context?, driverCertificate: String?) { var map = getMapByAny() - map["identification"] = driverCertificate - callNet(context!!,Api.loginByIdentification,map){ + map["taxiAptitudeCard"] = driverCertificate + callNet(context!!, Api.loginByTaxiAptitudeCard, map) { + MyApplication.upLog("登录车载端,taxiAptitudeCard:${driverCertificate}") cn.sinata.xldutils.utils.toast("登录成功") var bean = Gson().fromJson<LoginBean>(it, LoginBean::class.java) CacheKey.putKeyStr("appid", bean.data.appid) @@ -94,5 +94,4 @@ } } } - } \ No newline at end of file -- Gitblit v1.7.1