Merge branch 'fix_loginMultiRoom_bug'

# Conflicts: # gradle.properties
2021-12-29 11:40:57 +08:00
parent c01d52bacc e4808667d5
commit d9c424f787
2 changed files with 41 additions and 19 deletions
--- a/app/src/main/res/layout/activity_live_play.xml
+++ b/app/src/main/res/layout/activity_live_play.xml
@@ -34,7 +34,7 @@
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:hint="请输入要查看的车机SN"
-                android:text="F803EB2046PZD00274"
+                android:text="F803EB2046PZD00212"
                android:textColor="#000"
                app:layout_constraintBottom_toBottomOf="parent"
                app:layout_constraintEnd_toEndOf="parent"