作业风险清单调整

app/src/main/java/com/rehome/zhdcoa/ui/activity/WorkRiskListActivity.kt

@@ -34,6 +34,13 @@ class WorkRiskListActivity : BaseActivityOaToolbarViewBinding<ActivityWorkRiskLi
     private var datas: MutableList<WorkRiskLevelListBean.RowsBean> = mutableListOf()
     private lateinit var mAdapter: WorkRiskLevelListAdapter
 
+    private var dataA: MutableList<WorkRiskLevelListBean.RowsBean> = mutableListOf()
+    private var dataB: MutableList<WorkRiskLevelListBean.RowsBean> = mutableListOf()
+    private var dataC1: MutableList<WorkRiskLevelListBean.RowsBean> = mutableListOf()
+    private var dataC2: MutableList<WorkRiskLevelListBean.RowsBean> = mutableListOf()
+    private var dataC3: MutableList<WorkRiskLevelListBean.RowsBean> = mutableListOf()
+    private var dataLowRisk: MutableList<WorkRiskLevelListBean.RowsBean> = mutableListOf()
+
     override fun getViewBinding() = ActivityWorkRiskListBinding.inflate(layoutInflater)
 
     override fun getToolbar() = binding.toolbarView.toolbar
@@ -72,7 +79,7 @@ class WorkRiskListActivity : BaseActivityOaToolbarViewBinding<ActivityWorkRiskLi
         val calendar = Calendar.getInstance()
         //输出当前系统时间;
         binding.tvTime.text = sdFormat.format(calendar.time)
-
+        bindViewClick()
     }
 
     override fun initData() {
@@ -135,6 +142,43 @@ class WorkRiskListActivity : BaseActivityOaToolbarViewBinding<ActivityWorkRiskLi
                             datas.clear()
                             datas.addAll(workRiskLevelLists)
                             mAdapter.notifyDataSetChanged()
+
+                            dataA.clear()
+                            dataB.clear()
+                            dataC1.clear()
+                            dataC2.clear()
+                            dataC3.clear()
+                            dataLowRisk.clear()
+
+
+                            for(item in datas){
+                                showLog(GsonUtils.GsonString(item))
+                                if(item.level!=null&&item.level=="A"){
+                                    dataA.add(item)
+                                }
+                                if(item.level!=null&&item.level=="B"){
+                                    dataB.add(item)
+                                }
+                                if(item.level!=null&&item.level=="C1"){
+                                    dataC1.add(item)
+                                }
+                                if(item.level!=null&&item.level=="C2"){
+                                    dataC2.add(item)
+                                }
+                                if(item.level!=null&&item.level=="C3"){
+                                    dataC3.add(item)
+                                }
+                                if(item.level!=null&&item.level=="低风险"){
+                                    dataLowRisk.add(item)
+                                }
+                            }
+                            binding.tvA.text = dataA.size.toString()
+                            binding.tvB.text = dataB.size.toString()
+                            binding.tvC1.text = dataC1.size.toString()
+                            binding.tvC2.text = dataC2.size.toString()
+                            binding.tvC3.text = dataC3.size.toString()
+                            binding.tvLowLisk.text = dataLowRisk.size.toString()
+
                         } else {
                             binding.tvNodata.visibility = View.VISIBLE
                         }
@@ -146,4 +190,37 @@ class WorkRiskListActivity : BaseActivityOaToolbarViewBinding<ActivityWorkRiskLi
                 }
             })
     }
+
+    private fun bindViewClick() {
+        binding.llA.setOnClickListener {
+            datas.clear()
+            datas.addAll(dataA)
+            mAdapter.notifyDataSetChanged()
+        }
+        binding.llB.setOnClickListener {
+            datas.clear()
+            datas.addAll(dataB)
+            mAdapter.notifyDataSetChanged()
+        }
+        binding.llC1.setOnClickListener {
+            datas.clear()
+            datas.addAll(dataC1)
+            mAdapter.notifyDataSetChanged()
+        }
+        binding.llC2.setOnClickListener {
+            datas.clear()
+            datas.addAll(dataC2)
+            mAdapter.notifyDataSetChanged()
+        }
+        binding.llC3.setOnClickListener {
+            datas.clear()
+            datas.addAll(dataC3)
+            mAdapter.notifyDataSetChanged()
+        }
+        binding.llLowLisk.setOnClickListener {
+            datas.clear()
+            datas.addAll(dataLowRisk)
+            mAdapter.notifyDataSetChanged()
+        }
+    }
 }

app/src/main/java/com/rehome/zhdcoa/ui/fragment/HomeFragment.kt

@@ -76,7 +76,7 @@ import com.rehome.zhdcoa.utils.HttpListener
 import com.rehome.zhdcoa.utils.HttpUtils
 import com.rehome.zhdcoa.utils.ModuleDatas
 import com.rehome.zhdcoa.utils.NohttpUtils
-import com.rehome.zhdcoa.weiget.GridViewDialogKotlin
+import com.rehome.zhdcoa.weiget.GridViewDialog
 import com.xuexiang.xui.widget.textview.supertextview.SuperTextView
 import com.xuexiang.xui.widget.textview.supertextview.SuperTextView.OnSuperTextViewClickListener
 import com.yolanda.nohttp.NoHttp
@@ -116,7 +116,7 @@ class HomeFragment : BaseViewBindingFragment<FragmentHomeBinding>() {
         launcherResultAUDIT = createActivityResultLauncherAUDIT()
 
 
-        showLog(GridViewDialogKotlin.TAG_AF)
+        showLog(GridViewDialog.TAG_AF)
 
     }
 
@@ -211,20 +211,20 @@ class HomeFragment : BaseViewBindingFragment<FragmentHomeBinding>() {
                 } else {
                     var TAG = ""
                     when (position) {
-                        0 -> TAG = GridViewDialogKotlin.TAG_VISIT
+                        0 -> TAG = GridViewDialog.TAG_VISIT
-                        1 -> TAG = GridViewDialogKotlin.TAG_MEET
+                        1 -> TAG = GridViewDialog.TAG_MEET
-                        2 -> TAG = GridViewDialogKotlin.TAG_DINNER
+                        2 -> TAG = GridViewDialog.TAG_DINNER
-                        4 -> TAG = GridViewDialogKotlin.TAG_OFFICE
+                        4 -> TAG = GridViewDialog.TAG_OFFICE
-                        5 -> TAG = GridViewDialogKotlin.TAG_TASK
+                        5 -> TAG = GridViewDialog.TAG_TASK
-                        6 -> TAG = GridViewDialogKotlin.TAG_SCHEDULE
+                        6 -> TAG = GridViewDialog.TAG_SCHEDULE
-                        7 -> TAG = GridViewDialogKotlin.TAG_CHECK
+                        7 -> TAG = GridViewDialog.TAG_CHECK
-                        8 -> TAG = GridViewDialogKotlin.TAG_PEIXUN
+                        8 -> TAG = GridViewDialog.TAG_PEIXUN
-                        9 -> TAG = GridViewDialogKotlin.TAG_PDANGJIAN
+                        9 -> TAG = GridViewDialog.TAG_PDANGJIAN
-                        10 -> TAG = GridViewDialogKotlin.TAG_GONGHUI
+                        10 -> TAG = GridViewDialog.TAG_GONGHUI
-                        11 -> TAG = GridViewDialogKotlin.TAG_JD
+                        11 -> TAG = GridViewDialog.TAG_JD
-                        12 -> TAG = GridViewDialogKotlin.TAG_AF
+                        12 -> TAG = GridViewDialog.TAG_AF
                     }
-                    val dialog = GridViewDialogKotlin(context, TAG)
+                    val dialog = GridViewDialog(context, TAG)
                     dialog.show()
                 }
             }

app/src/main/java/com/rehome/zhdcoa/weiget/GridViewDialog.kt

@@ -69,7 +69,7 @@ import com.rehome.zhdcoa.ui.activity.ZxtpActivity
  * Created by Rehome-rjb1 on 2017/5/18.
  * 每个模块弹窗，选择模块的对话框
  */
-class GridViewDialogKotlin(context:Context) : Dialog(context) {
+class GridViewDialog(context:Context) : Dialog(context) {
     companion object{//伴生对象是可以指定名字的，不过一般都省略掉。
         val TAG_VISIT:String = "TAG_VISIT";//来访
         val TAG_MEET:String = "TAG_MEET";//会议

app/src/main/res/layout/activity_work_risk_list.xml

@@ -67,6 +67,7 @@
             android:orientation="horizontal">
 
             <LinearLayout
+                android:id="@+id/ll_a"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
@@ -95,6 +96,7 @@
                     android:text="0" />
             </LinearLayout>
             <LinearLayout
+                android:id="@+id/ll_b"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
@@ -106,10 +108,10 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
+                    android:layout_marginStart="20dp"
                     android:gravity="center"
-                    android:layout_marginStart="30dp"
+                    android:text="B:"
-                    android:textSize="20sp"
+                    android:textSize="20sp" />
-                    android:text="B:" />
 
                 <TextView
                     android:id="@+id/tv_b"
@@ -124,6 +126,7 @@
 
             </LinearLayout>
             <LinearLayout
+                android:id="@+id/ll_c1"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
@@ -136,7 +139,6 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
                     android:gravity="center"
-                    android:layout_marginStart="30dp"
                     android:textSize="20sp"
                     android:text="C1:" />
 
@@ -158,10 +160,10 @@
             android:layout_width="match_parent"
             android:layout_height="80px"
             android:gravity="center"
-            android:layout_marginTop="5dp"
             android:orientation="horizontal">
 
             <LinearLayout
+                android:id="@+id/ll_c2"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
@@ -190,6 +192,7 @@
                     android:text="0" />
             </LinearLayout>
             <LinearLayout
+                android:id="@+id/ll_c3"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
@@ -202,7 +205,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
                     android:gravity="center"
-                    android:layout_marginStart="30dp"
+                    android:layout_marginStart="20dp"
                     android:textSize="20sp"
                     android:text="C3:" />
 
@@ -219,6 +222,7 @@
 
             </LinearLayout>
             <LinearLayout
+                android:id="@+id/ll_lowLisk"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
@@ -231,7 +235,6 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
                     android:gravity="center"
-                    android:layout_marginStart="30dp"
                     android:textSize="20sp"
                     android:text="低风险:" />
 

app/src/main/res/layout/item_work_risk_list_tip.xml

@@ -60,7 +60,7 @@
             android:layout_marginLeft="10px"
             android:layout_marginEnd="10px"
             android:layout_weight="2.4"
-            android:text="预防措施" />
+            android:text="防范措施" />