更新jcenter版本为1.3.0

README.md

@@ -55,7 +55,7 @@ dependencies {
 
 ```
 dependencies {
-    compile 'com.zhy:autolayout:1.2.1'
+    compile 'com.zhy:autolayout:1.3.0'
 }
 ```
 

autolayout/autolayout.iml

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

autolayout/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
 
-version = "1.2.1"
+version = "1.3.0"
 
 android {
     compileSdkVersion 23

autolayout/src/main/java/com/zhy/autolayout/attr/AutoAttr.java

@@ -3,6 +3,7 @@
 import android.view.View;
 
 import com.zhy.autolayout.utils.AutoUtils;
+import com.zhy.autolayout.utils.L;
 
 
 /**
@@ -24,16 +25,34 @@ public AutoAttr(int pxVal, int baseWidth, int baseHeight)
     public void apply(View view)
     {
 
+        boolean log = view.getTag() != null && view.getTag().toString().equals("auto");
+
+        if (log)
+        {
+            L.e(" pxVal = " + pxVal +" ," + this.getClass().getSimpleName());
+        }
         int val;
         if (useDefault())
         {
             val = defaultBaseWidth() ? getPercentWidthSize() : getPercentHeightSize();
+            if (log)
+            {
+                L.e(" useDefault val= " + val);
+            }
         } else if (baseWidth())
         {
             val = getPercentWidthSize();
+            if (log)
+            {
+                L.e(" baseWidth val= " + val);
+            }
         } else
         {
             val = getPercentHeightSize();
+            if (log)
+            {
+                L.e(" baseHeight val= " + val);
+            }
         }
         execute(view, val);
     }
@@ -56,7 +75,7 @@ protected boolean baseWidth()
 
     protected boolean useDefault()
     {
-        return !contains(baseHeight, attrVal()) || !contains(baseWidth, attrVal());
+        return !contains(baseHeight, attrVal()) && !contains(baseWidth, attrVal());
     }
 
     protected boolean contains(int baseVal, int flag)

sample/src/main/res/layout/activity_square.xml

@@ -19,7 +19,6 @@
             android:layout_marginRight="20px"
             android:background="#44ff0000"
             android:gravity="center"
-            android:tag="auto"
             android:text="我"
             app:layout_auto_basewidth="height"/>