bai 3 vuotta sitten
vanhempi
commit
fc58753a5b

+ 7 - 1
app/src/main/java/com/ys/bdtp/adm/app/theme/Color.kt

@@ -25,6 +25,9 @@ val divColor = Color(0xFFEFF0F1)
 // 文本黑色
 val textBlackColor = Color(0xFF1F2429)
 
+// 文本灰色
+val textGrayColor = Color(0XFF8D9399)
+
 // 文本蓝色
 val textBlueColor = blueColor
 
@@ -37,4 +40,7 @@ val trBgColor = whiteColor
 // 表行分割线
 val trDivColor = Color(0xFFE4E6E7)
 
-val grayColor = Color(0xFFC3C7CB)
+val grayColor = Color(0xFFC3C7CB)
+
+// 底色
+val underColor = Color(0xFFF8F9FA)

+ 20 - 9
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/flash/FlashScreen.kt

@@ -2,26 +2,31 @@ package com.ys.bdtp.adm.mvvm.ui.screen.flash
 
 import android.content.SharedPreferences
 import android.net.ConnectivityManager
+import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.*
 import androidx.compose.material.Text
-import androidx.compose.runtime.*
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.rememberUpdatedState
 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.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.Zygote
 import com.ys.bdtp.adm.mvvm.vm.flash.FlashViewModel
 import kotlinx.coroutines.delay
 import org.kodein.di.compose.rememberInstance
 import org.kodein.di.compose.rememberViewModel
 
-
 @Composable
 fun FlashScreen(block: (Zygote) -> Unit) {
     val vm by rememberViewModel<FlashViewModel>()
@@ -57,12 +62,18 @@ fun FlashScreen(block: (Zygote) -> Unit) {
         }
     }
 
-    Column(
+    Box(
         modifier = Modifier.fillMaxSize().background(Color.White),
-        verticalArrangement = Arrangement.Center,
-        horizontalAlignment = Alignment.CenterHorizontally
+        contentAlignment = Alignment.Center
     ) {
-        Text(text = "Yushu", fontSize = 24.sp)
+        Image(painter = painterResource(R.drawable.flash_bg), contentDescription = "")
+        Column(
+            horizontalAlignment = Alignment.CenterHorizontally
+        ) {
+            Image(painter = painterResource(R.drawable.flash_logo), contentDescription = "")
+            Spacer(modifier = Modifier.height(32.dp).fillMaxWidth())
+            Text("智慧建筑运维平台", fontSize = 48.sp, color = textBlackColor)
+        }
     }
 }
 

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


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