bai 3 anni fa
parent
commit
0a718875e2
23 ha cambiato i file con 170 aggiunte e 332 eliminazioni
  1. 1 1
      app/src/main/java/com/ys/bdtp/adm/App.kt
  2. 27 45
      app/src/main/java/com/ys/bdtp/adm/mvvm/ui/compose/ExpandList.kt
  3. 2 2
      app/src/main/java/com/ys/bdtp/adm/mvvm/ui/compose/SelectButton.kt
  4. 56 72
      app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/cad/CadContent.kt
  5. 0 103
      app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/cad/CadHeadMiddle.kt
  6. 17 31
      app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/cad/CadScreen.kt
  7. 24 1
      app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/cad/CadSide.kt
  8. 2 2
      app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/flash/Flash.kt
  9. 6 12
      app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/main/Main.kt
  10. 0 43
      app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/home/HomeScreen.kt
  11. 16 0
      app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/home/Route.kt
  12. 7 7
      app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/login/LoginContent.kt
  13. 1 2
      app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/offline/Offline.kt
  14. 1 1
      app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/offline/OfflineHeadLeft.kt
  15. 2 2
      app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/project/Project.kt
  16. 2 2
      app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/project/ProjectItem.kt
  17. 1 1
      app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/task/Task.kt
  18. 2 2
      app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/task/TaskContent.kt
  19. 3 3
      app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/task/TaskSide.kt
  20. BIN
      app/src/main/res/drawable-hdpi/select_left_blue_bg.png
  21. BIN
      app/src/main/res/drawable-hdpi/select_right_blue_bg.png
  22. BIN
      app/src/main/res/drawable-xhdpi/select_left_blue_bg.png
  23. BIN
      app/src/main/res/drawable-xhdpi/select_right_blue_bg.png

+ 1 - 1
app/src/main/java/com/ys/bdtp/adm/App.kt

@@ -9,7 +9,7 @@ import androidx.compose.ui.platform.LocalContext
 import com.google.accompanist.insets.ProvideWindowInsets
 import com.google.accompanist.systemuicontroller.rememberSystemUiController
 import com.ys.bdtp.adm.app.theme.AdmTheme
-import com.ys.bdtp.adm.mvvm.ui.screen.main.Main
+import com.ys.bdtp.adm.mvvm.ui.screen.home.Main
 import org.kodein.di.compose.onDIContext
 
 @Composable

+ 27 - 45
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/compose/ExpandList.kt

@@ -24,9 +24,10 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import com.ys.bdtp.adm.app.theme.textBlackColor
+import com.ys.bdtp.adm.app.theme.underColor
 
 data class Building(val id: String, val name: String, val floors: List<String>)
 
@@ -47,7 +48,7 @@ fun ExpandList(items: List<Building>) {
     LazyColumn(
         modifier = Modifier
             .fillMaxSize()
-            .background(Color.White)
+            .background(underColor)
     ) {
         items(
             items = items,
@@ -55,9 +56,8 @@ fun ExpandList(items: List<Building>) {
         ) { building ->
             Row(
                 modifier = Modifier
-                    .height(44.dp)
+                    .height(60.dp)
                     .fillMaxWidth()
-                    .background(Color.White)
                     .clickable {
                         if (selectId == building.id) {
                             isExpand = !isExpand
@@ -65,54 +65,36 @@ fun ExpandList(items: List<Building>) {
                             isExpand = true
                             selectId = building.id
                         }
-                    }
+                    },
+                verticalAlignment = Alignment.CenterVertically
             ) {
-                Box(modifier = Modifier.fillMaxHeight()) {
-                    Row(
-                        modifier = Modifier
-                            .align(Alignment.CenterStart),
-                        verticalAlignment = Alignment.CenterVertically
-                    ) {
-                        Icon(
-                            imageVector = if (building.id == selectId && isExpand)
-                                Icons.Default.ArrowDropDown
-                            else
-                                Icons.Default.ArrowRight,
-                            contentDescription = ""
-                        )
-                        Text(text = building.name, color = Color(0xFF1F2429))
-                    }
-                    Spacer(
-                        modifier = Modifier
-                            .align(Alignment.BottomCenter)
-                            .fillMaxWidth()
-                            .height(1.dp)
-                            .background(Color(0xFFEFF0F1))
-                    )
-                }
+                Spacer(modifier = Modifier.width(24.dp))
+                Icon(
+                    imageVector = if (building.id == selectId && isExpand)
+                        Icons.Default.ArrowDropDown
+                    else
+                        Icons.Default.ArrowRight,
+                    contentDescription = ""
+                )
+                Text(text = building.name, color = textBlackColor)
             }
 
             if (building.id == selectId && isExpand) {
                 building.floors.forEach { floor ->
                     Row(
-                        modifier = Modifier.height(40.dp)
+                        modifier = Modifier
+                            .height(60.dp)
+                            .fillMaxWidth()
+                            .clickable {
+
+                            },
+                        verticalAlignment = Alignment.CenterVertically
                     ) {
-                        Spacer(modifier = Modifier.width(30.dp))
-                        Box(modifier = Modifier.fillMaxHeight()) {
-                            Text(
-                                text = floor,
-                                color = Color.DarkGray,
-                                modifier = Modifier
-                                    .align(Alignment.CenterStart)
-                            )
-                            Spacer(
-                                modifier = Modifier
-                                    .align(Alignment.BottomCenter)
-                                    .fillMaxWidth()
-                                    .height(1.dp)
-                                    .background(Color(0xFFEFF0F1))
-                            )
-                        }
+                        Spacer(modifier = Modifier.width(48.dp))
+                        Text(
+                            text = floor,
+                            color = textBlackColor,
+                        )
                     }
                 }
             }

+ 2 - 2
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/compose/SelectButton.kt

@@ -44,8 +44,8 @@ sealed interface SelectState {
 }
 
 @Composable
-fun SelectButton(initState: SelectState.Left, click: (SelectState) -> Unit) {
-    var state by remember { mutableStateOf<SelectState>(initState) }
+fun SelectButton(initState: SelectState, click: (SelectState) -> Unit) {
+    var state by remember { mutableStateOf(initState) }
     var leftResId by remember { mutableStateOf(R.drawable.btn_bg_blue_left_close) }
     var rightResId by remember { mutableStateOf(R.drawable.btn_bg_gray_right_open) }
 

+ 56 - 72
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/cad/CadContent.kt

@@ -1,100 +1,84 @@
 package com.ys.bdtp.adm.mvvm.ui.screen.cad
 
 import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.ButtonDefaults
 import androidx.compose.material.Text
-import androidx.compose.material.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import com.google.accompanist.flowlayout.FlowRow
 import com.ys.bdtp.adm.app.theme.textBlackColor
 import com.ys.bdtp.adm.app.theme.trDivColor
+import com.ys.bdtp.adm.app.theme.whiteColor
+import com.ys.bdtp.adm.mvvm.ui.compose.SelectState
 import com.ys.bdtp.adm.mvvm.ui.compose.Table
 
-data class Major(val major: String, val number: Int)
-
-val majors = listOf(
-    Major(major = "强电专业", number = 6),
-    Major(major = "弱点专业", number = 6),
-    Major(major = "空调专业", number = 6),
-    Major(major = "给排水专业", number = 6),
-    Major(major = "消防专业", number = 6),
-    Major(major = "安防专业", number = 6),
-    Major(major = "土建精装专业", number = 6),
-    Major(major = "电梯专业", number = 6)
-)
-
 @Composable
-fun CadContent(modifier: Modifier = Modifier) {
-    Column(modifier = modifier.background(Color.White)) {
-        FlowRow {
-            majors.forEach { major ->
-                Box(
-                    modifier = Modifier
-                        .width(150.dp)
-                        .height(58.dp)
-                        .padding(start = 10.dp, top = 10.dp),
-                ) {
-                    TextButton(
-                        onClick = {},
-                        modifier = modifier.width(120.dp).height(28.dp),
-                        colors = ButtonDefaults.textButtonColors(
-                            backgroundColor = Color(0xFFE1F2FF),
-                            contentColor = Color(0xFF0091FF)
-                        ),
-                        contentPadding = PaddingValues(),
-                        shape = RoundedCornerShape(4.dp)
-                    ) {
-                        Text(text = "${major.major}(${major.number})", fontSize = 14.sp)
+fun CadContent(selectState: SelectState) {
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .background(whiteColor)
+            .padding(horizontal = 50.dp, vertical = 50.dp)
+    ) {
+        if (selectState == SelectState.Left) {
+            Table(
+                name = {
+                    Text(text = "土建图纸核查", color = textBlackColor, fontSize = 16.sp)
+                },
+                th = {
+                    CadDrawingTitle()
+                },
+                tr = {
+                    LazyColumn(modifier = Modifier.fillMaxSize()) {
+                        items(20) {
+                            Box {
+                                CadDrawingItem()
+                                Spacer(
+                                    modifier = Modifier
+                                        .align(Alignment.BottomCenter)
+                                        .fillMaxWidth().height(1.dp)
+                                        .background(trDivColor)
+                                )
+                            }
+                        }
                     }
                 }
-            }
-        }
-        Spacer(modifier = Modifier.fillMaxWidth().height(40.dp))
-        Table(
-            name = {
-                Text(text = "CAD图纸核查", color = textBlackColor, fontSize = 16.sp)
-            },
-            th = {
-                CadDrawingTitle()
-            },
-            tr = {
-                LazyColumn(modifier = Modifier.fillMaxSize()) {
-                    items(20) {
-                        Box {
-                            CadDrawingItem()
-                            Spacer(
-                                modifier = Modifier
-                                    .align(Alignment.BottomCenter)
-                                    .fillMaxWidth().height(1.dp)
-                                    .background(trDivColor)
-                            )
+            )
+        } else {
+            Table(
+                name = {
+                    Text(text = "机电图纸核查", color = textBlackColor, fontSize = 16.sp)
+                },
+                th = {
+                    CadDrawingTitle()
+                },
+                tr = {
+                    LazyColumn(modifier = Modifier.fillMaxSize()) {
+                        items(20) {
+                            Box {
+                                CadDrawingItem()
+                                Spacer(
+                                    modifier = Modifier
+                                        .align(Alignment.BottomCenter)
+                                        .fillMaxWidth().height(1.dp)
+                                        .background(trDivColor)
+                                )
+                            }
                         }
                     }
                 }
-            }
-        )
+            )
+        }
+
     }
 }
 
 @Preview(widthDp = 910, heightDp = 711)
 @Composable
 fun PreviewCadContent() {
-    CadContent()
+    CadContent(SelectState.Left)
 }

+ 0 - 103
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/cad/CadHeadMiddle.kt

@@ -1,103 +0,0 @@
-package com.ys.bdtp.adm.mvvm.ui.screen.cad
-
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.ButtonDefaults
-import androidx.compose.material.Text
-import androidx.compose.material.TextButton
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import com.ys.bdtp.adm.R
-import com.ys.bdtp.adm.app.theme.textBlackColor
-import com.ys.bdtp.adm.app.theme.whiteColor
-
-@Composable
-fun CadHeadMiddle() {
-    Row(
-        modifier = Modifier
-            .width(360.dp)
-            .height(32.dp)
-            .background(Color.White, shape = RoundedCornerShape(4.dp))
-    ) {
-
-        TextButton(
-            modifier = Modifier.weight(1f),
-            onClick = {},
-            contentPadding = PaddingValues(),
-            shape = RoundedCornerShape(
-                topStart = 4.dp,
-                bottomStart = 4.dp,
-                topEnd = 0.dp,
-                bottomEnd = 0.dp
-            ),
-            colors = ButtonDefaults.textButtonColors(
-                backgroundColor = whiteColor,
-                contentColor = textBlackColor
-            )
-        ) {
-            Box {
-                Image(
-                    modifier = Modifier.fillMaxSize().align(Alignment.Center),
-                    painter = painterResource(R.drawable.btn_bg_blue_left_close),
-                    contentDescription = ""
-                )
-                Text(
-                    modifier = Modifier.align(Alignment.Center),
-                    text = "土建精装图纸核查",
-                    color = textBlackColor,
-                    fontSize = 14.sp
-                )
-            }
-        }
-
-        TextButton(
-            modifier = Modifier.weight(1f),
-            onClick = {},
-            contentPadding = PaddingValues(),
-            shape = RoundedCornerShape(
-                topStart = 0.dp,
-                bottomStart = 0.dp,
-                topEnd = 4.dp,
-                bottomEnd = 4.dp
-            ),
-            colors = ButtonDefaults.textButtonColors(
-                backgroundColor = whiteColor,
-                contentColor = textBlackColor
-            )
-        ) {
-            Box {
-                Image(
-                    modifier = Modifier.fillMaxSize().align(Alignment.Center),
-                    painter = painterResource(R.drawable.btn_bg_gray_right_open),
-                    contentDescription = ""
-                )
-                Text(
-                    modifier = Modifier.align(Alignment.Center),
-                    text = "机电管道图纸核查",
-                    color = textBlackColor,
-                    fontSize = 14.sp
-                )
-            }
-        }
-
-    }
-}
-
-@Preview
-@Composable
-fun PreviewCadHeadMiddle() {
-    CadHeadMiddle()
-}

+ 17 - 31
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/cad/CadScreen.kt

@@ -2,34 +2,33 @@ package com.ys.bdtp.adm.mvvm.ui.screen.cad
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.width
-import androidx.compose.runtime.Composable
+import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import com.ys.bdtp.adm.mvvm.ui.compose.Blank
-import com.ys.bdtp.adm.mvvm.ui.compose.Body
-import com.ys.bdtp.adm.mvvm.ui.compose.Div
-import com.ys.bdtp.adm.mvvm.ui.compose.Head
-import com.ys.bdtp.adm.mvvm.ui.compose.HeadLeft
-import com.ys.bdtp.adm.mvvm.ui.compose.HeadRight
-import com.ys.bdtp.adm.mvvm.ui.compose.Side
-import com.ys.bdtp.adm.mvvm.ui.compose.buildings
-import com.ys.bdtp.adm.mvvm.ui.screen.offline.OfflineContent
+import com.ys.bdtp.adm.mvvm.ui.compose.*
 
 @Composable
 fun CadScreen() {
+    var selectState by remember { mutableStateOf<SelectState>(SelectState.Left) }
     Column(modifier = Modifier.background(Color.White)) {
         Head(
             left = { HeadLeft() },
+            middle = {
+                SelectButton(
+                    SelectState.Left,
+                    click = {
+                        selectState = it
+                    }
+                )
+            },
             right = {
                 HeadRight(
                     role = { "物业管家" },
-                    click = {}
+                    click = {
+
+                    }
                 )
             }
         )
@@ -37,24 +36,11 @@ fun CadScreen() {
         Body(
             modifier = Modifier.fillMaxSize(),
             side = {
-                Side(
-                    modifier = Modifier
-                        .width(288.dp)
-                        .fillMaxHeight()
-                        .padding(start = 32.dp, top = 12.dp, bottom = 12.dp)
-                ) {
-                    CadSide(buildings)
-                }
+                CadSide(buildings)
             },
             content = {
-                Column(
-                    modifier = Modifier
-                        .fillMaxSize()
-                        .padding(horizontal = 50.dp, vertical = 50.dp)
-                ) {
-                    //Blank()
-                    CadContent()
-                }
+                //Blank()
+                CadContent(selectState)
             },
             div = { Div(Div.Col) }
         )

+ 24 - 1
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/cad/CadSide.kt

@@ -1,14 +1,37 @@
 package com.ys.bdtp.adm.mvvm.ui.screen.cad
 
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.*
+import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.ys.bdtp.adm.app.theme.textBlackColor
+import com.ys.bdtp.adm.app.theme.underColor
 import com.ys.bdtp.adm.mvvm.ui.compose.Building
 import com.ys.bdtp.adm.mvvm.ui.compose.ExpandList
 import com.ys.bdtp.adm.mvvm.ui.compose.buildings
 
 @Composable
 fun CadSide(buildings: List<Building>) {
-    ExpandList(buildings)
+    Column(
+        modifier = Modifier
+            .width(280.dp)
+            .fillMaxHeight()
+            .background(color = underColor)
+        /*.padding(horizontal = 30.dp, vertical = 20.dp)*/
+    ) {
+        Row(
+            modifier = Modifier
+                .wrapContentHeight()
+                .padding(top = 20.dp, start = 32.dp)
+        ) {
+            Text(text = "选择楼层", fontSize = 16.sp, color = textBlackColor)
+        }
+        ExpandList(buildings)
+    }
 }
 
 @Preview

+ 2 - 2
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/flash/Flash.kt

@@ -19,8 +19,8 @@ import com.ys.bdtp.adm.R
 import com.ys.bdtp.adm.app.Token
 import com.ys.bdtp.adm.app.isNet
 import com.ys.bdtp.adm.app.theme.textBlackColor
-import com.ys.bdtp.adm.mvvm.ui.screen.main.LocalNavHostController
-import com.ys.bdtp.adm.mvvm.ui.screen.main.Route
+import com.ys.bdtp.adm.mvvm.ui.screen.home.LocalNavHostController
+import com.ys.bdtp.adm.mvvm.ui.screen.home.Route
 import com.ys.bdtp.adm.mvvm.vm.flash.FlashViewModel
 import org.kodein.di.compose.rememberInstance
 import org.kodein.di.compose.rememberViewModel

+ 6 - 12
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/main/Main.kt

@@ -1,4 +1,4 @@
-package com.ys.bdtp.adm.mvvm.ui.screen.main
+package com.ys.bdtp.adm.mvvm.ui.screen.home
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
@@ -7,6 +7,7 @@ import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
+import com.ys.bdtp.adm.mvvm.ui.screen.cad.CadScreen
 import com.ys.bdtp.adm.mvvm.ui.screen.flash.Flash
 import com.ys.bdtp.adm.mvvm.ui.screen.login.LoginScreen
 import com.ys.bdtp.adm.mvvm.ui.screen.offline.Offline
@@ -14,16 +15,6 @@ import com.ys.bdtp.adm.mvvm.ui.screen.project.Project
 import com.ys.bdtp.adm.mvvm.ui.screen.task.Task
 import com.ys.bdtp.adm.mvvm.ui.screen.task.Tasks
 
-
-object Route {
-    const val Flash = "flash"
-    const val Login = "login"
-    const val Project = "project"
-    const val Task = "task"
-    const val Tasks = "tasks"
-    const val Offline = "offline"
-}
-
 val LocalNavHostController = compositionLocalOf<NavHostController?> { null }
 
 @Composable
@@ -46,9 +37,12 @@ fun Main() {
             composable(Route.Tasks) {
                 Tasks()
             }
-             composable(Route.Offline) {
+            composable(Route.Offline) {
                 Offline()
             }
+            composable(Route.Cad) {
+                CadScreen()
+            }
 
         }
 

+ 0 - 43
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/home/HomeScreen.kt

@@ -1,43 +0,0 @@
-package com.ys.bdtp.adm.mvvm.ui.screen.home
-
-import androidx.compose.foundation.ExperimentalFoundationApi
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.*
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import com.ys.bdtp.adm.mvvm.ui.compose.*
-import com.ys.bdtp.adm.mvvm.ui.screen.project.Project
-
-@OptIn(ExperimentalFoundationApi::class)
-@Composable
-fun HomeScreen() {
-    Column(modifier = Modifier.fillMaxSize()) {
-        Head(
-            left = { HeadLeft() },
-            right = {
-                HeadRight(
-                    role = { "管家" },
-                    click = { println("heiheihei") }
-                )
-            }
-        )
-
-        Spacer(
-            modifier = Modifier.fillMaxWidth().height(1.dp).background(Color(0xFFEFF0F1))
-        )
-
-        Content {
-            Project()
-        }
-    }
-}
-
-
-@Preview(widthDp = 1280, heightDp = 800)
-@Composable
-fun PreviewHomeTopBar() {
-    HomeScreen()
-}

+ 16 - 0
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/home/Route.kt

@@ -0,0 +1,16 @@
+package com.ys.bdtp.adm.mvvm.ui.screen.home
+
+/**
+ * 路由对象
+ *
+ * @author bai
+ */
+object Route {
+    const val Flash = "flash"
+    const val Login = "login"
+    const val Project = "project"
+    const val Task = "task"
+    const val Tasks = "tasks"
+    const val Offline = "offline"
+    const val Cad = "cad"
+}

+ 7 - 7
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/login/LoginContent.kt

@@ -23,8 +23,8 @@ import com.ys.bdtp.adm.app.theme.blueColor
 import com.ys.bdtp.adm.app.theme.grayColor
 import com.ys.bdtp.adm.app.theme.textBlackColor
 import com.ys.bdtp.adm.mvvm.model.vo.request.Login
-import com.ys.bdtp.adm.mvvm.ui.screen.main.LocalNavHostController
-import com.ys.bdtp.adm.mvvm.ui.screen.main.Main
+import com.ys.bdtp.adm.mvvm.ui.screen.home.LocalNavHostController
+import com.ys.bdtp.adm.mvvm.ui.screen.home.Route
 import com.ys.bdtp.adm.mvvm.vm.login.LoginViewModel
 import kotlinx.coroutines.launch
 import org.kodein.di.compose.rememberInstance
@@ -36,10 +36,10 @@ fun LoginContent() {
     val sp by rememberInstance<SharedPreferences>()
 
     var isShowPassword by remember { mutableStateOf(false) }
-    var isLoginBtnEnable by remember { mutableStateOf(false) }
+    var isLoginBtnEnable by remember { mutableStateOf(true) }
 
-    var username by remember { mutableStateOf("") }
-    var password by remember { mutableStateOf("") }
+    var username by remember { mutableStateOf("17337681032") }
+    var password by remember { mutableStateOf("123456") }
 
     var visualState: VisualTransformation by remember { mutableStateOf(PasswordVisualTransformation()) }
 
@@ -200,8 +200,8 @@ fun LoginContent() {
                     ),
                     success = { token ->
                         sp.edit { putString(Token, token) }
-                        nav.navigate(Main.Project) {
-                            popUpTo(Main.Login) {
+                        nav.navigate(Route.Project) {
+                            popUpTo(Route.Login) {
                                 inclusive = true
                             }
                         }

+ 1 - 2
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/offline/Offline.kt

@@ -16,9 +16,8 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.ys.bdtp.adm.mvvm.ui.compose.Head
-import com.ys.bdtp.adm.mvvm.ui.compose.HeadLeft
 import com.ys.bdtp.adm.mvvm.ui.compose.HeadRight
-import com.ys.bdtp.adm.mvvm.ui.screen.main.LocalNavHostController
+import com.ys.bdtp.adm.mvvm.ui.screen.home.LocalNavHostController
 
 @Composable
 fun Offline() {

+ 1 - 1
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/offline/OfflineHeadLeft.kt

@@ -16,7 +16,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.navigation.NavHostController
 import com.ys.bdtp.adm.R
-import com.ys.bdtp.adm.mvvm.ui.screen.main.LocalNavHostController
+import com.ys.bdtp.adm.mvvm.ui.screen.home.LocalNavHostController
 
 @Composable
 fun OfflineHeadLeft(nav: NavHostController) {

+ 2 - 2
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/project/Project.kt

@@ -15,8 +15,8 @@ import com.ys.bdtp.adm.mvvm.model.SuccessResponse
 import com.ys.bdtp.adm.mvvm.model.db.entity.ProjectEntity
 import com.ys.bdtp.adm.mvvm.model.db.entity.UserEntity
 import com.ys.bdtp.adm.mvvm.ui.compose.*
-import com.ys.bdtp.adm.mvvm.ui.screen.main.LocalNavHostController
-import com.ys.bdtp.adm.mvvm.ui.screen.main.Route
+import com.ys.bdtp.adm.mvvm.ui.screen.home.LocalNavHostController
+import com.ys.bdtp.adm.mvvm.ui.screen.home.Route
 import com.ys.bdtp.adm.mvvm.vm.project.ProjectViewModel
 import kotlinx.coroutines.launch
 import org.kodein.di.compose.rememberInstance

+ 2 - 2
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/project/ProjectItem.kt

@@ -17,8 +17,8 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.ys.bdtp.adm.R
 import com.ys.bdtp.adm.mvvm.model.db.entity.ProjectEntity
-import com.ys.bdtp.adm.mvvm.ui.screen.main.LocalNavHostController
-import com.ys.bdtp.adm.mvvm.ui.screen.main.Route
+import com.ys.bdtp.adm.mvvm.ui.screen.home.LocalNavHostController
+import com.ys.bdtp.adm.mvvm.ui.screen.home.Route
 
 @Composable
 fun ProjectItem(project: ProjectEntity) {

+ 1 - 1
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/task/Task.kt

@@ -26,7 +26,7 @@ import com.ys.bdtp.adm.app.theme.underColor
 import com.ys.bdtp.adm.mvvm.model.db.entity.ProjectEntity
 import com.ys.bdtp.adm.mvvm.ui.compose.Head
 import com.ys.bdtp.adm.mvvm.ui.compose.HeadRight
-import com.ys.bdtp.adm.mvvm.ui.screen.main.LocalNavHostController
+import com.ys.bdtp.adm.mvvm.ui.screen.home.LocalNavHostController
 import com.ys.bdtp.adm.mvvm.vm.task.TaskViewModel
 import org.kodein.di.compose.rememberViewModel
 

+ 2 - 2
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/task/TaskContent.kt

@@ -14,8 +14,8 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import com.ys.bdtp.adm.mvvm.ui.screen.main.LocalNavHostController
-import com.ys.bdtp.adm.mvvm.ui.screen.main.Route
+import com.ys.bdtp.adm.mvvm.ui.screen.home.LocalNavHostController
+import com.ys.bdtp.adm.mvvm.ui.screen.home.Route
 
 /**
  * 近期任务组件

+ 3 - 3
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/task/TaskSide.kt

@@ -10,8 +10,8 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavHostController
 import com.ys.bdtp.adm.R
-import com.ys.bdtp.adm.mvvm.ui.screen.main.LocalNavHostController
-import com.ys.bdtp.adm.mvvm.ui.screen.main.Route
+import com.ys.bdtp.adm.mvvm.ui.screen.home.LocalNavHostController
+import com.ys.bdtp.adm.mvvm.ui.screen.home.Route
 
 @Composable
 fun TaskSide(nav: NavHostController) {
@@ -19,7 +19,7 @@ fun TaskSide(nav: NavHostController) {
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
         TaskType(R.drawable.project_task_cad, "CAD核查") {
-            //nav.navigate()
+            nav.navigate(Route.Cad)
         }
         Spacer(modifier = Modifier.height(20.dp))
         TaskType(R.drawable.project_task_space, "空间模型核查") {}

BIN
app/src/main/res/drawable-hdpi/select_left_blue_bg.png


BIN
app/src/main/res/drawable-hdpi/select_right_blue_bg.png


BIN
app/src/main/res/drawable-xhdpi/select_left_blue_bg.png


BIN
app/src/main/res/drawable-xhdpi/select_right_blue_bg.png