wangguannan
/
ShangHaiProjectSurvey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update ui

Browse Source
main
chenglifeng 6 months ago
parent a1a49c0776
commit c63f6085d2
6 changed files with 24 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      app/src/main/java/com/project/survey/ui/pointmeasure/PointMeasureListActivity.kt
  2. 10
      app/src/main/java/com/project/survey/ui/pointmeasure/adapter/PointMeasureListAdapter.kt
  3. 5
      app/src/main/res/color/text_color_measure.xml
  4. 6
      app/src/main/res/drawable/bg_point_measure_selector.xml
  5. 2
      app/src/main/res/layout/item_lofting_list.xml
  6. 6
      app/src/main/res/layout/item_point_measure_list.xml

15
app/src/main/java/com/project/survey/ui/pointmeasure/PointMeasureListActivity.kt
Unescape View File

@ -98,6 +98,13 @@ class PointMeasureListActivity : BaseBindingActivity<ActivityPointMeasureListBin
// 生成报验单
viewModel.createInspectionReportResponse.observe(this) {
navigation2BaoYanDan(it.BD_CLJH_ID)
val position = adapter.items.indexOfFirst { bean -> bean.BD_CLJH_ID == it.BD_CLJH_ID }
if (position > -1) {
adapter.getItem(position)?.let { bean ->
bean.CLJH_WORKSTATUS = "报验单已生成"
adapter.notifyItemChanged(position, AdapterConstants.WORK_STATUS)
}
}
}
//
viewModel.updateMeasureWorkStatusResponse.observe(this) {
@ -125,11 +132,11 @@ class PointMeasureListActivity : BaseBindingActivity<ActivityPointMeasureListBin
// 生成报验单
adapter.addOnItemChildClickListener(R.id.tvGenerateForm) { adapter, _, position ->
adapter.getItem(position)?.let { bean ->
if ("报验单已生成" == bean.CLJH_WORKSTATUS){
navigation2BaoYanDan(bean.BD_CLJH_ID)
} else {
// if ("报验单已生成" == bean.CLJH_WORKSTATUS){
// navigation2BaoYanDan(bean.BD_CLJH_ID)
// } else {
viewModel.createInspectionReport(bean.BD_CLJH_ID)
}
// }
}
}
// 结束测量

10
app/src/main/java/com/project/survey/ui/pointmeasure/adapter/PointMeasureListAdapter.kt
Unescape View File

@ -29,10 +29,7 @@ class PointMeasureListAdapter(val type: String) : BaseQuickAdapter<MeasureBean,
.setText(R.id.tvApplyUser, item.SY_CREATEUSERNAME)
.setVisible(R.id.tvGenerateForm, isCLJH)
.setEnabled(
R.id.tvGenerateForm,
"已结束" == item.CLJH_WORKSTATUS || "报验单已生成" == item.CLJH_WORKSTATUS
)
.setEnabled(R.id.tvGenerateForm, "已结束" == item.CLJH_WORKSTATUS)
if (isCLJH) {
holder.setEnabled(R.id.tvStopMeasure, "执行中" == item.CLJH_WORKSTATUS)
.setEnabled(
@ -68,10 +65,7 @@ class PointMeasureListAdapter(val type: String) : BaseQuickAdapter<MeasureBean,
val isCLJH = type == Constants.TYPE_BD_CLJH
val type = payloads[0] as Int
if (type == AdapterConstants.WORK_STATUS) {
holder.setEnabled(
R.id.tvGenerateForm,
"已结束" == item.CLJH_WORKSTATUS || "报验单已生成" == item.CLJH_WORKSTATUS
)
holder.setEnabled(R.id.tvGenerateForm, "已结束" == item.CLJH_WORKSTATUS)
if (isCLJH) {
holder.setEnabled(R.id.tvStopMeasure, "执行中" == item.CLJH_WORKSTATUS)
.setEnabled(

5
app/src/main/res/color/text_color_measure.xml
Unescape View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="#FFFFFF" android:state_enabled="true" />
<item android:color="#A5A8AA" android:state_enabled="false" />
</selector>

6
app/src/main/res/drawable/bg_point_measure_selector.xml
Unescape View File

@ -2,17 +2,15 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="true">
<shape android:shape="rectangle">
<solid android:color="#E9F1FC" />
<solid android:color="#396BD0" />
<corners android:radius="@dimen/sw_15dp" />
<stroke android:width="@dimen/sw_0_5dp" android:color="#1F396BD0" />
</shape>
</item>
<item android:state_enabled="false">
<shape android:shape="rectangle">
<solid android:color="#59BBBBBB" />
<solid android:color="#E8EAEE" />
<corners android:radius="@dimen/sw_15dp" />
<stroke android:width="@dimen/sw_0_5dp" android:color="#59999999" />
</shape>
</item>

2
app/src/main/res/layout/item_lofting_list.xml
Unescape View File

@ -123,7 +123,7 @@
android:paddingHorizontal="@dimen/sw_28dp"
android:paddingVertical="@dimen/sw_6dp"
android:text="@string/lofting"
android:textColor="@color/text_color_20"
android:textColor="@color/text_color_measure"
android:textSize="@dimen/sw_12sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/viewLine" />

6
app/src/main/res/layout/item_point_measure_list.xml
Unescape View File

@ -126,7 +126,7 @@
android:paddingHorizontal="@dimen/sw_16dp"
android:paddingVertical="@dimen/sw_6dp"
android:text="生成报验单"
android:textColor="@color/text_color_20"
android:textColor="@color/text_color_measure"
android:textSize="@dimen/sw_12sp"
app:layout_constraintBaseline_toBaselineOf="@id/tvEnterMeasure"
app:layout_constraintEnd_toStartOf="@id/tvStopMeasure" />
@ -140,7 +140,7 @@
android:paddingHorizontal="@dimen/sw_16dp"
android:paddingVertical="@dimen/sw_6dp"
android:text="结束测量"
android:textColor="@color/text_color_20"
android:textColor="@color/text_color_measure"
android:textSize="@dimen/sw_12sp"
app:layout_constraintBaseline_toBaselineOf="@id/tvEnterMeasure"
app:layout_constraintEnd_toStartOf="@id/tvEnterMeasure" />
@ -154,7 +154,7 @@
android:paddingHorizontal="@dimen/sw_16dp"
android:paddingVertical="@dimen/sw_6dp"
android:text="进入测量"
android:textColor="@color/text_color_20"
android:textColor="@color/text_color_measure"
android:textSize="@dimen/sw_12sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/viewLine" />

Write Preview
Loading…
Cancel
Save