From 16d807930e47fcab5a7e773046daad78e04849e2 Mon Sep 17 00:00:00 2001
From: liugl <liugl@sinata.cn>
Date: 星期三, 18 十一月 2020 14:52:43 +0800
Subject: [PATCH] 11.11 修改bug2个
---
app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt | 128 +++++++++++++++++++++++++++++++-----------
1 files changed, 95 insertions(+), 33 deletions(-)
diff --git a/app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt b/app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt
index d126f15..bb0d39a 100644
--- a/app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt
+++ b/app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt
@@ -11,6 +11,7 @@
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
@@ -29,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
@@ -84,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{
+ showNoneNetDialog()
}
- //重重新登录 用来上线
}
+
private fun callPersion() {
@@ -114,18 +120,63 @@
}
}
+ var popup:EasyPopup? = null
+
override fun onResume() {
super.onResume()
+ showNoneNetDialog()
try {
- mainFragment.refresh()
+ mainFragment?.refresh()
+ callPersion()
}catch (e:Exception){
}
}
+ fun showNoneNetDialog(){
+ if (!NetUtils.isNetworkConnected(this)){
+ popup = getSlabDelAndSurePopWindow(this,"刷新","取消","网络不通畅,是否刷新页面？",{}){
+ if (!NetUtils.isNetworkConnected(this)){
+ toast("无网络")
+ }else{
+ initView()
+ popup?.dismiss()
+ }
+ }
+ window.decorView.post {
+ popup?.showCenter(window.decorView)
+ }
+ }
+ }
+
+ 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
+ tv_title_top.text = "服 务 监 督 卡"
+ 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 =
@@ -208,6 +259,7 @@
}
tv_name.clickDelay {
+
}
tv_car_num.clickDelay {
@@ -293,11 +345,16 @@
toast("收到显示屏信息")
}
}
+ BaseEvent.UPDATA_MAIN_CAR->{
+ try {
+ mainFragment.refresh()
+ }catch (e:Exception){
+ }
+ }
BaseEvent.ERROR_INFO -> {
try {
mainFragment.refresh()
}catch (e:Exception){
-
}
}
}
@@ -326,16 +383,17 @@
if (bean.data.version != "" && bean.data.version != Utils.getAppVersion(this)) {
if (bean.data.mandatory == 0) {
var pop =
- DialogUtil.getSlabDelAndSurePopWindow(this, "确定", "取消", "有新版本是否更新", {}) {
+ DialogUtil.getSlabDelAndSurePopWindow(true,this, "确定", "取消", "有新版本是否更新", {}) {
DownloadUtil(this).downloadAPK(bean.data.url, "ok出行车载端")
}
pop.showCenter(window.decorView)
} else {
var pop = DialogUtil.getSlabDelAndSurePopWindow(
+ false,
this,
"确定",
"取消",
- "版本已过时，是否强制升级?",
+ "版本已过时，强制升级!",
{}) {
DownloadUtil(this).downloadAPK(bean.data.url, "ok出行车载端")
toast("后台开始下载，请等待")
@@ -353,21 +411,8 @@
var identification = CacheKey.getKeyStr("identification")
if (jobNum.isNotEmpty()) {
var map = getMapByAny()
- map["jobNum"] = jobNum
- callNet(true, Api.loginByJobNumber, map) {
- var bean = gson.fromJson<LoginBean>(it, LoginBean::class.java)
- CacheKey.putKeyStr("jobNum", jobNum)
- 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())
- ok()
- }
- } else if (identification.isNotEmpty()) {
- var map = getMapByAny()
- map["identification"] = identification
- callNet(true, Api.loginByIdentification, map) {
+ map["taxiAptitudeCard"] = identification
+ callNet(this, Api.loginByTaxiAptitudeCard, map,{
var bean = Gson().fromJson<LoginBean>(it, LoginBean::class.java)
CacheKey.putKeyStr("identification", identification)
CacheKey.putKeyStr("appid", bean.data.appid)
@@ -376,6 +421,23 @@
CacheKey.putKeyStr("serverId", bean.data.serverId.toString())
CacheKey.putKeyStr("terminalName", bean.data.terminalId.toString())
ok()
+ }) {
+ ok()
+ }
+ } else if (identification.isNotEmpty()) {
+ var map = getMapByAny()
+ map["taxiAptitudeCard"] = identification
+ callNet(this, Api.loginByTaxiAptitudeCard, map,{
+ var bean = Gson().fromJson<LoginBean>(it, LoginBean::class.java)
+ CacheKey.putKeyStr("identification", identification)
+ 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())
+ ok()
+ }) {
+ ok()
}
} else {
ok()
--
Gitblit v1.7.1