nnnn

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

@@ -9,6 +9,7 @@ import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import com.app.baselibrary.base.app.AppManager;
 import com.app.baselibrary.base.common.BaseActivity;
 import com.app.baselibrary.commonUtil.BDttsUtils;
 import com.app.baselibrary.commonUtil.CheckUtil;
@@ -123,6 +124,8 @@ public class EyeTestActivity extends BaseActivity {
         if (null != mStudentList && mStudentList.size() > 0) {
             prepareStudentTest(0);
         } else {
+            AppManager.getInstance().killOtherActivity(EyeTestMainActivity.class);
+            startActivity(EyeTestMainActivity.class);
             finish();
         }
     }
@@ -509,6 +512,8 @@ public class EyeTestActivity extends BaseActivity {
                 .setOnLittleHelperListener(new AfterTestDialog.AfterTestListener() {
                     @Override
                     public void onFinish() {
+                        AppManager.getInstance().killOtherActivity(EyeTestMainActivity.class);
+                        startActivity(EyeTestMainActivity.class);
                         finish();
                     }
 
@@ -604,6 +609,8 @@ public class EyeTestActivity extends BaseActivity {
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         if (keyCode == KeyEvent.KEYCODE_BACK) {
+            AppManager.getInstance().killOtherActivity(EyeTestMainActivity.class);
+            startActivity(EyeTestMainActivity.class);
             finish();
             return true;
         }

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

@@ -4,9 +4,12 @@ import android.app.Dialog;
 import android.content.Context;
 import android.os.Bundle;
 import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.app.baselibrary.commonUtil.CheckUtil;
+import com.app.baselibrary.commonUtil.DensityUtil;
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.oo.eye.R;
 
@@ -44,7 +47,6 @@ public class AfterTestDialog extends Dialog{
 
     }
 
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -52,13 +54,15 @@ public class AfterTestDialog extends Dialog{
         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);
         mUsername_tv = (TextView) findViewById(R.id.tv_after_name);
-        mNextName= (TextView) findViewById(R.id.tv_nest_name);
+        mNextName = (TextView) findViewById(R.id.tv_nest_name);
         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_value);
+        mTestTime = (TextView) findViewById(R.id.tv_after_time);
 
         mContinueText = (TextView) findViewById(R.id.tv_after_continue);
         mContinueText.setVisibility(isShowContinueText?View.VISIBLE:View.GONE);
@@ -90,26 +94,13 @@ public class AfterTestDialog extends Dialog{
         mUsername_tv.setText("姓         名："+userName);
         mLeftEye.setText(lefteye);
         mRightEye.setText(righteye);
-        mTestTime.setText(mSimpleDateFormat.format(mDate));
+        mTestTime.setText("检测时间：  "+mSimpleDateFormat.format(mDate));
     }
 
-//    @Override
-//    public void show() {
-//        super.show();
-//        /**
-//         * 设置宽度全屏，要设置在show的后面
-//         */
-//        WindowManager.LayoutParams layoutParams = getWindow().getAttributes();
-//        layoutParams.gravity = Gravity.BOTTOM;
-//        layoutParams.width = ViewGroup.LayoutParams.MATCH_PARENT;
-//        layoutParams.height = ViewGroup.LayoutParams.WRAP_CONTENT;
-//        getWindow().getDecorView().setPadding(0, 0, 0, 0);
-//        getWindow().setAttributes(layoutParams);
-//    }
 
     public interface AfterTestListener {
-        public void onFinish();
-        public void onContinue();
+         void onFinish();
+         void onContinue();
     }
 
     public static class Builder {

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

 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="600dp"
-    android:layout_height="400dp"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:id="@+id/root_view"
     android:background="@color/line_color">
-    <LinearLayout
+
+
+    <RelativeLayout
         android:id="@+id/main_lay"
-        android:layout_width="wrap_content"
+        android:layout_width="400dp"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
         android:background="@color/white"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:padding="@dimen/dp_30">
 
         <TextView
             android:id="@+id/tv_after_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="@dimen/dp_20"
+            android:layout_centerHorizontal="true"
             android:text="视力检测报告单"
             android:textColor="@color/text_color"
             android:textSize="@dimen/sp_24" />
@@ -25,6 +28,7 @@
             android:id="@+id/tv_after_name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_below="@+id/tv_after_title"
             android:layout_marginLeft="@dimen/dp_30"
             android:layout_marginTop="@dimen/dp_22"
             android:gravity="center"
@@ -35,8 +39,8 @@
             android:id="@+id/test_result_lay"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_below="@+id/tv_after_name"
             android:layout_marginLeft="@dimen/dp_30"
-            android:layout_marginRight="@dimen/dp_30"
             android:orientation="horizontal">
 
             <TextView
@@ -78,34 +82,22 @@
                 android:textSize="@dimen/sp_28" />
         </LinearLayout>
 
-        <LinearLayout
+        <TextView
+            android:id="@+id/tv_after_time"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_below="@+id/test_result_lay"
             android:layout_marginLeft="@dimen/dp_30"
-            android:layout_marginTop="@dimen/dp_8">
-            <TextView
-                android:id="@+id/tv_after_time"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:text="检测时间："
-                android:textColor="@color/text_color"
-                android:textSize="16dp" />
+            android:layout_marginTop="@dimen/dp_8"
+            android:gravity="center"
+            android:textColor="@color/text_color"
+            android:textSize="16dp" />
 
-            <TextView
-                android:id="@+id/tv_after_time_value"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/dp_20"
-                android:gravity="center"
-                android:textColor="@color/text_color"
-                android:textSize="16dp" />
-        </LinearLayout>
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:orientation="horizontal"
+            android:layout_below="@+id/tv_after_time"
+            android:gravity="center_horizontal"
             android:layout_marginTop="25dp">
             <TextView
                 android:id="@+id/tv_after_continue"
@@ -119,8 +111,7 @@
                 android:gravity="center"
                 android:text="继续测试"
                 android:textColor="@color/white"
-                android:textSize="15dp"
-                android:visibility="gone"/>
+                android:textSize="15dp" />
 
             <TextView
                 android:id="@+id/tv_after_finish"
@@ -137,17 +128,18 @@
                 android:textColor="@color/white"
                 android:textSize="15dp" />
         </LinearLayout>
-        <TextView
-            android:layout_gravity="center_horizontal"
-            android:id="@+id/tv_nest_name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:gravity="center"
-            android:textColor="@color/text_color"
-            android:textSize="18dp" />
-        <View
-            android:layout_width="wrap_content"
-            android:layout_height="20dp"/>
-    </LinearLayout>
+    </RelativeLayout>
+    <TextView
+        android:layout_centerHorizontal="true"
+        android:layout_below="@+id/main_lay"
+        android:visibility="invisible"
+        android:id="@+id/tv_nest_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/dp_30"
+        android:layout_marginTop="@dimen/dp_20"
+        android:gravity="center"
+        android:text="下一位：  游客11"
+        android:textColor="@color/white"
+        android:textSize="18dp" />
 </RelativeLayout>
\ No newline at end of file