test main

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

@@ -220,24 +220,21 @@ public class EyeSettingActivity extends BaseActivity {
             }
         });
         //测视帮助
-        int help = PreferencesUtils.getInt(EyeConfig.EYE_HELP_SETTING_KEY, 0);
-        switch (help) {
-            case 0:
-                mCheckboxHelp.setChecked(true);
-                break;
-            case 1:
-                mCheckboxCloseHelp.setChecked(true);
-                break;
+        boolean help = PreferencesUtils.getBoolean(EyeConfig.EYE_HELP_SETTING_KEY, true);
+        if (help) {
+            mCheckboxHelp.setChecked(true);
+        } else {
+            mCheckboxCloseHelp.setChecked(true);
         }
         mGroupHelp.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(RadioGroup group, int checkedId) {
                 switch (checkedId) {
                     case R.id.checkbox_help:
-                        PreferencesUtils.putInt(EyeConfig.EYE_HELP_SETTING_KEY, 0);
+                        PreferencesUtils.putBoolean(EyeConfig.EYE_HELP_SETTING_KEY, true);
                         break;
                     case R.id.checkbox_close_help:
-                        PreferencesUtils.putInt(EyeConfig.EYE_HELP_SETTING_KEY, 1);
+                        PreferencesUtils.putBoolean(EyeConfig.EYE_HELP_SETTING_KEY, false);
                         break;
                 }
             }

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

@@ -128,7 +128,12 @@ public class EyeTestActivity extends BaseActivity {
 
     @Override
     protected void init() {
-        showBeforeDialog(true);
+        boolean help = PreferencesUtils.getBoolean(EyeConfig.EYE_HELP_SETTING_KEY, true);
+        if (help){
+            showBeforeDialog(true);
+        }else {
+            prepareQueue();
+        }
         initialize();
     }
 
@@ -572,7 +577,12 @@ public class EyeTestActivity extends BaseActivity {
         if (isSecondTest) {//右眼训练
             mRightEye = eyeResult;
             speak("测试完成");
-            showBeforeDialog(false);
+            boolean help = PreferencesUtils.getBoolean(EyeConfig.EYE_HELP_SETTING_KEY, true);
+            if (help){
+                showBeforeDialog(false);
+            }else {
+                showStudentTestDialog();
+            }
         } else {//左眼训练
             mLeftEye = eyeResult;
             resetView(false);

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

@@ -133,7 +133,7 @@ public class SinglePeopleTestActivity extends BaseActivity {
                     ArrayList<StudentBean> list = new ArrayList<>();
                     list.add(bean);
                     EyeConfig.getInstance().setStudents(list);
-                    startActivity(BeforeEyeTestActivity.class);
+                    startActivity(EyeTestActivity.class);
                 }
                 break;
         }