[*]修改电磁版本

陈奇

2018-11-01 cdbaf79d124d46b69dc62b653fde55f9d40b5534

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

@@ -63,8 +63,8 @@
                android:layout_width="@dimen/x52"
                android:layout_height="@dimen/x48"
                android:layout_alignParentRight="true"
                android:layout_marginRight="@dimen/x2"
                android:layout_marginTop="@dimen/x3"
                android:layout_marginRight="@dimen/x2"
                android:background="@mipmap/bg_conner_green"
                android:gravity="center"
                android:orientation="vertical">
@@ -95,6 +95,7 @@
                android:orientation="horizontal">

                <LinearLayout
                    android:id="@+id/lv_ljjl"
                    android:layout_width="0dp"
                    android:layout_height="@dimen/x48"
                    android:layout_weight="1"
@@ -102,6 +103,7 @@
                    android:orientation="vertical">

                    <TextView
                        android:id="@+id/tv_ljjl_title"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:text="累计计量(uSv)"
@@ -132,6 +134,7 @@
                    android:orientation="vertical">

                    <TextView
                        android:id="@+id/tv_shishi_title"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:text="实时计量(uSv/h)"
@@ -151,9 +154,14 @@
        </RelativeLayout>
    </FrameLayout>

    <RelativeLayout
        android:layout_width="wrap_content"
        android:layout_height="wrap_content">

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


        <ScrollView
            android:layout_width="match_parent"
@@ -165,25 +173,13 @@
                android:layout_height="match_parent"
                android:orientation="vertical">


                <FrameLayout
                    android:layout_width="@dimen/x280"
                    android:layout_height="@dimen/x280"
                    android:layout_gravity="center_horizontal"
                    android:layout_marginTop="@dimen/x8">

                    <com.moral.yunfushao.ui.PanelView
                        android:id="@+id/pv"
                        android:layout_width="@dimen/x280"
                        android:layout_height="@dimen/x280" />

                    <ImageView
                        android:layout_width="@dimen/x30"
                        android:layout_height="@dimen/x30"
                        android:layout_gravity="bottom|center_horizontal"
                        android:layout_marginBottom="@dimen/x8"
                        android:src="@mipmap/icon_fushe" />
                </FrameLayout>
                        android:layout_height="@dimen/x280"
                        android:layout_alignParentStart="true"
                        android:layout_alignParentTop="true"
                        android:layout_gravity="center_horizontal" />

                <TextView
                    android:id="@+id/tv_tishi"
@@ -192,7 +188,6 @@
                    android:layout_gravity="center_horizontal"
                    android:background="@mipmap/bt_blue"
                    android:gravity="center_horizontal"
                    android:paddingTop="@dimen/x3"
                    android:text="当前辐射安全"
                    android:textColor="@color/white"
                    android:textSize="16sp" />
@@ -223,13 +218,31 @@
                </FrameLayout>
            </LinearLayout>
        </ScrollView>
        </FrameLayout>

        <ImageView
            android:id="@+id/iv_dianliang"
            android:layout_width="@dimen/x30"
            android:layout_height="@dimen/x30"
            android:layout_alignParentRight="true"
            android:layout_gravity="right"
            android:layout_marginRight="20dp"
            android:layout_marginTop="20dp"
            android:layout_marginRight="20dp"
            android:src="@mipmap/icon_full" />
    </FrameLayout>

        <TextView
            android:id="@+id/tv_dianliang2"
            android:layout_width="wrap_content"
            android:layout_height="@dimen/x30"
            android:layout_alignParentRight="true"
            android:layout_gravity="right"
            android:layout_marginTop="20dp"
            android:layout_marginRight="20dp"
            android:gravity="center"
            android:src="@mipmap/icon_full"
            android:textColor="@color/blue"
            android:textStyle="bold"
            android:visibility="gone" />

    </RelativeLayout>
</LinearLayout>