test main

app/src/main/java/com/oo/eye/activity/MorePeopleTestActivity.java

@@ -17,7 +17,6 @@ import android.widget.TextView;
 
 import com.app.baselibrary.base.common.BaseActivity;
 import com.app.baselibrary.commonUtil.CheckUtil;
-import com.app.baselibrary.commonUtil.LogUtil;
 import com.app.baselibrary.commonUtil.ToastUtil;
 import com.oo.eye.EyeConfig;
 import com.oo.eye.R;
@@ -77,6 +76,8 @@ public class MorePeopleTestActivity extends BaseActivity {
     EditText mKeyTest;
     @BindView(R.id.progress)
     RelativeLayout mProgress;
+    @BindView(R.id.text_empty)
+    RelativeLayout mTextEmpty;
     private List<StudentBean> mStudentBeans;
     private MorePeopleAdapter mPeopleAdapter;
     private SearchParamBean mSearchParamBean = new SearchParamBean();
@@ -225,9 +226,11 @@ public class MorePeopleTestActivity extends BaseActivity {
                 popuBean.setClassBeans(gradeBean.getClassList());
                 popuBeans.add(popuBean);
             }
+            mTextEmpty.setVisibility(View.GONE);
             mAreaList = popuBeans;
             showPopWindow(popuBeans);
         } else {
+            mTextEmpty.setVisibility(View.VISIBLE);
             ToastUtil.showMessage("暂无数据");
         }
     }
@@ -247,10 +250,12 @@ public class MorePeopleTestActivity extends BaseActivity {
                 popuBeans.add(popuBean);
             }
             mClassList = popuBeans;
+            mTextEmpty.setVisibility(View.GONE);
             showPopWindow(popuBeans);
         } else {
             if (!isAll) {
                 ToastUtil.showMessage("暂无数据");
+                mTextEmpty.setVisibility(View.VISIBLE);
             }
         }
     }
@@ -360,8 +365,10 @@ public class MorePeopleTestActivity extends BaseActivity {
                             mProgress.setVisibility(View.GONE);
                             mPeopleAdapter.clear();
                             mPeopleAdapter.appendToListAndNotify(listOldResponse.getData());
+                            mTextEmpty.setVisibility(View.GONE);
                         } else {
                             ToastUtil.showMessage("暂无数据");
+                            mTextEmpty.setVisibility(View.VISIBLE);
                         }
                     }
 

app/src/main/java/com/oo/eye/activity/SinglePeopleTestActivity.java

@@ -56,12 +56,15 @@ public class SinglePeopleTestActivity extends BaseActivity {
     RelativeLayout mProgress;
     @BindView(R.id.key_test)
     EditText mKeyTest;
+    @BindView(R.id.text_empty)
+    RelativeLayout mTextEmpty;
     private List<StudentBean> mStudentBeans;
     private SinglePeopleAdapter mPeopleAdapter;
     private SearchParamBean mSearchParamBean = new SearchParamBean();
     private SchoolBean mSchoolBean;
     private PopuAdapter mPopuAdapter;
     private List<PopuBean> mAreaList = new ArrayList<>();
+
     @Override
     protected int getLayoutId() {
         return R.layout.activity_singletest;

app/src/main/java/com/oo/eye/activity/TestResurtListActivity.java

@@ -11,6 +11,7 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.PopupWindow;
+import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
@@ -64,10 +65,6 @@ public class TestResurtListActivity extends BaseActivity {
     LinearLayout mSeleteLay;
     // @BindView(R.id.selete1_tv)
     // TextView mSelete1Tv;
-    @BindView(R.id.selete1_iv)
-    ImageView mSelete1Iv;
-    @BindView(R.id.selete1_lay)
-    LinearLayout mSelete1Lay;
     @BindView(R.id.selete2_iv)
     ImageView mSelete2Iv;
     @BindView(R.id.selete2_tv)
@@ -86,6 +83,16 @@ public class TestResurtListActivity extends BaseActivity {
     TextView mTextView;
     @BindView(R.id.progress)
     RelativeLayout mProgress;
+    @BindView(R.id.back_iv)
+    ImageView mBackIv;
+    @BindView(R.id.selete1_iv)
+    ImageView mSelete1Iv;
+    @BindView(R.id.search_lay)
+    LinearLayout mSearchLay;
+    @BindView(R.id.selete1_lay)
+    LinearLayout mSelete1Lay;
+    @BindView(R.id.text_empty)
+    RelativeLayout mTextEmpty;
     private List<ClassBean> mClassBeans;//选择学校的所有小组
     private boolean isAll = true;//是否是全部学校
     private List<PopuBean> mAreaList = new ArrayList<>();
@@ -124,6 +131,7 @@ public class TestResurtListActivity extends BaseActivity {
                 mTitle1.setSelected(true);
                 mTitle2.setSelected(false);
                 mSeleteAreaLay.setVisibility(View.VISIBLE);
+                mSearchLay.setVisibility(View.VISIBLE);
                 if (isA) {
                     mSelete2Iv.setImageResource(R.drawable.select3_sel);
                 } else {
@@ -137,6 +145,7 @@ public class TestResurtListActivity extends BaseActivity {
                 mTitle1.setSelected(false);
                 mTitle2.setSelected(true);
                 mSeleteAreaLay.setVisibility(View.GONE);
+                mSearchLay.setVisibility(View.GONE);
                 if (isTemporaryA) {
                     mSelete2Iv.setImageResource(R.drawable.select3_sel);
                 } else {
@@ -282,9 +291,11 @@ public class TestResurtListActivity extends BaseActivity {
             }
             mClassList = popuBeans;
             showPopWindow(popuBeans);
+            mTextEmpty.setVisibility(View.GONE);
         } else {
             if (!isAll) {
                 ToastUtil.showMessage("暂无数据");
+                mTextEmpty.setVisibility(View.VISIBLE);
             }
         }
     }
@@ -387,8 +398,10 @@ public class TestResurtListActivity extends BaseActivity {
                             mProgress.setVisibility(View.GONE);
                             mResultListAdapter.clear();
                             mResultListAdapter.appendToListAndNotify(listOldResponse.getData());
+                            mTextEmpty.setVisibility(View.GONE);
                         } else {
                             ToastUtil.showMessage("暂无数据");
+                            mTextEmpty.setVisibility(View.VISIBLE);
                         }
                     }
 
@@ -426,9 +439,11 @@ public class TestResurtListActivity extends BaseActivity {
         mResultListAdapter.clearAndNotify();
         List<StudentBean> list = DbManager.getInstance(this).getStudents(this, className, isTemporaryA);
         if (!CheckUtil.isEmpty(list)) {
+            mTextEmpty.setVisibility(View.GONE);
             mResultListAdapter.appendToListAndNotify(list);
         } else {
             ToastUtil.showMessage("暂无数据");
+            mTextEmpty.setVisibility(View.VISIBLE);
         }
     }
 }

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

@@ -304,4 +304,19 @@
             android:layout_height="wrap_content"
             android:layout_centerInParent="true" />
     </RelativeLayout>
+    <RelativeLayout
+        android:id="@+id/text_empty"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@+id/ddd"
+        android:visibility="gone">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:text="暂无数据"
+            android:textColor="@color/text_color"
+            android:textSize="@dimen/sp_18" />
+    </RelativeLayout>
 </RelativeLayout>
\ No newline at end of file

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

@@ -273,4 +273,19 @@
             android:layout_height="wrap_content"
             android:layout_centerInParent="true" />
     </RelativeLayout>
+    <RelativeLayout
+        android:id="@+id/text_empty"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@+id/ddd"
+        android:visibility="gone">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:text="暂无数据"
+            android:textColor="@color/text_color"
+            android:textSize="@dimen/sp_18" />
+    </RelativeLayout>
 </RelativeLayout>
\ No newline at end of file

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

@@ -39,10 +39,10 @@
 
         <TextView
             android:id="@+id/title_2"
-            android:paddingLeft="@dimen/dp_20"
-            android:paddingRight="@dimen/dp_20"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:paddingLeft="@dimen/dp_20"
+            android:paddingRight="@dimen/dp_20"
             android:text="临时报表"
             android:textColor="@color/indicator_light_color"
             android:textSize="24sp"
@@ -74,11 +74,11 @@
         <LinearLayout
             android:id="@+id/selete_area_lay"
             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:orientation="horizontal">
+            android:orientation="horizontal"
+            android:paddingBottom="@dimen/dp_6"
+            android:paddingLeft="@dimen/dp_20"
+            android:paddingTop="@dimen/dp_20">
 
             <TextView
                 android:id="@+id/selete_area_tv"
@@ -97,13 +97,13 @@
         </LinearLayout>
 
         <LinearLayout
-            android:paddingTop="@dimen/dp_20"
-            android:paddingBottom="@dimen/dp_6"
             android:id="@+id/selete_lay"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingBottom="@dimen/dp_6"
             android:paddingLeft="@dimen/dp_20"
-            android:orientation="horizontal">
+            android:paddingTop="@dimen/dp_20">
 
             <TextView
                 android:id="@+id/selete_tv"
@@ -122,14 +122,14 @@
         </LinearLayout>
 
         <LinearLayout
-            android:paddingTop="@dimen/dp_20"
-            android:paddingBottom="@dimen/dp_6"
-            android:visibility="gone"
             android:id="@+id/selete1_lay"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingBottom="@dimen/dp_6"
             android:paddingLeft="@dimen/dp_20"
-            android:orientation="horizontal">
+            android:paddingTop="@dimen/dp_20"
+            android:visibility="gone">
 
             <TextView
                 android:id="@+id/selete1_tv"
@@ -148,13 +148,13 @@
         </LinearLayout>
 
         <LinearLayout
-            android:paddingTop="@dimen/dp_20"
-            android:paddingBottom="@dimen/dp_6"
             android:id="@+id/selete2_lay"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingBottom="@dimen/dp_6"
             android:paddingLeft="@dimen/dp_20"
-            android:orientation="horizontal">
+            android:paddingTop="@dimen/dp_20">
 
             <ImageView
                 android:id="@+id/selete2_iv"
@@ -174,49 +174,56 @@
 
         </LinearLayout>
 
-        <ImageView
-            android:paddingTop="@dimen/dp_20"
-            android:paddingBottom="@dimen/dp_6"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/dp_20"
-            android:src="@drawable/search" />
-
         <LinearLayout
-            android:paddingTop="@dimen/dp_20"
-            android:paddingBottom="@dimen/dp_6"
+            android:id="@+id/search_lay"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:layout_height="match_parent"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/dp_20"
+                android:paddingBottom="@dimen/dp_6"
+                android:paddingTop="@dimen/dp_20"
+                android:src="@drawable/search" />
 
-            <EditText
-                android:id="@+id/key_test"
-                android:layout_width="140dip"
+            <LinearLayout
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/dp_6"
-                android:background="@null"
-                android:textColor="@color/white"
-                android:hint="输入学员编号后4位"
-                android:textColorHint="@color/hint_text_color"
-                android:textSize="@dimen/sp_16" />
+                android:orientation="vertical"
+                android:paddingBottom="@dimen/dp_6"
+                android:paddingTop="@dimen/dp_20">
+
+                <EditText
+                    android:id="@+id/key_test"
+                    android:layout_width="140dip"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/dp_6"
+                    android:background="@null"
+                    android:hint="输入学员编号后4位"
+                    android:textColor="@color/white"
+                    android:textColorHint="@color/hint_text_color"
+                    android:textSize="@dimen/sp_16" />
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1px"
+                    android:layout_marginTop="@dimen/dp_1"
+                    android:background="@color/hint_text_color"></View>
+            </LinearLayout>
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1px"
-                android:layout_marginTop="@dimen/dp_1"
-                android:background="@color/hint_text_color"></View>
+            <TextView
+                android:id="@+id/do_search"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingBottom="@dimen/dp_6"
+                android:paddingLeft="@dimen/dp_20"
+                android:paddingTop="@dimen/dp_20"
+                android:text="查询"
+                android:textColor="@color/indicator_color"
+                android:textSize="@dimen/sp_18" />
         </LinearLayout>
-
-        <TextView
-            android:paddingTop="@dimen/dp_20"
-            android:paddingBottom="@dimen/dp_6"
-            android:id="@+id/do_search"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingLeft="@dimen/dp_20"
-            android:text="查询"
-            android:textColor="@color/indicator_color"
-            android:textSize="@dimen/sp_18" />
     </LinearLayout>
 
     <LinearLayout
@@ -378,11 +385,12 @@
         android:layout_height="match_parent"
         android:layout_below="@+id/ddd"
         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:layout_below="@+id/ddd"
         android:background="#60000000">
 
         <ProgressBar
@@ -390,4 +398,20 @@
             android:layout_height="wrap_content"
             android:layout_centerInParent="true" />
     </RelativeLayout>
+
+    <RelativeLayout
+        android:id="@+id/text_empty"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@+id/ddd"
+        android:visibility="gone">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:text="暂无数据"
+            android:textColor="@color/text_color"
+            android:textSize="@dimen/sp_18" />
+    </RelativeLayout>
 </RelativeLayout>
\ No newline at end of file