From 63b87b529196c056fb4d96a58eded3936d3445f2 Mon Sep 17 00:00:00 2001
From: haijiang <181069201@qq.com>
Date: Tue, 17 Jul 2018 16:19:35 +0800
Subject: [PATCH] 提交
---
app/src/main/res/layout/ac_charts_layout.xml | 38 ++++++++++++++++++++++++--------------
1 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/app/src/main/res/layout/ac_charts_layout.xml b/app/src/main/res/layout/ac_charts_layout.xml
index e87c359..d0011b8 100644
--- a/app/src/main/res/layout/ac_charts_layout.xml
+++ b/app/src/main/res/layout/ac_charts_layout.xml
@@ -5,49 +5,59 @@
android:background="@mipmap/bg"
android:fitsSystemWindows="true"
android:orientation="vertical">
- <include layout="@layout/top_bar_layout"/>
+
+ <include layout="@layout/top_bar_layout" />
+
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical"
android:layout_marginLeft="@dimen/x8"
android:layout_marginRight="@dimen/x8"
android:layout_marginTop="@dimen/x20"
- android:padding="@dimen/x10"
- android:background="@mipmap/bg_chart">
+ android:background="@mipmap/bg_chart"
+ android:orientation="vertical"
+ android:padding="@dimen/x10">
+
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center_vertical"
android:orientation="horizontal">
+
<ImageView
android:layout_width="@dimen/x10"
android:layout_height="@dimen/x10"
- android:src="@mipmap/icon_yuan"/>
+ android:src="@mipmap/icon_yuan" />
+
<TextView
android:id="@+id/tv_sub"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textColor="@color/white"
- android:textSize="16sp"
android:layout_gravity="center_horizontal"
- android:text="PM2.5���������"
- android:layout_marginRight="@dimen/x4"
android:layout_marginLeft="@dimen/x4"
- />
+ android:layout_marginRight="@dimen/x4"
+ android:text="PM2.5���������"
+ android:textColor="@color/white"
+ android:textSize="16sp" />
+
<ImageView
android:layout_width="@dimen/x10"
android:layout_height="@dimen/x10"
- android:src="@mipmap/icon_xia"/>
+ android:src="@mipmap/icon_xia" />
</LinearLayout>
+ <TextView
+ android:id="@+id/tv_unit"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textColor="@color/blue_txt"
+ android:textSize="14sp" />
<lecho.lib.hellocharts.view.LineChartView
android:id="@+id/chart"
android:layout_width="match_parent"
- android:layout_marginTop="@dimen/x8"
- android:layout_height="@dimen/y300">
- </lecho.lib.hellocharts.view.LineChartView>
+ android:layout_height="@dimen/y300"
+ android:layout_marginTop="@dimen/x8"/>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
--
Gitblit v1.8.0