Commit 6aeb6145 by chengxiuhong

test main

parent 7894b611
...@@ -644,7 +644,7 @@ public class EyeTestActivity extends BaseActivity { ...@@ -644,7 +644,7 @@ public class EyeTestActivity extends BaseActivity {
.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
......
...@@ -40,7 +40,7 @@ public class AfterTestDialog extends Dialog{ ...@@ -40,7 +40,7 @@ public class AfterTestDialog extends Dialog{
private String righteye; private String righteye;
private Date mDate; private Date mDate;
private String nextUserName; private String nextUserName;
private String finishTest; private boolean isHaveFinish;
private boolean isShowContinueText; private boolean isShowContinueText;
private AfterTestListener myListener; private AfterTestListener myListener;
private SimpleDateFormat mSimpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); private SimpleDateFormat mSimpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
...@@ -98,7 +98,11 @@ public class AfterTestDialog extends Dialog{ ...@@ -98,7 +98,11 @@ public class AfterTestDialog extends Dialog{
mUsername_tv.setText("姓 名:"+userName); mUsername_tv.setText("姓 名:"+userName);
mLeftEye.setText(lefteye); mLeftEye.setText(lefteye);
mRightEye.setText(righteye); mRightEye.setText(righteye);
mFinishTv.setText(finishTest); if (isHaveFinish){
mFinishText.setVisibility(View.VISIBLE);
}else {
mFinishText.setVisibility(View.INVISIBLE);
}
mTestTime.setText("检测时间: "+mSimpleDateFormat.format(mDate)); mTestTime.setText("检测时间: "+mSimpleDateFormat.format(mDate));
} }
...@@ -142,8 +146,8 @@ public class AfterTestDialog extends Dialog{ ...@@ -142,8 +146,8 @@ public class AfterTestDialog extends Dialog{
mDialog.nextUserName = name; mDialog.nextUserName = name;
return this; return this;
} }
public Builder setFinishTv(String string){ public Builder setFinishTv(boolean ishave){
mDialog.finishTest = string; mDialog.isHaveFinish = ishave;
return this; return this;
} }
public Builder setOnLittleHelperListener(AfterTestListener listener) { public Builder setOnLittleHelperListener(AfterTestListener listener) {
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
<LinearLayout <LinearLayout
android:id="@+id/tv_after_finish" android:id="@+id/tv_after_finish"
android:layout_width="match_parent" android:layout_width="match_parent"
android:visibility="invisible"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="right" android:gravity="right"
android:orientation="horizontal" android:orientation="horizontal"
......
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