Merge remote-tracking branch 'origin/main'

# Conflicts: # app/src/main/java/com/shuwei/intelligent/shelves/InitActivity.kt # app/src/main/java/com/shuwei/intelligent/shelves/net/ApiService.kt # app/src/main/java/com/shuwei/intelligent/shelves/net/NetViewModel.kt
2025-11-06 19:32:30 +08:00
parent 647ec0dcb7 61c9452295
commit 3366fc02e5
12 changed files with 119 additions and 25 deletions
@@ -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