From bd6a8872438a35d47821c5d5da7fe149e5fed3ab Mon Sep 17 00:00:00 2001
From: lmw <125975490@qq.com>
Date: 星期三, 21 六月 2023 09:53:36 +0800
Subject: [PATCH] 处理收不到广播
---
app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt b/app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt
index a5330ec..3c361be 100644
--- a/app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt
+++ b/app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt
@@ -154,7 +154,7 @@
clickClose: () -> Unit,
clickSure: () -> Unit
): PopupWindow {
- var dialog = PopupWindow(createView(R.layout.dialog_sure_and_del_slab,context))
+ var dialog = PopupWindow(createView(R.layout.dialog_sure_and_del_slab, context))
dialog.width = ViewGroup.LayoutParams.MATCH_PARENT
dialog.height = ViewGroup.LayoutParams.MATCH_PARENT
@@ -173,10 +173,13 @@
return dialog
}
-
private fun showUI(data: UserInfoBean?) {
data?.let {
- textView_version.text = "版本-V" + PackageUtil.getVersionName(this)
+ if (Api.BASE_URL.contains("okyueche")){
+ textView_version.text = "版本-V" + PackageUtil.getVersionName(this)+"_online"
+ }else{
+ textView_version.text = "版本-V" + PackageUtil.getVersionName(this)+ "_测试"
+ }
tv_title_top.text = "服 务 监 督 卡"
if (data.taxiAptitudeCard.length > 7) {
tv_code_num.text = "资格证号：" + data.taxiAptitudeCard.substring(
@@ -223,7 +226,7 @@
} else {
// MyApplication.getTTsManager().setVideoText("您已下班")
var mapC = getMapByAny()
- mapC["type"] = "2"
+ mapC["type"] = "2,4"
callNet(true, Api.work2, mapC) {
homeDataBean?.data?.work = 1
tv_car.text = "收车"
@@ -291,7 +294,7 @@
}
tv_title_top.clickDelay {
-
+// showOrder("3170","2",100,1)
}
view_mode.clickDelay {
@@ -402,7 +405,7 @@
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.version != "" && bean.data.version > Utils.getAppVersion(this)) {
if (bean.data.mandatory == 0) {
var pop =
DialogUtil.getSlabDelAndSurePopWindow(
--
Gitblit v1.7.1