diff --git a/app/src/main/java/com/shuwei/intelligent/shelves/HomeActivity.kt b/app/src/main/java/com/shuwei/intelligent/shelves/HomeActivity.kt index 605b22c..a557a8f 100644 --- a/app/src/main/java/com/shuwei/intelligent/shelves/HomeActivity.kt +++ b/app/src/main/java/com/shuwei/intelligent/shelves/HomeActivity.kt @@ -111,6 +111,7 @@ class HomeActivity : BaseActivity() { super.onCreate(savedInstanceState) binding = ActivityHomeBinding.inflate(layoutInflater) EventBus.getDefault().register(this) + setBackground() setContentView(binding.root) updateLeftStatus("1-1冷藏柜 -°C / -%") diff --git a/app/src/main/java/com/shuwei/intelligent/shelves/ShelfActivity.kt b/app/src/main/java/com/shuwei/intelligent/shelves/ShelfActivity.kt index e3ea8d7..4efe815 100644 --- a/app/src/main/java/com/shuwei/intelligent/shelves/ShelfActivity.kt +++ b/app/src/main/java/com/shuwei/intelligent/shelves/ShelfActivity.kt @@ -81,6 +81,7 @@ class ShelfActivity : BaseActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) binding = ActivityShelfBinding.inflate(layoutInflater) + setBackground() setContentView(binding.root) EventBus.getDefault().register(this) // tvFoodWeight =binding.tvFoodWeight diff --git a/app/src/main/java/com/shuwei/intelligent/shelves/base/BaseActivity.kt b/app/src/main/java/com/shuwei/intelligent/shelves/base/BaseActivity.kt index 8d29ec3..433b474 100644 --- a/app/src/main/java/com/shuwei/intelligent/shelves/base/BaseActivity.kt +++ b/app/src/main/java/com/shuwei/intelligent/shelves/base/BaseActivity.kt @@ -48,14 +48,14 @@ open class BaseActivity : AppCompatActivity() { } } - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { - window.setDecorFitsSystemWindows(false) - window.insetsController?.apply { - hide(WindowInsets.Type.statusBars()) // 隐藏状态栏 - systemBarsBehavior = - WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE // 滑动时临时显示 - } - } +// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { +// window.setDecorFitsSystemWindows(false) +// window.insetsController?.apply { +// hide(WindowInsets.Type.statusBars()) // 隐藏状态栏 +// systemBarsBehavior = +// WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE // 滑动时临时显示 +// } +// } } @@ -77,6 +77,10 @@ open class BaseActivity : AppCompatActivity() { binding.tvRightStatus.setTextColor(color) } + fun setBackground() { + binding.root.setBackgroundColor(ContextCompat.getColor(this,R.color.bg_page)) + } + override fun setContentView(view: View?) { if (view == binding.root) { super.setContentView(view) diff --git a/app/src/main/java/com/shuwei/intelligent/shelves/utils/BootReceiver.kt b/app/src/main/java/com/shuwei/intelligent/shelves/utils/BootReceiver.kt index 63e8c0d..8914d21 100644 --- a/app/src/main/java/com/shuwei/intelligent/shelves/utils/BootReceiver.kt +++ b/app/src/main/java/com/shuwei/intelligent/shelves/utils/BootReceiver.kt @@ -3,14 +3,14 @@ package com.shuwei.intelligent.shelves.utils import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import com.shuwei.intelligent.shelves.HomeActivity +import com.shuwei.intelligent.shelves.InitActivity import kotlin.jvm.java class BootReceiver : BroadcastReceiver() { override fun onReceive(context: Context, intent: Intent) { if (Intent.ACTION_BOOT_COMPLETED == intent.action) { // 启动服务或Activity - val launchIntent = Intent(context, HomeActivity::class.java) + val launchIntent = Intent(context, InitActivity::class.java) launchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) context.startActivity(launchIntent) } diff --git a/app/src/main/res/drawable-sw600dp/bg_splash.xml b/app/src/main/res/drawable-sw600dp/bg_splash.xml new file mode 100644 index 0000000..ca24da3 --- /dev/null +++ b/app/src/main/res/drawable-sw600dp/bg_splash.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_splash.xml b/app/src/main/res/drawable/bg_splash.xml new file mode 100644 index 0000000..ef87bfd --- /dev/null +++ b/app/src/main/res/drawable/bg_splash.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout-sw600dp/activity_base.xml b/app/src/main/res/layout-sw600dp/activity_base.xml index 82afe0a..4726d73 100644 --- a/app/src/main/res/layout-sw600dp/activity_base.xml +++ b/app/src/main/res/layout-sw600dp/activity_base.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:background="@color/bg_page"> + tools:background="@color/bg_page"> + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_base.xml b/app/src/main/res/layout/activity_base.xml index 03e8501..acdfe08 100644 --- a/app/src/main/res/layout/activity_base.xml +++ b/app/src/main/res/layout/activity_base.xml @@ -6,7 +6,7 @@ android:layout_height="match_parent" android:orientation="vertical" android:fitsSystemWindows="false" - android:background="@color/bg_page"> + tools:background="@color/bg_page"> + tools:ignore="ContentDescription" + android:visibility="invisible"/> @@ -39,10 +38,10 @@ diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml index 2515de4..e7eb8f4 100644 --- a/app/src/main/res/values-night/themes.xml +++ b/app/src/main/res/values-night/themes.xml @@ -12,6 +12,7 @@ @color/white + @drawable/bg_splash \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index dbbabfc..bb70a94 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -10,7 +10,9 @@ @color/teal_700 @color/black - ?attr/colorPrimaryVariant + @color/bg_page + + @drawable/bg_splash