test main

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

@@ -9,7 +9,7 @@
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
         android:layout_gravity="center_horizontal"
-        android:layout_marginTop="@dimen/dp_20"
+        android:layout_marginTop="@dimen/dp_16"
         android:text="选择测试学员（可多选）"
         android:textColor="@color/white"
         android:textSize="24sp"
@@ -19,7 +19,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
-        android:layout_marginTop="@dimen/dp_70"
+        android:layout_marginTop="@dimen/dp_60"
         android:gravity="center_vertical"
         android:orientation="horizontal">
         <LinearLayout
@@ -128,17 +128,17 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="@dimen/dp_120"
+        android:layout_marginTop="@dimen/dp_95"
         android:background="@color/white"></LinearLayout>
 
     <LinearLayout
         android:id="@+id/ddd"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_120"
+        android:layout_marginTop="@dimen/dp_95"
         android:gravity="center_horizontal"
         android:orientation="horizontal"
-        android:paddingTop="@dimen/dp_20">
+        android:paddingTop="@dimen/dp_12">
         <RelativeLayout
             android:layout_width="@dimen/item_dimen_2"
             android:layout_height="@dimen/dp_40"

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

@@ -9,7 +9,7 @@
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
         android:layout_gravity="center_horizontal"
-        android:layout_marginTop="@dimen/dp_20"
+        android:layout_marginTop="@dimen/dp_16"
         android:text="请输入学员编号"
         android:textColor="@color/white"
         android:textSize="24sp"
@@ -19,7 +19,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
-        android:layout_marginTop="@dimen/dp_70"
+        android:layout_marginTop="@dimen/dp_60"
         android:orientation="horizontal">
 
         <LinearLayout
@@ -92,17 +92,17 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="@dimen/dp_120"
+        android:layout_marginTop="@dimen/dp_95"
         android:background="@color/white"></LinearLayout>
 
     <LinearLayout
         android:id="@+id/ddd"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_120"
+        android:layout_marginTop="@dimen/dp_95"
         android:gravity="center_horizontal"
         android:orientation="horizontal"
-        android:paddingTop="@dimen/dp_20">
+        android:paddingTop="@dimen/dp_12">
         <RelativeLayout
             android:layout_width="@dimen/item_dimen_2"
             android:layout_height="@dimen/dp_40"

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

@@ -9,7 +9,7 @@
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
         android:layout_gravity="center_horizontal"
-        android:layout_marginTop="@dimen/dp_20"
+        android:layout_marginTop="@dimen/dp_16"
         android:text="测试顺序"
         android:textColor="@color/white"
         android:textSize="24sp"
@@ -19,7 +19,7 @@
         android:layout_centerHorizontal="true"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_70"
+        android:layout_marginTop="@dimen/dp_60"
         android:text="请学员按以下顺序排队测试"
         android:textColor="@color/white"
         android:textSize="@dimen/sp_18" />
@@ -27,17 +27,17 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="@dimen/dp_120"
+        android:layout_marginTop="@dimen/dp_95"
         android:background="@color/white"></LinearLayout>
 
     <LinearLayout
         android:id="@+id/ddd"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_120"
+        android:layout_marginTop="@dimen/dp_95"
         android:gravity="center_horizontal"
         android:orientation="horizontal"
-        android:paddingTop="@dimen/dp_20">
+        android:paddingTop="@dimen/dp_12">
         <RelativeLayout
             android:layout_width="@dimen/item_dimen_4"
             android:layout_height="@dimen/dp_40"

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

@@ -9,7 +9,7 @@
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
         android:layout_gravity="center_horizontal"
-        android:layout_marginTop="@dimen/dp_20"
+        android:layout_marginTop="@dimen/dp_16"
         android:text="请输入学员编号"
         android:textColor="@color/white"
         android:textSize="24sp"
@@ -18,8 +18,8 @@
         android:layout_alignParentRight="true"
         android:layout_width="@dimen/dp_60"
         android:layout_marginRight="@dimen/dp_40"
-        android:layout_height="@dimen/dp_30"
-        android:layout_marginTop="@dimen/dp_20"
+        android:layout_height="@dimen/dp_26"
+        android:layout_marginTop="@dimen/dp_16"
         android:text="导出"
         android:gravity="center"
         android:textColor="@color/e_test_color"
@@ -30,7 +30,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
-        android:layout_marginTop="@dimen/dp_70"
+        android:layout_marginTop="@dimen/dp_60"
         android:gravity="center_vertical"
         android:orientation="horizontal">
         <LinearLayout
@@ -166,17 +166,17 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="@dimen/dp_127"
+        android:layout_marginTop="@dimen/dp_95"
         android:background="@color/white"></LinearLayout>
 
     <LinearLayout
         android:id="@+id/ddd"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_120"
+        android:layout_marginTop="@dimen/dp_95"
         android:gravity="center_horizontal"
         android:orientation="horizontal"
-        android:paddingTop="@dimen/dp_20">
+        android:paddingTop="@dimen/dp_12">
 
         <RelativeLayout
             android:layout_width="@dimen/item_dimen_5"

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

@@ -110,7 +110,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
-            android:text="5.2|5.3"
+            android:text="5.2 | 5.3"
             android:textColor="@color/text_color"
             android:textSize="@dimen/sp_18" />
 

app/src/main/res/values/strings.xml

 <resources>
-    <string name="app_name">etest_library</string>
+    <string name="app_name">海航</string>
     <string name="prompt">提示</string>
     <!-- 视力测试 -->
     <string name="eye_prompt">欧欧视力检查工具</string>