Skip to content

H
haihang
Commit adc6cb95 by chengxiuhong
Options

test main

parent f1ff8f55
Showing with 72 additions and 41 deletions
.idea/misc.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="EntryPointsManager">
<entry_points version="2.0" />
</component>
<component name="NullableNotNullManager"> <component name="NullableNotNullManager">
<option name="myDefaultNullable" value="android.support.annotation.Nullable" /> <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
<option name="myDefaultNotNull" value="android.support.annotation.NonNull" /> <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
...@@ -43,17 +40,7 @@ ...@@ -43,17 +40,7 @@
</profile-state> </profile-state>
</entry> </entry>
</component> </component>
<component name="ProjectLevelVcsManager" settingsEditedManually="false"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8 (6)" project-jdk-type="JavaSDK">
<OptionsSetting value="true" id="Add" />
<OptionsSetting value="true" id="Remove" />
<OptionsSetting value="true" id="Checkout" />
<OptionsSetting value="true" id="Update" />
<OptionsSetting value="true" id="Status" />
<OptionsSetting value="true" id="Edit" />
<ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" />
</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">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">
......
.idea/modules.xml
...@@ -4,7 +4,8 @@ ...@@ -4,7 +4,8 @@
<modules> <modules>
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" /> <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$/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://$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/library.iml" filepath="$PROJECT_DIR$/library/library.iml" />
<module fileurl="file://$PROJECT_DIR$/library/netlibrary/netlibrary.iml" filepath="$PROJECT_DIR$/library/netlibrary/netlibrary.iml" /> <module fileurl="file://$PROJECT_DIR$/library/netlibrary/netlibrary.iml" filepath="$PROJECT_DIR$/library/netlibrary/netlibrary.iml" />
<module fileurl="file://$PROJECT_DIR$/library/oo_statistics_lib/oo_statistics_lib.iml" filepath="$PROJECT_DIR$/library/oo_statistics_lib/oo_statistics_lib.iml" /> <module fileurl="file://$PROJECT_DIR$/library/oo_statistics_lib/oo_statistics_lib.iml" filepath="$PROJECT_DIR$/library/oo_statistics_lib/oo_statistics_lib.iml" />
......
.idea/vcs.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>
\ No newline at end of file
app/build.gradle
apply plugin: 'com.android.library' apply plugin: 'com.android.application'
apply plugin: 'com.jakewharton.butterknife' apply plugin: 'com.jakewharton.butterknife'
apply plugin: 'android-apt' apply plugin: 'android-apt'
apply plugin: 'org.greenrobot.greendao' apply plugin: 'org.greenrobot.greendao'
......
app/src/main/AndroidManifest.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.oo.eye"> package="com.oo.eye">
<application android:allowBackup="true" <application
android:label="@string/app_name" android:name="com.app.baselibrary.base.app.BaseApplication"
android:supportsRtl="true"> android:allowBackup="true"
<activity android:name="com.oo.eye.activity.EyeTestMainActivity" android:label="@string/app_name"
android:screenOrientation="landscape"/> android:supportsRtl="true"
<activity android:name="com.oo.eye.activity.BeforeEyeTestActivity" android:theme="@style/AppTheme">
android:screenOrientation="landscape"/> <activity
<activity android:name="com.oo.eye.activity.EyeTestActivity" android:name=".activity.EyeTestMainActivity"
android:screenOrientation="landscape"/> android:launchMode="singleTask"
<activity android:name="com.oo.eye.activity.AfterEyeTestActivity" android:theme="@style/Theme.AppCompat.Light.NoActionBar"
android:screenOrientation="landscape"/> android:screenOrientation="landscape">
<activity android:name="com.oo.eye.activity.EyeTestHistroyActivity" <intent-filter>
android:screenOrientation="landscape"/> <action android:name="android.intent.action.MAIN" />
<activity android:name="com.oo.eye.activity.EyeTestStatisticsActivity"
android:screenOrientation="landscape"/> <category android:name="android.intent.category.LAUNCHER" />
<activity android:name="com.oo.eye.activity.EyeSettingActivity" <category android:name="android.intent.category.DEFAULT" />
android:screenOrientation="landscape"/> </intent-filter>
</activity>
<activity
android:name="com.oo.eye.activity.BeforeEyeTestActivity"
android:screenOrientation="landscape" />
<activity
android:name="com.oo.eye.activity.EyeTestActivity"
android:screenOrientation="landscape" />
<activity
android:name="com.oo.eye.activity.AfterEyeTestActivity"
android:screenOrientation="landscape" />
<activity
android:name="com.oo.eye.activity.EyeTestHistroyActivity"
android:screenOrientation="landscape" />
<activity
android:name="com.oo.eye.activity.EyeTestStatisticsActivity"
android:screenOrientation="landscape" />
<activity
android:name="com.oo.eye.activity.EyeSettingActivity"
android:screenOrientation="landscape" />
</application> </application>
</manifest> </manifest>
\ No newline at end of file
app/src/main/java/com/oo/eye/activity/EyeTestMainActivity.java
...@@ -62,7 +62,7 @@ public class EyeTestMainActivity extends BaseActivity implements EyeMainContract ...@@ -62,7 +62,7 @@ public class EyeTestMainActivity extends BaseActivity implements EyeMainContract
mStateView.unRegistStateListener(); mStateView.unRegistStateListener();
} }
@OnClick(R2.id.tv_eye_test) @OnClick(R2.id.lin_eye_test)
void onClickTest(View v){ void onClickTest(View v){
startActivity(BeforeEyeTestActivity.class); startActivity(BeforeEyeTestActivity.class);
} }
...@@ -76,11 +76,11 @@ public class EyeTestMainActivity extends BaseActivity implements EyeMainContract ...@@ -76,11 +76,11 @@ public class EyeTestMainActivity extends BaseActivity implements EyeMainContract
} }
startActivity(EyeTestHistroyActivity.class); startActivity(EyeTestHistroyActivity.class);
} }
@OnClick(R2.id.tv_eye_test_setting) @OnClick(R2.id.lin_eye_test_setting)
void onClickSetting(View v){ void onClickSetting(View v){
startActivity(EyeSettingActivity.class); startActivity(EyeSettingActivity.class);
} }
@OnClick(R2.id.tv_eye_test_statistics) @OnClick(R2.id.lin_eye_test_statistics)
void onClickStatistics(View v){ void onClickStatistics(View v){
EyeHistroyBean eyeTestBean = EyeConfig.getInstance().getCuurentBean(); EyeHistroyBean eyeTestBean = EyeConfig.getInstance().getCuurentBean();
if(EyeConfig.getInstance().getCuurentBean() == null || if(EyeConfig.getInstance().getCuurentBean() == null ||
......
app/src/main/java/com/oo/eye/gen/EyeHistroyBeanDao.java
...@@ -3,14 +3,13 @@ package com.oo.eye.gen; ...@@ -3,14 +3,13 @@ package com.oo.eye.gen;
import android.database.Cursor; import android.database.Cursor;
import android.database.sqlite.SQLiteStatement; import android.database.sqlite.SQLiteStatement;
import com.oo.eye.bean.EyeHistroyBean;
import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.AbstractDao;
import org.greenrobot.greendao.Property; import org.greenrobot.greendao.Property;
import org.greenrobot.greendao.internal.DaoConfig;
import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.Database;
import org.greenrobot.greendao.database.DatabaseStatement; import org.greenrobot.greendao.database.DatabaseStatement;
import org.greenrobot.greendao.internal.DaoConfig;
import com.oo.eye.bean.EyeHistroyBean;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
/** /**
......
app/src/main/res/values/colors.xml
...@@ -4,5 +4,5 @@ ...@@ -4,5 +4,5 @@
<color name="btn_focus_bg">#3effffff</color> <color name="btn_focus_bg">#3effffff</color>
<color name="gray_white">#c7c9d1</color> <color name="gray_white">#c7c9d1</color>
<color name="white">#fff</color> <color name="white">#fff</color>
<color name="e_test_color">#205B64</color> <color name="e_test_color">#2498cd</color>
</resources> </resources>
\ No newline at end of file
app/src/main/res/values/dimen.xml
...@@ -2,4 +2,6 @@ ...@@ -2,4 +2,6 @@
<resources> <resources>
<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_150">130dp</dimen>
<dimen name="dimen_120">100dp</dimen>
</resources> </resources>
\ No newline at end of file
app/src/main/res/values/styles.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<!-- Base application theme. -->
<style name="AppTheme" parent="BaseAppTheme">
<!-- Customize your theme here. -->
</style>
<style name="BaseAppTheme" parent="Theme.AppCompat.Light.NoActionBar">
<!-- Customize your theme here. -->
<item name="android:windowNoTitle">true</item>
<item name="android:windowFullscreen">true</item>
<item name="android:windowContentOverlay">@null</item>
<item name="android:listDivider">@color/transparent</item>
<item name="android:windowBackground">@android:color/transparent</item>
</style>
</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