refactor(更新)

- 修改`fragment_set_job_card.xml`中图标颜色、缩放类型和内边距
- 为多个管理界面的弹窗增加`onConfirmClick`回调以刷新数据

app/src/main/java/com/grkj/iscs/features/main/fragment/data_manage/PointMangeFragment.kt

@@ -82,6 +82,9 @@ class PointMangeFragment : BaseFragment<FragmentPointManageBinding>() {
                                 msg = CommonUtils.getStr("add_point_succeed"),
                                 countDownTime = 10,
                                 showCancel = false,
+                                onConfirmClick = {
+                                    getPointData(nextPage = false)
+                                },
                                 onCancelClick = {
                                     getPointData(nextPage = false)
                                 }
@@ -93,6 +96,9 @@ class PointMangeFragment : BaseFragment<FragmentPointManageBinding>() {
                                 msg = CommonUtils.getStr("add_point_failed"),
                                 countDownTime = 10,
                                 showCancel = false,
+                                onConfirmClick = {
+                                    getPointData(nextPage = false)
+                                },
                                 onCancelClick = {
                                     getPointData(nextPage = false)
                                 }
@@ -207,6 +213,9 @@ class PointMangeFragment : BaseFragment<FragmentPointManageBinding>() {
                             msg = CommonUtils.getStr("update_point_succeed"),
                             countDownTime = 10,
                             showCancel = false,
+                            onConfirmClick = {
+                                getPointData(nextPage = false)
+                            },
                             onCancelClick = {
                                 getPointData(nextPage = false)
                             }
@@ -218,6 +227,9 @@ class PointMangeFragment : BaseFragment<FragmentPointManageBinding>() {
                             msg = CommonUtils.getStr("update_point_failed"),
                             countDownTime = 10,
                             showCancel = false,
+                            onConfirmClick = {
+                                getPointData(nextPage = false)
+                            },
                             onCancelClick = {
                                 getPointData(nextPage = false)
                             }

app/src/main/java/com/grkj/iscs/features/main/fragment/data_manage/RoleManageFragment.kt

@@ -56,6 +56,9 @@ class RoleManageFragment : BaseFragment<FragmentRoleManageBinding>() {
                         msg = CommonUtils.getStr("role_key_already_exists"),
                         countDownTime = 10,
                         showCancel = false,
+                        onConfirmClick = {
+                            getRoleData(nextPage = false)
+                        },
                         onCancelClick = {
                             getRoleData(nextPage = false)
                         }
@@ -72,6 +75,9 @@ class RoleManageFragment : BaseFragment<FragmentRoleManageBinding>() {
                                 msg = CommonUtils.getStr("add_role_succeed"),
                                 countDownTime = 10,
                                 showCancel = false,
+                                onConfirmClick = {
+                                    getRoleData(nextPage = false)
+                                },
                                 onCancelClick = {
                                     getRoleData(nextPage = false)
                                 }
@@ -83,6 +89,9 @@ class RoleManageFragment : BaseFragment<FragmentRoleManageBinding>() {
                                 msg = CommonUtils.getStr("add_role_failed"),
                                 countDownTime = 10,
                                 showCancel = false,
+                                onConfirmClick = {
+                                    getRoleData(nextPage = false)
+                                },
                                 onCancelClick = {
                                     getRoleData(nextPage = false)
                                 }
@@ -171,6 +180,9 @@ class RoleManageFragment : BaseFragment<FragmentRoleManageBinding>() {
                                     .toString(),
                                 countDownTime = 10,
                                 showCancel = false,
+                                onConfirmClick = {
+                                    getRoleData(nextPage = false)
+                                },
                                 onCancelClick = {
                                     getRoleData(nextPage = false)
                                 }
@@ -186,6 +198,9 @@ class RoleManageFragment : BaseFragment<FragmentRoleManageBinding>() {
                                     msg = CommonUtils.getStr("update_role_succeed"),
                                     countDownTime = 10,
                                     showCancel = false,
+                                    onConfirmClick = {
+                                        getRoleData(nextPage = false)
+                                    },
                                     onCancelClick = {
                                         getRoleData(nextPage = false)
                                     }
@@ -197,6 +212,9 @@ class RoleManageFragment : BaseFragment<FragmentRoleManageBinding>() {
                                     msg = CommonUtils.getStr("update_role_failed"),
                                     countDownTime = 10,
                                     showCancel = false,
+                                    onConfirmClick = {
+                                        getRoleData(nextPage = false)
+                                    },
                                     onCancelClick = {
                                         getRoleData(nextPage = false)
                                     }

app/src/main/java/com/grkj/iscs/features/main/fragment/data_manage/UserManageFragment.kt

@@ -89,6 +89,9 @@ class UserManageFragment : BaseFragment<FragmentUserManageBinding>() {
                                     msg = CommonUtils.getStr("add_user_succeed"),
                                     countDownTime = 10,
                                     showCancel = false,
+                                    onConfirmClick = {
+                                        getUserData(false)
+                                    },
                                     onCancelClick = {
                                         getUserData(false)
                                     }
@@ -188,6 +191,9 @@ class UserManageFragment : BaseFragment<FragmentUserManageBinding>() {
                                 msg = CommonUtils.getStr("update_user_succeed"),
                                 countDownTime = 10,
                                 showCancel = false,
+                                onConfirmClick = {
+                                    getUserData(false)
+                                },
                                 onCancelClick = {
                                     getUserData(false)
                                 }
@@ -199,6 +205,9 @@ class UserManageFragment : BaseFragment<FragmentUserManageBinding>() {
                                 msg = CommonUtils.getStr("update_user_failed"),
                                 countDownTime = 10,
                                 showCancel = false,
+                                onConfirmClick = {
+                                    getUserData(false)
+                                },
                                 onCancelClick = {
                                     getUserData(false)
                                 }

app/src/main/java/com/grkj/iscs/features/main/fragment/data_manage/WorkstationManageFragment.kt

@@ -64,6 +64,9 @@ class WorkstationManageFragment : BaseFragment<FragmentWorkstationManageBinding>
                                 msg = CommonUtils.getStr("update_workstation_succeed"),
                                 countDownTime = 10,
                                 showCancel = false,
+                                onConfirmClick = {
+                                    getWorkstationManageData()
+                                },
                                 onCancelClick = {
                                     getWorkstationManageData()
                                 }
@@ -75,6 +78,9 @@ class WorkstationManageFragment : BaseFragment<FragmentWorkstationManageBinding>
                                 msg = CommonUtils.getStr("update_workstation_failed"),
                                 countDownTime = 10,
                                 showCancel = false,
+                                onConfirmClick = {
+                                    getWorkstationManageData()
+                                },
                                 onCancelClick = {
                                     getWorkstationManageData()
                                 }
@@ -99,6 +105,9 @@ class WorkstationManageFragment : BaseFragment<FragmentWorkstationManageBinding>
                                 msg = CommonUtils.getStr("add_workstation_succeed"),
                                 countDownTime = 10,
                                 showCancel = false,
+                                onConfirmClick = {
+                                    getWorkstationManageData()
+                                },
                                 onCancelClick = {
                                     getWorkstationManageData()
                                 }
@@ -110,6 +119,9 @@ class WorkstationManageFragment : BaseFragment<FragmentWorkstationManageBinding>
                                 msg = CommonUtils.getStr("add_workstation_failed"),
                                 countDownTime = 10,
                                 showCancel = false,
+                                onConfirmClick = {
+                                    getWorkstationManageData()
+                                },
                                 onCancelClick = {
                                     getWorkstationManageData()
                                 }

app/src/main/java/com/grkj/iscs/features/main/fragment/hardware_manage/CardManageFragment.kt

@@ -52,6 +52,9 @@ class CardManageFragment : BaseFragment<FragmentCardManageBinding>() {
                             msg = CommonUtils.getStr(msgRes).toString(),
                             countDownTime = 10,
                             showCancel = false,
+                            onConfirmClick = {
+                                loadCards(false)
+                            },
                             onCancelClick = { loadCards(reset = true) }
                         )
                     }
@@ -120,6 +123,9 @@ class CardManageFragment : BaseFragment<FragmentCardManageBinding>() {
                         msg = CommonUtils.getStr(msgRes).toString(),
                         countDownTime = 10,
                         showCancel = false,
+                        onConfirmClick = {
+                            loadCards(false)
+                        },
                         onCancelClick = { loadCards(reset = true) }
                     )
                 }

app/src/main/java/com/grkj/iscs/features/main/fragment/hardware_manage/KeyManageFragment.kt

@@ -56,6 +56,9 @@ class KeyManageFragment : BaseFragment<FragmentKeyManageBinding>() {
                                 msg = CommonUtils.getStr("add_key_succeed"),
                                 countDownTime = 10,
                                 showCancel = false,
+                                onConfirmClick = {
+                                    getKeyData(false)
+                                },
                                 onCancelClick = {
                                     getKeyData(false)
                                 }
@@ -68,6 +71,9 @@ class KeyManageFragment : BaseFragment<FragmentKeyManageBinding>() {
                                 msg = CommonUtils.getStr("add_key_failed"),
                                 countDownTime = 10,
                                 showCancel = false,
+                                onConfirmClick = {
+                                    getKeyData(false)
+                                },
                                 onCancelClick = {
                                     getKeyData(false)
                                 }
@@ -136,6 +142,9 @@ class KeyManageFragment : BaseFragment<FragmentKeyManageBinding>() {
                             msg = CommonUtils.getStr("update_key_succeed"),
                             countDownTime = 10,
                             showCancel = false,
+                            onConfirmClick = {
+                                getKeyData(false)
+                            },
                             onCancelClick = {
                                 getKeyData(false)
                             }
@@ -148,6 +157,9 @@ class KeyManageFragment : BaseFragment<FragmentKeyManageBinding>() {
                             msg = CommonUtils.getStr("update_key_failed").toString(),
                             countDownTime = 10,
                             showCancel = false,
+                            onConfirmClick = {
+                                getKeyData(false)
+                            },
                             onCancelClick = {
                                 getKeyData(false)
                             }

app/src/main/java/com/grkj/iscs/features/main/fragment/hardware_manage/LockManageFragment.kt

@@ -53,6 +53,9 @@ class LockManageFragment : BaseFragment<FragmentLockManageBinding>() {
                             msg = CommonUtils.getStr(msgRes),
                             countDownTime = 10,
                             showCancel = false,
+                            onConfirmClick = {
+                                loadLocks(false)
+                            },
                             onCancelClick = { loadLocks(reset = true) }
                         )
                     }
@@ -123,6 +126,9 @@ class LockManageFragment : BaseFragment<FragmentLockManageBinding>() {
                             msg = CommonUtils.getStr(msgRes),
                             countDownTime = 10,
                             showCancel = false,
+                            onConfirmClick = {
+                                loadLocks(false)
+                            },
                             onCancelClick = { loadLocks(reset = true) }
                         )
                     }

app/src/main/java/com/grkj/iscs/features/main/fragment/hardware_manage/RfidTokenManageFragment.kt

@@ -50,6 +50,9 @@ class RfidTokenManageFragment : BaseFragment<FragmentRfidTokenManageBinding>() {
                             msg = CommonUtils.getStr(msgRes),
                             countDownTime = 10,
                             showCancel = false,
+                            onConfirmClick = {
+                                loadTokens(false)
+                            },
                             onCancelClick = {
                                 loadTokens(reset = true)
                             }
@@ -126,6 +129,9 @@ class RfidTokenManageFragment : BaseFragment<FragmentRfidTokenManageBinding>() {
                         msg = CommonUtils.getStr(msgRes),
                         countDownTime = 10,
                         showCancel = false,
+                        onConfirmClick = {
+                            loadTokens(false)
+                        },
                         onCancelClick = { loadTokens(reset = true) }
                     )
                 }

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

@@ -123,9 +123,10 @@
                 <ImageView
                     android:layout_width="@dimen/login_method_item_layout_width"
                     android:layout_height="@dimen/login_method_item_layout_width"
+                    android:padding="@dimen/iscs_space_2"
                     android:background="@drawable/circle_image_bg"
-                    android:scaleType="center"
-                    android:tint="?attr/colorBlack"
+                    android:scaleType="fitCenter"
+                    android:tint="?attr/colorPrimary"
                     app:skinSrc='@{"icon_login_menu_card.png"}' />
 
                 <TextView