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
@@ -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">

    <FrameLayout
        android:id="@+id/flStatusBar"