diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WorkRiskListActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WorkRiskListActivity.kt index 44ff0b0..23d853a 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WorkRiskListActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WorkRiskListActivity.kt @@ -34,6 +34,13 @@ class WorkRiskListActivity : BaseActivityOaToolbarViewBinding = mutableListOf() private lateinit var mAdapter: WorkRiskLevelListAdapter + private var dataA: MutableList = mutableListOf() + private var dataB: MutableList = mutableListOf() + private var dataC1: MutableList = mutableListOf() + private var dataC2: MutableList = mutableListOf() + private var dataC3: MutableList = mutableListOf() + private var dataLowRisk: MutableList = mutableListOf() + override fun getViewBinding() = ActivityWorkRiskListBinding.inflate(layoutInflater) override fun getToolbar() = binding.toolbarView.toolbar @@ -72,7 +79,7 @@ class WorkRiskListActivity : BaseActivityOaToolbarViewBinding() { launcherResultAUDIT = createActivityResultLauncherAUDIT() - showLog(GridViewDialogKotlin.TAG_AF) + showLog(GridViewDialog.TAG_AF) } @@ -211,20 +211,20 @@ class HomeFragment : BaseViewBindingFragment() { } else { var TAG = "" when (position) { - 0 -> TAG = GridViewDialogKotlin.TAG_VISIT - 1 -> TAG = GridViewDialogKotlin.TAG_MEET - 2 -> TAG = GridViewDialogKotlin.TAG_DINNER - 4 -> TAG = GridViewDialogKotlin.TAG_OFFICE - 5 -> TAG = GridViewDialogKotlin.TAG_TASK - 6 -> TAG = GridViewDialogKotlin.TAG_SCHEDULE - 7 -> TAG = GridViewDialogKotlin.TAG_CHECK - 8 -> TAG = GridViewDialogKotlin.TAG_PEIXUN - 9 -> TAG = GridViewDialogKotlin.TAG_PDANGJIAN - 10 -> TAG = GridViewDialogKotlin.TAG_GONGHUI - 11 -> TAG = GridViewDialogKotlin.TAG_JD - 12 -> TAG = GridViewDialogKotlin.TAG_AF + 0 -> TAG = GridViewDialog.TAG_VISIT + 1 -> TAG = GridViewDialog.TAG_MEET + 2 -> TAG = GridViewDialog.TAG_DINNER + 4 -> TAG = GridViewDialog.TAG_OFFICE + 5 -> TAG = GridViewDialog.TAG_TASK + 6 -> TAG = GridViewDialog.TAG_SCHEDULE + 7 -> TAG = GridViewDialog.TAG_CHECK + 8 -> TAG = GridViewDialog.TAG_PEIXUN + 9 -> TAG = GridViewDialog.TAG_PDANGJIAN + 10 -> TAG = GridViewDialog.TAG_GONGHUI + 11 -> TAG = GridViewDialog.TAG_JD + 12 -> TAG = GridViewDialog.TAG_AF } - val dialog = GridViewDialogKotlin(context, TAG) + val dialog = GridViewDialog(context, TAG) dialog.show() } } diff --git a/app/src/main/java/com/rehome/zhdcoa/weiget/GridViewDialogKotlin.kt b/app/src/main/java/com/rehome/zhdcoa/weiget/GridViewDialog.kt similarity index 99% rename from app/src/main/java/com/rehome/zhdcoa/weiget/GridViewDialogKotlin.kt rename to app/src/main/java/com/rehome/zhdcoa/weiget/GridViewDialog.kt index 53515ab..b96fe4d 100644 --- a/app/src/main/java/com/rehome/zhdcoa/weiget/GridViewDialogKotlin.kt +++ b/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";//会议 diff --git a/app/src/main/res/layout/activity_work_risk_list.xml b/app/src/main/res/layout/activity_work_risk_list.xml index decfce9..3c7cc21 100644 --- a/app/src/main/res/layout/activity_work_risk_list.xml +++ b/app/src/main/res/layout/activity_work_risk_list.xml @@ -67,6 +67,7 @@ android:orientation="horizontal"> + android:text="B:" + android:textSize="20sp" /> @@ -158,10 +160,10 @@ android:layout_width="match_parent" android:layout_height="80px" android:gravity="center" - android:layout_marginTop="5dp" android:orientation="horizontal"> @@ -219,6 +222,7 @@ diff --git a/app/src/main/res/layout/item_work_risk_list_tip.xml b/app/src/main/res/layout/item_work_risk_list_tip.xml index 3b139ec..aeac6a7 100644 --- a/app/src/main/res/layout/item_work_risk_list_tip.xml +++ b/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="防范措施" />