From 47f5d71a81a528aff225805d28bf181ce4d6f55d Mon Sep 17 00:00:00 2001
From: 陈奇 <1650699704@qq.com>
Date: Thu, 15 Nov 2018 13:14:43 +0800
Subject: [PATCH] [*]1.0.3.2版本

---
 app/src/main/res/layout/fragment_monitor_layout.xml |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/fragment_monitor_layout.xml b/app/src/main/res/layout/fragment_monitor_layout.xml
index ca35289..bf4eac7 100644
--- a/app/src/main/res/layout/fragment_monitor_layout.xml
+++ b/app/src/main/res/layout/fragment_monitor_layout.xml
@@ -116,7 +116,7 @@
                         android:layout_marginTop="@dimen/x4"
                         android:text="0"
                         android:textColor="@color/green_txt"
-                        android:textSize="18sp"
+                        android:textSize="14sp"
                         android:textStyle="bold" />
                 </LinearLayout>
 
@@ -147,7 +147,7 @@
                         android:layout_marginTop="@dimen/x4"
                         android:text="0"
                         android:textColor="@color/yellow_txt"
-                        android:textSize="18sp"
+                        android:textSize="14sp"
                         android:textStyle="bold" />
                 </LinearLayout>
             </LinearLayout>
@@ -177,6 +177,7 @@
                         android:id="@+id/pv"
                         android:layout_width="@dimen/x280"
                         android:layout_height="@dimen/x280"
+                        android:transitionName="pv_main"
                         android:layout_alignParentStart="true"
                         android:layout_alignParentTop="true"
                         android:layout_gravity="center_horizontal" />
@@ -199,6 +200,17 @@
                         android:orientation="vertical">
 
                         <TextView
+                            android:id="@+id/tv_text_mac"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_marginTop="@dimen/x15"
+                            android:background="@color/white"
+                            android:gravity="center"
+                            android:padding="@dimen/x15"
+                            android:text="���������,���mac���"
+                            android:textColor="#ae8082" />
+
+                        <TextView
                             android:id="@+id/tv_desc"
                             android:layout_width="match_parent"
                             android:layout_height="match_parent"
@@ -208,6 +220,7 @@
                             android:padding="@dimen/x15"
                             android:text="���������������������������\n������������������������������������������������"
                             android:textColor="#ae8082" />
+
 
                         <ImageView
                             android:id="@+id/iv_bottom_status"
@@ -227,6 +240,7 @@
             android:layout_alignParentRight="true"
             android:layout_gravity="right"
             android:layout_marginTop="20dp"
+            android:transitionName="dddd"
             android:layout_marginRight="20dp"
             android:src="@mipmap/icon_full" />
 

--
Gitblit v1.8.0