From c5bf501d8b507d1e3e79541e7ac9b45910860b4d Mon Sep 17 00:00:00 2001
From: 陈奇 <1650699704@qq.com>
Date: Wed, 29 May 2019 16:17:07 +0800
Subject: [PATCH] 添加新功能
---
app/src/main/res/layout/fragment_monitor_layout.xml | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/app/src/main/res/layout/fragment_monitor_layout.xml b/app/src/main/res/layout/fragment_monitor_layout.xml
index 653352c..e29d0d7 100644
--- a/app/src/main/res/layout/fragment_monitor_layout.xml
+++ b/app/src/main/res/layout/fragment_monitor_layout.xml
@@ -107,6 +107,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="������������(uSv)"
+ android:textColor="@color/black_txt"
android:textSize="12sp" />
<TextView
@@ -116,7 +117,7 @@
android:layout_marginTop="@dimen/x4"
android:text="0"
android:textColor="@color/green_txt"
- android:textSize="18sp"
+ android:textSize="14sp"
android:textStyle="bold" />
</LinearLayout>
@@ -138,6 +139,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="������������(uSv/h)"
+ android:textColor="@color/black_txt"
android:textSize="12sp" />
<TextView
@@ -147,7 +149,7 @@
android:layout_marginTop="@dimen/x4"
android:text="0"
android:textColor="@color/yellow_txt"
- android:textSize="18sp"
+ android:textSize="14sp"
android:textStyle="bold" />
</LinearLayout>
</LinearLayout>
@@ -179,7 +181,8 @@
android:layout_height="@dimen/x280"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
- android:layout_gravity="center_horizontal" />
+ android:layout_gravity="center_horizontal"
+ android:transitionName="pv_main" />
<TextView
android:id="@+id/tv_tishi"
@@ -239,8 +242,7 @@
android:layout_alignParentRight="true"
android:layout_gravity="right"
android:layout_marginTop="20dp"
- android:layout_marginRight="20dp"
- android:src="@mipmap/icon_full" />
+ android:layout_marginRight="20dp"/>
<TextView
android:id="@+id/tv_dianliang2"
--
Gitblit v1.8.0