From 080f7b67b66121fb325d777ba066112a2ace6825 Mon Sep 17 00:00:00 2001 From: liugl <liugl@sinata.cn> Date: 星期一, 02 十一月 2020 15:57:03 +0800 Subject: [PATCH] 11.30 首页列表添加 其他数据用来展示页面 不空 --- app/src/main/java/com/okgoincar/slab/SlabLoginActivity.kt | 65 ++++++-------------------------- 1 files changed, 12 insertions(+), 53 deletions(-) diff --git a/app/src/main/java/com/okgoincar/slab/SlabLoginActivity.kt b/app/src/main/java/com/okgoincar/slab/SlabLoginActivity.kt index f3e7c5a..410d5ca 100644 --- a/app/src/main/java/com/okgoincar/slab/SlabLoginActivity.kt +++ b/app/src/main/java/com/okgoincar/slab/SlabLoginActivity.kt @@ -36,8 +36,8 @@ override fun onResume() { super.onResume() - if (!NetUtils.isNetworkConnected(this)){ - var dialog = DialogUtil.getSlabSurePopWindow(this,"当前网络不通畅,请稍后再登录"){ + if (!NetUtils.isNetworkConnected(this)) { + var dialog = DialogUtil.getSlabSurePopWindow(this, "当前网络不通畅,请稍后再登录") { EventBus.getDefault().post(BaseEvent(BaseEvent.OUT_APP)) } dialog.showCenter(window.decorView) @@ -46,37 +46,19 @@ 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>() -// } -// 51168119911111447X 15928265276 11111q -// toLoginActivity(this,"51168119911111447X") - + // 51168119911111447X 15928265276 11111q +// 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) @@ -96,43 +78,20 @@ } } -// private fun toLoginActivity(context: Context?, driverCertificate: String?) { -// var map = getMapByAny() -// map["taxiAptitudeCard"] = driverCertificate -// callNet(context!!,Api.loginByTaxiAptitudeCard,map){ -// cn.sinata.xldutils.utils.toast("登录成功") -// var bean = Gson().fromJson<LoginBean>(it, LoginBean::class.java) -// 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()) -// Handler(Looper.getMainLooper()).post { -// context.startActivity<SlabMainActivity>() -// } -// } -// } - - private fun toLoginActivity(context: Context?, driverCertificate: String?) { var map = getMapByAny() - map["identification"] = driverCertificate - callNet(context!!, Api.loginByIdentification, map) { - toast("登录成功") + map["taxiAptitudeCard"] = driverCertificate + callNet(context!!, Api.loginByTaxiAptitudeCard, map) { + cn.sinata.xldutils.utils.toast("登录成功") var bean = Gson().fromJson<LoginBean>(it, LoginBean::class.java) - CacheKey.putKeyStr("identification", driverCertificate!!) 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()) Handler(Looper.getMainLooper()).post { - var intent = Intent() - intent.setClass(context, SlabMainActivity::class.java) - intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK - context.startActivity(intent) + context.startActivity<SlabMainActivity>() } } } - } \ No newline at end of file -- Gitblit v1.7.1