Commit 7614348f by chengxiuhong

test main

parent 0cd68f24
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
android:name="com.oo.eye.activity.BeforeEyeTestActivity" android:name="com.oo.eye.activity.BeforeEyeTestActivity"
android:screenOrientation="landscape" /> android:screenOrientation="landscape" />
<activity <activity
android:name="com.oo.eye.activity.EyeTestActivityF" android:name="com.oo.eye.activity.EyeTestActivity"
android:screenOrientation="landscape" /> android:screenOrientation="landscape" />
<activity <activity
android:name="com.oo.eye.activity.AfterEyeTestActivity" android:name="com.oo.eye.activity.AfterEyeTestActivity"
......
...@@ -17,7 +17,6 @@ import com.app.baselibrary.commonUtil.NibiruUtils; ...@@ -17,7 +17,6 @@ import com.app.baselibrary.commonUtil.NibiruUtils;
import com.oo.eye.R; import com.oo.eye.R;
import com.oo.eye.R2; import com.oo.eye.R2;
import com.oo.eye.manager.DaemonSender; import com.oo.eye.manager.DaemonSender;
import com.oo.eye.manager.OOMsg;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
...@@ -78,7 +77,7 @@ public class BeforeEyeTestActivity extends BaseActivity { ...@@ -78,7 +77,7 @@ public class BeforeEyeTestActivity extends BaseActivity {
mLlBeforeEyePrepare1.setVisibility(View.VISIBLE); mLlBeforeEyePrepare1.setVisibility(View.VISIBLE);
speak("调节测视距离,请等待"); speak("调节测视距离,请等待");
// DaemonSender.startEyeTestMotor(this); // DaemonSender.startEyeTestMotor(this);
Intent intent2 = new Intent(BeforeEyeTestActivity.this,EyeTestActivityF.class); Intent intent2 = new Intent(BeforeEyeTestActivity.this,EyeTestActivity.class);
startActivity(intent2); startActivity(intent2);
finish(); finish();
} }
......
package com.oo.eye.activity; package com.oo.eye.activity;
import android.os.Bundle; import android.os.Bundle;
import android.view.View;
import android.widget.RadioButton; import android.widget.RadioButton;
import android.widget.RadioGroup; import android.widget.RadioGroup;
import android.widget.RelativeLayout;
import com.app.baselibrary.base.common.BaseActivity; import com.app.baselibrary.base.common.BaseActivity;
import com.app.baselibrary.commonUtil.PreferencesUtils; import com.app.baselibrary.commonUtil.PreferencesUtils;
...@@ -34,6 +36,8 @@ public class EyeSettingActivity extends BaseActivity { ...@@ -34,6 +36,8 @@ public class EyeSettingActivity extends BaseActivity {
RadioGroup mGroupReport; RadioGroup mGroupReport;
@BindView(R.id.group_help) @BindView(R.id.group_help)
RadioGroup mGroupHelp; RadioGroup mGroupHelp;
@BindView(R.id.about_lay_show)
RelativeLayout mAboutLayShow;
private int selectId; private int selectId;
...@@ -76,5 +80,6 @@ public class EyeSettingActivity extends BaseActivity { ...@@ -76,5 +80,6 @@ public class EyeSettingActivity extends BaseActivity {
@OnClick(R.id.about_lay) @OnClick(R.id.about_lay)
public void onClick() { public void onClick() {
mAboutLayShow.setVisibility(View.VISIBLE);
} }
} }
...@@ -447,6 +447,8 @@ ...@@ -447,6 +447,8 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:visibility="invisible"
android:id="@+id/about_lay_show"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="#e0000000"> android:background="#e0000000">
......
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