解决include标签不显示的问题

hongyangAndroid · hongyangAndroid · commit cc4b969ade4c · 2015-11-23T18:46:58.000+08:00
diff --git a/autolayout/src/main/java/com/zhy/autolayout/AutoFrameLayout.java b/autolayout/src/main/java/com/zhy/autolayout/AutoFrameLayout.java
@@ -110,10 +110,6 @@ public AutoLayoutHelper.AutoLayoutInfo getPercentLayoutInfo()
             return mAutoLayoutInfo;
         }
 
-        @Override
-        protected void setBaseAttributes(TypedArray a, int widthAttr, int heightAttr)
-        {
-            AutoLayoutHelper.fetchWidthAndHeight(this, a, widthAttr, heightAttr);
-        }
+
     }
 }
diff --git a/autolayout/src/main/java/com/zhy/autolayout/AutoLayoutActivity.java b/autolayout/src/main/java/com/zhy/autolayout/AutoLayoutActivity.java
@@ -37,7 +37,6 @@ public View onCreateView(String name, Context context, AttributeSet attrs)
 
         if (view != null) return view;
 
-
         return super.onCreateView(name, context, attrs);
     }
 
diff --git a/autolayout/src/main/java/com/zhy/autolayout/AutoLayoutHelper.java b/autolayout/src/main/java/com/zhy/autolayout/AutoLayoutHelper.java
@@ -71,14 +71,6 @@ public AutoLayoutHelper(ViewGroup host)
     }
 
 
-    public static void fetchWidthAndHeight(ViewGroup.LayoutParams params, TypedArray array,
-                                           int widthAttr, int heightAttr)
-    {
-        params.width = array.getLayoutDimension(widthAttr, 0);
-        params.height = array.getLayoutDimension(heightAttr, 0);
-
-    }
-
     public void adjustChildren()
     {
         for (int i = 0, n = mHost.getChildCount(); i < n; i++)
diff --git a/autolayout/src/main/java/com/zhy/autolayout/AutoLinearLayout.java b/autolayout/src/main/java/com/zhy/autolayout/AutoLinearLayout.java
@@ -1,7 +1,6 @@
 package com.zhy.autolayout;
 
 import android.content.Context;
-import android.content.res.TypedArray;
 import android.util.AttributeSet;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
@@ -36,10 +35,11 @@ protected void onLayout(boolean changed, int l, int t, int r, int b)
         super.onLayout(changed, l, t, r, b);
     }
 
+
     @Override
     public LayoutParams generateLayoutParams(AttributeSet attrs)
     {
-        return new LayoutParams(getContext(), attrs);
+        return new AutoLinearLayout.LayoutParams(getContext(), attrs);
     }
 
 
@@ -60,11 +60,6 @@ public AutoLayoutHelper.AutoLayoutInfo getPercentLayoutInfo()
             return mAutoLayoutInfo;
         }
 
-        @Override
-        protected void setBaseAttributes(TypedArray a, int widthAttr, int heightAttr)
-        {
-            AutoLayoutHelper.fetchWidthAndHeight(this, a, widthAttr, heightAttr);
-        }
 
         public LayoutParams(int width, int height)
         {
diff --git a/autolayout/src/main/java/com/zhy/autolayout/AutoRelativeLayout.java b/autolayout/src/main/java/com/zhy/autolayout/AutoRelativeLayout.java
@@ -47,6 +47,8 @@ public LayoutParams generateLayoutParams(AttributeSet attrs)
         return new LayoutParams(getContext(), attrs);
     }
 
+
+
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec)
     {
@@ -93,10 +95,6 @@ public AutoLayoutHelper.AutoLayoutInfo getPercentLayoutInfo()
             return mAutoLayoutInfo;
         }
 
-        @Override
-        protected void setBaseAttributes(TypedArray a, int widthAttr, int heightAttr)
-        {
-            AutoLayoutHelper.fetchWidthAndHeight(this, a, widthAttr, heightAttr);
-        }
+
     }
 }
diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml
@@ -125,5 +125,10 @@
 
     </RelativeLayout>
 
+    <include
+        layout="@layout/include_test"
+        >
+    </include>
+
 
 </LinearLayout>
diff --git a/sample/src/main/res/layout/activity_main02.xml b/sample/src/main/res/layout/activity_main02.xml
@@ -38,6 +38,7 @@
             />
 
 
+
     </com.zhy.autolayout.AutoRelativeLayout>
 
 
@@ -132,5 +133,7 @@
 
     </com.zhy.autolayout.AutoRelativeLayout>
 
+    <include layout="@layout/include_test" ></include>
+
 
 </com.zhy.autolayout.AutoLinearLayout>
diff --git a/sample/src/main/res/layout/include_test.xml b/sample/src/main/res/layout/include_test.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="108px"
+    android:layout_marginTop="26px"
+    android:background="#ffffffff"
+    >
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="22px"
+        android:layout_marginTop="16px"
+        android:text="王大炮 From Include"
+        android:textColor="#333"
+        android:textSize="28px"
+        />
+
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="16px"
+        android:layout_marginLeft="22px"
+        android:text="护照：G50786449"
+        android:textColor="#999"
+        android:textSize="26px"
+        />
+
+</RelativeLayout>

Original file line number	Diff line number	Diff line change
`@@ -110,10 +110,6 @@ public AutoLayoutHelper.AutoLayoutInfo getPercentLayoutInfo()`
`110`	`110`	`return mAutoLayoutInfo;`
`111`	`111`	`}`
`112`	`112`
`113`		`- @Override`
`114`		`- protected void setBaseAttributes(TypedArray a, int widthAttr, int heightAttr)`
`115`		`- {`
`116`		`- AutoLayoutHelper.fetchWidthAndHeight(this, a, widthAttr, heightAttr);`
`117`		`- }`
	`113`	`+`
`118`	`114`	`}`
`119`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,6 @@ public View onCreateView(String name, Context context, AttributeSet attrs)`
`37`	`37`
`38`	`38`	`if (view != null) return view;`
`39`	`39`
`40`		`-`
`41`	`40`	`return super.onCreateView(name, context, attrs);`
`42`	`41`	`}`
`43`	`42`
Original file line number	Diff line number	Diff line change
`@@ -71,14 +71,6 @@ public AutoLayoutHelper(ViewGroup host)`
`71`	`71`	`}`
`72`	`72`
`73`	`73`
`74`		`- public static void fetchWidthAndHeight(ViewGroup.LayoutParams params, TypedArray array,`
`75`		`- int widthAttr, int heightAttr)`
`76`		`- {`
`77`		`- params.width = array.getLayoutDimension(widthAttr, 0);`
`78`		`- params.height = array.getLayoutDimension(heightAttr, 0);`
`79`		`-`
`80`		`- }`
`81`		`-`
`82`	`74`	`public void adjustChildren()`
`83`	`75`	`{`
`84`	`76`	`for (int i = 0, n = mHost.getChildCount(); i < n; i++)`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`package com.zhy.autolayout;`
`2`	`2`
`3`	`3`	`import android.content.Context;`
`4`		`-import android.content.res.TypedArray;`
`5`	`4`	`import android.util.AttributeSet;`
`6`	`5`	`import android.view.ViewGroup;`
`7`	`6`	`import android.widget.LinearLayout;`
`@@ -36,10 +35,11 @@ protected void onLayout(boolean changed, int l, int t, int r, int b)`
`36`	`35`	`super.onLayout(changed, l, t, r, b);`
`37`	`36`	`}`
`38`	`37`
	`38`	`+`
`39`	`39`	`@Override`
`40`	`40`	`public LayoutParams generateLayoutParams(AttributeSet attrs)`
`41`	`41`	`{`
`42`		`- return new LayoutParams(getContext(), attrs);`
	`42`	`+ return new AutoLinearLayout.LayoutParams(getContext(), attrs);`
`43`	`43`	`}`
`44`	`44`
`45`	`45`
`@@ -60,11 +60,6 @@ public AutoLayoutHelper.AutoLayoutInfo getPercentLayoutInfo()`
`60`	`60`	`return mAutoLayoutInfo;`
`61`	`61`	`}`
`62`	`62`
`63`		`- @Override`
`64`		`- protected void setBaseAttributes(TypedArray a, int widthAttr, int heightAttr)`
`65`		`- {`
`66`		`- AutoLayoutHelper.fetchWidthAndHeight(this, a, widthAttr, heightAttr);`
`67`		`- }`
`68`	`63`
`69`	`64`	`public LayoutParams(int width, int height)`
`70`	`65`	`{`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,8 @@ public LayoutParams generateLayoutParams(AttributeSet attrs)`
`47`	`47`	`return new LayoutParams(getContext(), attrs);`
`48`	`48`	`}`
`49`	`49`
	`50`	`+`
	`51`	`+`
`50`	`52`	`@Override`
`51`	`53`	`protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec)`
`52`	`54`	`{`
`@@ -93,10 +95,6 @@ public AutoLayoutHelper.AutoLayoutInfo getPercentLayoutInfo()`
`93`	`95`	`return mAutoLayoutInfo;`
`94`	`96`	`}`
`95`	`97`
`96`		`- @Override`
`97`		`- protected void setBaseAttributes(TypedArray a, int widthAttr, int heightAttr)`
`98`		`- {`
`99`		`- AutoLayoutHelper.fetchWidthAndHeight(this, a, widthAttr, heightAttr);`
`100`		`- }`
	`98`	`+`
`101`	`99`	`}`
`102`	`100`	`}`