修复bug，加入重连，铃声选择，小时数据

haijiang

2018-04-18 1b6d4163ff60828aa6e5043ad29d2167801caac7

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

@@ -9,16 +9,16 @@
        android:layout_width="match_parent"
        android:layout_height="@dimen/y40"
        android:background="@mipmap/bg_head">

        <ImageView
            android:id="@+id/iv_search"
            android:layout_width="@dimen/x20"
            android:layout_height="@dimen/x20"
            android:padding="@dimen/x4"
            android:src="@mipmap/icon_find"
            android:layout_width="@dimen/x26"
            android:layout_height="@dimen/x26"
            android:layout_centerVertical="true"
            android:layout_marginLeft="@dimen/x16"
            android:visibility="gone"
            />
            android:padding="@dimen/x4"
            android:src="@mipmap/icon_clear" />

        <TextView
            android:id="@+id/tv_title"
            android:layout_width="wrap_content"
@@ -30,15 +30,17 @@
            android:text="辐射监测"
            android:textColor="@color/white"
            android:textSize="18sp" />

        <ImageView
            android:id="@+id/iv_his"
            android:layout_width="@dimen/x20"
            android:layout_height="@dimen/x20"
            android:padding="@dimen/x4"
            android:src="@mipmap/icon_history"
            android:layout_width="@dimen/x26"
            android:layout_height="@dimen/x26"
            android:layout_alignParentRight="true"
            android:layout_centerVertical="true"
            android:layout_marginRight="@dimen/x16"
            android:layout_alignParentRight="true"/>
            android:padding="@dimen/x4"
            android:scaleType="centerCrop"
            android:src="@mipmap/icon_history" />
    </RelativeLayout>

    <FrameLayout
@@ -102,8 +104,8 @@
                    <TextView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:textSize="12sp"
                        android:text="累计计量(uSv)" />
                        android:text="累计计量(uSv)"
                        android:textSize="12sp" />

                    <TextView
                        android:id="@+id/tv_ljjl"
@@ -132,8 +134,8 @@
                    <TextView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:textSize="12sp"
                        android:text="实时计量(uSv/h)" />
                        android:text="实时计量(uSv/h)"
                        android:textSize="12sp" />

                    <TextView
                        android:id="@+id/tv_shishi"
@@ -148,6 +150,10 @@
            </LinearLayout>
        </RelativeLayout>
    </FrameLayout>

    <FrameLayout
        android:layout_width="match_parent"
        android:layout_height="match_parent">

    <ScrollView
        android:layout_width="match_parent"
@@ -184,8 +190,9 @@
                android:layout_width="@dimen/x180"
                android:layout_height="wrap_content"
                android:layout_gravity="center_horizontal"
                android:background="@mipmap/bt_red"
                android:gravity="center"
                    android:background="@mipmap/bt_blue"
                    android:gravity="center_horizontal"
                    android:paddingTop="@dimen/x3"
                android:text="当前辐射安全"
                android:textColor="@color/white"
                android:textSize="16sp" />
@@ -208,11 +215,21 @@
                    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_good" />
                        android:src="@mipmap/icon_qingwei" />
            </FrameLayout>
        </LinearLayout>
    </ScrollView>
        <ImageView
            android:id="@+id/iv_dianliang"
            android:layout_width="@dimen/x30"
            android:layout_height="@dimen/x30"
            android:layout_gravity="right"
            android:layout_marginRight="20dp"
            android:layout_marginTop="20dp"
            android:src="@mipmap/icon_full" />
    </FrameLayout>
</LinearLayout>