Browse Source

补充分割线

bjb 1 tuần trước cách đây
mục cha
commit
1d83c49915

+ 2 - 0
app/build.gradle.kts

@@ -61,6 +61,8 @@ dependencies {
     implementation(libs.tencent.mmkv)
     // 阿里云消息推送
     implementation(libs.push)
+    implementation(libs.push.third)
+    implementation(libs.push.third.xiaomi)
 
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)

+ 3 - 0
app/src/main/java/com/iscs/bozzys/Entry.kt

@@ -3,6 +3,7 @@ package com.iscs.bozzys
 import android.app.Application
 import com.alibaba.sdk.android.push.noonesdk.PushInitConfig
 import com.alibaba.sdk.android.push.noonesdk.PushServiceFactory
+import com.alibaba.sdk.android.push.register.MiPushRegister
 import com.iscs.bozzys.utils.Storage
 
 /**
@@ -25,6 +26,8 @@ class Entry : Application() {
             .appSecret("a641c237c69e4fcfbff6ca4d3638758d")
             .build()
         PushServiceFactory.init(config)
+        // 小米通道注册
+        MiPushRegister.register(this, "2882303761520479855", "5522047986855")
     }
 
 }

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

@@ -58,7 +58,7 @@ fun HomeCompose(pv: PaddingValues, zIndex: Float, vmHome: VMHome) {
         modifier = Modifier
             .fillMaxSize()
             .zIndex(zIndex)
-            .background(Color(0xFFF8F8F8))
+            .background(Color.White)
     ) {
         PullToRefreshBox(isRefresh, onRefresh = {
             isRefresh = true

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

@@ -48,7 +48,7 @@ fun JobsCompose(pv: PaddingValues, zIndex: Float, vmHome: VMHome) {
         modifier = Modifier
             .fillMaxSize()
             .zIndex(zIndex)
-            .background(Color(0xFFF8F8F8))
+            .background(Color.White)
     ) {
         // 顶部工具栏
         Column(

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

@@ -45,7 +45,7 @@ fun MessageCompose(pv: PaddingValues, zIndex: Float, vmHome: VMHome) {
         modifier = Modifier
             .fillMaxSize()
             .zIndex(zIndex)
-            .background(Color(0xFFF8F8F8))
+            .background(Color.White)
     ) {
         // 顶部工具栏
         Column(

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

@@ -18,10 +18,8 @@ fun MyCompose(pv: PaddingValues, zIndex: Float) {
         modifier = Modifier
             .fillMaxSize()
             .zIndex(zIndex)
-            .background(Color(0xFFF8F8F8))
+            .background(Color.White)
     ) {
-        Text("我的")
-    }
-    LaunchedEffect("") {
+        Text("设置")
     }
 }

+ 48 - 44
app/src/main/java/com/iscs/bozzys/ui/pages/home/PageHome.kt

@@ -18,6 +18,7 @@ import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
@@ -88,53 +89,56 @@ class PageHome : PageBase() {
     @Composable
     fun CreateNavigationBar(pv: PaddingValues, bgColor: Color, vm: VMHome) {
         val state by vm.state.collectAsState()
-        Row(
-            modifier = Modifier
-                .fillMaxWidth()
-                .background(bgColor)
-                .padding(PaddingValues(bottom = pv.calculateBottomPadding()))
-        ) {
-            state.navs.forEach { nav ->
-                Box(
-                    modifier = Modifier
-                        .weight(1.0f)
-                        .height(66.dp)
-                        .clickable(
-                            interactionSource = remember { MutableInteractionSource() },
-                            indication = null,
-                            onClick = { vm.updateNavIndex(nav.id) }),
-                ) {
-                    Column(
-                        verticalArrangement = Arrangement.Center, horizontalAlignment = Alignment.CenterHorizontally,
-                        modifier = Modifier.align(Alignment.Center)
+        Column(modifier = Modifier.fillMaxWidth()) {
+            HorizontalDivider(thickness = 1.dp, color = Color(0xFFEEEEEE))
+            Row(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .background(bgColor)
+                    .padding(PaddingValues(bottom = pv.calculateBottomPadding()))
+            ) {
+                state.navs.forEach { nav ->
+                    Box(
+                        modifier = Modifier
+                            .weight(1.0f)
+                            .height(66.dp)
+                            .clickable(
+                                interactionSource = remember { MutableInteractionSource() },
+                                indication = null,
+                                onClick = { vm.updateNavIndex(nav.id) }),
                     ) {
-                        Icon(
-                            painter = painterResource(nav.icon),
-                            contentDescription = null,
-                            modifier = Modifier.size(18.dp),
-                            tint = if (state.navIndex == nav.id) nav.selectedColor else nav.unselectedColor
-                        )
-                        Text(
-                            nav.title,
-                            Modifier.padding(top = 5.dp),
-                            fontSize = 12.sp,
-                            lineHeight = 12.sp,
-                            color = if (state.navIndex == nav.id) nav.selectedColor else nav.unselectedColor
+                        Column(
+                            verticalArrangement = Arrangement.Center, horizontalAlignment = Alignment.CenterHorizontally,
+                            modifier = Modifier.align(Alignment.Center)
+                        ) {
+                            Icon(
+                                painter = painterResource(nav.icon),
+                                contentDescription = null,
+                                modifier = Modifier.size(18.dp),
+                                tint = if (state.navIndex == nav.id) nav.selectedColor else nav.unselectedColor
+                            )
+                            Text(
+                                nav.title,
+                                Modifier.padding(top = 5.dp),
+                                fontSize = 12.sp,
+                                lineHeight = 12.sp,
+                                color = if (state.navIndex == nav.id) nav.selectedColor else nav.unselectedColor
+                            )
+                        }
+                        if (nav.count > 0) Text(
+                            "${nav.count}", color = Color.White, modifier = Modifier
+                                .offset(x = 16.dp, y = 5.dp)
+                                .defaultMinSize(14.dp, 14.dp)
+                                .clip(RoundedCornerShape(14.dp))
+                                .background(Color.Red)
+                                .align(Alignment.TopCenter)
+                                .padding(top = 1.dp)
+                                .padding(horizontal = 2.dp),
+                            textAlign = TextAlign.Center,
+                            fontSize = 10.sp,
+                            lineHeight = 10.sp
                         )
                     }
-                    if (nav.count > 0) Text(
-                        "${nav.count}", color = Color.White, modifier = Modifier
-                            .offset(x = 16.dp, y = 5.dp)
-                            .defaultMinSize(14.dp, 14.dp)
-                            .clip(RoundedCornerShape(14.dp))
-                            .background(Color.Red)
-                            .align(Alignment.TopCenter)
-                            .padding(top = 1.dp)
-                            .padding(horizontal = 2.dp),
-                        textAlign = TextAlign.Center,
-                        fontSize = 10.sp,
-                        lineHeight = 10.sp
-                    )
                 }
             }
         }

+ 4 - 1
gradle/libs.versions.toml

@@ -9,6 +9,7 @@ lifecycleRuntimeKtx = "2.6.1"
 activityCompose = "1.8.0"
 composeBom = "2024.09.00"
 coroutines = "1.6.4"
+push = "3.10.1"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
@@ -38,7 +39,9 @@ coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutin
 # MMKV
 tencent-mmkv = { group = "com.tencent", name = "mmkv", version = "2.2.3" }
 # 阿里消息推送
-push = { group = "com.aliyun.ams", name = "alicloud-android-push", version = "3.10.1" }
+push = { group = "com.aliyun.ams", name = "alicloud-android-push", version.ref = "push" }
+push_third = { group = "com.aliyun.ams", name = "alicloud-android-third-push", version.ref = "push" }
+push_third_xiaomi = { group = "com.aliyun.ams", name = "alicloud-android-third-push-xiaomi", version.ref = "push" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }