Merge branch 'master' of git.iouou.cn:xucongqi/haihang

.idea/misc.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
@@ -43,7 +40,7 @@
       </profile-state>
     </entry>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8 (6)" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

.idea/modules.xml

@@ -4,8 +4,7 @@
     <modules>
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
       <module fileurl="file://$PROJECT_DIR$/library/baselibrary/baselibrary.iml" filepath="$PROJECT_DIR$/library/baselibrary/baselibrary.iml" />
-      <module fileurl="file://$PROJECT_DIR$/eye_haihang.iml" filepath="$PROJECT_DIR$/eye_haihang.iml" />
-      <module fileurl="file://G:/workspace_ooyby/haihang/eye_haihang.iml" filepath="G:/workspace_ooyby/haihang/eye_haihang.iml" />
+      <module fileurl="file://G:\workspace_ooyby\haihang\eye_haihang.iml" filepath="G:\workspace_ooyby\haihang\eye_haihang.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/haihang.iml" filepath="$PROJECT_DIR$/.idea/haihang.iml" />
       <module fileurl="file://$PROJECT_DIR$/library/library.iml" filepath="$PROJECT_DIR$/library/library.iml" />
       <module fileurl="file://$PROJECT_DIR$/library/netlibrary/netlibrary.iml" filepath="$PROJECT_DIR$/library/netlibrary/netlibrary.iml" />

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

@@ -94,9 +94,12 @@ public class MorePeopleTestActivity extends BaseActivity {
         ButterKnife.bind(this);
     }
 
-    @OnClick({R.id.selete_area_lay, R.id.selete_lay, R.id.selete1_lay, R.id.do_search, R.id.begin_test})
+    @OnClick({R.id.back_iv,R.id.selete_area_lay, R.id.selete_lay, R.id.selete1_lay, R.id.do_search, R.id.begin_test})
     public void onClick(View view) {
         switch (view.getId()) {
+            case R.id.back_iv:
+                finish();
+                break;
             case R.id.selete_area_lay:
                 showPopWindow(1);
                 break;

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

@@ -62,9 +62,12 @@ public class SinglePeopleTestActivity extends BaseActivity {
         mRecycleView.setAdapter(mPeopleAdapter);
     }
 
-    @OnClick({R.id.selete_area_lay, R.id.do_search, R.id.begin_test})
+    @OnClick({R.id.back_iv,R.id.selete_area_lay, R.id.do_search, R.id.begin_test})
     public void onClick(View view) {
         switch (view.getId()) {
+            case R.id.back_iv:
+                finish();
+                break;
             case R.id.selete_area_lay:
                 showPopWindow();
                 break;

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

 package com.oo.eye.activity;
 
 import android.content.Intent;
+import android.os.Bundle;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
@@ -15,6 +17,7 @@ import com.oo.eye.bean.StudentBean;
 import java.util.List;
 
 import butterknife.BindView;
+import butterknife.ButterKnife;
 import butterknife.OnClick;
 
 /**
@@ -42,9 +45,23 @@ public class TestListActivity extends BaseActivity {
         mRecycleView.setAdapter(new TestListAdapter(list, this));
     }
 
-    @OnClick(R.id.begin_test)
-    public void onClick() {
-        Intent intent=new Intent(this,EyeTestActivity.class);
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        // TODO: add setContentView(...) invocation
+        ButterKnife.bind(this);
+    }
+
+    @OnClick({R.id.back_iv, R.id.begin_test})
+    public void onClick(View view) {
+        switch (view.getId()) {
+            case R.id.back_iv:
+                finish();
+                break;
+            case R.id.begin_test:
+                Intent intent = new Intent(this, EyeTestActivity.class);
                 startActivity(intent);
+                break;
+        }
     }
 }

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

 package com.oo.eye.activity;
 
 import android.graphics.drawable.ColorDrawable;
+import android.os.Bundle;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
@@ -22,6 +23,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import butterknife.BindView;
+import butterknife.ButterKnife;
 import butterknife.OnClick;
 
 /**
@@ -32,8 +34,6 @@ import butterknife.OnClick;
 public class TestResurtListActivity extends BaseActivity {
     @BindView(R.id.ddd)
     LinearLayout mDdd;
-    @BindView(R.id.begin_test)
-    TextView mBeginTest;
     @BindView(R.id.recycle_view)
     RecyclerView mRecycleView;
     @BindView(R.id.selete_area_tv)
@@ -64,6 +64,12 @@ public class TestResurtListActivity extends BaseActivity {
     EditText mKeyTest;
     @BindView(R.id.do_search)
     TextView mDoSearch;
+    @BindView(R.id.title_1)
+    TextView mTitle1;
+    @BindView(R.id.title_2)
+    TextView mTitle2;
+    @BindView(R.id.textView)
+    TextView mTextView;
 
     @Override
     protected int getLayoutId() {
@@ -72,6 +78,8 @@ public class TestResurtListActivity extends BaseActivity {
 
     @Override
     protected void init() {
+        mTitle1.setSelected(true);
+        mTitle2.setSelected(false);
         mRecycleView.setLayoutManager(new LinearLayoutManager(this));
         List<StudentBean> list = new ArrayList<>();
         for (int i = 0; i < 10; i++) {
@@ -83,9 +91,20 @@ public class TestResurtListActivity extends BaseActivity {
 
     private boolean isA;
 
-    @OnClick({R.id.selete_area_lay, R.id.selete_lay, R.id.selete1_lay, R.id.selete2_lay, R.id.do_search, R.id.begin_test})
+    @OnClick({R.id.title_1, R.id.title_2,R.id.back_iv, R.id.selete_area_lay, R.id.selete_lay, R.id.selete1_lay, R.id.selete2_lay, R.id.do_search})
     public void onClick(View view) {
         switch (view.getId()) {
+            case R.id.title_1:
+                mTitle1.setSelected(true);
+                mTitle2.setSelected(false);
+                break;
+            case R.id.title_2:
+                mTitle1.setSelected(false);
+                mTitle2.setSelected(true);
+                break;
+            case R.id.back_iv:
+                finish();
+                break;
             case R.id.selete_area_lay:
                 showPopWindow(1);
                 break;
@@ -105,8 +124,6 @@ public class TestResurtListActivity extends BaseActivity {
                 break;
             case R.id.do_search:
                 break;
-            case R.id.begin_test:
-                break;
         }
     }
 
@@ -132,7 +149,7 @@ public class TestResurtListActivity extends BaseActivity {
             ColorDrawable cd = new ColorDrawable(0x00ffffff);// 背景颜色全透明
             popupWindow.setBackgroundDrawable(cd);
             ListView listView = (ListView) conview.findViewById(R.id.list_view);
-            listView.setAdapter(new PopuAdapter(this,null));
+            listView.setAdapter(new PopuAdapter(this, null));
             int[] location = new int[2];
             view.getLocationOnScreen(location);
 //            popupWindow.setAnimationStyle(R.style.style_pop_animation);// 动画效果必须放在showAsDropDown()方法上边，否则无效
@@ -145,4 +162,12 @@ public class TestResurtListActivity extends BaseActivity {
         }
 
     }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        // TODO: add setContentView(...) invocation
+        ButterKnife.bind(this);
+    }
+
 }

app/src/main/res/color/indicator_light_color.xml

+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/white" android:state_selected="true"  />
+    <item android:color="@color/white" android:state_focused="true"  />
+    <item android:color="@color/white" android:state_pressed="true"  />
+    <item android:color="@color/light_color" />
+</selector>
\ No newline at end of file

app/src/main/res/drawable/btn_result_focus_selector.xml

@@ -23,7 +23,7 @@
 
     <item>
         <shape>
-            <solid android:color="@color/white" />
+            <solid android:color="@color/light_color" />
            <corners android:radius="@dimen/dp_4"></corners>
         </shape>
     </item>

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

@@ -3,13 +3,18 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/e_test_color">
-
+    <ImageView
+        android:id="@+id/back_iv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/dp_12"
+        android:src="@drawable/back" />
     <TextView
         android:layout_width="wrap_content"
         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 +24,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
@@ -32,7 +37,7 @@
                 android:id="@+id/selete_area_tv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="黄冈校区22323"
+                android:text="选择学校"
                 android:textColor="@color/white"
                 android:textSize="@dimen/sp_18" />
 
@@ -128,17 +133,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"
@@ -256,11 +261,11 @@
     <TextView
         android:layout_marginTop="@dimen/dp_12"
         android:id="@+id/begin_test"
-        android:layout_width="130dip"
+        android:layout_width="140dip"
         android:layout_height="40dip"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
-        android:layout_marginBottom="@dimen/dp_30"
+        android:layout_marginBottom="@dimen/dp_12"
         android:background="@drawable/after_btn_bg"
         android:gravity="center"
         android:text="生成测试队列"

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

@@ -3,13 +3,18 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/e_test_color">
-
+    <ImageView
+        android:id="@+id/back_iv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/dp_12"
+        android:src="@drawable/back" />
     <TextView
         android:layout_width="wrap_content"
         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 +24,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
@@ -32,7 +37,7 @@
                 android:id="@+id/selete_area_tv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="黄冈校区22323"
+                android:text="选择学校"
                 android:textColor="@color/white"
                 android:textSize="@dimen/sp_18" />
 
@@ -92,17 +97,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"
@@ -218,11 +223,12 @@
     </LinearLayout>
     <TextView
         android:id="@+id/begin_test"
-        android:layout_width="100dip"
+        android:layout_width="110dip"
         android:layout_height="40dip"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
-        android:layout_marginBottom="@dimen/dp_40"
+        android:layout_marginBottom="@dimen/dp_12"
+        android:layout_marginTop="@dimen/dp_12"
         android:background="@drawable/after_btn_bg"
         android:gravity="center"
         android:text="开始测试"

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

@@ -3,13 +3,18 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/e_test_color">
-
+    <ImageView
+        android:id="@+id/back_iv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/dp_12"
+        android:src="@drawable/back" />
     <TextView
         android:layout_width="wrap_content"
         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 +24,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 +32,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"
@@ -157,11 +162,11 @@
 
     <TextView
         android:id="@+id/begin_test"
-        android:layout_width="100dip"
+        android:layout_width="110dip"
         android:layout_height="40dip"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
-        android:layout_marginBottom="@dimen/dp_30"
+        android:layout_marginBottom="@dimen/dp_12"
         android:layout_marginTop="@dimen/dp_12"
         android:background="@drawable/after_btn_bg"
         android:gravity="center"

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

@@ -4,35 +4,69 @@
     android:layout_height="match_parent"
     android:background="@color/e_test_color">
 
-    <TextView
+    <ImageView
+        android:id="@+id/back_iv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/dp_12"
+        android:src="@drawable/back" />
+
+    <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_alignTop="@+id/textView"
         android:layout_centerHorizontal="true"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="@dimen/dp_20"
-        android:text="请输入学员编号"
-        android:textColor="@color/white"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/title_1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="结果报表"
+            android:textColor="@color/indicator_light_color"
             android:textSize="24sp"
             android:textStyle="bold" />
+
+        <View
+            android:layout_width="1px"
+            android:layout_height="@dimen/dp_20"
+            android:layout_gravity="center_vertical"
+            android:layout_marginLeft="@dimen/dp_30"
+            android:layout_marginRight="@dimen/dp_30"
+            android:background="@color/white" />
+
         <TextView
-        android:layout_alignParentRight="true"
+            android:id="@+id/title_2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="临时报表"
+            android:textColor="@color/indicator_light_color"
+            android:textSize="24sp"
+            android:textStyle="bold" />
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/textView"
         android:layout_width="@dimen/dp_60"
+        android:layout_height="@dimen/dp_26"
+        android:layout_alignParentRight="true"
         android:layout_marginRight="@dimen/dp_40"
-        android:layout_height="@dimen/dp_30"
-        android:layout_marginTop="@dimen/dp_20"
-        android:text="导出"
+        android:layout_marginTop="@dimen/dp_16"
+        android:background="@drawable/btn_result_focus_selector"
         android:gravity="center"
+        android:text="导出"
         android:textColor="@color/e_test_color"
         android:textSize="15sp"
-        android:background="@drawable/btn_result_focus_selector"
         android:textStyle="bold" />
+
     <LinearLayout
         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
             android:id="@+id/selete_area_lay"
             android:layout_width="wrap_content"
@@ -43,7 +77,7 @@
                 android:id="@+id/selete_area_tv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="黄冈校区22323"
+                android:text="选择学校"
                 android:textColor="@color/white"
                 android:textSize="@dimen/sp_18" />
 
@@ -54,11 +88,12 @@
                 android:layout_marginLeft="@dimen/dp_6"
                 android:src="@drawable/more" />
         </LinearLayout>
+
         <LinearLayout
             android:id="@+id/selete_lay"
-            android:layout_marginLeft="@dimen/dp_20"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/dp_20"
             android:orientation="horizontal">
 
             <TextView
@@ -109,9 +144,9 @@
 
             <ImageView
                 android:id="@+id/selete2_iv"
-                android:layout_gravity="center_vertical"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
                 android:src="@drawable/select3_nor" />
 
             <TextView
@@ -166,17 +201,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"
@@ -316,25 +351,11 @@
         </RelativeLayout>
     </LinearLayout>
 
-    <TextView
-        android:id="@+id/begin_test"
-        android:layout_width="130dip"
-        android:layout_height="40dip"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true"
-        android:layout_marginBottom="@dimen/dp_30"
-        android:layout_marginTop="@dimen/dp_12"
-        android:background="@drawable/after_btn_bg"
-        android:gravity="center"
-        android:text="生成测试队列"
-        android:textColor="@color/white"
-        android:textSize="@dimen/sp_16" />
-
     <android.support.v7.widget.RecyclerView
         android:id="@+id/recycle_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_above="@+id/begin_test"
-        android:layout_below="@+id/ddd"></android.support.v7.widget.RecyclerView>
+        android:layout_below="@+id/ddd"
+        android:layout_marginBottom="@dimen/dp_20"></android.support.v7.widget.RecyclerView>
 
 </RelativeLayout>
\ No newline at end of file

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/colors.xml

@@ -8,4 +8,5 @@
     <color name="hint_text_color">#ccc</color>
     <color name="line_color">#979797</color>
     <color name="text_color">#4A4A4A</color>
+    <color name="light_color">#92c2ea</color>
 </resources>
\ No newline at end of file

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>