Fix H07000223#22

gzzx24 · Jul 28, 2016 · 803d841 · 803d841
1 parent 7e1a146
commit 803d841
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 9 deletions.
diff --git a/CHNAGELOG.md b/CHNAGELOG.md
@@ -31,19 +31,23 @@ Version 1.2.2 *(2015-12-20)*
 ----------------------------
 * BasePopup small bug fix
 
-Version 1.2.6 *(2015-01-07)*
+Version 1.2.6 *(2016-01-07)*
 ----------------------------
 * Combine FlycoAnimation_Lib into FlycoDialog_Lib
 * Fix bug for View in Popup click no response
 * Improve the function of BaseBubblePopup
 
-Version 1.2.8 *(2015-04-28)*
+Version 1.2.8 *(2016-04-28)*
 ----------------------------
 * bugfix issue14
 
-Version 1.3.0 *(2015-05-21)*
+Version 1.3.0 *(2016-05-21)*
 ----------------------------
 * remove the dependence of NineOldAnimation(only support 3.0+)
 
+Version 1.3.2 *(2016-07-18)*
+----------------------------
+* bugfix issue22
+
 
 
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.3.0"
+version = "1.3.2"
 android {
     compileSdkVersion 23
     buildToolsVersion "23.0.3"
     resourcePrefix "FlycoDialog_"    //这个随便填
     defaultConfig {
         minSdkVersion 11
         targetSdkVersion 23
-        versionCode 130
+        versionCode 132
         versionName version
     }
     buildTypes {

diff --git a/FlycoDialog_Lib/src/main/java/com/flyco/dialog/widget/internal/InternalBasePopup.java b/FlycoDialog_Lib/src/main/java/com/flyco/dialog/widget/internal/InternalBasePopup.java
@@ -42,6 +42,7 @@ public void onGlobalLayout() {
     @Override
     public void onAttachedToWindow() {
         super.onAttachedToWindow();
+        mOnCreateView.setClickable(false);
         if (isLayoutObtain) {
             onLayoutObtain();
         }

diff --git a/README.md b/README.md
@@ -144,7 +144,7 @@ dependencies{
 
 After v1.3.0
 dependencies{
-     compile 'com.flyco.dialog:FlycoDialog_Lib:1.3.0@aar'
+     compile 'com.flyco.dialog:FlycoDialog_Lib:1.3.2@aar'
 }
 
 ```

diff --git a/README_CN.md b/README_CN.md
@@ -145,7 +145,7 @@ dependencies{
 
 After v1.3.0
 dependencies{
-     compile 'com.flyco.dialog:FlycoDialog_Lib:1.3.0@aar'
+     compile 'com.flyco.dialog:FlycoDialog_Lib:1.3.2@aar'
 }
 
 ```

diff --git a/app/build.gradle b/app/build.gradle
@@ -26,7 +26,7 @@ dependencies {
     compile project(':FlycoDialog_Lib')
 
 //    After 1.3.0
-//    compile 'com.flyco.dialog:FlycoDialog_Lib:1.3.0@aar'
+//    compile 'com.flyco.dialog:FlycoDialog_Lib:1.3.2@aar'
 
 //    compile 'com.flyco.dialog:FlycoDialog_Lib:1.2.8@aar'
 //    compile 'com.nineoldandroids:library:2.4.0'

diff --git a/app/src/main/java/com/flyco/dialogsamples/ui/CustomPopupActivity.java b/app/src/main/java/com/flyco/dialogsamples/ui/CustomPopupActivity.java
@@ -42,6 +42,7 @@ protected void onCreate(Bundle savedInstanceState) {
         ButterKnife.bind(this);
 
         mQuickCustomPopup = new SimpleCustomPop(mContext);
+//        mQuickCustomPopup.setCanceledOnTouchOutside(false);
     }
 
     @OnClick(R.id.tv_center)
@@ -115,6 +116,7 @@ class SimpleCustomPop extends BasePopup<SimpleCustomPop> {
 
         public SimpleCustomPop(Context context) {
             super(context);
+//            setCanceledOnTouchOutside(false);
         }
 
         @Override

diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.0'
+        classpath 'com.android.tools.build:gradle:2.1.2'
 //        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