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
5e3c0272
Commit
5e3c0272
authored
Aug 31, 2018
by
chengxiuhong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
test main
parent
97c0c4b0
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
208 additions
and
16 deletions
+208
-16
misc.xml
.idea/misc.xml
+1
-4
modules.xml
.idea/modules.xml
+1
-2
AfterTestDialog.java
app/src/main/java/com/oo/eye/widget/AfterTestDialog.java
+134
-0
activity_morepeople.xml
app/src/main/res/layout/activity_morepeople.xml
+2
-2
activity_testresult.xml
app/src/main/res/layout/activity_testresult.xml
+24
-3
dialog_after_eye_test.xml
app/src/main/res/layout/dialog_after_eye_test.xml
+37
-5
styles.xml
app/src/main/res/values/styles.xml
+9
-0
No files found.
.idea/misc.xml
View file @
5e3c0272
<?xml version="1.0" encoding="UTF-8"?>
<project
version=
"4"
>
<component
name=
"EntryPointsManager"
>
<entry_points
version=
"2.0"
/>
</component>
<component
name=
"NullableNotNullManager"
>
<option
name=
"myDefaultNullable"
value=
"android.support.annotation.Nullable"
/>
<option
name=
"myDefaultNotNull"
value=
"android.support.annotation.NonNull"
/>
...
...
@@ -43,7 +40,7 @@
</profile-state>
</entry>
</component>
<component
name=
"ProjectRootManager"
version=
"2"
languageLevel=
"JDK_1_7"
default=
"true"
assert-keyword=
"true"
jdk-15=
"true"
project-jdk-name=
"1.8
"
project-jdk-type=
"JavaSDK"
>
<component
name=
"ProjectRootManager"
version=
"2"
languageLevel=
"JDK_1_7"
default=
"true"
project-jdk-name=
"1.8 (6)
"
project-jdk-type=
"JavaSDK"
>
<output
url=
"file://$PROJECT_DIR$/build/classes"
/>
</component>
<component
name=
"ProjectType"
>
...
...
.idea/modules.xml
View file @
5e3c0272
...
...
@@ -4,8 +4,7 @@
<modules>
<module
fileurl=
"file://$PROJECT_DIR$/app/app.iml"
filepath=
"$PROJECT_DIR$/app/app.iml"
/>
<module
fileurl=
"file://$PROJECT_DIR$/library/baselibrary/baselibrary.iml"
filepath=
"$PROJECT_DIR$/library/baselibrary/baselibrary.iml"
/>
<module
fileurl=
"file://$PROJECT_DIR$/eye_haihang.iml"
filepath=
"$PROJECT_DIR$/eye_haihang.iml"
/>
<module
fileurl=
"file://G:/workspace_ooyby/haihang/eye_haihang.iml"
filepath=
"G:/workspace_ooyby/haihang/eye_haihang.iml"
/>
<module
fileurl=
"file://G:\workspace_ooyby\haihang\eye_haihang.iml"
filepath=
"G:\workspace_ooyby\haihang\eye_haihang.iml"
/>
<module
fileurl=
"file://$PROJECT_DIR$/.idea/haihang.iml"
filepath=
"$PROJECT_DIR$/.idea/haihang.iml"
/>
<module
fileurl=
"file://$PROJECT_DIR$/library/library.iml"
filepath=
"$PROJECT_DIR$/library/library.iml"
/>
<module
fileurl=
"file://$PROJECT_DIR$/library/netlibrary/netlibrary.iml"
filepath=
"$PROJECT_DIR$/library/netlibrary/netlibrary.iml"
/>
...
...
app/src/main/java/com/oo/eye/widget/AfterTestDialog.java
0 → 100644
View file @
5e3c0272
package
com
.
oo
.
eye
.
widget
;
import
android.app.Dialog
;
import
android.content.Context
;
import
android.os.Bundle
;
import
android.view.View
;
import
android.view.WindowManager
;
import
android.widget.ListView
;
import
android.widget.TextView
;
import
com.facebook.drawee.view.SimpleDraweeView
;
import
com.oo.eye.R
;
/**
* Date : 2018/5/2.
* Author: cxh
* 测试完成后
*/
public
class
AfterTestDialog
extends
Dialog
implements
View
.
OnClickListener
{
private
SimpleDraweeView
mHead_iv
;
private
TextView
mUsername_tv
;
private
TextView
mLeftEye
;
private
TextView
mRightEye
;
private
TextView
mTestTime
;
private
TextView
mNextName
;
private
static
TextView
mPlan_start_train
;
private
TextView
mStart_train_later
;
private
TextView
mGiveUp2
;
private
String
userName
;
private
String
lefteye
;
private
String
righteye
;
private
String
trainTime
;
private
AfterTestListener
myListener
;
public
AfterTestDialog
(
Context
context
,
int
themeResId
)
{
super
(
context
,
themeResId
);
}
@Override
protected
void
onCreate
(
Bundle
savedInstanceState
)
{
super
.
onCreate
(
savedInstanceState
);
getWindow
().
setType
(
WindowManager
.
LayoutParams
.
TYPE_SYSTEM_OVERLAY
);
setContentView
(
R
.
layout
.
dialog_after_eye_test
);
initView
();
setClickListener
();
}
private
void
initView
()
{
mUsername_tv
=
(
TextView
)
findViewById
(
R
.
id
.
tv_after_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
);
mPlan_start_train
=
(
TextView
)
findViewById
(
R
.
id
.
tv_after_save
);
mStart_train_later
=
(
TextView
)
findViewById
(
R
.
id
.
tv_after_give_up
);
mGiveUp2
=
(
TextView
)
findViewById
(
R
.
id
.
tv_after_give2
);
mUsername_tv
.
setText
(
userName
);
mLeftEye
.
setText
(
lefteye
);
mRightEye
.
setText
(
righteye
);
mTestTime
.
setText
(
trainTime
);
}
private
void
setClickListener
()
{
mPlan_start_train
.
setOnClickListener
(
this
);
mStart_train_later
.
setOnClickListener
(
this
);
}
@Override
public
void
onClick
(
View
v
)
{
//继续测试
if
(
v
.
getId
()
==
R
.
id
.
tv_after_save
)
{
if
(
myListener
!=
null
)
{
myListener
.
onAfterTestListener
(
v
);
dismiss
();
}
}
else
{
dismiss
();
}
}
public
interface
AfterTestListener
{
void
onAfterTestListener
(
View
view
);
}
public
static
class
Builder
{
private
AfterTestDialog
mDialog
;
public
Builder
(
Context
context
,
int
themeResId
)
{
mDialog
=
new
AfterTestDialog
(
context
,
themeResId
);
}
public
Builder
setUserName
(
String
userName
)
{
mDialog
.
userName
=
userName
;
return
this
;
}
public
Builder
setLeftEye
(
String
trainPlan
)
{
mDialog
.
lefteye
=
trainPlan
;
return
this
;
}
public
Builder
setRightEye
(
String
trainCount
)
{
mDialog
.
righteye
=
trainCount
;
return
this
;
}
public
Builder
setTrainTime
(
String
trainTime
)
{
mDialog
.
trainTime
=
trainTime
;
return
this
;
}
public
Builder
setOnLittleHelperListener
(
AfterTestListener
listener
)
{
mDialog
.
myListener
=
listener
;
return
this
;
}
public
AfterTestDialog
create
()
{
return
mDialog
;
}
}
public
static
TextView
getCountDownTtext
()
{
return
mPlan_start_train
;
}
}
app/src/main/res/layout/activity_morepeople.xml
View file @
5e3c0272
...
...
@@ -46,7 +46,7 @@
<LinearLayout
android:id=
"@+id/selete1_lay"
android:layout_marginLeft=
"@dimen/dp_
18
"
android:layout_marginLeft=
"@dimen/dp_
20
"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:orientation=
"horizontal"
>
...
...
@@ -67,7 +67,7 @@
</LinearLayout>
<ImageView
android:layout_marginLeft=
"@dimen/dp_
16
"
android:layout_marginLeft=
"@dimen/dp_
20
"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:src=
"@drawable/search"
/>
...
...
app/src/main/res/layout/activity_testresult.xml
View file @
5e3c0272
...
...
@@ -33,9 +33,30 @@
android:layout_marginTop=
"@dimen/dp_70"
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
<LinearLayout
android:id=
"@+id/selete_area_lay"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:orientation=
"horizontal"
>
<TextView
android:id=
"@+id/selete_area_tv"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"黄冈校区22323"
android:textColor=
"@color/white"
android:textSize=
"@dimen/sp_18"
/>
<ImageView
android:id=
"@+id/selete_area_iv"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_6"
android:src=
"@drawable/more"
/>
</LinearLayout>
<LinearLayout
android:id=
"@+id/selete_lay"
android:layout_marginLeft=
"@dimen/dp_20"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:orientation=
"horizontal"
>
...
...
@@ -60,7 +81,7 @@
android:id=
"@+id/selete1_lay"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_
18
"
android:layout_marginLeft=
"@dimen/dp_
20
"
android:orientation=
"horizontal"
>
<TextView
...
...
@@ -83,7 +104,7 @@
android:id=
"@+id/selete2_lay"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_
18
"
android:layout_marginLeft=
"@dimen/dp_
20
"
android:orientation=
"horizontal"
>
<ImageView
...
...
@@ -107,7 +128,7 @@
<ImageView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_
16
"
android:layout_marginLeft=
"@dimen/dp_
20
"
android:src=
"@drawable/search"
/>
<LinearLayout
...
...
app/src/main/res/layout/
activity
_after_eye_test.xml
→
app/src/main/res/layout/
dialog
_after_eye_test.xml
View file @
5e3c0272
...
...
@@ -10,7 +10,8 @@
<RelativeLayout
android:layout_width=
"346dp"
android:id=
"@+id/main_lay"
android:layout_width=
"400dp"
android:layout_height=
"wrap_content"
android:layout_centerHorizontal=
"true"
android:layout_centerVertical=
"true"
...
...
@@ -33,7 +34,7 @@
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_below=
"@+id/tv_after_title"
android:layout_marginLeft=
"@dimen/dp_
22
"
android:layout_marginLeft=
"@dimen/dp_
30
"
android:layout_marginTop=
"@dimen/dp_22"
android:gravity=
"center"
android:text=
"姓 名: 游客11"
...
...
@@ -45,7 +46,7 @@
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_below=
"@+id/tv_after_name"
android:layout_marginLeft=
"@dimen/dp_
22
"
android:layout_marginLeft=
"@dimen/dp_
30
"
android:orientation=
"horizontal"
>
<TextView
...
...
@@ -94,7 +95,7 @@
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_below=
"@+id/test_result_lay"
android:layout_marginLeft=
"@dimen/dp_
22
"
android:layout_marginLeft=
"@dimen/dp_
30
"
android:layout_marginTop=
"@dimen/dp_8"
android:gravity=
"center"
android:text=
"检测时间: 2018-09-09 13:21:55"
...
...
@@ -106,7 +107,7 @@
android:layout_width=
"120dip"
android:layout_height=
"@dimen/dp_40"
android:layout_below=
"@+id/tv_after_time"
android:layout_marginLeft=
"@dimen/dp_
22
"
android:layout_marginLeft=
"@dimen/dp_
30
"
android:layout_marginTop=
"25dp"
android:background=
"@drawable/after_btn_bg"
android:clickable=
"true"
...
...
@@ -133,5 +134,35 @@
android:text=
"完成"
android:textColor=
"@color/white"
android:textSize=
"15dp"
/>
<TextView
android:id=
"@+id/tv_after_give2"
android:layout_width=
"120dip"
android:layout_height=
"@dimen/dp_40"
android:layout_below=
"@+id/tv_after_time"
android:visibility=
"gone"
android:layout_marginLeft=
"30dp"
android:layout_marginTop=
"25dp"
android:layout_centerHorizontal=
"true"
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"
/>
</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
app/src/main/res/values/styles.xml
View file @
5e3c0272
...
...
@@ -12,4 +12,12 @@
<item
name=
"android:listDivider"
>
@color/transparent
</item>
<item
name=
"android:windowBackground"
>
@android:color/transparent
</item>
</style>
<!--common dialog style-->
<style
name=
"style_common_dialog"
>
<item
name=
"android:windowFrame"
>
@null
</item>
<item
name=
"android:windowNoTitle"
>
true
</item>
<item
name=
"android:windowBackground"
>
@color/transparent
</item>
<item
name=
"android:windowIsFloating"
>
true
</item>
<item
name=
"android:windowContentOverlay"
>
@null
</item>
</style>
</resources>
\ 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