test main

app/src/main/AndroidManifest.xml

@@ -45,11 +45,6 @@
             android:screenOrientation="landscape"
             android:launchMode="singleTop"></activity>
         <activity
-            android:name="com.oo.eye.activity.BeforeEyeTestActivity"
-            android:configChanges="orientation|keyboardHidden|keyboard|navigation"
-            android:launchMode="singleTop"
-            android:screenOrientation="landscape" />
-        <activity
             android:name="com.oo.eye.activity.EyeTestActivity"
             android:configChanges="orientation|keyboardHidden|keyboard|navigation"
             android:launchMode="singleTop"

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

-package com.oo.eye.activity;
-
-import android.content.Intent;
-import android.os.Handler;
-import android.view.View;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
-
-import com.app.baselibrary.base.common.BaseActivity;
-import com.app.baselibrary.commonUtil.BDttsUtils;
-import com.oo.eye.R;
-import com.oo.eye.R2;
-
-import butterknife.BindView;
-import butterknife.OnClick;
-
-
-/**
- */
-
-public class BeforeEyeTestActivity extends BaseActivity {
-
-    @BindView(R.id.ll_before_eye_start1)
-    RelativeLayout mLlBeforeEyeStart1;
-    @BindView(R.id.ll_before_eye_prepare1)
-    LinearLayout mLlBeforeEyePrepare1;
-
-    private Handler mHandler;
-
-    @Override
-    protected int getLayoutId() {
-        return R.layout.activity_before_eye_test;
-    }
-
-    @Override
-    protected void init() {
-        mHandler = new Handler();
-    }
-
-
-    @OnClick(R2.id.tv_eye_test_start1)
-    public void click(View view) {
-        mLlBeforeEyeStart1.setVisibility(View.GONE);
-        mLlBeforeEyePrepare1.setVisibility(View.VISIBLE);
-		Intent intent2 = new Intent(BeforeEyeTestActivity.this,EyeTestActivity.class);
-        intent2.putExtra("isTemporary",getIntent().getBooleanExtra("isTemporary",false));
-		startActivity(intent2);
-		finish();
-    }
-
-    private void speak(String text) {
-        BDttsUtils.getInstance().speak(text);
-    }
-
-
-}

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

@@ -26,6 +26,7 @@ import com.oo.eye.bean.StudentBean;
 import com.oo.eye.db.DbManager;
 import com.oo.eye.net.EyeDataManager;
 import com.oo.eye.widget.AfterTestDialog;
+import com.oo.eye.widget.BeforeTestDialog;
 import com.oo.seex.netlibrary.net.response.OldResponseImpl;
 import com.oo.seex.netlibrary.net.response.RxCallback;
 
@@ -118,6 +119,7 @@ public class EyeTestActivity extends BaseActivity {
     private AfterTestDialog mAfterTestDialog;
 
     private boolean isTemporary;
+    private BeforeTestDialog mBeforeTestDialog;
 
     @Override
     protected int getLayoutId() {
@@ -126,8 +128,23 @@ public class EyeTestActivity extends BaseActivity {
 
     @Override
     protected void init() {
+        showBeforeDialog(true);
         initialize();
-        prepareQueue();
+    }
+
+    private void showBeforeDialog(final boolean isFrist) {
+        mBeforeTestDialog = new BeforeTestDialog.Builder(EyeTestActivity.this, R.style.style_common_dialog)
+                .setOnClickListener(new BeforeTestDialog.BeforeTestListener() {
+                    @Override
+                    public void onClick() {
+                        if (isFrist) {
+                            prepareQueue();
+                        }else{
+                            showStudentTestDialog();
+                        }
+                    }
+                }).create();
+        mBeforeTestDialog.show();
     }
 
     private void initialize() {
@@ -555,7 +572,7 @@ public class EyeTestActivity extends BaseActivity {
         if (isSecondTest) {//右眼训练
             mRightEye = eyeResult;
             speak("测试完成");
-            showStudentTestDialog();
+            showBeforeDialog(false);
         } else {//左眼训练
             mLeftEye = eyeResult;
             resetView(false);

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

@@ -142,7 +142,7 @@ public class EyeTestMainActivity extends BaseActivity {
                 student.setClassname(mSimpleDateFormat.format(new Date()));
                 list.add(student);
                 EyeConfig.getInstance().setStudents(list);
-                Intent intent = new Intent(EyeTestMainActivity.this,BeforeEyeTestActivity.class);
+                Intent intent = new Intent(EyeTestMainActivity.this,EyeTestActivity.class);
                 intent.putExtra("isTemporary",true);
                 startActivity(intent);
                 break;

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

+package com.oo.eye.widget;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.app.baselibrary.commonUtil.DensityUtil;
+import com.oo.eye.R;
+
+import java.util.Date;
+
+/**
+ * Date : 2018/9/13.
+ * Author:  cxh
+ */
+
+public class BeforeTestDialog extends Dialog {
+    private RelativeLayout mLlBeforeEyeStart1;
+    private LinearLayout mLlBeforeEyePrepare1;
+    private TextView mTextView;
+    private BeforeTestListener myListener;
+
+    public BeforeTestDialog(@NonNull Context context, int themeResId) {
+        super(context, themeResId);
+    }
+
+    public BeforeTestDialog(@NonNull Context context) {
+        super(context);
+    }
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.dialog_before_eye_test);
+        initView();
+    }
+
+    private void initView() {
+        RelativeLayout rootView = (RelativeLayout) findViewById(R.id.root_view);
+        FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(DensityUtil.getScreenWidth(), DensityUtil.getScreenHeight());
+        rootView.setLayoutParams(params);
+        mLlBeforeEyeStart1= (RelativeLayout) findViewById(R.id.ll_before_eye_start1);
+        mLlBeforeEyePrepare1= (LinearLayout) findViewById(R.id.ll_before_eye_prepare1);
+        mTextView= (TextView) findViewById(R.id.tv_eye_test_start1);
+        mTextView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if(myListener != null){
+                    myListener.onClick();
+                }
+                mLlBeforeEyeStart1.setVisibility(View.GONE);
+                mLlBeforeEyePrepare1.setVisibility(View.VISIBLE);
+                dismiss();
+            }
+        });
+    }
+    public static class Builder {
+        private BeforeTestDialog mDialog;
+
+        public Builder(Context context, int themeResId) {
+            mDialog = new BeforeTestDialog(context, themeResId);
+        }
+
+        public BeforeTestDialog.Builder setOnClickListener(BeforeTestListener listener) {
+            mDialog.myListener = listener;
+            return this;
+        }
+
+        public BeforeTestDialog create() {
+            return mDialog;
+        }
+
+    }
+    public interface BeforeTestListener {
+        void onClick();
+    }
+}

app/src/main/res/layout/activity_before_eye_test.xml → app/src/main/res/layout/dialog_before_eye_test.xml

@@ -3,6 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/line_color"
+    android:id="@+id/root_view"
     android:orientation="vertical"
     android:paddingBottom="@dimen/activity_vertical_margin"
     android:paddingLeft="@dimen/activity_horizontal_margin"