test main

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

@@ -129,9 +129,9 @@ public class EyeTestActivity extends BaseActivity {
     @Override
     protected void init() {
         boolean help = PreferencesUtils.getBoolean(EyeConfig.EYE_HELP_SETTING_KEY, true);
-        if (help){
+        if (help) {
             showBeforeDialog(true);
-        }else {
+        } else {
             prepareQueue();
         }
         initialize();
@@ -144,7 +144,7 @@ public class EyeTestActivity extends BaseActivity {
                     public void onClick() {
                         if (isFrist) {
                             prepareQueue();
-                        }else{
+                        } else {
                             showStudentTestDialog();
                         }
                     }
@@ -578,9 +578,11 @@ public class EyeTestActivity extends BaseActivity {
             mRightEye = eyeResult;
             speak("测试完成");
             boolean help = PreferencesUtils.getBoolean(EyeConfig.EYE_HELP_SETTING_KEY, true);
-            if (help){
+            //判断是否是最后一个人
+            boolean isHaveLastStuent = (currentIndex < mStudentList.size());
+            if (help && isHaveLastStuent) {
                 showBeforeDialog(false);
-            }else {
+            } else {
                 showStudentTestDialog();
             }
         } else {//左眼训练
@@ -634,12 +636,14 @@ public class EyeTestActivity extends BaseActivity {
                         }
                     });
         }
+        boolean isLastStuent=(currentIndex==mStudentList.size()-1);
         mAfterTestDialog = new AfterTestDialog.Builder(EyeTestActivity.this, R.style.style_common_dialog)
                 .setLeftEye("" + mLeftEye)
                 .setRightEye("" + mRightEye)
                 .setUserName("" + measureStudent.getRealname())
                 .setShowContinueText(isShow)
                 .setNextName(nextName)
+                .setFinishTv(isLastStuent?"完成":"结束测试")
                 .setTrainTime(new Date())
                 .setOnLittleHelperListener(new AfterTestDialog.AfterTestListener() {
                     @Override
@@ -726,22 +730,22 @@ public class EyeTestActivity extends BaseActivity {
         return Double.parseDouble(levelByIndex);
     }
 
-//    @Override
-//    public boolean onTouchEvent(MotionEvent event) {
-//        if(event.getAction() == MotionEvent.ACTION_DOWN){
-//            //两次点击大于1秒
-//            long currentTime = System.currentTimeMillis();
-//            if (mLastOnKeyTime > 0 && currentTime - mLastOnKeyTime < 500) {
-//                return true;
-//            }
-//            mLastOnKeyTime = currentTime;
-//            if(isKeyDwon) {
-//                userChooseError();
-//            }
-//        }
-//        return super.onTouchEvent(event);
-//
-//    }
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        if (event.getAction() == MotionEvent.ACTION_DOWN) {
+            //两次点击大于1秒
+            long currentTime = System.currentTimeMillis();
+            if (mLastOnKeyTime > 0 && currentTime - mLastOnKeyTime < 500) {
+                return true;
+            }
+            mLastOnKeyTime = currentTime;
+            if (isKeyDwon) {
+                userChooseError();
+            }
+        }
+        return super.onTouchEvent(event);
+
+    }
 
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
@@ -771,7 +775,7 @@ public class EyeTestActivity extends BaseActivity {
     @Override
     protected void onPause() {
         super.onPause();
-        if (BDttsUtils.getInstance()!=null){
+        if (BDttsUtils.getInstance() != null) {
             BDttsUtils.getInstance().pause();
         }
     }
@@ -779,7 +783,7 @@ public class EyeTestActivity extends BaseActivity {
     @Override
     protected void onResume() {
         super.onResume();
-        if (BDttsUtils.getInstance()!=null){
+        if (BDttsUtils.getInstance() != null) {
             BDttsUtils.getInstance().resume();
         }
     }
@@ -787,7 +791,7 @@ public class EyeTestActivity extends BaseActivity {
     @Override
     public void finish() {
         super.finish();
-        if (BDttsUtils.getInstance()!=null){
+        if (BDttsUtils.getInstance() != null) {
             BDttsUtils.getInstance().stop();
         }
     }

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

@@ -115,12 +115,12 @@ public class EyeTestMainActivity extends BaseActivity {
             System.exit(0);
         }
     }
-
-    @Override
-    public boolean dispatchTouchEvent(MotionEvent ev) {
-        LogUtil.e("dispatchTouchEvent:" + ev.getAction());
-        return super.dispatchTouchEvent(ev);
-    }
+//
+//    @Override
+//    public boolean dispatchTouchEvent(MotionEvent ev) {
+//        LogUtil.e("dispatchTouchEvent:" + ev.getAction());
+//        return super.dispatchTouchEvent(ev);
+//    }
 
     @OnClick({R.id.test_setting, R.id.lin_eye_test, R.id.lin_eye_test_histroy, R.id.lin_eye_test_statistics, R.id.lin_eye_test_setting})
     public void onClick(View view) {
@@ -155,7 +155,9 @@ public class EyeTestMainActivity extends BaseActivity {
     @Override
     protected void onDestroy() {
         super.onDestroy();
+        if (tExit != null) {
             tExit.cancel();
-        tExit=null;
+            tExit = null;
+        }
     }
 }

app/src/main/java/com/oo/eye/widget/AfterTestDialog.java

@@ -32,6 +32,7 @@ public class AfterTestDialog extends Dialog{
     private TextView mTestTime;
     private TextView mNextName;
     private TextView mContinueText;
+    private TextView mFinishTv;
     private LinearLayout mFinishText;
 
     private String userName;
@@ -39,6 +40,7 @@ public class AfterTestDialog extends Dialog{
     private String righteye;
     private Date mDate;
     private String nextUserName;
+    private String finishTest;
     private boolean isShowContinueText;
     private AfterTestListener myListener;
     private SimpleDateFormat mSimpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
@@ -64,6 +66,7 @@ public class AfterTestDialog extends Dialog{
         mLeftEye = (TextView) findViewById(R.id.tv_after_result_left);
         mRightEye = (TextView) findViewById(R.id.tv_after_result_right);
         mTestTime = (TextView) findViewById(R.id.tv_after_time);
+        mFinishTv= (TextView) findViewById(R.id.finish_test);
 
         mContinueText = (TextView) findViewById(R.id.tv_after_continue);
         mContinueText.setVisibility(isShowContinueText?View.VISIBLE:View.GONE);
@@ -95,6 +98,7 @@ public class AfterTestDialog extends Dialog{
         mUsername_tv.setText("姓         名："+userName);
         mLeftEye.setText(lefteye);
         mRightEye.setText(righteye);
+        mFinishTv.setText(finishTest);
         mTestTime.setText("检测时间：  "+mSimpleDateFormat.format(mDate));
     }
 
@@ -138,7 +142,10 @@ public class AfterTestDialog extends Dialog{
             mDialog.nextUserName = name;
             return this;
         }
-
+        public Builder setFinishTv(String string){
+            mDialog.finishTest = string;
+            return this;
+        }
         public Builder setOnLittleHelperListener(AfterTestListener listener) {
             mDialog.myListener = listener;
             return this;

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

@@ -20,6 +20,7 @@
             android:src="@drawable/exitwhite" />
 
         <TextView
+            android:id="@+id/finish_test"
             android:layout_gravity="center_vertical"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"