Skip to content

H
haihang
Commit 661cf3db by chengxiuhong
Options

test main

parent 26ea9322
Showing with 151 additions and 303 deletions
app/src/main/AndroidManifest.xml
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
android:name="com.app.baselibrary.base.app.BaseApplication" android:name="com.app.baselibrary.base.app.BaseApplication"
android:allowBackup="true" android:allowBackup="true"
android:label="@string/app_name" android:label="@string/app_name"
android:icon="@drawable/nav2"
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/AppTheme"> android:theme="@style/AppTheme">
<activity <activity
...@@ -22,21 +23,25 @@ ...@@ -22,21 +23,25 @@
</activity> </activity>
<activity android:name=".activity.SinglePeopleTestActivity" <activity android:name=".activity.SinglePeopleTestActivity"
android:screenOrientation="landscape" android:screenOrientation="landscape"
android:windowSoftInputMode="stateAlwaysHidden|adjustPan"
android:launchMode="singleTop"></activity> android:launchMode="singleTop"></activity>
<activity android:name=".activity.MorePeopleTestActivity" <activity android:name=".activity.MorePeopleTestActivity"
android:windowSoftInputMode="stateAlwaysHidden|adjustPan"
android:screenOrientation="landscape" android:screenOrientation="landscape"
android:launchMode="singleTop"></activity> android:launchMode="singleTop"></activity>
<activity android:name=".activity.TestListActivity" <activity android:name=".activity.TestListActivity"
android:windowSoftInputMode="stateAlwaysHidden|adjustPan"
android:screenOrientation="landscape" android:screenOrientation="landscape"
android:launchMode="singleTop"></activity> android:launchMode="singleTop"></activity>
<activity android:name=".activity.TestResurtListActivity" <activity android:name=".activity.TestResurtListActivity"
android:windowSoftInputMode="stateAlwaysHidden|adjustPan"
android:screenOrientation="landscape" android:screenOrientation="landscape"
android:launchMode="singleTop"></activity> android:launchMode="singleTop"></activity>
<activity <activity
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.EyeTestActivity" android:name="com.oo.eye.activity.EyeTestActivityF"
android:screenOrientation="landscape" /> android:screenOrientation="landscape" />
<activity <activity
android:name="com.oo.eye.activity.AfterEyeTestActivity" android:name="com.oo.eye.activity.AfterEyeTestActivity"
......
app/src/main/java/com/oo/eye/activity/BeforeEyeTestActivity.java
...@@ -78,7 +78,7 @@ public class BeforeEyeTestActivity extends BaseActivity { ...@@ -78,7 +78,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,EyeTestActivity.class); Intent intent2 = new Intent(BeforeEyeTestActivity.this,EyeTestActivityF.class);
startActivity(intent2); startActivity(intent2);
finish(); finish();
} }
......
app/src/main/java/com/oo/eye/activity/EyeSettingActivity.java
package com.oo.eye.activity; package com.oo.eye.activity;
import android.view.View; import android.os.Bundle;
import android.widget.TextView; import android.widget.RadioButton;
import android.widget.RadioGroup;
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;
import com.app.baselibrary.commonUtil.ToastUtil;
import com.oo.eye.EyeConfig; import com.oo.eye.EyeConfig;
import com.oo.eye.R; import com.oo.eye.R;
import com.oo.eye.R2; import com.oo.eye.R2;
import com.oo.seex.sys_state.widget.StateView; import com.oo.seex.sys_state.widget.StateView;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
/** /**
*/ */
public class EyeSettingActivity extends BaseActivity{ public class EyeSettingActivity extends BaseActivity {
@BindView(R2.id.state_view) @BindView(R2.id.state_view)
StateView mStateView; StateView mStateView;
@BindView(R.id.group_decimal)
RadioGroup mGroupDecimal;
@BindView(R.id.group_distance)
RadioGroup mGroupDistance;
@BindView(R.id.group_direction)
RadioGroup mGroupDirection;
@BindView(R.id.group_wait)
RadioGroup mGroupWait;
@BindView(R.id.group_report)
RadioGroup mGroupReport;
@BindView(R.id.group_help)
RadioGroup mGroupHelp;
@BindView(R2.id.tv_eye_setting_normal) private int selectId;
TextView normalText;
@BindView(R2.id.tv_eye_setting_decimals) @Override
TextView decimalsText; protected int getLayoutId() {
return R.layout.activity_eye_setting;
}
private int selectId; protected void onResume() {
super.onResume();
mStateView.registStateListener();
}
@Override
protected int getLayoutId() {
return R.layout.activity_eye_setting;
}
protected void onResume() { @Override
super.onResume(); protected void onPause() {
mStateView.registStateListener(); super.onPause();
} mStateView.unRegistStateListener();
}
@Override
protected void init() {
selectId = PreferencesUtils.getInt(EyeConfig.EYE_SETTING_KEY, selectId);
for (int i = 0; i < mGroupDecimal.getChildCount(); i++) {
RadioButton rb = (RadioButton) mGroupDecimal.getChildAt(i);
if (rb.isChecked()) {
//txtSex.setText(rb.getText());
break;
}
}
@Override }
protected void onPause() {
super.onPause();
mStateView.unRegistStateListener();
}
@Override @Override
protected void init() { protected void onCreate(Bundle savedInstanceState) {
selectId = PreferencesUtils.getInt( EyeConfig.EYE_SETTING_KEY,selectId); super.onCreate(savedInstanceState);
normalText.setOnFocusChangeListener(new View.OnFocusChangeListener() { // TODO: add setContentView(...) invocation
@Override ButterKnife.bind(this);
public void onFocusChange(View v, boolean hasFocus) { }
if(hasFocus){
normalText.setTextColor(getResources().getColor(R.color.e_test_color));
}else{
normalText.setTextColor(getResources().getColor(R.color.white));
}
}
});
normalText.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
selectId = 0;
PreferencesUtils.putInt( EyeConfig.EYE_SETTING_KEY,selectId);
ToastUtil.showLongMessage("选择5分法成功");
}
});
decimalsText.setOnFocusChangeListener(new View.OnFocusChangeListener() {
@Override
public void onFocusChange(View v, boolean hasFocus) {
if(hasFocus){
decimalsText.setTextColor(getResources().getColor(R.color.e_test_color));
selectId = 1;
}else{
decimalsText.setTextColor(getResources().getColor(R.color.white));
}
}
});
decimalsText.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
selectId = 1;
PreferencesUtils.putInt( EyeConfig.EYE_SETTING_KEY,selectId);
ToastUtil.showLongMessage("选择小数法成功");
}
});
if(selectId == 1){
decimalsText.requestFocus();
}
}
@OnClick(R.id.about_lay)
public void onClick() {
}
} }
app/src/main/res/drawable/btn_single_focus_selector.xml deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true">
<shape>
<solid android:color="@color/btn_focus_bg" />
<corners android:radius="@dimen/dp_4"></corners>
</shape>
</item>
<item android:state_focused="true">
<shape>
<solid android:color="@color/btn_focus_bg" />
<corners android:radius="@dimen/dp_4"></corners>
</shape>
</item>
<!--<item android:state_focused="true" android:state_window_focused="false">-->
<!--<shape>-->
<!--<solid android:color="@color/btn_focus_bg" />-->
<!--<stroke android:width="1dp" android:color="@color/white" />-->
<!--</shape>-->
<!--</item>-->
<item>
<shape>
<solid android:color="@color/e_test_color" />
<corners android:radius="@dimen/dp_4"></corners>
</shape>
</item>
</selector>
app/src/main/res/drawable/checkbox.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/select1_sel" android:state_checked="true"/>
<item android:drawable="@drawable/select1_nor" android:state_checked="false"/>
<item android:drawable="@drawable/select1_nor"/>
</selector>
\ No newline at end of file
app/src/main/res/drawable/e_down.xml deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:viewportHeight="10"
android:viewportWidth="10">
<path
android:fillColor="#ff040000"
android:pathData="M8,0h2v10h-2z"/>
<path
android:fillColor="#ff040000"
android:pathData="M0,0h10v2.5h-10z"/>
<path
android:fillColor="#ff040000"
android:pathData="M4,0h2v10h-2z"/>
<path
android:fillColor="#ff040000"
android:pathData="M0,0h2v10h-2z"/>
</vector>
\ No newline at end of file
app/src/main/res/drawable/e_left.xml deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:viewportHeight="10"
android:viewportWidth="10">
<path
android:fillColor="#ff040000"
android:pathData="M0,8h10v2h-10z"/>
<path
android:fillColor="#ff040000"
android:pathData="M7.5,0h2.5v10h-2.5z"/>
<path
android:fillColor="#ff040000"
android:pathData="M0,4h10v2h-10z"/>
<path
android:fillColor="#ff040000"
android:pathData="M0,0h10v2h-10z"/>
</vector>
\ No newline at end of file
app/src/main/res/drawable/e_right.xml deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:viewportHeight="10"
android:viewportWidth="10">
<path
android:fillColor="#ff040000"
android:pathData="M0,0h10v2h-10z"/>
<path
android:fillColor="#ff040000"
android:pathData="M0,0h2.5v10h-2.5z"/>
<path
android:fillColor="#ff040000"
android:pathData="M0,4h10v2h-10z"/>
<path
android:fillColor="#ff040000"
android:pathData="M0,8h10v2h-10z"/>
</vector>
\ No newline at end of file
app/src/main/res/drawable/e_up.xml deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:viewportHeight="10"
android:viewportWidth="10">
<path
android:fillColor="#ff040000"
android:pathData="M0,0h2v10h-2z"/>
<path
android:fillColor="#ff040000"
android:pathData="M0,7.5h10v2.5h-10z"/>
<path
android:fillColor="#ff040000"
android:pathData="M4,0h2v10h-2z"/>
<path
android:fillColor="#ff040000"
android:pathData="M8,0h2v10h-2z"/>
</vector>
\ No newline at end of file
app/src/main/res/drawable/eye_setting_btn_bg.xml deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true">
<shape>
<solid android:color="@color/white" />
<corners android:radius="18dp"/>
<stroke android:width="1dp" android:color="@color/transparent" />
</shape>
</item>
<item android:state_focused="true">
<shape>
<solid android:color="@color/gray_white" />
<corners android:radius="18dp"/>
<stroke android:width="1dp" android:color="@color/transparent" />
</shape>
</item>
<item>
<shape>
<solid android:color="@color/transparent" />
<corners android:radius="18dp"/>
<stroke android:width="1dp" android:color="@color/white" />
</shape>
</item>
</selector>
app/src/main/res/layout/activity_eye_histroy.xml
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
android:paddingLeft="@dimen/activity_horizontal_margin" android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin" android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin" android:paddingTop="@dimen/activity_vertical_margin"
android:background="@drawable/etest_bg_default"> android:background="@color/e_test_color">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
......
app/src/main/res/layout/activity_eye_statistics.xml
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
android:paddingBottom="@dimen/activity_vertical_margin" android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin" android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin" android:paddingRight="@dimen/activity_horizontal_margin"
android:background="@drawable/etest_bg_default"> android:background="@color/e_test_color">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
......
app/src/main/res/layout/activity_eye_test_main.xml
...@@ -4,10 +4,9 @@ ...@@ -4,10 +4,9 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/e_test_color" android:background="@color/e_test_color"
android:orientation="vertical" android:orientation="vertical"
android:paddingLeft="@dimen/activity_horizontal_margin" android:paddingLeft="@dimen/activity_vertical_margin"
android:paddingRight="@dimen/activity_vertical_margin" android:paddingRight="@dimen/activity_vertical_margin"
android:paddingBottom="@dimen/activity_vertical_margin" android:paddingTop="@dimen/dp_20">
android:paddingTop="@dimen/activity_vertical_margin">
<LinearLayout <LinearLayout
android:id="@+id/test_setting" android:id="@+id/test_setting"
...@@ -28,7 +27,7 @@ ...@@ -28,7 +27,7 @@
android:layout_marginLeft="@dimen/dp_8" android:layout_marginLeft="@dimen/dp_8"
android:text="设置" android:text="设置"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="16sp" /> android:textSize="20sp" />
</LinearLayout> </LinearLayout>
<ImageView <ImageView
...@@ -45,7 +44,7 @@ ...@@ -45,7 +44,7 @@
android:layout_marginTop="@dimen/dp_8" android:layout_marginTop="@dimen/dp_8"
android:text="欧欧智能自动测试仪" android:text="欧欧智能自动测试仪"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="24sp" android:textSize="30sp"
android:textStyle="bold" /> android:textStyle="bold" />
<LinearLayout <LinearLayout
...@@ -68,7 +67,7 @@ ...@@ -68,7 +67,7 @@
android:layout_marginRight="@dimen/dp_8" android:layout_marginRight="@dimen/dp_8"
android:text="海航招飞测试专业版" android:text="海航招飞测试专业版"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="16sp" /> android:textSize="20sp" />
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -84,8 +83,8 @@ ...@@ -84,8 +83,8 @@
android:visibility="gone" /> android:visibility="gone" />
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="700dip"
android:layout_height="@dimen/dimen_100" android:layout_height="@dimen/dp_120"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/dp_70" android:layout_marginTop="@dimen/dp_70"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -108,12 +107,12 @@ ...@@ -108,12 +107,12 @@
android:src="@drawable/nav1" /> android:src="@drawable/nav1" />
<TextView <TextView
android:layout_width="@dimen/dimen_130" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center" android:gravity="center"
android:text="单人测试" android:text="单人测试"
android:textColor="@color/e_test_color" android:textColor="@color/e_test_color"
android:textSize="20dp" android:textSize="22dp"
android:textStyle="bold" /> android:textStyle="bold" />
</LinearLayout> </LinearLayout>
...@@ -138,12 +137,12 @@ ...@@ -138,12 +137,12 @@
<TextView <TextView
android:id="@+id/tv_eye_test_histroy" android:id="@+id/tv_eye_test_histroy"
android:layout_width="@dimen/dimen_130" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center" android:gravity="center"
android:text="多人测试" android:text="多人测试"
android:textColor="@color/e_test_color" android:textColor="@color/e_test_color"
android:textSize="20dp" android:textSize="22dp"
android:textStyle="bold" /> android:textStyle="bold" />
</LinearLayout> </LinearLayout>
...@@ -166,12 +165,12 @@ ...@@ -166,12 +165,12 @@
android:src="@drawable/nav3" /> android:src="@drawable/nav3" />
<TextView <TextView
android:layout_width="@dimen/dimen_130" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center" android:gravity="center"
android:text="临时测试" android:text="临时测试"
android:textColor="@color/e_test_color" android:textColor="@color/e_test_color"
android:textSize="20dp" android:textSize="22dp"
android:textStyle="bold" /> android:textStyle="bold" />
</LinearLayout> </LinearLayout>
...@@ -194,12 +193,12 @@ ...@@ -194,12 +193,12 @@
android:src="@drawable/nav4" /> android:src="@drawable/nav4" />
<TextView <TextView
android:layout_width="@dimen/dimen_130" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center" android:gravity="center"
android:text="结果报表" android:text="结果报表"
android:textColor="@color/e_test_color" android:textColor="@color/e_test_color"
android:textSize="20dp" android:textSize="22dp"
android:textStyle="bold" /> android:textStyle="bold" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
...@@ -208,7 +207,7 @@ ...@@ -208,7 +207,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/dp_40" android:layout_marginTop="@dimen/dp_30"
android:text="Copyright © 2019 北京星辰万有" android:text="Copyright © 2019 北京星辰万有"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="13sp" /> android:textSize="13sp" />
......
app/src/main/res/layout/activity_morepeople.xml
...@@ -107,19 +107,19 @@ ...@@ -107,19 +107,19 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="@dimen/dimen_120" android:layout_marginTop="@dimen/dp_120"
android:background="@color/white"></LinearLayout> android:background="@color/white"></LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/ddd" android:id="@+id/ddd"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dimen_120" android:layout_marginTop="@dimen/dp_120"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingTop="@dimen/dp_20"> android:paddingTop="@dimen/dp_20">
<RelativeLayout <RelativeLayout
android:layout_width="@dimen/dimen_120" android:layout_width="@dimen/item_dimen_2"
android:layout_height="@dimen/dp_40" android:layout_height="@dimen/dp_40"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_width="@dimen/dimen_180" android:layout_width="@dimen/item_dimen_5"
android:layout_height="@dimen/dp_40" android:layout_height="@dimen/dp_40"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_width="@dimen/dimen_120" android:layout_width="@dimen/item_dimen_2"
android:layout_height="@dimen/dp_40" android:layout_height="@dimen/dp_40"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -188,7 +188,7 @@ ...@@ -188,7 +188,7 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_width="@dimen/dimen_140" android:layout_width="@dimen/item_dimen_3"
android:layout_height="@dimen/dp_40" android:layout_height="@dimen/dp_40"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -210,7 +210,7 @@ ...@@ -210,7 +210,7 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_width="@dimen/dimen_160" android:layout_width="@dimen/item_dimen_4"
android:layout_height="@dimen/dp_40" android:layout_height="@dimen/dp_40"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -235,12 +235,12 @@ ...@@ -235,12 +235,12 @@
<TextView <TextView
android:layout_marginTop="@dimen/dp_12" android:layout_marginTop="@dimen/dp_12"
android:id="@+id/begin_test" android:id="@+id/begin_test"
android:layout_width="100dip" android:layout_width="130dip"
android:layout_height="40dip" android:layout_height="40dip"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginBottom="@dimen/dp_30" android:layout_marginBottom="@dimen/dp_30"
android:background="@drawable/btn_single_focus_selector" android:background="@drawable/after_btn_bg"
android:gravity="center" android:gravity="center"
android:text="生成测试队列" android:text="生成测试队列"
android:textColor="@color/white" android:textColor="@color/white"
......
app/src/main/res/layout/activity_singletest.xml
...@@ -63,20 +63,20 @@ ...@@ -63,20 +63,20 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="@dimen/dimen_120" android:layout_marginTop="@dimen/dp_120"
android:background="@color/white"></LinearLayout> android:background="@color/white"></LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/ddd" android:id="@+id/ddd"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dimen_120" android:layout_marginTop="@dimen/dp_120"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingTop="@dimen/dp_20"> android:paddingTop="@dimen/dp_20">
<RelativeLayout <RelativeLayout
android:layout_width="@dimen/dimen_180" android:layout_width="@dimen/item_dimen_5"
android:layout_height="@dimen/dp_40" android:layout_height="@dimen/dp_40"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_width="@dimen/dimen_120" android:layout_width="@dimen/item_dimen_2"
android:layout_height="@dimen/dp_40" android:layout_height="@dimen/dp_40"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_width="@dimen/dimen_140" android:layout_width="@dimen/item_dimen_3"
android:layout_height="@dimen/dp_40" android:layout_height="@dimen/dp_40"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_width="@dimen/dimen_160" android:layout_width="@dimen/item_dimen_4"
android:layout_height="@dimen/dp_40" android:layout_height="@dimen/dp_40"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -190,7 +190,7 @@ ...@@ -190,7 +190,7 @@
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginBottom="@dimen/dp_40" android:layout_marginBottom="@dimen/dp_40"
android:background="@drawable/btn_single_focus_selector" android:background="@drawable/after_btn_bg"
android:gravity="center" android:gravity="center"
android:text="开始测试" android:text="开始测试"
android:textColor="@color/white" android:textColor="@color/white"
......
app/src/main/res/layout/activity_testlist.xml
...@@ -27,19 +27,19 @@ ...@@ -27,19 +27,19 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="@dimen/dimen_120" android:layout_marginTop="@dimen/dp_120"
android:background="@color/white"></LinearLayout> android:background="@color/white"></LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/ddd" android:id="@+id/ddd"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dimen_120" android:layout_marginTop="@dimen/dp_120"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingTop="@dimen/dp_20"> android:paddingTop="@dimen/dp_20">
<RelativeLayout <RelativeLayout
android:layout_width="@dimen/dimen_160" android:layout_width="@dimen/item_dimen_4"
android:layout_height="@dimen/dp_40" android:layout_height="@dimen/dp_40"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_width="@dimen/dimen_180" android:layout_width="@dimen/item_dimen_5"
android:layout_height="@dimen/dp_40" android:layout_height="@dimen/dp_40"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_width="@dimen/dimen_120" android:layout_width="@dimen/item_dimen_2"
android:layout_height="@dimen/dp_40" android:layout_height="@dimen/dp_40"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_width="@dimen/dimen_140" android:layout_width="@dimen/item_dimen_3"
android:layout_height="@dimen/dp_40" android:layout_height="@dimen/dp_40"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_width="@dimen/dimen_160" android:layout_width="@dimen/item_dimen_4"
android:layout_height="@dimen/dp_40" android:layout_height="@dimen/dp_40"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -163,7 +163,7 @@ ...@@ -163,7 +163,7 @@
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginBottom="@dimen/dp_30" android:layout_marginBottom="@dimen/dp_30"
android:layout_marginTop="@dimen/dp_12" android:layout_marginTop="@dimen/dp_12"
android:background="@drawable/btn_single_focus_selector" android:background="@drawable/after_btn_bg"
android:gravity="center" android:gravity="center"
android:text="生成测试队列" android:text="生成测试队列"
android:textColor="@color/white" android:textColor="@color/white"
......
app/src/main/res/layout/activity_testresult.xml
...@@ -88,9 +88,10 @@ ...@@ -88,9 +88,10 @@
<ImageView <ImageView
android:id="@+id/selete2_iv" android:id="@+id/selete2_iv"
android:layout_gravity="center_vertical"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@drawable/select2_sel" /> android:src="@drawable/select3_sel" />
<TextView <TextView
android:id="@+id/selete2_tv" android:id="@+id/selete2_tv"
...@@ -144,20 +145,20 @@ ...@@ -144,20 +145,20 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="@dimen/dimen_120" android:layout_marginTop="@dimen/dp_127"
android:background="@color/white"></LinearLayout> android:background="@color/white"></LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/ddd" android:id="@+id/ddd"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dimen_120" android:layout_marginTop="@dimen/dp_120"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingTop="@dimen/dp_20"> android:paddingTop="@dimen/dp_20">
<RelativeLayout <RelativeLayout
android:layout_width="@dimen/dimen_180" android:layout_width="@dimen/item_dimen_5"
android:layout_height="@dimen/dp_40" android:layout_height="@dimen/dp_40"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -184,7 +185,7 @@ ...@@ -184,7 +185,7 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_width="@dimen/dimen_120" android:layout_width="@dimen/item_dimen_2"
android:layout_height="@dimen/dp_40" android:layout_height="@dimen/dp_40"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -206,7 +207,7 @@ ...@@ -206,7 +207,7 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_width="@dimen/dimen_140" android:layout_width="@dimen/item_dimen_3"
android:layout_height="@dimen/dp_40" android:layout_height="@dimen/dp_40"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -228,7 +229,7 @@ ...@@ -228,7 +229,7 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_width="@dimen/dimen_160" android:layout_width="@dimen/item_dimen_4"
android:layout_height="@dimen/dp_40" android:layout_height="@dimen/dp_40"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -250,7 +251,7 @@ ...@@ -250,7 +251,7 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_width="@dimen/dimen_160" android:layout_width="@dimen/item_dimen_4"
android:layout_height="@dimen/dp_40" android:layout_height="@dimen/dp_40"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -272,7 +273,7 @@ ...@@ -272,7 +273,7 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_width="@dimen/dimen_160" android:layout_width="@dimen/item_dimen_4"
android:layout_height="@dimen/dp_40" android:layout_height="@dimen/dp_40"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -296,13 +297,13 @@ ...@@ -296,13 +297,13 @@
<TextView <TextView
android:id="@+id/begin_test" android:id="@+id/begin_test"
android:layout_width="100dip" android:layout_width="130dip"
android:layout_height="40dip" android:layout_height="40dip"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginBottom="@dimen/dp_30" android:layout_marginBottom="@dimen/dp_30"
android:layout_marginTop="@dimen/dp_12" android:layout_marginTop="@dimen/dp_12"
android:background="@drawable/btn_single_focus_selector" android:background="@drawable/after_btn_bg"
android:gravity="center" android:gravity="center"
android:text="生成测试队列" android:text="生成测试队列"
android:textColor="@color/white" android:textColor="@color/white"
......
app/src/main/res/layout/include_people.xml
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
android:orientation="horizontal"> android:orientation="horizontal">
<RelativeLayout <RelativeLayout
android:layout_width="@dimen/dimen_180" android:layout_width="@dimen/item_dimen_5"
android:layout_height="@dimen/dp_40" android:layout_height="@dimen/dp_40"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_width="@dimen/dimen_120" android:layout_width="@dimen/item_dimen_2"
android:layout_height="@dimen/dp_40" android:layout_height="@dimen/dp_40"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_width="@dimen/dimen_140" android:layout_width="@dimen/item_dimen_3"
android:layout_height="@dimen/dp_40" android:layout_height="@dimen/dp_40"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_width="@dimen/dimen_160" android:layout_width="@dimen/item_dimen_4"
android:layout_height="@dimen/dp_40" android:layout_height="@dimen/dp_40"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
......
app/src/main/res/layout/item_people.xml
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
android:orientation="horizontal"> android:orientation="horizontal">
<RelativeLayout <RelativeLayout
android:layout_width="@dimen/dimen_120" android:layout_width="@dimen/item_dimen_2"
android:layout_height="@dimen/dp_40" android:layout_height="@dimen/dp_40"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_width="@dimen/dimen_180" android:layout_width="@dimen/item_dimen_5"
android:layout_height="@dimen/dp_40" android:layout_height="@dimen/dp_40"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_width="@dimen/dimen_120" android:layout_width="@dimen/item_dimen_2"
android:layout_height="@dimen/dp_40" android:layout_height="@dimen/dp_40"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_width="@dimen/dimen_140" android:layout_width="@dimen/item_dimen_3"
android:layout_height="@dimen/dp_40" android:layout_height="@dimen/dp_40"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_width="@dimen/dimen_160" android:layout_width="@dimen/item_dimen_4"
android:layout_height="@dimen/dp_40" android:layout_height="@dimen/dp_40"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
......
app/src/main/res/layout/item_testlist.xml
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
android:orientation="horizontal"> android:orientation="horizontal">
<RelativeLayout <RelativeLayout
android:layout_width="@dimen/dimen_160" android:layout_width="@dimen/item_dimen_4"
android:layout_height="@dimen/dp_40" android:layout_height="@dimen/dp_40"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_width="@dimen/dimen_180" android:layout_width="@dimen/item_dimen_5"
android:layout_height="@dimen/dp_40" android:layout_height="@dimen/dp_40"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_width="@dimen/dimen_120" android:layout_width="@dimen/item_dimen_2"
android:layout_height="@dimen/dp_40" android:layout_height="@dimen/dp_40"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_width="@dimen/dimen_140" android:layout_width="@dimen/item_dimen_3"
android:layout_height="@dimen/dp_40" android:layout_height="@dimen/dp_40"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_width="@dimen/dimen_160" android:layout_width="@dimen/item_dimen_4"
android:layout_height="@dimen/dp_40" android:layout_height="@dimen/dp_40"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
......
app/src/main/res/layout/item_testresultlist.xml
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
android:orientation="horizontal"> android:orientation="horizontal">
<RelativeLayout <RelativeLayout
android:layout_width="@dimen/dimen_180" android:layout_width="@dimen/item_dimen_5"
android:layout_height="@dimen/dp_40" android:layout_height="@dimen/dp_40"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_width="@dimen/dimen_120" android:layout_width="@dimen/item_dimen_2"
android:layout_height="@dimen/dp_40" android:layout_height="@dimen/dp_40"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_width="@dimen/dimen_140" android:layout_width="@dimen/item_dimen_3"
android:layout_height="@dimen/dp_40" android:layout_height="@dimen/dp_40"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_width="@dimen/dimen_160" android:layout_width="@dimen/item_dimen_4"
android:layout_height="@dimen/dp_40" android:layout_height="@dimen/dp_40"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
android:background="@color/line_color"></View> android:background="@color/line_color"></View>
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_width="@dimen/dimen_160" android:layout_width="@dimen/item_dimen_4"
android:layout_height="@dimen/dp_40" android:layout_height="@dimen/dp_40"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
android:background="@color/line_color"></View> android:background="@color/line_color"></View>
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_width="@dimen/dimen_160" android:layout_width="@dimen/item_dimen_4"
android:layout_height="@dimen/dp_40" android:layout_height="@dimen/dp_40"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
......
app/src/main/res/values/dimen.xml
...@@ -3,9 +3,10 @@ ...@@ -3,9 +3,10 @@
<dimen name="activity_horizontal_margin">115dp</dimen> <dimen name="activity_horizontal_margin">115dp</dimen>
<dimen name="activity_vertical_margin">38dp</dimen> <dimen name="activity_vertical_margin">38dp</dimen>
<dimen name="dimen_130">130dp</dimen> <dimen name="dimen_130">130dp</dimen>
<dimen name="dimen_100">100dp</dimen> <dimen name="dp_120">120dip</dimen>
<dimen name="dimen_120">120dp</dimen> <dimen name="item_dimen_1">80dp</dimen>
<dimen name="dimen_140">140dp</dimen> <dimen name="item_dimen_2">100dp</dimen>
<dimen name="dimen_160">160dp</dimen> <dimen name="item_dimen_3">120dp</dimen>
<dimen name="dimen_180">180dip</dimen> <dimen name="item_dimen_4">140dp</dimen>
<dimen name="item_dimen_5">160dip</dimen>
</resources> </resources>
\ No newline at end of file
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