bugfix issue14

H07000223 · Apr 28, 2016 · 796b8de · 796b8de
1 parent 9dcd7f5
commit 796b8de
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 8 deletions.
diff --git a/CHNAGELOG.md b/CHNAGELOG.md
@@ -37,3 +37,7 @@ Version 1.2.6 *(2015-01-07)*
 * Fix bug for View in Popup click no response
 * Improve the function of BaseBubblePopup
 
+Version 1.2.8 *(2015-04-28)*
+----------------------------
+* bugfix issue14
+
diff --git a/FlycoDialog_Lib/build.gradle b/FlycoDialog_Lib/build.gradle
@@ -3,15 +3,15 @@ apply plugin: 'com.android.library'
 //apply plugin: 'com.jfrog.bintray'
 
 // 这个version是区分library版本的，因此当我们需要更新library时记得修改这个version
-version = "1.2.6"
+version = "1.2.8"
 android {
     compileSdkVersion 23
     buildToolsVersion "23.0.2"
     resourcePrefix "FlycoDialog_"    //这个随便填
     defaultConfig {
         minSdkVersion 8
         targetSdkVersion 23
-        versionCode 126
+        versionCode 128
         versionName version
     }
     buildTypes {

diff --git a/FlycoDialog_Lib/src/main/java/com/flyco/dialog/widget/base/BaseDialog.java b/FlycoDialog_Lib/src/main/java/com/flyco/dialog/widget/base/BaseDialog.java
@@ -135,6 +135,13 @@ public void onClick(View v) {
                 }
             }
         });
+
+        mOnCreateView.setClickable(true);
+    }
+
+    /** get actual created view(获取实际创建的View) */
+    public View getCreateView() {
+        return mOnCreateView;
     }
 
     /**

diff --git a/README.md b/README.md
@@ -135,7 +135,7 @@ dependencies{
 
 After v1.2.6
 dependencies{
-     compile 'com.flyco.dialog:FlycoDialog_Lib:1.2.6@aar'
+     compile 'com.flyco.dialog:FlycoDialog_Lib:1.2.8@aar'
      compile 'com.nineoldandroids:library:2.4.0'
 }
 ```

diff --git a/README_CN.md b/README_CN.md
@@ -136,7 +136,7 @@ dependencies{
 
 After v1.2.6
 dependencies{
-     compile 'com.flyco.dialog:FlycoDialog_Lib:1.2.6@aar'
+     compile 'com.flyco.dialog:FlycoDialog_Lib:1.2.8@aar'
      compile 'com.nineoldandroids:library:2.4.0'
 }
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -20,11 +20,11 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:23.1.1'
+    compile 'com.android.support:appcompat-v7:23.3.0'
     compile 'com.jakewharton:butterknife:7.0.1'
 
     compile project(':FlycoDialog_Lib')
 
-//    compile 'com.flyco.dialog:FlycoDialog_Lib:1.2.6@aar'
+//    compile 'com.flyco.dialog:FlycoDialog_Lib:1.2.8@aar'
 //    compile 'com.nineoldandroids:library:2.4.0'
 }
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.5.0'
+        classpath 'com.android.tools.build:gradle:2.1.0'
 //        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
 //        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip