|
@@ -1,118 +1,108 @@
|
|
|
<?xml version="1.0" encoding="utf-8"?>
|
|
|
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
|
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
|
xmlns:tools="http://schemas.android.com/tools"
|
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="match_parent"
|
|
|
android:orientation="vertical"
|
|
|
- tools:context=".views.DeviceBasicActivity">
|
|
|
+ tools:context=".views.BasicDeviceActivity">
|
|
|
|
|
|
- <LinearLayout
|
|
|
- android:id="@+id/contentPanel"
|
|
|
+ <android.support.v7.widget.RecyclerView
|
|
|
+ android:id="@+id/content"
|
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="wrap_content"
|
|
|
- android:orientation="vertical">
|
|
|
-
|
|
|
- <TextView
|
|
|
- android:id="@+id/t1"
|
|
|
- android:layout_width="match_parent"
|
|
|
- android:layout_height="wrap_content"
|
|
|
- android:padding="16dp"
|
|
|
- android:text="PAGEONE: 0" />
|
|
|
-
|
|
|
- <TextView
|
|
|
- android:id="@+id/t2"
|
|
|
- android:layout_width="match_parent"
|
|
|
- android:layout_height="wrap_content"
|
|
|
- android:padding="16dp"
|
|
|
- android:text="TestPageNum: 1" />
|
|
|
-
|
|
|
- <TextView
|
|
|
- android:id="@+id/t3"
|
|
|
- android:layout_width="match_parent"
|
|
|
- android:layout_height="wrap_content"
|
|
|
- android:padding="16dp"
|
|
|
- android:text="TestCursorNum: 1" />
|
|
|
-
|
|
|
- <TextView
|
|
|
- android:id="@+id/t4"
|
|
|
- android:layout_width="match_parent"
|
|
|
- android:layout_height="wrap_content"
|
|
|
- android:padding="16dp"
|
|
|
- android:text="Angle_P: 23.670000" />
|
|
|
-
|
|
|
- <TextView
|
|
|
- android:id="@+id/t5"
|
|
|
- android:layout_width="match_parent"
|
|
|
- android:layout_height="wrap_content"
|
|
|
- android:padding="16dp"
|
|
|
- android:text="Angle_I: -55.799999" />
|
|
|
-
|
|
|
- <TextView
|
|
|
- android:id="@+id/t6"
|
|
|
- android:layout_width="match_parent"
|
|
|
- android:layout_height="wrap_content"
|
|
|
- android:padding="16dp"
|
|
|
- android:text="Angle_D: 0.000000" />
|
|
|
- </LinearLayout>
|
|
|
+ android:layout_marginBottom="8dp"
|
|
|
+ android:padding="16dp"
|
|
|
+ app:layout_constraintBottom_toTopOf="@+id/op"
|
|
|
+ app:layout_constraintEnd_toEndOf="parent"
|
|
|
+ app:layout_constraintStart_toStartOf="parent"
|
|
|
+ app:layout_constraintTop_toTopOf="parent"
|
|
|
+ app:layout_constraintVertical_bias="0.0" />
|
|
|
|
|
|
<android.support.constraint.ConstraintLayout
|
|
|
android:id="@+id/op"
|
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="wrap_content"
|
|
|
android:layout_alignParentBottom="true"
|
|
|
- android:padding="16dp">
|
|
|
+ android:padding="8dp"
|
|
|
+ app:layout_constraintBottom_toBottomOf="parent"
|
|
|
+ app:layout_constraintEnd_toEndOf="parent"
|
|
|
+ app:layout_constraintStart_toStartOf="parent">
|
|
|
|
|
|
<android.support.design.widget.FloatingActionButton
|
|
|
android:id="@+id/opUp"
|
|
|
android:layout_width="wrap_content"
|
|
|
android:layout_height="wrap_content"
|
|
|
- android:layout_marginBottom="8dp"
|
|
|
+ android:layout_marginStart="16dp"
|
|
|
+ android:layout_marginTop="16dp"
|
|
|
+ android:layout_marginEnd="16dp"
|
|
|
+ android:layout_marginBottom="16dp"
|
|
|
+ android:backgroundTint="@color/colorPrimary"
|
|
|
app:layout_constraintBottom_toTopOf="@+id/opCenter"
|
|
|
app:layout_constraintEnd_toEndOf="parent"
|
|
|
app:layout_constraintStart_toStartOf="parent"
|
|
|
- app:srcCompat="@drawable/ic_info_outline_white_24dp" />
|
|
|
+ app:layout_constraintTop_toTopOf="parent"
|
|
|
+ app:srcCompat="@drawable/ic_expand_less_white_24dp" />
|
|
|
|
|
|
<android.support.design.widget.FloatingActionButton
|
|
|
android:id="@+id/opLeft"
|
|
|
android:layout_width="wrap_content"
|
|
|
android:layout_height="wrap_content"
|
|
|
- android:layout_marginEnd="8dp"
|
|
|
+ android:layout_marginTop="16dp"
|
|
|
+ android:layout_marginEnd="16dp"
|
|
|
+ android:layout_marginBottom="16dp"
|
|
|
+ android:backgroundTint="@color/colorPrimary"
|
|
|
app:layout_constraintBottom_toBottomOf="parent"
|
|
|
app:layout_constraintEnd_toStartOf="@+id/opCenter"
|
|
|
+ app:layout_constraintHorizontal_bias="1.0"
|
|
|
+ app:layout_constraintStart_toStartOf="parent"
|
|
|
app:layout_constraintTop_toTopOf="parent"
|
|
|
- app:srcCompat="@drawable/ic_info_outline_white_24dp" />
|
|
|
+ app:srcCompat="@drawable/ic_chevron_left_white_24dp" />
|
|
|
|
|
|
<android.support.design.widget.FloatingActionButton
|
|
|
android:id="@+id/opCenter"
|
|
|
android:layout_width="wrap_content"
|
|
|
android:layout_height="wrap_content"
|
|
|
- android:visibility="invisible"
|
|
|
+ android:layout_marginStart="16dp"
|
|
|
+ android:layout_marginTop="16dp"
|
|
|
+ android:layout_marginEnd="16dp"
|
|
|
+ android:layout_marginBottom="16dp"
|
|
|
+ android:backgroundTint="@color/colorPrimary"
|
|
|
app:layout_constraintBottom_toBottomOf="parent"
|
|
|
app:layout_constraintEnd_toEndOf="parent"
|
|
|
app:layout_constraintStart_toStartOf="parent"
|
|
|
app:layout_constraintTop_toTopOf="parent"
|
|
|
- app:srcCompat="@drawable/ic_info_outline_white_24dp" />
|
|
|
+ app:srcCompat="@drawable/ic_crop_square_white_24dp" />
|
|
|
|
|
|
<android.support.design.widget.FloatingActionButton
|
|
|
android:id="@+id/opRight"
|
|
|
android:layout_width="wrap_content"
|
|
|
android:layout_height="wrap_content"
|
|
|
- android:layout_marginStart="8dp"
|
|
|
+ android:layout_marginStart="16dp"
|
|
|
+ android:layout_marginTop="16dp"
|
|
|
+ android:layout_marginBottom="16dp"
|
|
|
+ android:backgroundTint="@color/colorPrimary"
|
|
|
app:layout_constraintBottom_toBottomOf="parent"
|
|
|
+ app:layout_constraintEnd_toEndOf="parent"
|
|
|
+ app:layout_constraintHorizontal_bias="0.0"
|
|
|
app:layout_constraintStart_toEndOf="@+id/opCenter"
|
|
|
app:layout_constraintTop_toTopOf="parent"
|
|
|
- app:srcCompat="@drawable/ic_info_outline_white_24dp" />
|
|
|
+ app:srcCompat="@drawable/ic_chevron_right_white_24dp" />
|
|
|
|
|
|
<android.support.design.widget.FloatingActionButton
|
|
|
android:id="@+id/opDown"
|
|
|
android:layout_width="wrap_content"
|
|
|
android:layout_height="wrap_content"
|
|
|
- android:layout_marginTop="8dp"
|
|
|
+ android:layout_marginStart="16dp"
|
|
|
+ android:layout_marginTop="16dp"
|
|
|
+ android:layout_marginEnd="16dp"
|
|
|
+ android:layout_marginBottom="16dp"
|
|
|
+ android:backgroundTint="@color/colorPrimary"
|
|
|
+ app:layout_constraintBottom_toBottomOf="parent"
|
|
|
app:layout_constraintEnd_toEndOf="parent"
|
|
|
app:layout_constraintStart_toStartOf="parent"
|
|
|
app:layout_constraintTop_toBottomOf="@+id/opCenter"
|
|
|
- app:srcCompat="@drawable/ic_info_outline_white_24dp" />
|
|
|
+ app:srcCompat="@drawable/ic_expand_more_white_24dp" />
|
|
|
</android.support.constraint.ConstraintLayout>
|
|
|
|
|
|
<com.joanzapata.iconify.widget.IconTextView
|
|
@@ -123,6 +113,11 @@
|
|
|
android:gravity="center"
|
|
|
android:text="{fa-hand-pointer-o 64sp}\n\n点击连接设备"
|
|
|
android:textSize="20sp"
|
|
|
- android:textStyle="bold" />
|
|
|
+ android:textStyle="bold"
|
|
|
+ android:visibility="invisible"
|
|
|
+ app:layout_constraintBottom_toBottomOf="parent"
|
|
|
+ app:layout_constraintEnd_toEndOf="parent"
|
|
|
+ app:layout_constraintStart_toStartOf="parent"
|
|
|
+ app:layout_constraintTop_toTopOf="parent" />
|
|
|
|
|
|
-</RelativeLayout>
|
|
|
+</android.support.constraint.ConstraintLayout>
|