From ade5a9ce4b8ec44c45e8f4784ff9456c1d1ebe79 Mon Sep 17 00:00:00 2001 From: itgaojian Date: Fri, 29 Mar 2024 15:10:03 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CheckRecordDetailActivity.java | 39 +- .../res/drawable-xhdpi/ic_arrow_sort_gray.png | Bin 0 -> 211 bytes .../drawable-xhdpi/ic_item_title_icon_rec.png | Bin 0 -> 83 bytes .../main/res/drawable-xhdpi/ic_start_hint.png | Bin 0 -> 511 bytes .../res/drawable/shape_rectangle_gray_5.xml | 6 + .../drawable/shp_rectangle_bottom_border.xml | 15 + .../layout/activity_check_record_detail.xml | 507 ++++++++++-------- .../res/layout/activity_check_register.xml | 499 +++++++++-------- .../layout/activity_check_register_car.xml | 422 +++++++++------ .../main/res/layout/item_record_detail.xml | 1 + modulecheck/src/main/res/values/styles.xml | 84 +++ 11 files changed, 945 insertions(+), 628 deletions(-) create mode 100644 modulecheck/src/main/res/drawable-xhdpi/ic_arrow_sort_gray.png create mode 100644 modulecheck/src/main/res/drawable-xhdpi/ic_item_title_icon_rec.png create mode 100644 modulecheck/src/main/res/drawable-xhdpi/ic_start_hint.png create mode 100755 modulecheck/src/main/res/drawable/shape_rectangle_gray_5.xml create mode 100755 modulecheck/src/main/res/drawable/shp_rectangle_bottom_border.xml create mode 100644 modulecheck/src/main/res/values/styles.xml diff --git a/modulecheck/src/main/java/com/sucstepsoft/modulecheck/activitys/enteroutexamine/CheckRecordDetailActivity.java b/modulecheck/src/main/java/com/sucstepsoft/modulecheck/activitys/enteroutexamine/CheckRecordDetailActivity.java index 0626331..b1d383f 100755 --- a/modulecheck/src/main/java/com/sucstepsoft/modulecheck/activitys/enteroutexamine/CheckRecordDetailActivity.java +++ b/modulecheck/src/main/java/com/sucstepsoft/modulecheck/activitys/enteroutexamine/CheckRecordDetailActivity.java @@ -9,6 +9,7 @@ import android.text.Html; import android.text.TextUtils; import android.view.View; import android.widget.ImageView; +import android.widget.LinearLayout; import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; @@ -98,6 +99,8 @@ public class CheckRecordDetailActivity extends BaseActivity { RecyclerView mRlvTools; @BindView(R2.id.tv_info) TextView mTvInfo; + @BindView(R2.id.ll_epi_info) + LinearLayout mLlEpiInfo; @BindView(R2.id.tv_pro) TextView mTvPro; private Unbinder mBind; @@ -238,34 +241,34 @@ public class CheckRecordDetailActivity extends BaseActivity { if (baseBean.getData() != null) { CheckRecordDetailBean data = baseBean.getData(); doRequestProcessById(data.getProcessId()); - mTvCause.setText("进出事由 : " + data.getCause()); - mTvEndTime.setText("授权结束时间 : " + data.getEndTime()); - mTvStartTime.setText("授权开始时间 : " + data.getStartTime()); - mTvManagerUser.setText("带领人员 : " + data.getGuideUserName()); - mTvFieldName.setText("进入监区:" + data.getFieldnNames()); + mTvCause.setText(data.getCause());//进出事由 + mTvEndTime.setText(data.getEndTime());//授权结束时间 + mTvStartTime.setText(data.getStartTime());//授权开始时间 + mTvManagerUser.setText(data.getGuideUserName());//"带领人员 : " + + mTvFieldName.setText(data.getFieldnNames());//"进入监区:" + //TODO 防疫措施 if ("1".equals(data.getType())) { //车辆进出 if (UserInfoSPUtils.getCarIsShow()) { - mTvInfo.setVisibility(View.VISIBLE); + mLlEpiInfo.setVisibility(View.VISIBLE); mTvInfo.setText(UserInfoSPUtils.getCarParams() + ":" + data.getInform()); } else { - mTvInfo.setVisibility(View.GONE); + mLlEpiInfo.setVisibility(View.GONE); } } else { //人员进出 if (UserInfoSPUtils.getPersonIsShow()) { - mTvInfo.setVisibility(View.VISIBLE); + mLlEpiInfo.setVisibility(View.VISIBLE); mTvInfo.setText(UserInfoSPUtils.getPersonParams() + ":" + data.getInform()); } else { - mTvInfo.setVisibility(View.GONE); + mLlEpiInfo.setVisibility(View.GONE); } } if ("1".equals(data.getProduction())) { - mTvPro.setText("是否需要进入生产区域:需要进入"); + mTvPro.setText("需要进入"); } else { - mTvPro.setText("是否需要进入生产区域:无需进入"); + mTvPro.setText("无需进入"); } Glide.with(mActivity) .load(BaseUrlApi.BASE_URL + data.getPhotoRecordPath()) @@ -283,13 +286,13 @@ public class CheckRecordDetailActivity extends BaseActivity { }); if (TextUtils.isEmpty(data.getType())) { - mTvType.setText("进出类型 : 未知"); + mTvType.setText("未知"); } else { if ("1".equals(data.getType())) { mRlvTools.setVisibility(View.GONE); mTvColHint.setText("司机、随车特警、带领民警、车合照"); - mTvTools.setText("装载货物 : " + data.getCarryTools()); - mTvType.setText("进出类型 : 车辆进出"); + mTvTools.setText( data.getCarryTools());//"装载货物 : " + + mTvType.setText("车辆进出"); mTvCop.setVisibility(View.VISIBLE); if (!TextUtils.isEmpty(data.getCertificatesPhotoPath())) { mTvColCarHint.setVisibility(View.VISIBLE); @@ -314,16 +317,16 @@ public class CheckRecordDetailActivity extends BaseActivity { mIvCarCard.setVisibility(View.GONE); } if (!TextUtils.isEmpty(data.getFollowCarUserName())) { - mTvCop.setText("随车特警 : " + data.getFollowCarUserName()); + mTvCop.setText( data.getFollowCarUserName()); } else { - mTvCop.setText("随车特警 : 无"); + mTvCop.setText("无"); } } else { mIvCarCard.setVisibility(View.GONE); mTvColCarHint.setVisibility(View.GONE); mTvColHint.setText("外来人员、带领民警合照"); - mTvTools.setText("携带工具 : " + data.getCarryTools()); - mTvType.setText("进出类型 : 人员进出"); + mTvTools.setText( data.getCarryTools()); + mTvType.setText("人员进出"); mTvCop.setVisibility(View.GONE); mRlvTools.setVisibility(View.VISIBLE); //TODO 携带工具数据回显 diff --git a/modulecheck/src/main/res/drawable-xhdpi/ic_arrow_sort_gray.png b/modulecheck/src/main/res/drawable-xhdpi/ic_arrow_sort_gray.png new file mode 100644 index 0000000000000000000000000000000000000000..73410431e308fc664125319dbe98578826952346 GIT binary patch literal 211 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}y`C{|UO78#w literal 0 HcmV?d00001 diff --git a/modulecheck/src/main/res/drawable-xhdpi/ic_item_title_icon_rec.png b/modulecheck/src/main/res/drawable-xhdpi/ic_item_title_icon_rec.png new file mode 100644 index 0000000000000000000000000000000000000000..f33013263571df943fde9bb639835678b9e20b6e GIT binary patch literal 83 zcmeAS@N?(olHy`uVBq!ia0vp^JV30%$P6UgT|EB-Ddqs55Legcf3q9Xl7L)pPZ!6K diaE&(l!2Ta2F5SR^VR}c44$rjF6*2UngFhh6K((i literal 0 HcmV?d00001 diff --git a/modulecheck/src/main/res/drawable-xhdpi/ic_start_hint.png b/modulecheck/src/main/res/drawable-xhdpi/ic_start_hint.png new file mode 100644 index 0000000000000000000000000000000000000000..0b023e84400f0998d36141d85935faf6d248aa10 GIT binary patch literal 511 zcmVUaDhFB%EeGk^FU$Nz`($S zX6Q}0p#~ZX$a4Gi)YXCF?I4Ty7%6W-)^rvn+zeG7?=@7d-fO5Rk1oI8R6*j1x;igV zJ^{!-f~N2P4sC5AhJE^~GUyU$co!;Pbv*&~;S8&^wAest56GE@9Cl>jRX`jIb}2Fd zg(WadjUisg2oiMsc&~v<-yTC%m;DY397LrE5CG;TUF-&`CJ=21GJxi!T{v9%5)>CC z8ww3$xIy4#hm;9G!9!Bv0xFHrTs94AQ8;=^SQW~^OoR)SJ<$xjx!G8X3&{ub(B#|k z8i*}oKw`*hK-n1>>vxHcIB0f5Chhq6zoQ8tJ2k44=sKQO4QXiLEr1E0Z zegg#oyg>kQv8o-gG!nt5rU8^u3{?CZ&+klFwM002ovPDHLkV1i5n B&0+um literal 0 HcmV?d00001 diff --git a/modulecheck/src/main/res/drawable/shape_rectangle_gray_5.xml b/modulecheck/src/main/res/drawable/shape_rectangle_gray_5.xml new file mode 100755 index 0000000..bbcc182 --- /dev/null +++ b/modulecheck/src/main/res/drawable/shape_rectangle_gray_5.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/modulecheck/src/main/res/drawable/shp_rectangle_bottom_border.xml b/modulecheck/src/main/res/drawable/shp_rectangle_bottom_border.xml new file mode 100755 index 0000000..9c80d8a --- /dev/null +++ b/modulecheck/src/main/res/drawable/shp_rectangle_bottom_border.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/modulecheck/src/main/res/layout/activity_check_record_detail.xml b/modulecheck/src/main/res/layout/activity_check_record_detail.xml index 384a5bd..aa15f55 100755 --- a/modulecheck/src/main/res/layout/activity_check_record_detail.xml +++ b/modulecheck/src/main/res/layout/activity_check_record_detail.xml @@ -13,245 +13,316 @@ + android:text="基础信息" + android:textStyle="bold" /> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + android:text="详细信息" + android:textStyle="bold" /> - + android:background="@color/white" + android:orientation="vertical" + android:paddingLeft="10dp" + android:paddingTop="10dp" + android:paddingRight="10dp"> - + - + - + - + - + - + - + - - - - - - - + + - - - - - - - - - - - diff --git a/modulecheck/src/main/res/layout/activity_check_register.xml b/modulecheck/src/main/res/layout/activity_check_register.xml index 634202b..0c7327d 100755 --- a/modulecheck/src/main/res/layout/activity_check_register.xml +++ b/modulecheck/src/main/res/layout/activity_check_register.xml @@ -2,7 +2,8 @@ + android:layout_height="match_parent" + android:background="@color/gray_bg"> - + android:text="基础信息" + android:textStyle="bold" /> + android:background="@color/white" + android:orientation="vertical" + android:paddingLeft="10dp" + android:paddingRight="10dp"> - - - - - - - - - - - - - - - - - - - - -