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/ac_charts_layout.xml | 111 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 78 insertions(+), 33 deletions(-)
diff --git a/app/src/main/res/layout/ac_charts_layout.xml b/app/src/main/res/layout/ac_charts_layout.xml
index ac5b5f4..55f3464 100644
--- a/app/src/main/res/layout/ac_charts_layout.xml
+++ b/app/src/main/res/layout/ac_charts_layout.xml
@@ -4,83 +4,126 @@
android:layout_height="match_parent"
android:background="@color/ac_bg"
android:orientation="vertical">
- <include layout="@layout/top_bar_layout_txt"/>
+
+ <include layout="@layout/top_bar_layout_txt" />
+
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
- android:padding="@dimen/x16"
android:gravity="center"
- android:orientation="horizontal">
+ android:orientation="horizontal"
+ android:padding="@dimen/x16">
+
<ImageView
android:id="@+id/iv_pre"
android:layout_width="@dimen/x20"
android:layout_height="@dimen/x20"
- android:src="@mipmap/icon_red_left"/>
- <TextView
- android:id="@+id/tv_time"
+ android:src="@mipmap/icon_red_left" />
+
+ <LinearLayout
android:layout_width="@dimen/x160"
android:layout_height="wrap_content"
- android:textSize="16sp"
- android:gravity="center"
- android:textColor="@color/red_txt"
- android:text="2017���7���13���"/>
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@+id/tv_starttime"
+ android:layout_width="@dimen/x160"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:text="2017���7���13���"
+ android:textColor="@color/blue_txt"
+ android:textSize="16sp" />
+
+ <TextView
+ android:layout_width="@dimen/x160"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:text="���" />
+
+ <TextView
+ android:id="@+id/tv_endtime"
+ android:layout_width="@dimen/x160"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:text="2017���7���13���"
+ android:textColor="@color/blue_txt"
+ android:textSize="16sp" />
+ </LinearLayout>
+
<ImageView
android:id="@+id/iv_next"
android:layout_width="@dimen/x20"
android:layout_height="@dimen/x20"
- android:src="@mipmap/icon_red_right"/>
+ android:src="@mipmap/icon_red_right" />
+
+ <Button
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@color/trans"
+ android:visibility="gone" />
</LinearLayout>
+
<lecho.lib.hellocharts.view.LineChartView
android:id="@+id/chart"
android:layout_width="match_parent"
- android:layout_height="@dimen/y240">
- </lecho.lib.hellocharts.view.LineChartView>
+ android:layout_height="@dimen/y240"></lecho.lib.hellocharts.view.LineChartView>
+
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="vertical"
- android:background="@mipmap/bg_head">
+ android:background="@mipmap/bg_head"
+ android:orientation="vertical">
+
<RadioGroup
+ android:id="@+id/rg_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:background="@mipmap/bg_conner"
+ android:layout_gravity="center"
android:layout_marginTop="@dimen/x16"
- android:layout_gravity="center">
+ android:orientation="horizontal">
+
<RadioButton
+ android:id="@+id/rb_day"
android:layout_width="@dimen/x80"
android:layout_height="@dimen/x30"
- android:button="@null"
android:background="@drawable/rb_bg"
- android:textColor="@color/rb_tv_color"
+ android:button="@null"
+ android:checked="true"
android:gravity="center"
- android:textSize="16sp"
- android:text="���"/>
+ android:text="���"
+ android:textColor="@color/rb_tv_color"
+ android:textSize="16sp" />
+
<RadioButton
+ android:id="@+id/rb_week"
android:layout_width="@dimen/x80"
android:layout_height="@dimen/x30"
- android:button="@null"
android:background="@drawable/rb_bg"
- android:textColor="@color/rb_tv_color"
+ android:button="@null"
android:gravity="center"
- android:textSize="16sp"
- android:text="���"/>
+ android:text="���"
+ android:textColor="@color/rb_tv_color"
+ android:textSize="16sp" />
+
<RadioButton
+ android:id="@+id/rb_month"
android:layout_width="@dimen/x80"
android:layout_height="@dimen/x30"
- android:button="@null"
android:background="@drawable/rb_bg"
+ android:button="@null"
android:gravity="center"
- android:textSize="16sp"
+ android:text="���"
android:textColor="@color/rb_tv_color"
- android:text="���"/>
+ android:textSize="16sp" />
</RadioGroup>
+
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/x10"
android:orientation="horizontal">
+
<LinearLayout
android:layout_width="0dp"
android:layout_height="@dimen/x48"
@@ -91,10 +134,11 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textColor="@color/light_txt"
- android:text="���������" />
+ android:text="���������"
+ android:textColor="@color/light_txt" />
<TextView
+ android:id="@+id/tv_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/x6"
@@ -120,10 +164,11 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textColor="@color/light_txt"
- android:text="������" />
+ android:text="������"
+ android:textColor="@color/light_txt" />
<TextView
+ android:id="@+id/tv_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/x6"
--
Gitblit v1.8.0