From 4912c06eaec62476354d0befa97ea3029cf756ed Mon Sep 17 00:00:00 2001
From: liugl <liugl@sinata.cn>
Date: 星期一, 03 八月 2020 14:35:01 +0800
Subject: [PATCH] 8.3
---
app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt | 161 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 134 insertions(+), 27 deletions(-)
diff --git a/app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt b/app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt
index f1d398c..1dee26f 100644
--- a/app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt
+++ b/app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt
@@ -1,10 +1,17 @@
package com.okgoincar.slab
+import android.content.Intent
+import android.content.IntentFilter
+import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
import android.widget.Toast
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import cn.sinata.rxnetty.NettyClient
+import cn.sinata.xldutils.utils.Utils
import cn.sinata.xldutils.utils.clickDelay
+import cn.sinata.xldutils.utils.getNowTimeBlack
import cn.sinata.xldutils.utils.textColor
import com.amap.api.location.AMapLocation
import com.amap.api.location.AMapLocationListener
@@ -17,15 +24,15 @@
import com.okgoincar.base.AMapKit
import com.okgoincar.base.BaseEvent
import com.okgoincar.base.MyApplication
-import com.okgoincar.bean.HomeDataBean
-import com.okgoincar.bean.MainInfoBean
-import com.okgoincar.bean.UserBean
-import com.okgoincar.bean.UserInfoBean
+import com.okgoincar.bean.*
import com.okgoincar.netUtls.Api
import com.okgoincar.slab.event.SlabMineEventActivity
+import com.okgoincar.slab.util.DialogUtil
import com.okgoincar.utils.DateUtil
+import com.okgoincar.utils.download.DownloadUtil
import com.okgoincar.utils.glide.GlideUtil
import kotlinx.android.synthetic.main.slab_activity_main.*
+import org.greenrobot.eventbus.EventBus
import org.jetbrains.anko.startActivity
import org.jetbrains.anko.toast
@@ -41,14 +48,39 @@
setContentView(R.layout.slab_activity_main)
}
+
override fun setBlackMode(b: Boolean?) {
super.setBlackMode(b)
- if (b!!) {
+ if (b!!) { //晚上
ct_bg.setBackgroundResource(R.color.black_191919)
- ll_top.setBackgroundResource(R.drawable.bg_green_top_black)
+ ll_top.setBackgroundResource(R.drawable.bg_gray_top)
+ tv_server_ing.textColor(this, R.color.write)
+ iv_small.textColor(this, R.color.write)
+ tv_wait_server.textColor(this, R.color.write)
+ tv_code_num.textColor(this, R.color.write)
+ tv_name.textColor(this, R.color.write)
+ tv_car_num.textColor(this, R.color.write)
+ tv_star_num.textColor(this, R.color.write)
+ tv_current_time.textColor(this, R.color.write)
+ tv_company.textColor(this, R.color.write)
+ tv_time.textColor(this, R.color.write)
+ tv_car_statue.textColor(this, R.color.write)
+ tv_title.textColor(this, R.color.slab_yellow_zhong)
} else {
ll_top.setBackgroundResource(R.drawable.bg_green_top)
- ct_bg.setBackgroundResource(R.drawable.bg_slab_main)
+ ct_bg.setBackgroundResource(R.drawable.write)
+ tv_server_ing.textColor(this, R.color.black)
+ iv_small.textColor(this, R.color.black)
+ tv_wait_server.textColor(this, R.color.black)
+ tv_code_num.textColor(this, R.color.black)
+ tv_name.textColor(this, R.color.black)
+ tv_car_num.textColor(this, R.color.black)
+ tv_star_num.textColor(this, R.color.black)
+ tv_current_time.textColor(this, R.color.black)
+ tv_company.textColor(this, R.color.black)
+ tv_time.textColor(this, R.color.black)
+ tv_car_statue.textColor(this, R.color.black)
+ tv_title.textColor(this, R.color.yellow_ffa72d)
}
}
@@ -62,7 +94,10 @@
initCall()
NettyClient.getInstance().startService()
callPersion()
+// showOrder("2221", "2", 100, 2)
+ callVersion()
}
+
private fun callPersion() {
callNet(true, Api.queryInfo, getMapByAny()) {
@@ -79,7 +114,7 @@
private fun showUI(data: UserInfoBean?) {
data?.let {
- tv_code_num.text = "证号：" + data.taxiAptitudeCard
+ tv_code_num.text = "资格证号：" + data.taxiAptitudeCard
tv_name.text = "姓名：" + it.name
tv_car_num.text = "车牌：" + it.licensePlate
recycler_view_start.layoutManager =
@@ -91,7 +126,7 @@
recycler_view_start.adapter = SlabStartAdapter(it.score.toDouble())
tv_company.text = "公司：" + it.company
tv_time.text = "发证日期：" + it.networkCarlssueDate
- GlideUtil.load(this, it.avatar, iv_head, 1)
+ GlideUtil.load(this, it.avatar, iv_head, 8)
tv_current_time.text = DateUtil.getTime(
DateUtil.TYPE7,
System.currentTimeMillis()
@@ -105,6 +140,18 @@
var data = gson.fromJson<HomeDataBean>(it, HomeDataBean::class.java)
homeDataBean = data
tv_car.text = if (data.data.work == 1) "收车" else "出车"
+ if (data.data.work == 1) {
+ MyApplication.getTTsManager().setVideoText("您正在上班中")
+ } else {
+// MyApplication.getTTsManager().setVideoText("您已下班")
+ var mapC = getMapByAny()
+ mapC["type"] = "2"
+ callNet(true, Api.work2, mapC) {
+ homeDataBean?.data?.work = 1
+ tv_car.text = "收车"
+ MyApplication.getTTsManager().setVideoText("您正在上班中")
+ }
+ }
}
@@ -125,19 +172,41 @@
override fun setOnclick() {
tv_server_ing.setOnClickListener {
tv_server_ing.textColor(this, R.color.main_yellow)
- tv_wait_server.textColor(this, R.color.white)
+ if (getNowTimeBlack()) {
+ tv_wait_server.textColor(this, R.color.white)
+ } else {
+ tv_wait_server.textColor(this, R.color.black)
+ }
mainFragment.state = 1
mainFragment.autoRefresh()
}
tv_wait_server.setOnClickListener {
- tv_server_ing.textColor(this, R.color.white)
tv_wait_server.textColor(this, R.color.main_yellow)
+ if (getNowTimeBlack()) {
+ tv_server_ing.textColor(this, R.color.white)
+ } else {
+ tv_server_ing.textColor(this, R.color.black)
+ }
mainFragment.state = 2
mainFragment.autoRefresh()
}
+ tv_name.clickDelay {
+ toast("点亮网约")
+ }
+ tv_car_num.clickDelay {
+
+ }
+
+ tv_star_num.clickDelay {
+
+ }
+
+ tv_more.clickDelay {
+ startActivity<SlabOrderListActivity>()
+ }
ll_task.clickDelay {
@@ -146,21 +215,21 @@
tv_car.clickDelay {
- if (homeDataBean?.data?.work == 1) {
- callNet(true, Api.work2, getMapByAny()) {
- homeDataBean?.data?.work = 2
- tv_car.text = "出车"
- toast("下班成功")
- }
- } else {
- var map = getMapByAny()
- map["type"] = "2"
- callNet(true, Api.work2, map) {
- homeDataBean?.data?.work = 1
- tv_car.text = "收车"
- toast("上班成功")
- }
- }
+ // if (homeDataBean?.data?.work == 1) {
+// callNet(true, Api.work2, getMapByAny()) {
+// homeDataBean?.data?.work = 2
+// tv_car.text = "出车"
+// MyApplication.getTTsManager().setVideoText("您已下班")
+// }
+// } else {
+// var map = getMapByAny()
+// map["type"] = "2"
+// callNet(true, Api.work2, map) {
+// homeDataBean?.data?.work = 1
+// tv_car.text = "收车"
+// MyApplication.getTTsManager().setVideoText("您正在上班中")
+// }
+// }
}
}
@@ -185,13 +254,51 @@
BaseEvent.START_CAR -> {
initCall()
}
+ BaseEvent.REQUEST_CAR_INFO -> {
+ Handler(Looper.getMainLooper()).post {
+ toast("收到显示屏信息")
+ }
+ }
}
}
override fun onLocationChanged(p0: AMapLocation?) {
- if (p0?.errorCode == 0) {
+ if (p0 == null) {
+ toast("高德位置是空的")
+ return
+ }
+ if (p0.errorCode == 0) {
+ toast("定位成功")
MyApplication.aMapLocation = p0
CacheKey.putKeyStr("location", Gson().toJson(p0))
+ } else {
+ p0.let {
+ toast("定位失败" + it.errorCode.toString())
+ }
+ }
+ }
+
+ private fun callVersion() {
+ var map = getMapByAny()
+ callNet(false, Api.queryNewData_, map) {
+ var bean = gson.fromJson<VersionBean>(it, VersionBean::class.java)
+ if (bean.data.version != "" && bean.data.version != Utils.getAppVersion(this)) {
+ if (bean.data.mandatory == 0) {
+ var pop = DialogUtil.getSlabDelAndSurePopWindow(this, "确定" ,"取消","有新版本是否更新", {}) {
+ DownloadUtil(this).downloadAPK(bean.data.url, "ok出行车载端")
+ }
+ pop.showCenter(window.decorView)
+ } else {
+ var pop = DialogUtil.getSlabDelAndSurePopWindow(this,"确定" ,"取消","版本已过时，是否强制升级?", {}) {
+ DownloadUtil(this).downloadAPK(bean.data.url, "ok出行车载端")
+ toast("后台开始下载，请等待")
+ }
+ pop.showCenter(window.decorView)
+ }
+
+ } else {
+ toast("已经是最新版本")
+ }
}
}
}
\ No newline at end of file
--
Gitblit v1.7.1