Commit e1741880 by chengxiuhong

test main

parent 976aba1f
...@@ -579,8 +579,8 @@ public class EyeTestActivity extends BaseActivity { ...@@ -579,8 +579,8 @@ public class EyeTestActivity extends BaseActivity {
speak("测试完成"); speak("测试完成");
boolean help = PreferencesUtils.getBoolean(EyeConfig.EYE_HELP_SETTING_KEY, true); boolean help = PreferencesUtils.getBoolean(EyeConfig.EYE_HELP_SETTING_KEY, true);
//判断是否是最后一个人 //判断是否是最后一个人
boolean isHaveLastStuent = (currentIndex < mStudentList.size()); boolean isLastStuent = (currentIndex == mStudentList.size() - 1);
if (help && isHaveLastStuent) { if (help && !isLastStuent) {
showBeforeDialog(false); showBeforeDialog(false);
} else { } else {
showStudentTestDialog(); showStudentTestDialog();
...@@ -636,14 +636,14 @@ public class EyeTestActivity extends BaseActivity { ...@@ -636,14 +636,14 @@ public class EyeTestActivity extends BaseActivity {
} }
}); });
} }
boolean isLastStuent=(currentIndex==mStudentList.size()-1); boolean isLastStuent = (currentIndex == mStudentList.size() - 1);
mAfterTestDialog = new AfterTestDialog.Builder(EyeTestActivity.this, R.style.style_common_dialog) mAfterTestDialog = new AfterTestDialog.Builder(EyeTestActivity.this, R.style.style_common_dialog)
.setLeftEye("" + mLeftEye) .setLeftEye("" + mLeftEye)
.setRightEye("" + mRightEye) .setRightEye("" + mRightEye)
.setUserName("" + measureStudent.getRealname()) .setUserName("" + measureStudent.getRealname())
.setShowContinueText(isShow) .setShowContinueText(isShow)
.setNextName(nextName) .setNextName(nextName)
.setFinishTv(isLastStuent?"完成":"结束测试") .setFinishTv(isLastStuent ? "完成" : "结束测试")
.setTrainTime(new Date()) .setTrainTime(new Date())
.setOnLittleHelperListener(new AfterTestDialog.AfterTestListener() { .setOnLittleHelperListener(new AfterTestDialog.AfterTestListener() {
@Override @Override
......
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