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
7614348f
Commit
7614348f
authored
Aug 30, 2018
by
chengxiuhong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
test main
parent
0cd68f24
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
9 additions
and
3 deletions
+9
-3
AndroidManifest.xml
app/src/main/AndroidManifest.xml
+1
-1
BeforeEyeTestActivity.java
app/src/main/java/com/oo/eye/activity/BeforeEyeTestActivity.java
+1
-2
EyeSettingActivity.java
app/src/main/java/com/oo/eye/activity/EyeSettingActivity.java
+5
-0
EyeTestActivity.java
app/src/main/java/com/oo/eye/activity/EyeTestActivity.java
+0
-0
EyeTestActivityF.java
app/src/main/java/com/oo/eye/activity/EyeTestActivityF.java
+0
-0
activity_eye_setting.xml
app/src/main/res/layout/activity_eye_setting.xml
+2
-0
No files found.
app/src/main/AndroidManifest.xml
View file @
7614348f
...
...
@@ -41,7 +41,7 @@
android:name=
"com.oo.eye.activity.BeforeEyeTestActivity"
android:screenOrientation=
"landscape"
/>
<activity
android:name=
"com.oo.eye.activity.EyeTestActivity
F
"
android:name=
"com.oo.eye.activity.EyeTestActivity"
android:screenOrientation=
"landscape"
/>
<activity
android:name=
"com.oo.eye.activity.AfterEyeTestActivity"
...
...
app/src/main/java/com/oo/eye/activity/BeforeEyeTestActivity.java
View file @
7614348f
...
...
@@ -17,7 +17,6 @@ import com.app.baselibrary.commonUtil.NibiruUtils;
import
com.oo.eye.R
;
import
com.oo.eye.R2
;
import
com.oo.eye.manager.DaemonSender
;
import
com.oo.eye.manager.OOMsg
;
import
butterknife.BindView
;
import
butterknife.ButterKnife
;
...
...
@@ -78,7 +77,7 @@ public class BeforeEyeTestActivity extends BaseActivity {
mLlBeforeEyePrepare1
.
setVisibility
(
View
.
VISIBLE
);
speak
(
"调节测视距离,请等待"
);
// DaemonSender.startEyeTestMotor(this);
Intent
intent2
=
new
Intent
(
BeforeEyeTestActivity
.
this
,
EyeTestActivity
F
.
class
);
Intent
intent2
=
new
Intent
(
BeforeEyeTestActivity
.
this
,
EyeTestActivity
.
class
);
startActivity
(
intent2
);
finish
();
}
...
...
app/src/main/java/com/oo/eye/activity/EyeSettingActivity.java
View file @
7614348f
package
com
.
oo
.
eye
.
activity
;
import
android.os.Bundle
;
import
android.view.View
;
import
android.widget.RadioButton
;
import
android.widget.RadioGroup
;
import
android.widget.RelativeLayout
;
import
com.app.baselibrary.base.common.BaseActivity
;
import
com.app.baselibrary.commonUtil.PreferencesUtils
;
...
...
@@ -34,6 +36,8 @@ public class EyeSettingActivity extends BaseActivity {
RadioGroup
mGroupReport
;
@BindView
(
R
.
id
.
group_help
)
RadioGroup
mGroupHelp
;
@BindView
(
R
.
id
.
about_lay_show
)
RelativeLayout
mAboutLayShow
;
private
int
selectId
;
...
...
@@ -76,5 +80,6 @@ public class EyeSettingActivity extends BaseActivity {
@OnClick
(
R
.
id
.
about_lay
)
public
void
onClick
()
{
mAboutLayShow
.
setVisibility
(
View
.
VISIBLE
);
}
}
app/src/main/java/com/oo/eye/activity/EyeTestActivity.java
View file @
7614348f
This diff is collapsed.
Click to expand it.
app/src/main/java/com/oo/eye/activity/EyeTestActivityF.java
deleted
100644 → 0
View file @
0cd68f24
This diff is collapsed.
Click to expand it.
app/src/main/res/layout/activity_eye_setting.xml
View file @
7614348f
...
...
@@ -447,6 +447,8 @@
</RelativeLayout>
<RelativeLayout
android:visibility=
"invisible"
android:id=
"@+id/about_lay_show"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:background=
"#e0000000"
>
...
...
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