From 798c626c95adfa29cdb54a04a55e0776f3b22c80 Mon Sep 17 00:00:00 2001
From: liugl <liugl@sinata.cn>
Date: 星期五, 04 九月 2020 15:47:34 +0800
Subject: [PATCH] 8.31
---
app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt | 86 ++++++++++++++++++++++++++++++++++---------
1 files changed, 68 insertions(+), 18 deletions(-)
diff --git a/app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt b/app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt
index 63e6c6a..376aea2 100644
--- a/app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt
+++ b/app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt
@@ -9,7 +9,9 @@
import android.widget.Toast
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
+import cn.sinata.rxnetty.Cache.CacheUtil
import cn.sinata.rxnetty.NettyClient
+import cn.sinata.xldutils.netstatus.NetUtils
import cn.sinata.xldutils.utils.*
import com.amap.api.location.AMapLocation
import com.amap.api.location.AMapLocationListener
@@ -28,8 +30,10 @@
import com.okgoincar.slab.event.SlabMineEventActivity
import com.okgoincar.slab.util.DialogUtil
import com.okgoincar.utils.DateUtil
+import com.okgoincar.utils.EasePopup.EasyPopup
import com.okgoincar.utils.download.DownloadUtil
import com.okgoincar.utils.glide.GlideUtil
+import kotlinx.android.synthetic.main.dialog_sure_and_del_slab.view.*
import kotlinx.android.synthetic.main.slab_activity_login.*
import kotlinx.android.synthetic.main.slab_activity_main.*
import kotlinx.android.synthetic.main.slab_activity_main.tv_name
@@ -83,26 +87,29 @@
tv_time.textColor(this, R.color.black)
tv_car_statue.textColor(this, R.color.black)
tv_title.textColor(this, R.color.yellow_ffa72d)
-
}
}
override fun initView() {
- setTitleText("OK出行司机")
- showHeader(false)
- showTitle(false)
- callLogin {
- view_mode.isSelected = !getNowTimeBlack()
- addFragment(mainFragment, R.id.rl_container)
- AMapKit.initLocation(this, this)
- initCall()
- NettyClient.getInstance().startService()
- callPersion()
+ if (NetUtils.isNetworkConnected(this)){
+ setTitleText("OK出行司机")
+ showHeader(false)
+ showTitle(false)
+ callLogin {
+ view_mode.isSelected = !getNowTimeBlack()
+ addFragment(mainFragment, R.id.rl_container)
+ AMapKit.initLocation(this, this)
+ initCall()
+ NettyClient.getInstance().startService()
+ callPersion()
// showOrder("2221", "2", 100, 2)
- callVersion()
+ callVersion()
+ }
+ }else{
+ toast("无网络")
}
- //重重新登录 用来上线
}
+
private fun callPersion() {
@@ -113,18 +120,58 @@
}
}
+ var popup:EasyPopup? = null
+
override fun onResume() {
super.onResume()
+ if (!NetUtils.isNetworkConnected(this)){
+ popup = getSlabDelAndSurePopWindow(this,"刷新","取消","网络不通畅,是否刷新页面？",{}){
+ if (!NetUtils.isNetworkConnected(this)){
+ toast("无网络")
+ }else{
+ initView()
+ popup?.dismiss()
+ }
+ }
+ window.decorView.post {
+ popup?.showCenter(window.decorView)
+ }
+ }
try {
- mainFragment.refresh()
+ mainFragment?.refresh()
}catch (e:Exception){
}
+
}
+
+ fun getSlabDelAndSurePopWindow(context: Context,sureStr:String,cancelStr:String,content:String,clickClose :() -> Unit,clickSure:() -> Unit): EasyPopup {
+ var dialog = DialogUtil.getPopupwindow(context, R.layout.dialog_sure_and_del_slab)
+ var view = dialog.contentView
+ view.tv_close_base.text = cancelStr
+ view.tv_sure_base.text = sureStr
+ view.tv_close_base.gone()
+ view.tv_close_base.setOnClickListener {
+ dialog.dismiss()
+ clickClose()
+ }
+ view.tv_sure_base.setOnClickListener {
+ clickSure()
+ }
+ view.tv_view_two_base.text = content
+ return dialog
+ }
+
+
+
private fun showUI(data: UserInfoBean?) {
data?.let {
- tv_code_num.text = "资格证号：" + data.taxiAptitudeCard
+ if (data.taxiAptitudeCard.length > 7){
+ tv_code_num.text = "资格证号："+data.taxiAptitudeCard.substring(0,3)+"*******"+data.taxiAptitudeCard.substring(data.taxiAptitudeCard.length-4,data.taxiAptitudeCard.length)
+ }else{
+ tv_code_num.text = "资格证号：" + data.taxiAptitudeCard
+ }
tv_name.text = "姓名：" + it.name
tv_car_num.text = "车牌：" + it.licensePlate
recycler_view_start.layoutManager =
@@ -134,7 +181,11 @@
false
) as RecyclerView.LayoutManager?
recycler_view_start.adapter = SlabStartAdapter(it.score.toDouble())
- tv_company.text = "公司：" + it.company
+ var company = it.company
+ if (company.startsWith("广西")){
+ company = company.substring(2,company.length)
+ }
+ tv_company.text = "公司：" + company
tv_time.text = "发证日期：" + it.networkCarlssueDate
GlideUtil.load(this, it.avatar, iv_head, 8)
tv_current_time.text = DateUtil.getTime(
@@ -203,6 +254,7 @@
}
tv_name.clickDelay {
+
}
tv_car_num.clickDelay {
@@ -216,7 +268,6 @@
tv_more.clickDelay {
startActivity<SlabOrderListActivity>()
}
-
ll_task.clickDelay {
startActivity<SlabMineEventActivity>()
@@ -343,7 +394,6 @@
}
}
}
-
private fun callLogin(ok: () -> Unit) {
var jobNum = CacheKey.getKeyStr("jobNum")
--
Gitblit v1.7.1