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 0000000..7341043
Binary files /dev/null and b/modulecheck/src/main/res/drawable-xhdpi/ic_arrow_sort_gray.png differ
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 0000000..f330132
Binary files /dev/null and b/modulecheck/src/main/res/drawable-xhdpi/ic_item_title_icon_rec.png differ
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 0000000..0b023e8
Binary files /dev/null and b/modulecheck/src/main/res/drawable-xhdpi/ic_start_hint.png differ
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">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:orientation="horizontal">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/modulecheck/src/main/res/layout/activity_check_register_car.xml b/modulecheck/src/main/res/layout/activity_check_register_car.xml
index 61a7385..7758fc0 100755
--- a/modulecheck/src/main/res/layout/activity_check_register_car.xml
+++ b/modulecheck/src/main/res/layout/activity_check_register_car.xml
@@ -1,8 +1,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">
-
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+ style="@style/issue_report_title"
+ android:drawableLeft="@drawable/ic_item_title_icon_rec"
+ android:drawablePadding="5dp"
+ android:padding="8dp"
+ android:text="详细信息"
+ android:textStyle="bold" />
+ android:background="@color/white"
+ android:orientation="vertical"
+ android:paddingLeft="10dp"
+ android:paddingRight="10dp">
-
+ android:layout_marginTop="3dp"
+ android:minHeight="150dp"
+ android:src="@drawable/ic_car_person_default" />
-
+ android:gravity="center"
+ android:hint="请上传司机、随车特警、带领民警、车合照"
+ android:padding="5dp" />
-
-
+
-
+
-
+
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+ android:background="@drawable/shape_input_white_bg"
+ android:drawablePadding="10dp"
+ android:gravity="left"
+ android:hint="请输入备注信息"
+ android:minHeight="100dp"
+ android:padding="8dp"
+ android:text=""
+ android:textSize="@dimen/text_18" />
+
+
+
+
+
+
+
+
+
+
diff --git a/modulecheck/src/main/res/layout/item_record_detail.xml b/modulecheck/src/main/res/layout/item_record_detail.xml
index bc07a49..eeb4f9b 100755
--- a/modulecheck/src/main/res/layout/item_record_detail.xml
+++ b/modulecheck/src/main/res/layout/item_record_detail.xml
@@ -4,6 +4,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
+ android:background="@color/white"
android:orientation="horizontal"
android:padding="2dp">
diff --git a/modulecheck/src/main/res/values/styles.xml b/modulecheck/src/main/res/values/styles.xml
new file mode 100644
index 0000000..4f20808
--- /dev/null
+++ b/modulecheck/src/main/res/values/styles.xml
@@ -0,0 +1,84 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file