From cdbaf79d124d46b69dc62b653fde55f9d40b5534 Mon Sep 17 00:00:00 2001
From: 陈奇 <1650699704@qq.com>
Date: Thu, 01 Nov 2018 17:23:32 +0800
Subject: [PATCH] [*]修改电磁版本
---
app/src/main/res/layout/fragment_monitor_layout.xml | 133 ++++++++++++++++++++++++--------------------
1 files changed, 73 insertions(+), 60 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..ca35289 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,6 +103,7 @@
android:orientation="vertical">
<TextView
+ android:id="@+id/tv_ljjl_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="������������(uSv)"
@@ -132,6 +134,7 @@
android:orientation="vertical">
<TextView
+ android:id="@+id/tv_shishi_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="������������(uSv/h)"
@@ -151,85 +154,95 @@
</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" />
<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_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:layout_marginRight="20dp"
android:src="@mipmap/icon_full" />
- </FrameLayout>
+
+ <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