|
@@ -74,11 +74,10 @@
|
|
|
<TextView
|
|
|
android:text="电脑"
|
|
|
android:layout_width="wrap_content"
|
|
|
- android:layout_height="42dp" android:id="@+id/computerText"
|
|
|
+ android:layout_height="47dp" android:id="@+id/computerText"
|
|
|
tools:text="电脑" android:textSize="24sp"
|
|
|
android:layout_marginTop="36dp"
|
|
|
app:layout_constraintTop_toBottomOf="@+id/imageView" app:layout_constraintStart_toStartOf="parent"
|
|
|
- android:layout_marginStart="186dp" android:layout_marginEnd="177dp"
|
|
|
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toBottomOf="parent"
|
|
|
android:layout_marginBottom="295dp"/>
|
|
|
<Button
|
|
@@ -89,7 +88,8 @@
|
|
|
app:layout_constraintTop_toBottomOf="@+id/computerText" app:layout_constraintStart_toStartOf="parent"
|
|
|
android:layout_marginStart="51dp" android:layout_marginEnd="44dp"
|
|
|
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toBottomOf="parent"
|
|
|
- android:layout_marginBottom="198dp" android:background="@drawable/button_shape" android:textColor="@color/white"/>
|
|
|
+ android:layout_marginBottom="198dp" android:background="@drawable/button_shape"
|
|
|
+ android:textColor="@color/white"/>
|
|
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
|
|
<androidx.constraintlayout.widget.ConstraintLayout
|
|
|
android:layout_width="match_parent"
|
|
@@ -107,12 +107,11 @@
|
|
|
<TextView
|
|
|
android:text="灯"
|
|
|
android:layout_width="wrap_content"
|
|
|
- android:layout_height="wrap_content" android:id="@+id/lightText"
|
|
|
+ android:layout_height="46dp" android:id="@+id/lightText"
|
|
|
android:textSize="24sp"
|
|
|
android:layout_marginTop="36dp"
|
|
|
app:layout_constraintTop_toBottomOf="@id/lightImageView"
|
|
|
app:layout_constraintStart_toStartOf="parent"
|
|
|
- android:layout_marginStart="186dp" android:layout_marginEnd="177dp"
|
|
|
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toBottomOf="parent"
|
|
|
android:layout_marginBottom="295dp"/>
|
|
|
<Button
|