[*]修改电磁版本

陈奇

2018-11-01 cdbaf79d124d46b69dc62b653fde55f9d40b5534

 app/src/main/res/layout/ac_charts_layout.xml

@@ -4,105 +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"/>
            android:src="@mipmap/icon_red_left" />

        <LinearLayout
            android:layout_width="@dimen/x160"
            android:layout_height="wrap_content"
            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:text="2017年7月13日"
                android:textColor="@color/blue_txt"
                android:text="2017年7月13日"/>
                android:textSize="16sp" />

            <TextView
                android:layout_width="@dimen/x160"
                android:layout_height="wrap_content"
                android:gravity="center"
                android:text="至"/>
                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:text="2017年7月13日"
                android:textColor="@color/blue_txt"
                android:text="2017年7月13日"/>
                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: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:gravity="center"
                android:textSize="16sp"
                android:textColor="@color/rb_tv_color"
                android:button="@null"
                android:checked="true"
                android:text="日"/>
                android:gravity="center"
                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: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" />
        </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"
@@ -113,8 +134,8 @@
                <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"
@@ -143,8 +164,8 @@
                <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"