Skip to content

H
haihang
Commit 67809f15 by chengxiuhong
Options

test main

parent e68e46da
Showing with 70 additions and 19 deletions
app/src/main/java/com/oo/eye/activity/MorePeopleTestActivity.java
...@@ -249,7 +249,7 @@ public class MorePeopleTestActivity extends BaseActivity { ...@@ -249,7 +249,7 @@ public class MorePeopleTestActivity extends BaseActivity {
mClassList = popuBeans; mClassList = popuBeans;
showPopWindow(popuBeans); showPopWindow(popuBeans);
} else { } else {
if (isAll) { if (!isAll) {
ToastUtil.showMessage("暂无数据"); ToastUtil.showMessage("暂无数据");
} }
} }
......
app/src/main/res/layout/activity_morepeople.xml
...@@ -24,10 +24,12 @@ ...@@ -24,10 +24,12 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp_60" android:layout_marginTop="@dimen/dp_40"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
<LinearLayout <LinearLayout
android:paddingBottom="@dimen/dp_6"
android:paddingTop="@dimen/dp_20"
android:id="@+id/selete_area_lay" android:id="@+id/selete_area_lay"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -49,7 +51,9 @@ ...@@ -49,7 +51,9 @@
android:src="@drawable/more" /> android:src="@drawable/more" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_marginLeft="@dimen/dp_20" android:paddingBottom="@dimen/dp_6"
android:paddingTop="@dimen/dp_20"
android:paddingLeft="@dimen/dp_20"
android:id="@+id/selete_lay" android:id="@+id/selete_lay"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -72,7 +76,9 @@ ...@@ -72,7 +76,9 @@
<LinearLayout <LinearLayout
android:id="@+id/selete1_lay" android:id="@+id/selete1_lay"
android:layout_marginLeft="@dimen/dp_20" android:paddingBottom="@dimen/dp_6"
android:paddingTop="@dimen/dp_20"
android:paddingLeft="@dimen/dp_20"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -93,12 +99,16 @@ ...@@ -93,12 +99,16 @@
</LinearLayout> </LinearLayout>
<ImageView <ImageView
android:layout_marginLeft="@dimen/dp_20" android:paddingBottom="@dimen/dp_6"
android:paddingTop="@dimen/dp_20"
android:paddingLeft="@dimen/dp_20"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@drawable/search" /> android:src="@drawable/search" />
<LinearLayout <LinearLayout
android:paddingBottom="@dimen/dp_6"
android:paddingTop="@dimen/dp_20"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
...@@ -121,10 +131,13 @@ ...@@ -121,10 +131,13 @@
</LinearLayout> </LinearLayout>
<TextView <TextView
android:paddingBottom="@dimen/dp_6"
android:paddingTop="@dimen/dp_20"
android:paddingLeft="@dimen/dp_20"
android:paddingRight="@dimen/dp_20"
android:id="@+id/do_search" android:id="@+id/do_search"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_20"
android:text="查询" android:text="查询"
android:textColor="@color/indicator_color" android:textColor="@color/indicator_color"
android:textSize="@dimen/sp_18" /> android:textSize="@dimen/sp_18" />
...@@ -133,7 +146,7 @@ ...@@ -133,7 +146,7 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="@dimen/dp_95" android:layout_marginTop="@dimen/dp_90"
android:background="@color/white"></LinearLayout> android:background="@color/white"></LinearLayout>
<LinearLayout <LinearLayout
......
app/src/main/res/layout/activity_singletest.xml
...@@ -26,11 +26,14 @@ ...@@ -26,11 +26,14 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp_60" android:layout_marginTop="@dimen/dp_40"
android:orientation="horizontal"> android:orientation="horizontal">
<LinearLayout <LinearLayout
android:id="@+id/selete_area_lay" android:id="@+id/selete_area_lay"
android:paddingTop="@dimen/dp_20"
android:paddingLeft="@dimen/dp_20"
android:paddingBottom="@dimen/dp_6"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -54,6 +57,8 @@ ...@@ -54,6 +57,8 @@
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="@dimen/dp_20"
android:paddingBottom="@dimen/dp_6"
android:layout_marginLeft="@dimen/dp_20" android:layout_marginLeft="@dimen/dp_20"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -92,7 +97,9 @@ ...@@ -92,7 +97,9 @@
android:id="@+id/do_search" android:id="@+id/do_search"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_20" android:paddingLeft="@dimen/dp_20"
android:paddingBottom="@dimen/dp_6"
android:paddingRight="@dimen/dp_20"
android:text="查询" android:text="查询"
android:textColor="@color/indicator_color" android:textColor="@color/indicator_color"
android:textSize="@dimen/sp_18" /> android:textSize="@dimen/sp_18" />
...@@ -102,7 +109,7 @@ ...@@ -102,7 +109,7 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="@dimen/dp_95" android:layout_marginTop="@dimen/dp_90"
android:background="@color/white"></LinearLayout> android:background="@color/white"></LinearLayout>
<LinearLayout <LinearLayout
......
app/src/main/res/layout/activity_testresult.xml
...@@ -22,6 +22,8 @@ ...@@ -22,6 +22,8 @@
android:id="@+id/title_1" android:id="@+id/title_1"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="@dimen/dp_20"
android:paddingRight="@dimen/dp_20"
android:text="结果报表" android:text="结果报表"
android:textColor="@color/indicator_light_color" android:textColor="@color/indicator_light_color"
android:textSize="24sp" android:textSize="24sp"
...@@ -31,12 +33,14 @@ ...@@ -31,12 +33,14 @@
android:layout_width="1px" android:layout_width="1px"
android:layout_height="@dimen/dp_20" android:layout_height="@dimen/dp_20"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginLeft="@dimen/dp_30" android:layout_marginLeft="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_30" android:layout_marginRight="@dimen/dp_10"
android:background="@color/white" /> android:background="@color/white" />
<TextView <TextView
android:id="@+id/title_2" android:id="@+id/title_2"
android:paddingLeft="@dimen/dp_20"
android:paddingRight="@dimen/dp_20"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="临时报表" android:text="临时报表"
...@@ -63,13 +67,16 @@ ...@@ -63,13 +67,16 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp_60" android:layout_marginTop="@dimen/dp_40"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
<LinearLayout <LinearLayout
android:id="@+id/selete_area_lay" android:id="@+id/selete_area_lay"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:paddingTop="@dimen/dp_20"
android:paddingLeft="@dimen/dp_20"
android:paddingBottom="@dimen/dp_6"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -90,10 +97,12 @@ ...@@ -90,10 +97,12 @@
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:paddingTop="@dimen/dp_20"
android:paddingBottom="@dimen/dp_6"
android:id="@+id/selete_lay" android:id="@+id/selete_lay"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_20" android:paddingLeft="@dimen/dp_20"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
...@@ -113,11 +122,13 @@ ...@@ -113,11 +122,13 @@
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:paddingTop="@dimen/dp_20"
android:paddingBottom="@dimen/dp_6"
android:visibility="gone" android:visibility="gone"
android:id="@+id/selete1_lay" android:id="@+id/selete1_lay"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_20" android:paddingLeft="@dimen/dp_20"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
...@@ -137,10 +148,12 @@ ...@@ -137,10 +148,12 @@
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:paddingTop="@dimen/dp_20"
android:paddingBottom="@dimen/dp_6"
android:id="@+id/selete2_lay" android:id="@+id/selete2_lay"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_20" android:paddingLeft="@dimen/dp_20"
android:orientation="horizontal"> android:orientation="horizontal">
<ImageView <ImageView
...@@ -148,7 +161,7 @@ ...@@ -148,7 +161,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:src="@drawable/select3_sel" /> android:src="@drawable/select3_nor" />
<TextView <TextView
android:id="@+id/selete2_tv" android:id="@+id/selete2_tv"
...@@ -162,12 +175,16 @@ ...@@ -162,12 +175,16 @@
</LinearLayout> </LinearLayout>
<ImageView <ImageView
android:paddingTop="@dimen/dp_20"
android:paddingBottom="@dimen/dp_6"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_20" android:layout_marginLeft="@dimen/dp_20"
android:src="@drawable/search" /> android:src="@drawable/search" />
<LinearLayout <LinearLayout
android:paddingTop="@dimen/dp_20"
android:paddingBottom="@dimen/dp_6"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
...@@ -190,10 +207,12 @@ ...@@ -190,10 +207,12 @@
</LinearLayout> </LinearLayout>
<TextView <TextView
android:paddingTop="@dimen/dp_20"
android:paddingBottom="@dimen/dp_6"
android:id="@+id/do_search" android:id="@+id/do_search"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_20" android:paddingLeft="@dimen/dp_20"
android:text="查询" android:text="查询"
android:textColor="@color/indicator_color" android:textColor="@color/indicator_color"
android:textSize="@dimen/sp_18" /> android:textSize="@dimen/sp_18" />
...@@ -202,7 +221,7 @@ ...@@ -202,7 +221,7 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="@dimen/dp_95" android:layout_marginTop="@dimen/dp_90"
android:background="@color/white"></LinearLayout> android:background="@color/white"></LinearLayout>
<LinearLayout <LinearLayout
...@@ -358,5 +377,16 @@ ...@@ -358,5 +377,16 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_below="@+id/ddd" android:layout_below="@+id/ddd"
android:layout_marginBottom="@dimen/dp_20"></android.support.v7.widget.RecyclerView> android:layout_marginBottom="@dimen/dp_20"></android.support.v7.widget.RecyclerView>
<RelativeLayout
android:id="@+id/progress"
android:layout_below="@+id/ddd"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#60000000">
<ProgressBar
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true" />
</RelativeLayout>
</RelativeLayout> </RelativeLayout>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment