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 | 153 ++++++++++++++++++++++++++++++---------------------
1 files changed, 90 insertions(+), 63 deletions(-)
diff --git a/app/src/main/res/layout/fragment_monitor_layout.xml b/app/src/main/res/layout/fragment_monitor_layout.xml
index b847b8b..e29d0d7 100644
--- a/app/src/main/res/layout/fragment_monitor_layout.xml
+++ b/app/src/main/res/layout/fragment_monitor_layout.xml
@@ -63,8 +63,8 @@
android:layout_width="@dimen/x52"
android:layout_height="@dimen/x48"
android:layout_alignParentRight="true"
- android:layout_marginRight="@dimen/x2"
android:layout_marginTop="@dimen/x3"
+ android:layout_marginRight="@dimen/x2"
android:background="@mipmap/bg_conner_green"
android:gravity="center"
android:orientation="vertical">
@@ -95,6 +95,7 @@
android:orientation="horizontal">
<LinearLayout
+ android:id="@+id/lv_ljjl"
android:layout_width="0dp"
android:layout_height="@dimen/x48"
android:layout_weight="1"
@@ -102,9 +103,11 @@
android:orientation="vertical">
<TextView
+ android:id="@+id/tv_ljjl_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="������������(uSv)"
+ android:textColor="@color/black_txt"
android:textSize="12sp" />
<TextView
@@ -114,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>
@@ -132,9 +135,11 @@
android:orientation="vertical">
<TextView
+ android:id="@+id/tv_shishi_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="������������(uSv/h)"
+ android:textColor="@color/black_txt"
android:textSize="12sp" />
<TextView
@@ -144,92 +149,114 @@
android:layout_marginTop="@dimen/x4"
android:text="0"
android:textColor="@color/yellow_txt"
- android:textSize="18sp"
+ android:textSize="14sp"
android:textStyle="bold" />
</LinearLayout>
</LinearLayout>
</RelativeLayout>
</FrameLayout>
- <FrameLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent">
+ <RelativeLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content">
- <ScrollView
+ <FrameLayout
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:scrollbars="none">
+ android:layout_height="match_parent">
- <LinearLayout
+
+ <ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="vertical">
+ android:scrollbars="none">
-
- <FrameLayout
- android:layout_width="@dimen/x280"
- android:layout_height="@dimen/x280"
- android:layout_gravity="center_horizontal"
- android:layout_marginTop="@dimen/x8">
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
<com.moral.yunfushao.ui.PanelView
android:id="@+id/pv"
android:layout_width="@dimen/x280"
- android:layout_height="@dimen/x280" />
-
- <ImageView
- android:layout_width="@dimen/x30"
- android:layout_height="@dimen/x30"
- android:layout_gravity="bottom|center_horizontal"
- android:layout_marginBottom="@dimen/x8"
- android:src="@mipmap/icon_fushe" />
- </FrameLayout>
-
- <TextView
- android:id="@+id/tv_tishi"
- android:layout_width="@dimen/x180"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:background="@mipmap/bt_blue"
- android:gravity="center_horizontal"
- android:paddingTop="@dimen/x3"
- android:text="������������������"
- android:textColor="@color/white"
- android:textSize="16sp" />
-
- <FrameLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_marginTop="@dimen/x10"
- android:orientation="vertical">
+ android:layout_height="@dimen/x280"
+ android:layout_alignParentStart="true"
+ android:layout_alignParentTop="true"
+ android:layout_gravity="center_horizontal"
+ android:transitionName="pv_main" />
<TextView
- android:id="@+id/tv_desc"
+ android:id="@+id/tv_tishi"
+ android:layout_width="@dimen/x180"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:background="@mipmap/bt_blue"
+ android:gravity="center_horizontal"
+ android:text="������������������"
+ android:textColor="@color/white"
+ android:textSize="16sp" />
+
+ <FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_marginTop="@dimen/x15"
- android:background="@color/white"
- android:gravity="center"
- android:padding="@dimen/x15"
- android:text="���������������������������\n������������������������������������������������"
- android:textColor="#ae8082" />
+ android:layout_marginTop="@dimen/x10"
+ android:orientation="vertical">
- <ImageView
- android:id="@+id/iv_bottom_status"
- android:layout_width="@dimen/x30"
- android:layout_height="@dimen/x30"
- android:layout_gravity="center_horizontal"
- android:src="@mipmap/icon_qingwei" />
- </FrameLayout>
- </LinearLayout>
- </ScrollView>
+ <TextView
+ android:id="@+id/tv_text_mac"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginTop="@dimen/x15"
+ android:background="@color/white"
+ android:gravity="center"
+ android:padding="@dimen/x15"
+ android:text="���������,���mac���"
+ android:textColor="#ae8082" />
+
+ <TextView
+ android:id="@+id/tv_desc"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginTop="@dimen/x15"
+ android:background="@color/white"
+ android:gravity="center"
+ android:padding="@dimen/x15"
+ android:text="���������������������������\n������������������������������������������������"
+ android:textColor="#ae8082" />
+
+
+ <ImageView
+ android:id="@+id/iv_bottom_status"
+ android:layout_width="@dimen/x30"
+ android:layout_height="@dimen/x30"
+ android:layout_gravity="center_horizontal"
+ android:src="@mipmap/icon_qingwei" />
+ </FrameLayout>
+ </LinearLayout>
+ </ScrollView>
+ </FrameLayout>
+
<ImageView
android:id="@+id/iv_dianliang"
android:layout_width="@dimen/x30"
android:layout_height="@dimen/x30"
+ android:layout_alignParentRight="true"
android:layout_gravity="right"
- android:layout_marginRight="20dp"
android:layout_marginTop="20dp"
- android:src="@mipmap/icon_full" />
- </FrameLayout>
+ android:layout_marginRight="20dp"/>
+
+ <TextView
+ android:id="@+id/tv_dianliang2"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/x30"
+ android:layout_alignParentRight="true"
+ android:layout_gravity="right"
+ android:layout_marginTop="20dp"
+ android:layout_marginRight="20dp"
+ android:gravity="center"
+ android:src="@mipmap/icon_full"
+ android:textColor="@color/blue"
+ android:textStyle="bold"
+ android:visibility="gone" />
+
+ </RelativeLayout>
</LinearLayout>
\ No newline at end of file
--
Gitblit v1.8.0