Quellcode durchsuchen

1. 补充enSuperadmin管理员账号
2. 点击首页任务的查看全部跳转到任务列表的进行中

bjb vor 2 Monaten
Ursprung
Commit
b71bb28795

+ 1 - 1
app/src/main/java/com/iscs/bozzys/ui/pages/home/HomeCompose.kt

@@ -367,7 +367,7 @@ private fun TaskList(pv: PaddingValues, vm: VMHome) {
                 .fillMaxWidth()
                 .height(36.dp)
                 .clickable(indication = null, interactionSource = remember { MutableInteractionSource() }, onClick = {
-                    vm.navigationToId(2)
+                    vm.onTaskProgressClick()
                 }),
             verticalAlignment = Alignment.CenterVertically
         ) {

+ 2 - 1
app/src/main/java/com/iscs/bozzys/ui/pages/home/JobsCompose.kt

@@ -57,6 +57,7 @@ import com.iscs.bozzys.ui.pages.vm.StatePage
 import com.iscs.bozzys.ui.pages.vm.VMHome
 import com.iscs.bozzys.ui.theme.Main
 import com.iscs.bozzys.ui.theme.Text
+import com.iscs.bozzys.utils.isAdmin
 
 @Composable
 fun JobsCompose(pv: PaddingValues, zIndex: Float, vm: VMHome) {
@@ -103,7 +104,7 @@ private fun TopToolBar(pv: PaddingValues, vm: VMHome) {
         ) {
             Text("我的作业", fontSize = 18.sp, color = Color.White, fontWeight = FontWeight.Medium)
             Spacer(Modifier.weight(1f))
-            if (state.roles.contains("super_admin")) {
+            if (state.roles.isAdmin()) {
                 Icon(
                     painter = painterResource(R.drawable.add),
                     contentDescription = null,

+ 4 - 1
app/src/main/java/com/iscs/bozzys/utils/Exts.kt

@@ -4,11 +4,14 @@ package com.iscs.bozzys.utils
  * 获取角色名称
  */
 fun List<String>.getRoleName(): String {
+    LogUtil.d("RoleList", "$this")
     val roles = Storage.readRoleList()
     return if (this.contains("super_admin")) {
         roles.find { it.code == "super_admin" }?.name ?: ""
     } else if (this.contains("tenant_admin")) {
         roles.find { it.code == "tenant_admin" }?.name ?: ""
+    } else if (this.contains("enSuperadmin")) {
+        roles.find { it.code == "enSuperadmin" }?.name ?: ""
     } else if (this.contains("jtdrawer")) {
         roles.find { it.code == "jtdrawer" }?.name ?: ""
     } else if (this.contains("jtlocker")) {
@@ -25,7 +28,7 @@ fun List<String>.getRoleName(): String {
  */
 fun List<String>?.isAdmin(): Boolean {
     if (this == null) return false
-    return this.contains("super_admin") || this.contains("tenant_admin")
+    return this.contains("super_admin") || this.contains("tenant_admin") || this.contains("enSuperadmin")
 }
 
 /**