修改expandableLinearLayout

app/src/main/AndroidManifest.xml

@@ -24,6 +24,8 @@
         </activity>
         <activity android:name=".activity.RunningTextViewDemoActivity">
         </activity>
+        <activity android:name=".activity.ExpandableLinearLayoutDemoActivity">
+        </activity>
     </application>
 
 </manifest>
\ No newline at end of file

app/src/main/java/com/chaychan/powerfulviewlibrary/activity/ExpandableLinearLayoutDemoActivity.java

+package com.chaychan.powerfulviewlibrary.activity;
+
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+
+import com.chaychan.powerfulviewlibrary.R;
+import com.chaychan.viewlib.ExpandableLinearLayout;
+
+public class ExpandableLinearLayoutDemoActivity extends AppCompatActivity {
+
+    private ExpandableLinearLayout ellProduct;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_expandable_linear_layout_demo);
+
+        ellProduct = (ExpandableLinearLayout) findViewById(R.id.ell_product);
+        for (int i = 0; i < 9; i++) {
+            View view = View.inflate(this, R.layout.item_product, null);
+            ellProduct.addItem(view);
+        }
+    }
+}

app/src/main/java/com/chaychan/powerfulviewlibrary/activity/MainActivity.java

@@ -15,7 +15,8 @@ public class MainActivity extends ListActivity {
             new DemoBean("PowerfulEditTextDemo",PowerfulEditTextDemoActivity.class),
             new DemoBean("ExpandableTextViewDemo",ExpandableTextViewDemoActivity.class),
             new DemoBean("PieChartViewDemo",PieChartViewDemoActivity.class),
-            new DemoBean("RunningTextViewDemo",RunningTextViewDemoActivity.class)
+            new DemoBean("RunningTextViewDemo",RunningTextViewDemoActivity.class),
+            new DemoBean("ExpandableLinearLayoutDemo",ExpandableLinearLayoutDemoActivity.class)
     };
 
     @Override

app/src/main/res/layout/activity_expandable_linear_layout_demo.xml

+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    >
+
+    <!--商品列表-->
+    <com.chaychan.viewlib.ExpandableLinearLayout
+        android:id="@+id/ell_product"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:orientation="vertical"
+        app:defaultItemCount="2"
+        app:expandText="收起内容"
+        app:hideText="查看更多"
+        >
+
+    </com.chaychan.viewlib.ExpandableLinearLayout>
+
+</ScrollView>

app/src/main/res/layout/item_product.xml

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:padding="10dp"
+    >
+
+    <ImageView
+        android:layout_width="100dp"
+        android:layout_height="80dp"
+        android:layout_gravity="center"
+        android:scaleType="centerCrop"
+        android:src="@mipmap/ic_default"
+        />
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:orientation="vertical"
+        >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="隆江猪脚饭"
+            />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:gravity="center"
+            android:orientation="horizontal"
+            >
+
+            <TextView
+                android:id="@+id/tv_intro"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="特别好吃哦，带回家啊时间还是健康的贺卡上空间的挥洒健康的贺卡姐啊上课黑色的健康哈空间"
+                android:textColor="#9f9f9f"
+                />
+
+            <TextView
+                android:id="@+id/tv_money"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:drawablePadding="5dp"
+                android:text="99.00"
+                />
+
+        </LinearLayout>
+
+
+    </LinearLayout>
+
+
+</LinearLayout>

viewlib/src/main/java/com/chaychan/viewlib/ExpandableLinearLayout.java

@@ -69,8 +69,7 @@ public class ExpandableLinearLayout extends FrameLayout implements View.OnClickL
 
 
     public void addItem(View view) {
-        LayoutParams params = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
-        llContainer.addView(view,params);
+        llContainer.addView(view);
         refreshUI();
     }
 
@@ -100,7 +99,7 @@ public class ExpandableLinearLayout extends FrameLayout implements View.OnClickL
             int viewHeight = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED);
 
             view.measure(viewWidth, viewHeight);
-            height += view.getMeasuredHeight();
+            height += view.getMeasuredHeight() + view.getPaddingTop() + view.getPaddingBottom();
         }
 
         doAnimation(params.height,height);//执行动画
@@ -120,7 +119,7 @@ public class ExpandableLinearLayout extends FrameLayout implements View.OnClickL
             int viewHeight = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED);
 
             view.measure(viewWidth, viewHeight);
-            height += view.getMeasuredHeight();
+            height += view.getMeasuredHeight()+ view.getPaddingTop() + view.getPaddingBottom();
         }
 
         if (withAnimation){
@@ -128,6 +127,7 @@ public class ExpandableLinearLayout extends FrameLayout implements View.OnClickL
         }else{
             params.height = height;
             llContainer.setLayoutParams(params);
+            llContainer.requestLayout();
         }
     }
 
@@ -147,6 +147,7 @@ public class ExpandableLinearLayout extends FrameLayout implements View.OnClickL
                 LinearLayout.LayoutParams params = (LinearLayout.LayoutParams) llContainer.getLayoutParams();
                 params.height = height;
                 llContainer.setLayoutParams(params);
+                llContainer.requestLayout();
             }
         });
 

viewlib/src/main/res/layout/expandable_linearlayout.xml

@@ -17,8 +17,8 @@
         android:layout_gravity="center"
         android:minHeight="30dp"
         android:id="@+id/rl_bottom"
-        android:layout_marginTop="5dp"
         android:visibility="gone"
+        android:layout_marginBottom="10dp"
         >
 
         <TextView