bug修改

Jackhu9018 · Sep 12, 2016 · 3858a1b · 3858a1b
1 parent 58b2bfe
commit 3858a1b
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@
 ##Gradle
 ```groovy
 dependencies{
-    compile 'com.youth.banner:banner:1.3.0'  //指定版本
+    compile 'com.youth.banner:banner:1.3.1'  //指定版本
     compile 'com.youth.banner:banner:+' //最新版本
 }
 ```
@@ -156,6 +156,11 @@ protected void onCreate(Bundle savedInstanceState) {
 
 ## 更新说明
 
+#### v1.3.1
+    修复bug
+ * app:delay_time="轮播间隔时间" 参数无用问题
+ * 在暂停轮播时，当你手动滑动时会重新开始轮播问题
+ * 在轮播中，当你按住轮播时暂停，松开后不会轮播问题
 
 #### v1.2.9
     修复bug以及更新功能

diff --git a/app/app.iml b/app/app.iml
@@ -63,14 +63,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -79,6 +71,14 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />

diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <array name="url">
-        <item>http://img.zcool.cn/community/0192a557a352ef0000012e7ed104e4.jpg</item>
+        <item>http://img.zcool.cn/community/01d28457d621800000018c1bb7877e.jpg</item>
         <item>http://img.zcool.cn/community/01ae5656e1427f6ac72531cb72bac5.jpg</item>
         <item>http://img.zcool.cn/community/0166c756e1427432f875520f7cc838.jpg</item>
         <item>http://img.zcool.cn/community/018fdb56e1428632f875520f7b67cb.jpg</item>
         <item>http://img.zcool.cn/community/01c8dc56e1428e6ac72531cbaa5f2c.jpg</item>
         <item>http://img.zcool.cn/community/01fd2756e142716ac72531cbf8bbbf.jpg</item>
-        <item>http://img.zcool.cn/community/0114a856640b6d32f87545731c076a.jpg</item>
+        <item>http://img.zcool.cn/community/0192a557a352ef0000012e7ed104e4.jpg</item>
     </array>
     <array name="url2">
         <item>http://img.zcool.cn/community/01b72057a7e0790000018c1bf4fce0.png</item>

diff --git a/banner/banner-banner.iml b/banner/banner-banner.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":banner" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.youth.banner" external.system.module.version="1.3.0" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":banner" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.youth.banner" external.system.module.version="1.3.1" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>

diff --git a/banner/build.gradle b/banner/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
-version = "1.3.0"
+version = "1.3.1"
 
 android {
     compileSdkVersion 23
@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion 11
         targetSdkVersion 23
-        versionCode 27
-        versionName "1.3.0"
+        versionCode 28
+        versionName "1.3.1"
     }
     buildTypes {
         release {

diff --git a/banner/src/main/java/com/youth/banner/Banner.java b/banner/src/main/java/com/youth/banner/Banner.java
@@ -384,11 +384,14 @@ public void run() {
     @Override
     public boolean dispatchTouchEvent(MotionEvent ev) {
         Log.i(tag, ev.getAction() + "--" + isAutoPlay);
-        int action = ev.getAction();
-        if (action == MotionEvent.ACTION_UP||action == MotionEvent.ACTION_CANCEL||action == MotionEvent.ACTION_OUTSIDE) {
-            isAutoPlay=true;
-        } else if (action == MotionEvent.ACTION_DOWN) {
-            isAutoPlay=false;
+        if (isAutoPlay) {
+            int action = ev.getAction();
+            if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_CANCEL
+                    || action == MotionEvent.ACTION_OUTSIDE) {
+                startAutoPlay();
+            } else if (action == MotionEvent.ACTION_DOWN) {
+                stopAutoPlay();
+            }
         }
         return super.dispatchTouchEvent(ev);
     }