From a7446bb3995654a2c5e8d03589111d16e0734bfc Mon Sep 17 00:00:00 2001
From: liugl <liugl@sinata.cn>
Date: 星期五, 31 七月 2020 15:04:08 +0800
Subject: [PATCH] 7.31
---
app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt | 105 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 66 insertions(+), 39 deletions(-)
diff --git a/app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt b/app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt
index 9145790..cef0b9c 100644
--- a/app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt
+++ b/app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt
@@ -9,6 +9,7 @@
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
@@ -23,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
@@ -53,33 +54,33 @@
if (b!!) { //晚上
ct_bg.setBackgroundResource(R.color.black_191919)
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)
+ 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.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)
+ 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)
}
}
@@ -93,8 +94,10 @@
initCall()
NettyClient.getInstance().startService()
callPersion()
- showOrder("2221","2",100,2)
+ showOrder("2221", "2", 100, 2)
+ callVersion()
}
+
private fun callPersion() {
callNet(true, Api.queryInfo, getMapByAny()) {
@@ -137,9 +140,9 @@
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){
+ if (data.data.work == 1) {
MyApplication.getTTsManager().setVideoText("您正在上班中")
- }else{
+ } else {
// MyApplication.getTTsManager().setVideoText("您已下班")
var mapC = getMapByAny()
mapC["type"] = "2"
@@ -169,9 +172,9 @@
override fun setOnclick() {
tv_server_ing.setOnClickListener {
tv_server_ing.textColor(this, R.color.main_yellow)
- if (getNowTimeBlack()){
+ if (getNowTimeBlack()) {
tv_wait_server.textColor(this, R.color.white)
- }else{
+ } else {
tv_wait_server.textColor(this, R.color.black)
}
mainFragment.state = 1
@@ -180,9 +183,9 @@
tv_wait_server.setOnClickListener {
tv_wait_server.textColor(this, R.color.main_yellow)
- if (getNowTimeBlack()){
+ if (getNowTimeBlack()) {
tv_server_ing.textColor(this, R.color.white)
- }else{
+ } else {
tv_server_ing.textColor(this, R.color.black)
}
mainFragment.state = 2
@@ -212,7 +215,7 @@
tv_car.clickDelay {
-// if (homeDataBean?.data?.work == 1) {
+ // if (homeDataBean?.data?.work == 1) {
// callNet(true, Api.work2, getMapByAny()) {
// homeDataBean?.data?.work = 2
// tv_car.text = "出车"
@@ -260,7 +263,7 @@
}
override fun onLocationChanged(p0: AMapLocation?) {
- if (p0 == null){
+ if (p0 == null) {
toast("高德位置是空的")
return
}
@@ -268,9 +271,33 @@
toast("定位成功")
MyApplication.aMapLocation = p0
CacheKey.putKeyStr("location", Gson().toJson(p0))
- }else{
+ } else {
p0.let {
- toast("定位失败"+it.errorCode.toString())
+ 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("已经是最新版本")
}
}
}
--
Gitblit v1.7.1