ソースを参照

物资检查计划显示调整,补充按钮逻辑

Frankensteinly 8 ヶ月 前
コミット
377d487042

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

@@ -54,6 +54,22 @@ class MaterialInspectionPlanFragment :
             }
         }
 
+        mBinding?.cbSign?.setOnClickListener {
+            navigateTo(MaterialInspectionPlanFragmentDirections.actionInspectionPlanFragmentToInspectionSignatureFragment())
+        }
+
+        mBinding?.cbStart?.setOnClickListener {
+
+        }
+
+        mBinding?.cbContinue?.setOnClickListener {
+
+        }
+
+        mBinding?.cbSubmit?.setOnClickListener {
+
+        }
+
 //        navigateTo(MaterialInspectionPlanFragmentDirections.actionInspectionPlanFragmentToInspectionTableFragment())
     }
 

+ 5 - 0
app/src/main/java/com/grkj/iscs_mc/view/fragment/MaterialInspectionSignatureFragment.kt

@@ -1,6 +1,7 @@
 package com.grkj.iscs_mc.view.fragment
 
 import com.grkj.iscs_mc.databinding.FragmentMaterialInspectionSignatureBinding
+import com.grkj.iscs_mc.extentions.navigateUp
 import com.grkj.iscs_mc.view.base.BaseFragment
 
 /**
@@ -13,6 +14,10 @@ class MaterialInspectionSignatureFragment :
         get() = FragmentMaterialInspectionSignatureBinding.inflate(layoutInflater)
 
     override fun initView() {
+        mBinding?.cbBack?.setOnClickListener {
+            navigateUp()
+        }
+
         mBinding?.cbClear?.setOnClickListener {
             mBinding?.sv?.destroyDrawingCache()
             mBinding?.sv?.clear()

+ 12 - 0
app/src/main/res/layout/fragment_material_inspection_plan.xml

@@ -29,6 +29,7 @@
         android:layout_alignParentBottom="true"
         android:layout_marginRight="@dimen/common_spacing"
         android:layout_toLeftOf="@id/cb_back"
+        android:visibility="gone"
         app:btn_bg="@drawable/common_btn_red_bg"
         app:btn_name="@string/start_inspection" />
 
@@ -39,6 +40,7 @@
         android:layout_alignParentBottom="true"
         android:layout_marginRight="@dimen/common_spacing"
         android:layout_toLeftOf="@id/cb_start"
+        android:visibility="gone"
         app:btn_bg="@drawable/common_btn_yellow_bg"
         app:btn_name="@string/continue_inspection" />
 
@@ -49,6 +51,7 @@
         android:layout_alignParentBottom="true"
         android:layout_marginRight="@dimen/common_spacing"
         android:layout_toLeftOf="@id/cb_continue"
+        android:visibility="gone"
         app:btn_bg="@drawable/common_btn_red_bg"
         app:btn_name="@string/submit_result" />
 
@@ -66,6 +69,15 @@
             style="@style/CommonTextView"
             android:layout_marginTop="@dimen/common_spacing_small" />
 
+        <com.grkj.iscs_mc.view.widget.CommonBtn
+            android:id="@+id/cb_sign"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:visibility="gone"
+            app:btn_bg="@drawable/common_btn_green_bg"
+            app:btn_name="@string/sign" />
+
         <com.google.android.material.card.MaterialCardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"

+ 8 - 0
app/src/main/res/navigation/nav_graph.xml

@@ -130,6 +130,14 @@
             app:exitAnim="@anim/slide_out_left"
             app:popEnterAnim="@anim/slide_in_left"
             app:popExitAnim="@anim/slide_out_right" />
+
+        <action
+            android:id="@+id/action_inspection_plan_fragment_to_inspection_signature_fragment"
+            app:destination="@id/material_inspection_signature_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

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

@@ -57,6 +57,7 @@
     <string name="submit_result">提交结果</string>
     <string name="not_start">未开始</string>
     <string name="finished">已完成</string>
+    <string name="sign">签名</string>
 
     <string name="material_type">物资类型</string>
     <string name="total_count">总数量</string>