diff --git a/AndroidImageIndicator/AndroidManifest.xml b/AndroidImageIndicator/AndroidManifest.xml index 251f79e..6d86b04 100644 --- a/AndroidImageIndicator/AndroidManifest.xml +++ b/AndroidImageIndicator/AndroidManifest.xml @@ -7,26 +7,6 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/AndroidImageIndicator/project.properties b/AndroidImageIndicator/project.properties index 66304d5..484dab0 100644 --- a/AndroidImageIndicator/project.properties +++ b/AndroidImageIndicator/project.properties @@ -12,4 +12,4 @@ # Project target. target=android-17 -android.library.reference.1=../../android-app-http/android-app-http +android.library=true diff --git a/AndroidImageIndicator/src/com/allthelucky/common/view/AutoPlayManager.java b/AndroidImageIndicator/src/com/allthelucky/common/view/AutoPlayManager.java index 6e0088c..fdff4b2 100644 --- a/AndroidImageIndicator/src/com/allthelucky/common/view/AutoPlayManager.java +++ b/AndroidImageIndicator/src/com/allthelucky/common/view/AutoPlayManager.java @@ -81,7 +81,7 @@ public class AutoPlayManager { * 设置自动播放启动时间和间隔 * * @param startMils - * 启动时间ms(>5, 默认为8s) + * 启动时间ms(>2, 默认为8s) * @param intevelMils * 间隔ms(默认为3s) */ @@ -122,7 +122,7 @@ public class AutoPlayManager { protected void handleMessage(android.os.Message msg) { if (broadcastEnable) { if (System.currentTimeMillis() - - mImageIndicatorView.getRefreshTime() < 5 * 1000) {// 最近一次划动间隔小于2s + - mImageIndicatorView.getRefreshTime() < 2 * 1000) {// 最近一次划动间隔小于2s return; } if ((broadcastTimes != DEFAULT_TIMES) diff --git a/AndroidImageIndicatorSample/.classpath b/AndroidImageIndicatorSample/.classpath new file mode 100644 index 0000000..5176974 --- /dev/null +++ b/AndroidImageIndicatorSample/.classpath @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/AndroidImageIndicatorSample/.gitignore b/AndroidImageIndicatorSample/.gitignore new file mode 100644 index 0000000..04e6b04 --- /dev/null +++ b/AndroidImageIndicatorSample/.gitignore @@ -0,0 +1,3 @@ +.settings +bin/ +gen/ \ No newline at end of file diff --git a/AndroidImageIndicatorSample/.project b/AndroidImageIndicatorSample/.project new file mode 100644 index 0000000..cad61a3 --- /dev/null +++ b/AndroidImageIndicatorSample/.project @@ -0,0 +1,33 @@ + + + AndroidImageIndicatorSample + + + + + + com.android.ide.eclipse.adt.ResourceManagerBuilder + + + + + com.android.ide.eclipse.adt.PreCompilerBuilder + + + + + org.eclipse.jdt.core.javabuilder + + + + + com.android.ide.eclipse.adt.ApkBuilder + + + + + + com.android.ide.eclipse.adt.AndroidNature + org.eclipse.jdt.core.javanature + + diff --git a/AndroidImageIndicatorSample/AndroidManifest.xml b/AndroidImageIndicatorSample/AndroidManifest.xml new file mode 100644 index 0000000..e531b7d --- /dev/null +++ b/AndroidImageIndicatorSample/AndroidManifest.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/AndroidImageIndicatorSample/proguard-project.txt b/AndroidImageIndicatorSample/proguard-project.txt new file mode 100644 index 0000000..f2fe155 --- /dev/null +++ b/AndroidImageIndicatorSample/proguard-project.txt @@ -0,0 +1,20 @@ +# To enable ProGuard in your project, edit project.properties +# to define the proguard.config property as described in that file. +# +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in ${sdk.dir}/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the ProGuard +# include property in project.properties. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} diff --git a/AndroidImageIndicatorSample/project.properties b/AndroidImageIndicatorSample/project.properties new file mode 100644 index 0000000..1f1f149 --- /dev/null +++ b/AndroidImageIndicatorSample/project.properties @@ -0,0 +1,15 @@ +# This file is automatically generated by Android Tools. +# Do not modify this file -- YOUR CHANGES WILL BE ERASED! +# +# This file must be checked in Version Control Systems. +# +# To customize properties used by the Ant build system edit +# "ant.properties", and override values to adapt the script to your +# project structure. +# +# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): +#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt + +# Project target. +target=android-17 +android.library.reference.1=../AndroidImageIndicator diff --git a/AndroidImageIndicator/res/drawable-hdpi/guide_00.jpg b/AndroidImageIndicatorSample/res/drawable-hdpi/guide_00.jpg similarity index 100% rename from AndroidImageIndicator/res/drawable-hdpi/guide_00.jpg rename to AndroidImageIndicatorSample/res/drawable-hdpi/guide_00.jpg diff --git a/AndroidImageIndicator/res/drawable-hdpi/guide_01.jpg b/AndroidImageIndicatorSample/res/drawable-hdpi/guide_01.jpg similarity index 100% rename from AndroidImageIndicator/res/drawable-hdpi/guide_01.jpg rename to AndroidImageIndicatorSample/res/drawable-hdpi/guide_01.jpg diff --git a/AndroidImageIndicatorSample/res/drawable-hdpi/ic_launcher.png b/AndroidImageIndicatorSample/res/drawable-hdpi/ic_launcher.png new file mode 100644 index 0000000..8074c4c Binary files /dev/null and b/AndroidImageIndicatorSample/res/drawable-hdpi/ic_launcher.png differ diff --git a/AndroidImageIndicator/res/drawable-hdpi/poster1.jpg b/AndroidImageIndicatorSample/res/drawable-hdpi/poster1.jpg similarity index 100% rename from AndroidImageIndicator/res/drawable-hdpi/poster1.jpg rename to AndroidImageIndicatorSample/res/drawable-hdpi/poster1.jpg diff --git a/AndroidImageIndicator/res/drawable-hdpi/poster2.jpg b/AndroidImageIndicatorSample/res/drawable-hdpi/poster2.jpg similarity index 100% rename from AndroidImageIndicator/res/drawable-hdpi/poster2.jpg rename to AndroidImageIndicatorSample/res/drawable-hdpi/poster2.jpg diff --git a/AndroidImageIndicator/res/drawable-hdpi/poster3.jpg b/AndroidImageIndicatorSample/res/drawable-hdpi/poster3.jpg similarity index 100% rename from AndroidImageIndicator/res/drawable-hdpi/poster3.jpg rename to AndroidImageIndicatorSample/res/drawable-hdpi/poster3.jpg diff --git a/AndroidImageIndicatorSample/res/drawable-ldpi/ic_launcher.png b/AndroidImageIndicatorSample/res/drawable-ldpi/ic_launcher.png new file mode 100644 index 0000000..1095584 Binary files /dev/null and b/AndroidImageIndicatorSample/res/drawable-ldpi/ic_launcher.png differ diff --git a/AndroidImageIndicatorSample/res/drawable-mdpi/ic_launcher.png b/AndroidImageIndicatorSample/res/drawable-mdpi/ic_launcher.png new file mode 100644 index 0000000..a07c69f Binary files /dev/null and b/AndroidImageIndicatorSample/res/drawable-mdpi/ic_launcher.png differ diff --git a/AndroidImageIndicator/res/layout/activity_indicator.xml b/AndroidImageIndicatorSample/res/layout/activity_indicator.xml similarity index 93% rename from AndroidImageIndicator/res/layout/activity_indicator.xml rename to AndroidImageIndicatorSample/res/layout/activity_indicator.xml index f326e09..1cce31f 100644 --- a/AndroidImageIndicator/res/layout/activity_indicator.xml +++ b/AndroidImageIndicatorSample/res/layout/activity_indicator.xml @@ -1,12 +1,12 @@ - - - - + + + + \ No newline at end of file diff --git a/AndroidImageIndicator/res/layout/activity_indicator_auto.xml b/AndroidImageIndicatorSample/res/layout/activity_indicator_auto.xml similarity index 93% rename from AndroidImageIndicator/res/layout/activity_indicator_auto.xml rename to AndroidImageIndicatorSample/res/layout/activity_indicator_auto.xml index 6493e92..556a352 100644 --- a/AndroidImageIndicator/res/layout/activity_indicator_auto.xml +++ b/AndroidImageIndicatorSample/res/layout/activity_indicator_auto.xml @@ -1,11 +1,11 @@ - - - - + + + + \ No newline at end of file diff --git a/AndroidImageIndicator/res/layout/activity_indicator_guide.xml b/AndroidImageIndicatorSample/res/layout/activity_indicator_guide.xml similarity index 95% rename from AndroidImageIndicator/res/layout/activity_indicator_guide.xml rename to AndroidImageIndicatorSample/res/layout/activity_indicator_guide.xml index c856dd6..cf16184 100644 --- a/AndroidImageIndicator/res/layout/activity_indicator_guide.xml +++ b/AndroidImageIndicatorSample/res/layout/activity_indicator_guide.xml @@ -1,21 +1,21 @@ - - - - -