tongtong/CubeAoleyunSN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update:2020.06.17

Browse Source 
fix:优化没有信息时标签不显示
add:
This commit is contained in:
Administrator
2020-06-17 16:53:52 +08:00
parent 780fb8561b
commit 988c1c9389
7 changed files with 82 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/res/layout-land/activity_main.xml
View File

@@ -62,8 +62,8 @@
android:id="@+id/linearLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:layout_marginLeft="@dimen/dp_150"
android:layout_marginTop="12dp"
android:layout_marginRight="@dimen/dp_150"
android:orientation="vertical"
app:layout_constraintEnd_toEndOf="parent"
@@ -73,8 +73,7 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_20"
>
android:layout_height="@dimen/dp_20">
<TextView
android:layout_width="wrap_content"
@@ -87,6 +86,7 @@
android:text="设备SN"
android:textColor="#000000"
android:textSize="@dimen/sp_12" />
<TextView
android:id="@+id/tv_devsn"
android:layout_width="wrap_content"
@@ -106,8 +106,7 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_20"
>
android:layout_height="@dimen/dp_20">
<TextView
android:layout_width="wrap_content"
@@ -120,6 +119,7 @@
android:text="MAC地址"
android:textColor="#000000"
android:textSize="@dimen/sp_12" />
<TextView
android:id="@+id/tv_devmac"
android:layout_width="wrap_content"
@@ -140,8 +140,7 @@
<RelativeLayout
android:id="@+id/checkupdate"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_20"
>
android:layout_height="@dimen/dp_20">
<TextView
android:layout_width="wrap_content"
@@ -154,6 +153,7 @@
android:text="版本"
android:textColor="#000000"
android:textSize="@dimen/sp_12" />
<TextView
android:id="@+id/version"
android:layout_width="wrap_content"
@@ -176,7 +176,8 @@
android:id="@+id/layout_class"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_20"
>
android:visibility="gone">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -210,7 +211,7 @@
android:id="@+id/layout_number"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_20"
>
android:visibility="gone">
<TextView
android:layout_width="wrap_content"
@@ -223,6 +224,7 @@
android:text="学号"
android:textColor="#000000"
android:textSize="@dimen/sp_12" />
<TextView
android:id="@+id/tv_number"
android:layout_width="wrap_content"
@@ -244,7 +246,7 @@
android:id="@+id/layout_name"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_20"
>
android:visibility="gone">
<TextView
android:layout_width="wrap_content"
@@ -257,6 +259,7 @@
android:text="姓名"
android:textColor="#000000"
android:textSize="@dimen/sp_12" />
<TextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
@@ -275,9 +278,8 @@
</RelativeLayout>
</LinearLayout>
<TextView
android:id="@+id/textView"
android:layout_width="wrap_content"

3
app/src/main/res/layout-port/activity_main.xml
View File

@@ -176,6 +176,7 @@
<RelativeLayout
android:visibility="gone"
android:id="@+id/layout_class"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_30"
@@ -211,6 +212,7 @@
</RelativeLayout>
<RelativeLayout
android:visibility="gone"
android:id="@+id/layout_number"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_30"
@@ -246,6 +248,7 @@
</RelativeLayout>
<RelativeLayout
android:visibility="gone"
android:id="@+id/layout_name"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_30"