From 51f8633b379efab41a8b19a375d5e41785a15ee6 Mon Sep 17 00:00:00 2001
From: 张海江 <181069201@qq.com>
Date: Fri, 11 Aug 2017 09:14:40 +0800
Subject: [PATCH] 提交代码
---
app/src/main/res/layout/ac_charts_layout.xml | 40 ++++++++++++++++++++++++++++++++--------
1 files changed, 32 insertions(+), 8 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..80409b9 100644
--- a/app/src/main/res/layout/ac_charts_layout.xml
+++ b/app/src/main/res/layout/ac_charts_layout.xml
@@ -17,14 +17,32 @@
android:layout_width="@dimen/x20"
android:layout_height="@dimen/x20"
android:src="@mipmap/icon_red_left"/>
- <TextView
- android:id="@+id/tv_time"
+ <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:textSize="16sp"
+ android:gravity="center"
+ android:textColor="@color/red_txt"
+ android:text="2017���7���13���"/>
+ <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:textSize="16sp"
+ android:gravity="center"
+ android:textColor="@color/red_txt"
+ android:text="2017���7���13���"/>
+ </LinearLayout>
<ImageView
android:id="@+id/iv_next"
android:layout_width="@dimen/x20"
@@ -42,13 +60,14 @@
android:orientation="vertical"
android:background="@mipmap/bg_head">
<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_marginTop="@dimen/x16"
android:layout_gravity="center">
<RadioButton
+ android:id="@+id/rb_week"
android:layout_width="@dimen/x80"
android:layout_height="@dimen/x30"
android:button="@null"
@@ -56,8 +75,10 @@
android:textColor="@color/rb_tv_color"
android:gravity="center"
android:textSize="16sp"
+ android:checked="true"
android:text="���"/>
<RadioButton
+ android:id="@+id/rb_month"
android:layout_width="@dimen/x80"
android:layout_height="@dimen/x30"
android:button="@null"
@@ -67,14 +88,16 @@
android:textSize="16sp"
android:text="���"/>
<RadioButton
+ android:id="@+id/rb_year"
android:layout_width="@dimen/x80"
android:layout_height="@dimen/x30"
android:button="@null"
android:background="@drawable/rb_bg"
android:gravity="center"
android:textSize="16sp"
+ android:visibility="gone"
android:textColor="@color/rb_tv_color"
- android:text="���"/>
+ android:text="������"/>
</RadioGroup>
<LinearLayout
android:layout_width="match_parent"
@@ -95,6 +118,7 @@
android:text="���������" />
<TextView
+ android:id="@+id/tv_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/x6"
--
Gitblit v1.8.0