Sfoglia il codice sorgente

添加ViewHolder扩展;添加物资检查表页

Frankensteinly 9 mesi fa
parent
commit
9095ccadc5
24 ha cambiato i file con 568 aggiunte e 8 eliminazioni
  1. 9 0
      app/src/main/java/com/grkj/iscs_mc/extentions/ViewHolder.kt
  2. 3 0
      app/src/main/java/com/grkj/iscs_mc/view/fragment/MaterialInspectionPlanFragment.kt
  3. 58 0
      app/src/main/java/com/grkj/iscs_mc/view/fragment/MaterialInspectionTableFragment.kt
  4. 6 0
      app/src/main/java/com/grkj/iscs_mc/view/iview/IMaterialInspectionTableView.kt
  5. 7 0
      app/src/main/java/com/grkj/iscs_mc/view/presenter/MaterialInspectionTablePresenter.kt
  6. 5 0
      app/src/main/res/drawable/status_damaged_bg_color_selector.xml
  7. 5 0
      app/src/main/res/drawable/status_damaged_bg_selector.xml
  8. 5 0
      app/src/main/res/drawable/status_expired_bg_color_selector.xml
  9. 5 0
      app/src/main/res/drawable/status_expired_bg_selector.xml
  10. 5 0
      app/src/main/res/drawable/status_ok_bg_color_selector.xml
  11. 5 0
      app/src/main/res/drawable/status_ok_bg_selector.xml
  12. 2 3
      app/src/main/res/layout/fragment_material_inspection_plan.xml
  13. 243 0
      app/src/main/res/layout/fragment_material_inspection_table.xml
  14. 40 0
      app/src/main/res/layout/item_rv_inspection_standard.xml
  15. 141 0
      app/src/main/res/layout/item_rv_inspection_table.xml
  16. 0 0
      app/src/main/res/mipmap/damaged_normal.png
  17. BIN
      app/src/main/res/mipmap/damaged_unselected.png
  18. 0 0
      app/src/main/res/mipmap/expired_normal.png
  19. BIN
      app/src/main/res/mipmap/expired_unselected.png
  20. BIN
      app/src/main/res/mipmap/ok_normal.png
  21. BIN
      app/src/main/res/mipmap/ok_unselected.png
  22. 14 2
      app/src/main/res/navigation/nav_graph.xml
  23. 3 3
      app/src/main/res/values/colors.xml
  24. 12 0
      app/src/main/res/values/strings.xml

+ 9 - 0
app/src/main/java/com/grkj/iscs_mc/extentions/ViewHolder.kt

@@ -0,0 +1,9 @@
+package com.grkj.iscs_mc.extentions
+
+import android.view.View
+import com.zhy.adapter.recyclerview.base.ViewHolder
+
+fun ViewHolder.setSelected(viewId: Int, isSelected: Boolean) {
+    val view = getView<View>(viewId)
+    view.isSelected = isSelected
+}

+ 3 - 0
app/src/main/java/com/grkj/iscs_mc/view/fragment/MaterialInspectionPlanFragment.kt

@@ -2,6 +2,7 @@ package com.grkj.iscs_mc.view.fragment
 
 import com.grkj.iscs_mc.R
 import com.grkj.iscs_mc.databinding.FragmentMaterialInspectionPlanBinding
+import com.grkj.iscs_mc.extentions.navigateTo
 import com.grkj.iscs_mc.extentions.navigateUp
 import com.grkj.iscs_mc.view.base.BaseMvpFragment
 import com.grkj.iscs_mc.view.iview.IMaterialInspectionPlanView
@@ -30,6 +31,8 @@ class MaterialInspectionPlanFragment :
 
             }
         }
+
+        navigateTo(MaterialInspectionPlanFragmentDirections.actionInspectionPlanFragmentToInspectionTableFragment())
     }
 
     override fun initPresenter(): MaterialInspectionPlanPresenter {

+ 58 - 0
app/src/main/java/com/grkj/iscs_mc/view/fragment/MaterialInspectionTableFragment.kt

@@ -0,0 +1,58 @@
+package com.grkj.iscs_mc.view.fragment
+
+import android.widget.RelativeLayout
+import com.grkj.iscs_mc.R
+import com.grkj.iscs_mc.databinding.FragmentMaterialInspectionTableBinding
+import com.grkj.iscs_mc.extentions.navigateUp
+import com.grkj.iscs_mc.extentions.setSelected
+import com.grkj.iscs_mc.view.base.BaseMvpFragment
+import com.grkj.iscs_mc.view.iview.IMaterialInspectionTableView
+import com.grkj.iscs_mc.view.presenter.MaterialInspectionTablePresenter
+import com.zhy.adapter.recyclerview.CommonAdapter
+import com.zhy.adapter.recyclerview.base.ViewHolder
+
+/**
+ * 物资检查表页
+ */
+class MaterialInspectionTableFragment :
+    BaseMvpFragment<IMaterialInspectionTableView, MaterialInspectionTablePresenter, FragmentMaterialInspectionTableBinding>() {
+
+    override val viewBinding: FragmentMaterialInspectionTableBinding
+        get() = FragmentMaterialInspectionTableBinding.inflate(layoutInflater)
+
+    override fun initView() {
+        mBinding?.cbBack?.setOnClickListener { navigateUp() }
+
+        mBinding?.rvMaterial?.adapter = object : CommonAdapter<String>(
+            requireContext(),
+            R.layout.item_rv_inspection_table,
+            mutableListOf()
+        ) {
+            override fun convert(holder: ViewHolder, t: String, position: Int) {
+                holder.setOnClickListener(R.id.rl_status_ok) {
+                    
+                }
+                holder.setOnClickListener(R.id.rl_status_expired) {
+
+                }
+                holder.setOnClickListener(R.id.rl_status_damaged) {
+
+                }
+            }
+        }
+
+        mBinding?.rvStandard?.adapter = object : CommonAdapter<String>(
+            requireContext(),
+            R.layout.item_rv_inspection_standard,
+            mutableListOf()
+        ) {
+            override fun convert(holder: ViewHolder, t: String, position: Int) {
+
+            }
+        }
+    }
+
+    override fun initPresenter(): MaterialInspectionTablePresenter {
+        return MaterialInspectionTablePresenter()
+    }
+}

+ 6 - 0
app/src/main/java/com/grkj/iscs_mc/view/iview/IMaterialInspectionTableView.kt

@@ -0,0 +1,6 @@
+package com.grkj.iscs_mc.view.iview
+
+import com.grkj.iscs_mc.view.base.IView
+
+interface IMaterialInspectionTableView : IView {
+}

+ 7 - 0
app/src/main/java/com/grkj/iscs_mc/view/presenter/MaterialInspectionTablePresenter.kt

@@ -0,0 +1,7 @@
+package com.grkj.iscs_mc.view.presenter
+
+import com.grkj.iscs_mc.view.base.BasePresenter
+import com.grkj.iscs_mc.view.iview.IMaterialInspectionTableView
+
+class MaterialInspectionTablePresenter : BasePresenter<IMaterialInspectionTableView>() {
+}

+ 5 - 0
app/src/main/res/drawable/status_damaged_bg_color_selector.xml

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

+ 5 - 0
app/src/main/res/drawable/status_damaged_bg_selector.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@mipmap/damaged_unselected" android:state_selected="false" />
+    <item android:drawable="@mipmap/damaged_normal" android:state_selected="true" />
+</selector>

+ 5 - 0
app/src/main/res/drawable/status_expired_bg_color_selector.xml

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

+ 5 - 0
app/src/main/res/drawable/status_expired_bg_selector.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@mipmap/expired_unselected" android:state_selected="false" />
+    <item android:drawable="@mipmap/expired_normal" android:state_selected="true" />
+</selector>

+ 5 - 0
app/src/main/res/drawable/status_ok_bg_color_selector.xml

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

+ 5 - 0
app/src/main/res/drawable/status_ok_bg_selector.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@mipmap/ok_unselected" android:state_selected="false" />
+    <item android:drawable="@mipmap/ok_normal" android:state_selected="true" />
+</selector>

+ 2 - 3
app/src/main/res/layout/fragment_material_inspection_plan.xml

@@ -64,8 +64,7 @@
         <TextView
             android:id="@+id/tv_title"
             style="@style/CommonTextView"
-            android:layout_marginBottom="@dimen/common_spacing"
-            android:text="计划日期" />
+            android:layout_marginTop="@dimen/common_spacing_small" />
 
         <com.google.android.material.card.MaterialCardView
             android:layout_width="match_parent"
@@ -73,7 +72,7 @@
             android:layout_below="@id/tv_title"
             android:layout_marginVertical="@dimen/common_spacing"
             app:cardBackgroundColor="@color/common_bg_white_10"
-            app:cardCornerRadius="@dimen/common_radius_big"
+            app:cardCornerRadius="@dimen/common_radius"
             app:cardElevation="0dp"
             app:strokeColor="@color/common_transparent">
 

+ 243 - 0
app/src/main/res/layout/fragment_material_inspection_table.xml

@@ -0,0 +1,243 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".view.fragment.MaterialInspectionTableFragment">
+
+    <com.grkj.iscs_mc.view.widget.TitleBar
+        android:id="@+id/tb"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:bar_icon="@mipmap/material_inspection_plan"
+        app:bar_title="@string/material_inspection_table" />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/cl_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true">
+
+        <com.grkj.iscs_mc.view.widget.CommonBtn
+            android:id="@+id/cb_back"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:btn_bg="@drawable/common_btn_blue_bg"
+            app:btn_name="@string/back"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <com.grkj.iscs_mc.view.widget.CommonBtn
+            android:id="@+id/cb_save"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_marginRight="@dimen/common_spacing"
+            app:btn_bg="@drawable/common_btn_red_bg"
+            app:btn_name="@string/save"
+            app:layout_constraintRight_toLeftOf="@id/cb_back"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <com.grkj.iscs_mc.view.widget.CommonBtn
+            android:id="@+id/cb_auto"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_marginRight="@dimen/common_spacing"
+            app:btn_bg="@drawable/common_btn_yellow_bg"
+            app:btn_name="@string/auto_inspection_all"
+            app:layout_constraintRight_toLeftOf="@id/cb_save"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/tv_status"
+            style="@style/CommonTextView"
+            android:text="@string/inspection_status"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_above="@id/cl_bar"
+        android:layout_below="@id/tb"
+        android:layout_marginVertical="@dimen/common_spacing"
+        android:orientation="horizontal">
+
+        <com.google.android.material.card.MaterialCardView
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1111"
+            app:cardBackgroundColor="@color/common_bg_white_10"
+            app:cardCornerRadius="@dimen/common_radius"
+            app:cardElevation="0dp"
+            app:strokeColor="@color/common_transparent">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@color/common_bg_white_10"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        style="@style/CommonTextView"
+                        android:layout_width="0dp"
+                        android:layout_weight="3"
+                        android:paddingVertical="@dimen/common_spacing"
+                        android:text="@string/number" />
+
+                    <View
+                        android:layout_width="@dimen/divider_line_width"
+                        android:layout_height="match_parent"
+                        android:background="@color/main_color" />
+
+                    <TextView
+                        style="@style/CommonTextView"
+                        android:layout_width="0dp"
+                        android:layout_weight="4"
+                        android:paddingVertical="@dimen/common_spacing"
+                        android:text="@string/material_type" />
+
+                    <View
+                        android:layout_width="@dimen/divider_line_width"
+                        android:layout_height="match_parent"
+                        android:background="@color/main_color" />
+
+                    <TextView
+                        style="@style/CommonTextView"
+                        android:layout_width="0dp"
+                        android:layout_weight="4"
+                        android:paddingVertical="@dimen/common_spacing"
+                        android:text="@string/material_name" />
+
+                    <View
+                        android:layout_width="@dimen/divider_line_width"
+                        android:layout_height="match_parent"
+                        android:background="@color/main_color" />
+
+                    <TextView
+                        style="@style/CommonTextView"
+                        android:layout_width="0dp"
+                        android:layout_weight="5"
+                        android:paddingVertical="@dimen/common_spacing"
+                        android:text="@string/rfid" />
+
+                    <View
+                        android:layout_width="@dimen/divider_line_width"
+                        android:layout_height="match_parent"
+                        android:background="@color/main_color" />
+
+                    <RelativeLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="2">
+
+                        <ImageView
+                            android:layout_width="@dimen/common_icon_size"
+                            android:layout_height="@dimen/common_icon_size"
+                            android:layout_centerInParent="true"
+                            android:src="@mipmap/ok_normal" />
+                    </RelativeLayout>
+
+                    <View
+                        android:layout_width="@dimen/divider_line_width"
+                        android:layout_height="match_parent"
+                        android:background="@color/main_color" />
+
+                    <RelativeLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="2">
+
+                        <ImageView
+                            android:layout_width="@dimen/common_icon_size"
+                            android:layout_height="@dimen/common_icon_size"
+                            android:layout_centerInParent="true"
+                            android:src="@mipmap/expired_normal" />
+                    </RelativeLayout>
+
+                    <View
+                        android:layout_width="@dimen/divider_line_width"
+                        android:layout_height="match_parent"
+                        android:background="@color/main_color" />
+
+                    <RelativeLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="2">
+
+                        <ImageView
+                            android:layout_width="@dimen/common_icon_size"
+                            android:layout_height="@dimen/common_icon_size"
+                            android:layout_centerInParent="true"
+                            android:src="@mipmap/damaged_normal" />
+                    </RelativeLayout>
+
+                    <View
+                        android:layout_width="@dimen/divider_line_width"
+                        android:layout_height="match_parent"
+                        android:background="@color/main_color" />
+
+                    <TextView
+                        style="@style/CommonTextView"
+                        android:layout_width="0dp"
+                        android:layout_weight="5"
+                        android:paddingVertical="@dimen/common_spacing"
+                        android:text="@string/method" />
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/divider_line_width"
+                    android:background="@color/main_color" />
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/rv_material"
+                    style="@style/CommonRecyclerView" />
+            </LinearLayout>
+        </com.google.android.material.card.MaterialCardView>
+
+        <com.google.android.material.card.MaterialCardView
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="@dimen/common_spacing"
+            android:layout_weight="398"
+            app:cardBackgroundColor="@color/common_bg_white_10"
+            app:cardCornerRadius="@dimen/common_radius"
+            app:cardElevation="0dp"
+            app:strokeColor="@color/common_transparent">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+                <TextView
+                    style="@style/CommonTextView"
+                    android:layout_width="match_parent"
+                    android:background="@color/common_bg_white_10"
+                    android:paddingVertical="@dimen/common_spacing"
+                    android:text="@string/inspection_standard" />
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/divider_line_width"
+                    android:background="@color/main_color" />
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/rv_standard"
+                    style="@style/CommonRecyclerView" />
+
+            </LinearLayout>
+        </com.google.android.material.card.MaterialCardView>
+    </LinearLayout>
+</RelativeLayout>

+ 40 - 0
app/src/main/res/layout/item_rv_inspection_standard.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/root"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:layout_width="@dimen/common_icon_size_big"
+            android:layout_height="@dimen/common_icon_size_big" />
+
+        <TextView
+            style="@style/CommonTextView"
+            android:layout_width="wrap_content"
+            android:layout_marginLeft="@dimen/common_spacing_small"
+            android:paddingVertical="@dimen/common_spacing" />
+    </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/divider_line_width"
+        android:background="@color/main_color" />
+
+    <TextView
+        style="@style/CommonTextView"
+        android:gravity="left"
+        android:padding="@dimen/common_spacing_small"
+        android:textSize="@dimen/common_text_size_small" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/divider_line_width"
+        android:background="@color/main_color" />
+</LinearLayout>

+ 141 - 0
app/src/main/res/layout/item_rv_inspection_table.xml

@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/root"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/tv_number"
+            style="@style/CommonTextView"
+            android:layout_width="0dp"
+            android:layout_weight="3"
+            android:paddingVertical="@dimen/common_spacing"
+            android:textSize="@dimen/common_text_size_small" />
+
+        <View
+            android:layout_width="@dimen/divider_line_width"
+            android:layout_height="match_parent"
+            android:background="@color/main_color" />
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="4"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:layout_width="@dimen/common_icon_size_big"
+                android:layout_height="@dimen/common_icon_size_big" />
+
+            <TextView
+                style="@style/CommonTextView"
+                android:layout_marginLeft="@dimen/common_spacing_small"
+                android:textSize="@dimen/common_text_size_small" />
+        </LinearLayout>
+
+        <View
+            android:layout_width="@dimen/divider_line_width"
+            android:layout_height="match_parent"
+            android:background="@color/main_color" />
+
+        <TextView
+            style="@style/CommonTextView"
+            android:layout_width="0dp"
+            android:layout_weight="4"
+            android:paddingVertical="@dimen/common_spacing"
+            android:textSize="@dimen/common_text_size_small" />
+
+        <View
+            android:layout_width="@dimen/divider_line_width"
+            android:layout_height="match_parent"
+            android:background="@color/main_color" />
+
+        <TextView
+            android:id="@+id/tv_rfid"
+            style="@style/CommonTextView"
+            android:layout_width="0dp"
+            android:layout_weight="5"
+            android:paddingVertical="@dimen/common_spacing" />
+
+        <View
+            android:layout_width="@dimen/divider_line_width"
+            android:layout_height="match_parent"
+            android:background="@color/main_color" />
+
+        <RelativeLayout
+            android:id="@+id/rl_status_ok"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="2"
+            android:background="@drawable/status_ok_bg_color_selector">
+
+            <ImageView
+                android:layout_width="@dimen/common_icon_size_big"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:src="@drawable/status_ok_bg_selector" />
+        </RelativeLayout>
+
+        <View
+            android:layout_width="@dimen/divider_line_width"
+            android:layout_height="match_parent"
+            android:background="@color/main_color" />
+
+        <RelativeLayout
+            android:id="@+id/rl_status_expired"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="2"
+            android:background="@drawable/status_expired_bg_color_selector">
+
+            <ImageView
+                android:layout_width="@dimen/common_icon_size_big"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:src="@drawable/status_expired_bg_selector" />
+        </RelativeLayout>
+
+        <View
+            android:layout_width="@dimen/divider_line_width"
+            android:layout_height="match_parent"
+            android:background="@color/main_color" />
+
+        <RelativeLayout
+            android:id="@+id/rl_status_damaged"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="2"
+            android:background="@drawable/status_damaged_bg_color_selector">
+
+            <ImageView
+                android:layout_width="@dimen/common_icon_size_big"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:src="@drawable/status_damaged_bg_selector" />
+        </RelativeLayout>
+
+        <View
+            android:layout_width="@dimen/divider_line_width"
+            android:layout_height="match_parent"
+            android:background="@color/main_color" />
+
+        <TextView
+            style="@style/CommonTextView"
+            android:layout_width="0dp"
+            android:layout_weight="5"
+            android:paddingVertical="@dimen/common_spacing" />
+    </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/divider_line_width"
+        android:background="@color/main_color" />
+</LinearLayout>

+ 0 - 0
app/src/main/res/mipmap/damaged.png → app/src/main/res/mipmap/damaged_normal.png


BIN
app/src/main/res/mipmap/damaged_unselected.png


+ 0 - 0
app/src/main/res/mipmap/expired.png → app/src/main/res/mipmap/expired_normal.png


BIN
app/src/main/res/mipmap/expired_unselected.png


BIN
app/src/main/res/mipmap/ok_normal.png


BIN
app/src/main/res/mipmap/ok_unselected.png


+ 14 - 2
app/src/main/res/navigation/nav_graph.xml

@@ -63,7 +63,7 @@
     <fragment
         android:id="@+id/material_inspection_fragment"
         android:name="com.grkj.iscs_mc.view.fragment.MaterialInspectionFragment"
-        tools:layout="@layout/fragment_material_inspection" >
+        tools:layout="@layout/fragment_material_inspection">
         <action
             android:id="@+id/action_inspection_fragment_to_inspection_plan_fragment"
             app:destination="@id/material_inspection_plan_fragment"
@@ -86,6 +86,18 @@
     <fragment
         android:id="@+id/material_inspection_plan_fragment"
         android:name="com.grkj.iscs_mc.view.fragment.MaterialInspectionPlanFragment"
-        tools:layout="@layout/fragment_material_inspection_plan" />
+        tools:layout="@layout/fragment_material_inspection_plan">
+        <action
+            android:id="@+id/action_inspection_plan_fragment_to_inspection_table_fragment"
+            app:destination="@id/material_inspection_table_fragment"
+            app:enterAnim="@anim/slide_in_right"
+            app:exitAnim="@anim/slide_out_left"
+            app:popEnterAnim="@anim/slide_in_left"
+            app:popExitAnim="@anim/slide_out_right" />
+    </fragment>
 
+    <fragment
+        android:id="@+id/material_inspection_table_fragment"
+        android:name="com.grkj.iscs_mc.view.fragment.MaterialInspectionTableFragment"
+        tools:layout="@layout/fragment_material_inspection_table" />
 </navigation>

+ 3 - 3
app/src/main/res/values/colors.xml

@@ -26,9 +26,9 @@
     <color name="switch_track_off">#E9E9E9</color>
     <color name="dialog_card_login_bg">#990E57EA</color>
     <color name="home_menu_bg">#4D2B7AE9</color>
-    <color name="common_btn_red_bg">#80FF0000</color>
-    <color name="common_btn_green_bg">#80047b0f</color>
-    <color name="common_btn_yellow_bg">#80e8900d</color>
+    <color name="common_btn_red_bg">#FF0000</color>
+    <color name="common_btn_green_bg">#047b0f</color>
+    <color name="common_btn_yellow_bg">#e8900d</color>
     <color name="lock_status_unlocked">#99008000</color>
     <color name="lock_status_locked">#CCFF0000</color>
     <color name="point_text_bg">#70b26f</color>

+ 12 - 0
app/src/main/res/values/strings.xml

@@ -34,6 +34,7 @@
     <string name="material_replacement_english">Materials Replacement</string>
     <string name="exception_handle">异常处理</string>
     <string name="material_inspection_plan">物资检查计划</string>
+    <string name="material_inspection_table">物资检查计表</string>
 
     <string name="action_confirm">操作确认</string>
     <string name="confirm">确定</string>
@@ -46,6 +47,8 @@
     <string name="expired">过期</string>
     <string name="damaged">损坏</string>
 
+    <string name="plan_date">计划日期</string>
+    <string name="plan_status">计划状态</string>
     <string name="start_inspection">开始检查</string>
     <string name="continue_inspection">继续检查</string>
     <string name="submit_result">提交结果</string>
@@ -57,4 +60,13 @@
     <string name="normal_count">正常数量</string>
     <string name="expired_count">过期数量</string>
     <string name="damaged_count">损坏数量</string>
+
+    <string name="save">保存</string>
+    <string name="auto_inspection_all">一键检查</string>
+    <string name="inspection_status">待检查:%d \t\t 正常:%d \t\t 过期:%d \t\t 损坏:%d</string>
+    <string name="number">编号</string>
+    <string name="material_name">物资名称</string>
+    <string name="rfid">RFID</string>
+    <string name="method">措施</string>
+    <string name="inspection_standard">检查标准</string>
 </resources>