diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt index 0468f95..e6160dc 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt @@ -104,6 +104,7 @@ entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java] entrustViewModel.addResult.observe(this) { if (it.code == 200) { + "委托添加成功".show(this) finish() } } @@ -271,6 +272,11 @@ return@setOnClickListener } + if (!contact.isPhoneNumber()) { + "请填写正确的联系方式".show(this) + return@setOnClickListener + } + val estimateTime = estimateTimeView.text.toString() if (estimateTime.isBlank()) { "请选择预计送到的时间".show(this) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt index 0468f95..e6160dc 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt @@ -104,6 +104,7 @@ entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java] entrustViewModel.addResult.observe(this) { if (it.code == 200) { + "委托添加成功".show(this) finish() } } @@ -271,6 +272,11 @@ return@setOnClickListener } + if (!contact.isPhoneNumber()) { + "请填写正确的联系方式".show(this) + return@setOnClickListener + } + val estimateTime = estimateTimeView.text.toString() if (estimateTime.isBlank()) { "请选择预计送到的时间".show(this) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index 292d7bc..a343b88 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -157,14 +157,26 @@ item.standardLaboratoryName } - if (item.validTime.isEarlierThenCurrent()) { - viewHolder.setTextColor( - R.id.deviceDateView, R.color.red.convertColor(context) - ) + val validTime = if (item.validTime == "") { + "暂时无法确定" } else { + item.validTime.formatToYearMonthDay() + } + + if (validTime == "暂时无法确定") { viewHolder.setTextColor( R.id.deviceDateView, R.color.gray.convertColor(context) ) + } else { + if (item.validTime.isEarlierThenCurrent()) { + viewHolder.setTextColor( + R.id.deviceDateView, R.color.red.convertColor(context) + ) + } else { + viewHolder.setTextColor( + R.id.deviceDateView, R.color.gray.convertColor(context) + ) + } } viewHolder.setText(R.id.deviceNameView, item.standardName) @@ -174,10 +186,7 @@ .setText(R.id.deviceCodeView, "装置编号:${item.standardNo}") .setText(R.id.remarkView, "备注:$remark") .setText(R.id.deviceLibView, lab) - .setText( - R.id.deviceDateView, - "有效期至:${item.validTime.formatToYearMonthDay()}" - ) + .setText(R.id.deviceDateView, "有效期至:${validTime}") .setText(R.id.labOwnerView, "管理员:${item.laboratoryOwnerName}") } } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt index 0468f95..e6160dc 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt @@ -104,6 +104,7 @@ entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java] entrustViewModel.addResult.observe(this) { if (it.code == 200) { + "委托添加成功".show(this) finish() } } @@ -271,6 +272,11 @@ return@setOnClickListener } + if (!contact.isPhoneNumber()) { + "请填写正确的联系方式".show(this) + return@setOnClickListener + } + val estimateTime = estimateTimeView.text.toString() if (estimateTime.isBlank()) { "请选择预计送到的时间".show(this) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index 292d7bc..a343b88 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -157,14 +157,26 @@ item.standardLaboratoryName } - if (item.validTime.isEarlierThenCurrent()) { - viewHolder.setTextColor( - R.id.deviceDateView, R.color.red.convertColor(context) - ) + val validTime = if (item.validTime == "") { + "暂时无法确定" } else { + item.validTime.formatToYearMonthDay() + } + + if (validTime == "暂时无法确定") { viewHolder.setTextColor( R.id.deviceDateView, R.color.gray.convertColor(context) ) + } else { + if (item.validTime.isEarlierThenCurrent()) { + viewHolder.setTextColor( + R.id.deviceDateView, R.color.red.convertColor(context) + ) + } else { + viewHolder.setTextColor( + R.id.deviceDateView, R.color.gray.convertColor(context) + ) + } } viewHolder.setText(R.id.deviceNameView, item.standardName) @@ -174,10 +186,7 @@ .setText(R.id.deviceCodeView, "装置编号:${item.standardNo}") .setText(R.id.remarkView, "备注:$remark") .setText(R.id.deviceLibView, lab) - .setText( - R.id.deviceDateView, - "有效期至:${item.validTime.formatToYearMonthDay()}" - ) + .setText(R.id.deviceDateView, "有效期至:${validTime}") .setText(R.id.labOwnerView, "管理员:${item.laboratoryOwnerName}") } } diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml index 7b6248b..8174070 100644 --- a/app/src/main/res/layout/activity_entrust_add.xml +++ b/app/src/main/res/layout/activity_entrust_add.xml @@ -54,7 +54,8 @@ android:id="@+id/contactView" style="@style/inputEditTextStyle" android:hint="请输入" - android:inputType="phone" /> + android:inputType="phone" + android:maxLength="11" /> diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt index 0468f95..e6160dc 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt @@ -104,6 +104,7 @@ entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java] entrustViewModel.addResult.observe(this) { if (it.code == 200) { + "委托添加成功".show(this) finish() } } @@ -271,6 +272,11 @@ return@setOnClickListener } + if (!contact.isPhoneNumber()) { + "请填写正确的联系方式".show(this) + return@setOnClickListener + } + val estimateTime = estimateTimeView.text.toString() if (estimateTime.isBlank()) { "请选择预计送到的时间".show(this) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index 292d7bc..a343b88 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -157,14 +157,26 @@ item.standardLaboratoryName } - if (item.validTime.isEarlierThenCurrent()) { - viewHolder.setTextColor( - R.id.deviceDateView, R.color.red.convertColor(context) - ) + val validTime = if (item.validTime == "") { + "暂时无法确定" } else { + item.validTime.formatToYearMonthDay() + } + + if (validTime == "暂时无法确定") { viewHolder.setTextColor( R.id.deviceDateView, R.color.gray.convertColor(context) ) + } else { + if (item.validTime.isEarlierThenCurrent()) { + viewHolder.setTextColor( + R.id.deviceDateView, R.color.red.convertColor(context) + ) + } else { + viewHolder.setTextColor( + R.id.deviceDateView, R.color.gray.convertColor(context) + ) + } } viewHolder.setText(R.id.deviceNameView, item.standardName) @@ -174,10 +186,7 @@ .setText(R.id.deviceCodeView, "装置编号:${item.standardNo}") .setText(R.id.remarkView, "备注:$remark") .setText(R.id.deviceLibView, lab) - .setText( - R.id.deviceDateView, - "有效期至:${item.validTime.formatToYearMonthDay()}" - ) + .setText(R.id.deviceDateView, "有效期至:${validTime}") .setText(R.id.labOwnerView, "管理员:${item.laboratoryOwnerName}") } } diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml index 7b6248b..8174070 100644 --- a/app/src/main/res/layout/activity_entrust_add.xml +++ b/app/src/main/res/layout/activity_entrust_add.xml @@ -54,7 +54,8 @@ android:id="@+id/contactView" style="@style/inputEditTextStyle" android:hint="请输入" - android:inputType="phone" /> + android:inputType="phone" + android:maxLength="11" /> diff --git a/app/src/main/res/layout/activity_feed_back.xml b/app/src/main/res/layout/activity_feed_back.xml index 34ed6ff..fc51932 100644 --- a/app/src/main/res/layout/activity_feed_back.xml +++ b/app/src/main/res/layout/activity_feed_back.xml @@ -95,7 +95,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@null" - android:hint="请输入手机号便于联系(非必填)" + android:hint="请输入手机号便于联系" android:inputType="phone" android:maxLength="11" android:paddingVertical="@dimen/dp_7" diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt index 0468f95..e6160dc 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt @@ -104,6 +104,7 @@ entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java] entrustViewModel.addResult.observe(this) { if (it.code == 200) { + "委托添加成功".show(this) finish() } } @@ -271,6 +272,11 @@ return@setOnClickListener } + if (!contact.isPhoneNumber()) { + "请填写正确的联系方式".show(this) + return@setOnClickListener + } + val estimateTime = estimateTimeView.text.toString() if (estimateTime.isBlank()) { "请选择预计送到的时间".show(this) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index 292d7bc..a343b88 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -157,14 +157,26 @@ item.standardLaboratoryName } - if (item.validTime.isEarlierThenCurrent()) { - viewHolder.setTextColor( - R.id.deviceDateView, R.color.red.convertColor(context) - ) + val validTime = if (item.validTime == "") { + "暂时无法确定" } else { + item.validTime.formatToYearMonthDay() + } + + if (validTime == "暂时无法确定") { viewHolder.setTextColor( R.id.deviceDateView, R.color.gray.convertColor(context) ) + } else { + if (item.validTime.isEarlierThenCurrent()) { + viewHolder.setTextColor( + R.id.deviceDateView, R.color.red.convertColor(context) + ) + } else { + viewHolder.setTextColor( + R.id.deviceDateView, R.color.gray.convertColor(context) + ) + } } viewHolder.setText(R.id.deviceNameView, item.standardName) @@ -174,10 +186,7 @@ .setText(R.id.deviceCodeView, "装置编号:${item.standardNo}") .setText(R.id.remarkView, "备注:$remark") .setText(R.id.deviceLibView, lab) - .setText( - R.id.deviceDateView, - "有效期至:${item.validTime.formatToYearMonthDay()}" - ) + .setText(R.id.deviceDateView, "有效期至:${validTime}") .setText(R.id.labOwnerView, "管理员:${item.laboratoryOwnerName}") } } diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml index 7b6248b..8174070 100644 --- a/app/src/main/res/layout/activity_entrust_add.xml +++ b/app/src/main/res/layout/activity_entrust_add.xml @@ -54,7 +54,8 @@ android:id="@+id/contactView" style="@style/inputEditTextStyle" android:hint="请输入" - android:inputType="phone" /> + android:inputType="phone" + android:maxLength="11" /> diff --git a/app/src/main/res/layout/activity_feed_back.xml b/app/src/main/res/layout/activity_feed_back.xml index 34ed6ff..fc51932 100644 --- a/app/src/main/res/layout/activity_feed_back.xml +++ b/app/src/main/res/layout/activity_feed_back.xml @@ -95,7 +95,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@null" - android:hint="请输入手机号便于联系(非必填)" + android:hint="请输入手机号便于联系" android:inputType="phone" android:maxLength="11" android:paddingVertical="@dimen/dp_7" diff --git a/app/src/main/res/layout/item_entrust_rv_l.xml b/app/src/main/res/layout/item_entrust_rv_l.xml index 4281184..c7c8a8d 100644 --- a/app/src/main/res/layout/item_entrust_rv_l.xml +++ b/app/src/main/res/layout/item_entrust_rv_l.xml @@ -76,7 +76,7 @@ + android:inputType="phone" + android:maxLength="11" /> diff --git a/app/src/main/res/layout/activity_feed_back.xml b/app/src/main/res/layout/activity_feed_back.xml index 34ed6ff..fc51932 100644 --- a/app/src/main/res/layout/activity_feed_back.xml +++ b/app/src/main/res/layout/activity_feed_back.xml @@ -95,7 +95,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@null" - android:hint="请输入手机号便于联系(非必填)" + android:hint="请输入手机号便于联系" android:inputType="phone" android:maxLength="11" android:paddingVertical="@dimen/dp_7" diff --git a/app/src/main/res/layout/item_entrust_rv_l.xml b/app/src/main/res/layout/item_entrust_rv_l.xml index 4281184..c7c8a8d 100644 --- a/app/src/main/res/layout/item_entrust_rv_l.xml +++ b/app/src/main/res/layout/item_entrust_rv_l.xml @@ -76,7 +76,7 @@ + android:padding="@dimen/dp_5"> + android:inputType="phone" + android:maxLength="11" /> diff --git a/app/src/main/res/layout/activity_feed_back.xml b/app/src/main/res/layout/activity_feed_back.xml index 34ed6ff..fc51932 100644 --- a/app/src/main/res/layout/activity_feed_back.xml +++ b/app/src/main/res/layout/activity_feed_back.xml @@ -95,7 +95,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@null" - android:hint="请输入手机号便于联系(非必填)" + android:hint="请输入手机号便于联系" android:inputType="phone" android:maxLength="11" android:paddingVertical="@dimen/dp_7" diff --git a/app/src/main/res/layout/item_entrust_rv_l.xml b/app/src/main/res/layout/item_entrust_rv_l.xml index 4281184..c7c8a8d 100644 --- a/app/src/main/res/layout/item_entrust_rv_l.xml +++ b/app/src/main/res/layout/item_entrust_rv_l.xml @@ -76,7 +76,7 @@ + android:padding="@dimen/dp_5"> 华东计量 中国航天科工集团二院二〇三所 - 数据加载中… + 暂时无法确定 中国航天科工集团二院二〇三所 版权所有 Copyright © 2023 – 2050 Casic. All rights reserved. 请输入问题描述,点击下方\"+\"号提交截图,帮助我们更快定位您的问题