Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
haihang
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
徐丛奇
haihang
Commits
8076c5f7
Commit
8076c5f7
authored
Sep 12, 2018
by
chengxiuhong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
test main
parent
f9a1cad3
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
57 additions
and
47 deletions
+57
-47
EyeTestActivity.java
app/src/main/java/com/oo/eye/activity/EyeTestActivity.java
+1
-0
AfterTestDialog.java
app/src/main/java/com/oo/eye/widget/AfterTestDialog.java
+3
-2
exitwhite.png
app/src/main/res/drawable-xhdpi/exitwhite.png
+0
-0
dialog_after_eye_test.xml
app/src/main/res/layout/dialog_after_eye_test.xml
+53
-45
No files found.
app/src/main/java/com/oo/eye/activity/EyeTestActivity.java
View file @
8076c5f7
...
@@ -620,6 +620,7 @@ public class EyeTestActivity extends BaseActivity {
...
@@ -620,6 +620,7 @@ public class EyeTestActivity extends BaseActivity {
@Override
@Override
public
void
onContinue
()
{
public
void
onContinue
()
{
//现显示提示界面
prepareStudentTest
(
next
);
prepareStudentTest
(
next
);
}
}
}).
create
();
}).
create
();
...
...
app/src/main/java/com/oo/eye/widget/AfterTestDialog.java
View file @
8076c5f7
...
@@ -5,6 +5,7 @@ import android.content.Context;
...
@@ -5,6 +5,7 @@ import android.content.Context;
import
android.os.Bundle
;
import
android.os.Bundle
;
import
android.view.View
;
import
android.view.View
;
import
android.widget.FrameLayout
;
import
android.widget.FrameLayout
;
import
android.widget.LinearLayout
;
import
android.widget.RelativeLayout
;
import
android.widget.RelativeLayout
;
import
android.widget.TextView
;
import
android.widget.TextView
;
...
@@ -31,7 +32,7 @@ public class AfterTestDialog extends Dialog{
...
@@ -31,7 +32,7 @@ public class AfterTestDialog extends Dialog{
private
TextView
mTestTime
;
private
TextView
mTestTime
;
private
TextView
mNextName
;
private
TextView
mNextName
;
private
TextView
mContinueText
;
private
TextView
mContinueText
;
private
TextView
mFinishText
;
private
LinearLayout
mFinishText
;
private
String
userName
;
private
String
userName
;
private
String
lefteye
;
private
String
lefteye
;
...
@@ -75,7 +76,7 @@ public class AfterTestDialog extends Dialog{
...
@@ -75,7 +76,7 @@ public class AfterTestDialog extends Dialog{
dismiss
();
dismiss
();
}
}
});
});
mFinishText
=
(
TextView
)
findViewById
(
R
.
id
.
tv_after_finish
);
mFinishText
=
(
LinearLayout
)
findViewById
(
R
.
id
.
tv_after_finish
);
mFinishText
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
mFinishText
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
@Override
@Override
public
void
onClick
(
View
v
)
{
public
void
onClick
(
View
v
)
{
...
...
app/src/main/res/drawable-xhdpi/exitwhite.png
0 → 100644
View file @
8076c5f7
406 Bytes
app/src/main/res/layout/dialog_after_eye_test.xml
View file @
8076c5f7
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<RelativeLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:id=
"@+id/root_view"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
android:id=
"@+id/root_view"
android:background=
"@color/line_color"
>
android:background=
"@color/line_color"
>
<LinearLayout
android:id=
"@+id/tv_after_finish"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:gravity=
"right"
android:orientation=
"horizontal"
android:padding=
"@dimen/dp_12"
>
<ImageView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:src=
"@drawable/exitwhite"
/>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_6"
android:text=
"结束测试"
android:textColor=
"@color/white"
android:textSize=
"@dimen/sp_18"
/>
</LinearLayout>
<RelativeLayout
<RelativeLayout
android:id=
"@+id/main_lay"
android:id=
"@+id/main_lay"
...
@@ -51,35 +72,38 @@
...
@@ -51,35 +72,38 @@
android:text=
"检测结果: 左眼-"
android:text=
"检测结果: 左眼-"
android:textColor=
"@color/text_color"
android:textColor=
"@color/text_color"
android:textSize=
"16dp"
/>
android:textSize=
"16dp"
/>
<TextView
<TextView
android:layout_marginLeft=
"@dimen/dp_5"
android:id=
"@+id/tv_after_result_left"
android:id=
"@+id/tv_after_result_left"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_5"
android:layout_marginTop=
"@dimen/dp_8"
android:layout_marginTop=
"@dimen/dp_8"
android:gravity=
"center"
android:gravity=
"center"
android:textStyle=
"bold"
android:textColor=
"@color/text_color"
android:textColor=
"@color/text_color"
android:textSize=
"@dimen/sp_28"
/>
android:textSize=
"@dimen/sp_28"
android:textStyle=
"bold"
/>
<TextView
<TextView
android:layout_marginLeft=
"@dimen/dp_20"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_20"
android:layout_marginTop=
"@dimen/dp_8"
android:layout_marginTop=
"@dimen/dp_8"
android:gravity=
"center"
android:gravity=
"center"
android:text=
"右眼-"
android:text=
"右眼-"
android:textColor=
"@color/text_color"
android:textColor=
"@color/text_color"
android:textSize=
"16dp"
/>
android:textSize=
"16dp"
/>
<TextView
<TextView
android:layout_marginLeft=
"@dimen/dp_5"
android:id=
"@+id/tv_after_result_right"
android:id=
"@+id/tv_after_result_right"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_5"
android:layout_marginTop=
"@dimen/dp_8"
android:layout_marginTop=
"@dimen/dp_8"
android:gravity=
"center"
android:gravity=
"center"
android:textStyle=
"bold"
android:textColor=
"@color/text_color"
android:textColor=
"@color/text_color"
android:textSize=
"@dimen/sp_28"
/>
android:textSize=
"@dimen/sp_28"
android:textStyle=
"bold"
/>
</LinearLayout>
</LinearLayout>
<TextView
<TextView
...
@@ -93,54 +117,37 @@
...
@@ -93,54 +117,37 @@
android:textColor=
"@color/text_color"
android:textColor=
"@color/text_color"
android:textSize=
"16dp"
/>
android:textSize=
"16dp"
/>
<LinearLayout
android:layout_width=
"wrap_content"
<TextView
android:layout_height=
"wrap_content"
android:id=
"@+id/tv_after_continue"
android:layout_width=
"120dip"
android:layout_height=
"@dimen/dp_40"
android:layout_below=
"@+id/tv_after_time"
android:layout_below=
"@+id/tv_after_time"
android:layout_centerHorizontal=
"true"
android:layout_centerHorizontal=
"true"
android:gravity=
"center_horizontal"
android:layout_marginLeft=
"@dimen/dp_30"
android:layout_marginTop=
"25dp"
>
android:layout_marginTop=
"25dp"
<TextView
android:background=
"@drawable/after_btn_bg"
android:id=
"@+id/tv_after_continue"
android:clickable=
"true"
android:layout_width=
"120dip"
android:focusable=
"true"
android:layout_height=
"@dimen/dp_40"
android:focusableInTouchMode=
"true"
android:layout_marginLeft=
"@dimen/dp_30"
android:gravity=
"center"
android:background=
"@drawable/after_btn_bg"
android:text=
"完成"
android:clickable=
"true"
android:textColor=
"@color/white"
android:focusable=
"true"
android:textSize=
"15dp"
/>
android:focusableInTouchMode=
"true"
android:gravity=
"center"
android:text=
"继续测试"
android:textColor=
"@color/white"
android:textSize=
"15dp"
/>
<TextView
android:id=
"@+id/tv_after_finish"
android:layout_width=
"120dip"
android:layout_height=
"@dimen/dp_40"
android:layout_marginLeft=
"30dp"
android:layout_marginRight=
"30dp"
android:background=
"@drawable/after_btn_bg"
android:clickable=
"true"
android:focusable=
"true"
android:focusableInTouchMode=
"true"
android:gravity=
"center"
android:text=
"完成"
android:textColor=
"@color/white"
android:textSize=
"15dp"
/>
</LinearLayout>
</RelativeLayout>
</RelativeLayout>
<TextView
<TextView
android:layout_centerHorizontal=
"true"
android:layout_below=
"@+id/main_lay"
android:visibility=
"invisible"
android:id=
"@+id/tv_nest_name"
android:id=
"@+id/tv_nest_name"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_below=
"@+id/main_lay"
android:layout_centerHorizontal=
"true"
android:layout_marginLeft=
"@dimen/dp_30"
android:layout_marginLeft=
"@dimen/dp_30"
android:layout_marginTop=
"@dimen/dp_20"
android:layout_marginTop=
"@dimen/dp_20"
android:gravity=
"center"
android:gravity=
"center"
android:text=
"下一位: 游客11"
android:text=
"下一位: 游客11"
android:textColor=
"@color/white"
android:textColor=
"@color/white"
android:textSize=
"18dp"
/>
android:textSize=
"18dp"
android:visibility=
"invisible"
/>
</RelativeLayout>
</RelativeLayout>
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment