From 500c89420af1d702c6b5351952d6f647080420c3 Mon Sep 17 00:00:00 2001 From: lijia Date: Sun, 3 Apr 2022 18:32:10 +0800 Subject: [PATCH] 1.0.4 --- .../main/java/com/dahe/examine/bean/UserBean.java | 9 +++++++++ .../ui/home/activity/ExamineDetailActivity.kt | 12 ++++++------ .../java/com/dahe/examine/ui/mine/MineFragment.kt | 2 +- app/src/main/res/layout/activity_examine_detail.xml | 10 +++++++--- app/src/main/res/layout/activity_record.xml | 1 + app/src/main/res/layout/fragment_gone.xml | 1 + app/src/main/res/layout/fragment_home.xml | 1 + app/src/main/res/layout/item_apply.xml | 2 ++ app/src/main/res/layout/item_gone.xml | 1 + app/src/main/res/layout/item_record.xml | 1 + 10 files changed, 30 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/dahe/examine/bean/UserBean.java b/app/src/main/java/com/dahe/examine/bean/UserBean.java index 8c330d2..a73ef44 100644 --- a/app/src/main/java/com/dahe/examine/bean/UserBean.java +++ b/app/src/main/java/com/dahe/examine/bean/UserBean.java @@ -88,10 +88,19 @@ public class UserBean implements Serializable { private String userId; private String phone; private String signName; + private String nickName; private String phonenumber; private String userName; private String sign; + public String getNickName() { + return nickName; + } + + public void setNickName(String nickName) { + this.nickName = nickName; + } + public String getUserName() { return userName; } diff --git a/app/src/main/java/com/dahe/examine/ui/home/activity/ExamineDetailActivity.kt b/app/src/main/java/com/dahe/examine/ui/home/activity/ExamineDetailActivity.kt index 07b77d9..ee23ac5 100644 --- a/app/src/main/java/com/dahe/examine/ui/home/activity/ExamineDetailActivity.kt +++ b/app/src/main/java/com/dahe/examine/ui/home/activity/ExamineDetailActivity.kt @@ -52,8 +52,8 @@ class ExamineDetailActivity : BaseActivity(), View.OnClickListener { tvJb.text = """国家A级: ${bean.nationalClassA}""" tvCls.text = bean.vehiclesNumber tvXqs.text = bean.numberOfPassesRequired - tvFzr.text = """负责人: ${bean.enterpriseContact}""" - tvPhone.text = """电话: ${bean.enterpriseContactPhone}""" + tvFzr.text = """通行证管理人: ${bean.enterpriseContact}""" + tvPhone.text = """管理人电话: ${bean.enterpriseContactPhone}""" DataManager.getInstance().appUser(bean.userId) @@ -63,8 +63,8 @@ class ExamineDetailActivity : BaseActivity(), View.OnClickListener { super.onSuccess(t) val data = t.data tvZcdz.text = data.placeOfRegistration - tvBgdz.text = data.companyAddress - tvCqdz.text = data.plantAddress + tvBgdz.text = data.plantAddress + tvCqdz.text = data.companyAddress } })) } @@ -119,7 +119,7 @@ class ExamineDetailActivity : BaseActivity(), View.OnClickListener { return } - if (tvStartTime.text.isNullOrEmpty()||tvEndTime.text.isNullOrEmpty()){ + if (tvStartTime.text.isNullOrEmpty()){ showToast("请选择时间") return } @@ -127,7 +127,7 @@ class ExamineDetailActivity : BaseActivity(), View.OnClickListener { applyBean.infoId = bean.infoId applyBean.numberOfPasses = etCount.text.toString() applyBean.passUsageStartTime = tvStartTime.text.toString() - applyBean.passUsageEndTime = tvEndTime.text.toString() +// applyBean.passUsageEndTime = tvEndTime.text.toString() applyBean.status = "1" DataManager.getInstance().appleEdit(applyBean) .compose(DataManager.setThread()) diff --git a/app/src/main/java/com/dahe/examine/ui/mine/MineFragment.kt b/app/src/main/java/com/dahe/examine/ui/mine/MineFragment.kt index 36ff84b..003bbb8 100644 --- a/app/src/main/java/com/dahe/examine/ui/mine/MineFragment.kt +++ b/app/src/main/java/com/dahe/examine/ui/mine/MineFragment.kt @@ -31,7 +31,7 @@ class MineFragment : BaseFragment(), View.OnClickListener { val userInfo = SPUtils.getUserInfo(mContext).userInfo if (null==userInfo) return - tvName.text = userInfo.signName + tvName.text = userInfo.nickName tvPhone.text = userInfo.userName } diff --git a/app/src/main/res/layout/activity_examine_detail.xml b/app/src/main/res/layout/activity_examine_detail.xml index 540c63d..59c2b7c 100644 --- a/app/src/main/res/layout/activity_examine_detail.xml +++ b/app/src/main/res/layout/activity_examine_detail.xml @@ -157,7 +157,7 @@ android:ellipsize="end" android:maxLength="11" android:maxLines="1" - android:text="负责人：王宗亮" + android:text="通行证管理人：王宗亮" android:textColor="@color/black"> @@ -183,7 +183,7 @@ android:ellipsize="end" android:maxLength="11" android:maxLines="1" - android:text="电话：13000000005" + android:text="管理人电话：13000000005" android:textColor="@color/black"> @@ -215,12 +215,14 @@ @@ -350,6 +352,7 @@ android:textSize="12dp">