|
|
@@ -70,9 +70,9 @@
|
|
|
android:layout_height="82dp"
|
|
|
android:layout_alignParentTop="true"
|
|
|
android:layout_alignParentRight="true"
|
|
|
- android:text="%"
|
|
|
android:layout_marginTop="10dp"
|
|
|
android:paddingLeft="10dp"
|
|
|
+ android:text="%"
|
|
|
android:textColor="@color/white"
|
|
|
android:textSize="20dp" />
|
|
|
</RelativeLayout>
|
|
|
@@ -111,25 +111,27 @@
|
|
|
<RelativeLayout
|
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="match_parent">
|
|
|
- <TextView
|
|
|
- android:id="@+id/textView10"
|
|
|
- android:layout_width="match_parent"
|
|
|
- android:layout_height="match_parent"
|
|
|
- android:layout_weight="1"
|
|
|
- android:layout_gravity="center"
|
|
|
- android:gravity="center_vertical|center"
|
|
|
- android:text="王仪涵"
|
|
|
- android:textColor="@color/white" />
|
|
|
- <ImageView
|
|
|
- android:id="@+id/sex"
|
|
|
- android:layout_width="18dp"
|
|
|
- android:layout_height="18dp"
|
|
|
- android:gravity="center_vertical|left"
|
|
|
- android:layout_gravity="center"
|
|
|
- android:layout_alignParentRight="true"
|
|
|
- android:layout_marginTop="25dp"
|
|
|
- android:layout_marginRight="20dp"
|
|
|
- android:src="@drawable/male" />
|
|
|
+
|
|
|
+ <TextView
|
|
|
+ android:id="@+id/textView10"
|
|
|
+ android:layout_width="match_parent"
|
|
|
+ android:layout_height="match_parent"
|
|
|
+ android:layout_gravity="center"
|
|
|
+ android:layout_weight="1"
|
|
|
+ android:gravity="center_vertical|center"
|
|
|
+ android:text="王仪涵"
|
|
|
+ android:textColor="@color/white" />
|
|
|
+
|
|
|
+ <ImageView
|
|
|
+ android:id="@+id/sex"
|
|
|
+ android:layout_width="18dp"
|
|
|
+ android:layout_height="18dp"
|
|
|
+ android:layout_alignParentRight="true"
|
|
|
+ android:layout_gravity="center"
|
|
|
+ android:layout_marginTop="25dp"
|
|
|
+ android:layout_marginRight="20dp"
|
|
|
+ android:gravity="center_vertical|left"
|
|
|
+ android:src="@drawable/male" />
|
|
|
</RelativeLayout>
|
|
|
</LinearLayout>
|
|
|
</LinearLayout>
|
|
|
@@ -538,38 +540,40 @@
|
|
|
<LinearLayout
|
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="30dp"
|
|
|
- android:background="#fff"
|
|
|
android:layout_gravity="center"
|
|
|
+ android:background="#fff"
|
|
|
android:gravity="center"
|
|
|
android:orientation="horizontal">
|
|
|
|
|
|
<Button
|
|
|
- android:id="@+id/button"
|
|
|
- android:layout_width="60dp"
|
|
|
+ android:id="@+id/btn_stop"
|
|
|
+ android:layout_width="70dp"
|
|
|
android:layout_height="30dp"
|
|
|
+ android:layout_marginLeft="20dp"
|
|
|
android:background="@drawable/gary_btn"
|
|
|
android:gravity="center"
|
|
|
- android:layout_marginLeft="20dp"
|
|
|
+ android:textColor="@color/red"
|
|
|
android:text="停止运动" />
|
|
|
|
|
|
<Button
|
|
|
- android:id="@+id/linkBtn"
|
|
|
+ android:id="@+id/beginBtn"
|
|
|
android:layout_width="210dp"
|
|
|
android:layout_height="30dp"
|
|
|
- android:background="@drawable/round_btn"
|
|
|
- android:gravity="center"
|
|
|
- android:text="运动时间 00:00:00"
|
|
|
android:layout_marginLeft="15dp"
|
|
|
android:layout_marginRight="15dp"
|
|
|
- android:textColor="#333" />
|
|
|
+ android:background="@drawable/round_btn"
|
|
|
+ android:gravity="center"
|
|
|
+ android:text="开始运动"
|
|
|
+ android:textColor="@color/green" />
|
|
|
+
|
|
|
<Button
|
|
|
- android:id="@+id/button3"
|
|
|
- android:layout_width="60dp"
|
|
|
+ android:id="@+id/reportHr"
|
|
|
+ android:layout_width="70dp"
|
|
|
android:layout_height="30dp"
|
|
|
+ android:layout_marginRight="20dp"
|
|
|
android:background="@drawable/gary_btn"
|
|
|
android:gravity="center"
|
|
|
android:text="心率上报"
|
|
|
- android:layout_marginRight="20dp"
|
|
|
android:textColor="#fff" />
|
|
|
</LinearLayout>
|
|
|
|
|
|
@@ -602,21 +606,22 @@
|
|
|
android:id="@+id/lineChart"
|
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="match_parent"
|
|
|
- android:background="#ffffff"
|
|
|
android:layout_margin="16dp"
|
|
|
+ android:background="#ffffff"
|
|
|
tools:ignore="MissingClass" />
|
|
|
</LinearLayout>
|
|
|
</LinearLayout>
|
|
|
+
|
|
|
<com.google.android.material.bottomnavigation.BottomNavigationView
|
|
|
android:id="@+id/bottomNavigation"
|
|
|
android:layout_width="0dp"
|
|
|
android:layout_height="50dp"
|
|
|
- android:paddingTop="0dp"
|
|
|
android:background="#ccc"
|
|
|
+ android:paddingTop="0dp"
|
|
|
app:itemIconSize="20dp"
|
|
|
+ app:labelVisibilityMode="labeled"
|
|
|
app:layout_constraintBottom_toBottomOf="parent"
|
|
|
app:layout_constraintLeft_toLeftOf="parent"
|
|
|
app:layout_constraintRight_toRightOf="parent"
|
|
|
- app:menu="@menu/bottom_nav_menu"
|
|
|
- app:labelVisibilityMode="labeled" />
|
|
|
+ app:menu="@menu/bottom_nav_menu" />
|
|
|
</androidx.constraintlayout.widget.ConstraintLayout>
|