Merge branch 'dev-member-john' of http://113.105.137.151:22280/lify/rvapp

RvWrapper/src/main/java/com/ruiwenliu/wrapper/http/OkHttpCreate.java

@@ -62,7 +62,7 @@ public class OkHttpCreate {
 //                return cookies != null ? cookies : new ArrayList<Cookie>();
 //            }
 //        });
-            setCache(mHttpBuilder);
+//            setCache(mHttpBuilder);
 //        addHttpHeader();
 //        return mHttpBuilder;
         }

RvWrapper/src/main/java/com/ruiwenliu/wrapper/util/glide/GlideManager.java

@@ -35,7 +35,7 @@ public class GlideManager {
 
     private Context mContext;
 
-    public GlideManager(Context context) {
+    private GlideManager(Context context) {
         this.mContext = context.getApplicationContext();
     }
 

plugin_member/src/main/java/com/rv.member/adapter/MemberListAdapter.java

@@ -247,7 +247,7 @@ public class MemberListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
             }
         });
         if (!TextUtils.isEmpty(bean.getIcon()))
-            new GlideManager(mContext).loadImage(bean.getIcon(), viewHolder.img_icon);
+            GlideManager.getInstance(mContext).loadImage(bean.getIcon(), viewHolder.img_icon);
 
         SpannableString spannableString = new SpannableString(bean.getName() + bean.getPrice() + "元 (永久)");
         spannableString.setSpan(new ForegroundColorSpan(Color.parseColor("#F25B5B")), bean.getName().length(), spannableString.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);

plugin_points/src/main/java/com/rv/points/PointsActivity.java

@@ -2,6 +2,8 @@ package com.rv.points;
 
 import android.content.Intent;
 import android.graphics.Color;
+import android.os.Build;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.os.Bundle;
 import android.support.v7.widget.LinearLayoutManager;
@@ -17,6 +19,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.base.utils.ui.image.round.RoundImageView;
+import com.bumptech.glide.Glide;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
@@ -37,6 +40,7 @@ import com.yuyife.okgo.OkGoUtil;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import butterknife.BindView;
@@ -56,6 +60,8 @@ public class PointsActivity extends BaseStatusActivity<PointPresenter> {
     private PointAdapter adapter;
     private UserInfoBean userInfo;
 
+    private List<PointBean.RvPointItem> points = new ArrayList<>();
+
     @Override
     protected int setLayout() {
         return R.layout.activity_points;
@@ -81,20 +87,31 @@ public class PointsActivity extends BaseStatusActivity<PointPresenter> {
             }
         }
         recyclerView.setLayoutManager(new LinearLayoutManager(this, LinearLayout.VERTICAL, false));
-        adapter = new PointAdapter(new ArrayList<PointBean.RvPointItem>());
+        adapter = new PointAdapter(this, points);
         recyclerView.setAdapter(adapter);
-        adapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
+        adapter.setOnItemClickListener(new PointAdapter.OnItemClickListener() {
+            @Override
+            public void openSignRuler(String code) {
+                if (!TextUtils.isEmpty(code))
+                    getSignRuler(code);
+            }
+
             @Override
-            public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
-                int id = view.getId();
-                PointBean.RvPointItem item = (PointBean.RvPointItem) adapter.getItem(position);
-                if (R.id.btn_state == id) {
+            public void onClick(PointBean.RvPointItem item) {
                 if (!TextUtils.isEmpty(item.getCode()))
                     mPresenter.go(item.getCode().toLowerCase().trim());
-                } else if (R.id.tv_regulation == id) {
-                    getSignRuler(item.getCode());
             }
+        });
 
+        recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
+            @Override
+            public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newState) {
+                super.onScrollStateChanged(recyclerView, newState);
+                if (newState == RecyclerView.SCROLL_STATE_IDLE) {
+                    Glide.with(PointsActivity.this).resumeRequests();//恢复Glide加载图片
+                } else {
+                    Glide.with(PointsActivity.this).pauseRequests();//禁止Glide加载图片
+                }
             }
         });
     }
@@ -146,8 +163,9 @@ public class PointsActivity extends BaseStatusActivity<PointPresenter> {
         if (requestType == 1) {
             PointBean pointBean = (PointBean) result;
             if (pointBean.getData() != null && pointBean.getData().getData() != null) {
-                adapter.getData().clear();
-                adapter.addData(pointBean.getData().getData());
+                points.clear();
+                points.addAll(pointBean.getData().getData());
+                adapter.notifyDataSetChanged();
             }
         }
 
@@ -155,11 +173,11 @@ public class PointsActivity extends BaseStatusActivity<PointPresenter> {
             if (result != null && result instanceof UserPointInfoBean) {
                 UserPointInfoBean pointInfoBean = (UserPointInfoBean) result;
                 if (pointInfoBean.getData() != null) {
-                    String text = pointInfoBean.getData().getRestPoint() + "\n分";
-                    int position = text.indexOf("分");
+                    String text = pointInfoBean.getData().getRestPoint() + "\n积分";
+                    int position = text.indexOf("积分");
                     SpannableString sStr = new SpannableString(text);
-                    sStr.setSpan(new AbsoluteSizeSpan(DisplayUtil.sp2px(this, 12)), position, position + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-                    sStr.setSpan(new ForegroundColorSpan(Color.parseColor("#F8F3C9")), position, position + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+                    sStr.setSpan(new AbsoluteSizeSpan(DisplayUtil.sp2px(this, 12)), position, position + 2, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+                    sStr.setSpan(new ForegroundColorSpan(Color.parseColor("#F8F3C9")), position, position + 2, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
                     tvPoint.setText(sStr);
                 }
             }

plugin_points/src/main/java/com/rv/points/adapter/PointAdapter.java

 package com.rv.points.adapter;
 
+import android.content.Context;
 import android.graphics.Color;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -15,38 +23,119 @@ import com.rv.points.bean.PointBean;
 
 import java.util.List;
 
-public class PointAdapter extends BaseQuickAdapter<PointBean.RvPointItem, BaseViewHolder> {
+public class PointAdapter extends RecyclerView.Adapter {
 
-    public PointAdapter(List<PointBean.RvPointItem> lists) {
-        super(R.layout.item_point, lists);
+    private Context mContext;
+    private List<PointBean.RvPointItem> mLists;
+    private OnItemClickListener mListener;
+
+    public PointAdapter(Context context, List<PointBean.RvPointItem> lists) {
+        super();
+        this.mContext = context;
+        this.mLists = lists;
+    }
+
+    public void setOnItemClickListener(OnItemClickListener listener) {
+        this.mListener = listener;
     }
 
+    @NonNull
     @Override
-    protected void convert(BaseViewHolder helper, PointBean.RvPointItem item) {
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int i) {
+        View view = LayoutInflater.from(mContext).inflate(R.layout.item_point, viewGroup, false);
+        return new PointViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder, int i) {
+        final PointBean.RvPointItem item = mLists.get(i);
+        PointViewHolder holder = (PointViewHolder) viewHolder;
         if (!TextUtils.isEmpty(item.getImg())) {
-            GlideManager.getInstance(mContext).loadImage(item.getImg(), (ImageView) helper.itemView.findViewById(R.id.img_icon));
+            GlideManager.getInstance(mContext).loadImage(item.getImg(), holder.imgIcon);
+        } else {
+            holder.imgIcon.setImageResource(com.ruiwenliu.wrapper.R.drawable.glide_icon_error);
         }
+
         if (!TextUtils.isEmpty(item.getName())) {
-            helper.setText(R.id.tv_name, item.getName());
+            holder.tvName.setText(item.getName());
+        } else {
+            holder.tvName.setText("");
         }
+
         if (!TextUtils.isEmpty(item.getRegulation())) {
             if ("SIGN".equals(item.getCode())) {
-                helper.setText(R.id.tv_regulation, "签到规则");
-                helper.setTextColor(R.id.tv_regulation, Color.parseColor("#FFB74B"));
-                helper.addOnClickListener(R.id.tv_regulation);
+                holder.tvRegulation.setText("签到规则");
+                holder.tvRegulation.setTextColor(Color.parseColor("#FFB74B"));
+                holder.tvRegulation.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        if (mListener != null) {
+                            mListener.openSignRuler(item.getCode());
+                        }
+                    }
+                });
             } else {
-                helper.setText(R.id.tv_regulation, item.getRegulation());
-                helper.setTextColor(R.id.tv_regulation, Color.parseColor("#999999"));
+                holder.tvRegulation.setText(item.getRegulation());
+                holder.tvRegulation.setTextColor(Color.parseColor("#999999"));
             }
+        } else {
+            holder.tvRegulation.setText("");
         }
         if (item.getPoint() != 0) {
-            helper.setText(R.id.tv_points, item.getPoint() + "分");
+            holder.tvPoints.setVisibility(View.VISIBLE);
+            holder.tvPoints.setText(item.getPoint() + "分");
+        } else {
+            holder.tvPoints.setVisibility(View.GONE);
         }
         if (!TextUtils.isEmpty(item.getBtnWord())) {
-            helper.setText(R.id.btn_state, item.getBtnWord());
+            holder.btnState.setText(item.getBtnWord());
         }
-        helper.setBackgroundRes(R.id.btn_state, item.isIntegralStatus() ? R.drawable.shape_rv_bg_member_top_grap : R.drawable.shape_rv_bg_dark_yellow);
-        helper.itemView.findViewById(R.id.btn_state).setEnabled(!item.isIntegralStatus());
-        helper.addOnClickListener(R.id.btn_state);
+
+        if ("SIGN".equals(item.getCode())) {
+            holder.btnState.setEnabled(true);
+            holder.btnState.setBackgroundResource(R.drawable.shape_rv_bg_dark_yellow);
+        } else {
+            holder.btnState.setEnabled(!item.isIntegralStatus());
+            holder.btnState.setBackgroundResource(item.isIntegralStatus() ? R.drawable.shape_rv_bg_member_top_grap : R.drawable.shape_rv_bg_dark_yellow);
         }
+        holder.btnState.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (mListener != null) {
+                    mListener.onClick(item);
+                }
+            }
+        });
+    }
+
+    @Override
+    public int getItemCount() {
+        return mLists.size();
+    }
+
+
+    private class PointViewHolder extends RecyclerView.ViewHolder {
+        ImageView imgIcon;
+        TextView tvName;
+        TextView tvPoints;
+        TextView tvRegulation;
+        Button btnState;
+
+        public PointViewHolder(@NonNull View itemView) {
+            super(itemView);
+            imgIcon = itemView.findViewById(R.id.img_icon);
+            tvName = itemView.findViewById(R.id.tv_name);
+            tvPoints = itemView.findViewById(R.id.tv_points);
+            tvRegulation = itemView.findViewById(R.id.tv_regulation);
+            btnState = itemView.findViewById(R.id.btn_state);
+        }
+    }
+
+    public interface OnItemClickListener {
+        void openSignRuler(String code);
+
+        void onClick(PointBean.RvPointItem item);
+    }
+
+
 }

plugin_points/src/main/res/layout/activity_points.xml

@@ -17,7 +17,7 @@
             android:layout_height="@dimen/dp_40"
             android:layout_centerVertical="true"
             android:padding="@dimen/size_10"
-            android:src="@drawable/rv_common_icon_back_white" />
+            android:src="@drawable/rv_common_icon_back_grap" />
 
         <TextView
             android:layout_width="wrap_content"
@@ -25,7 +25,7 @@
             android:layout_centerInParent="true"
             android:text="我的积分"
             android:textColor="@color/black"
-            android:textSize="@dimen/sp_16" />
+            android:textSize="@dimen/text_18" />
     </RelativeLayout>
 
     <RelativeLayout
@@ -61,10 +61,12 @@
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
             android:layout_marginRight="@dimen/size_50"
+            android:fontFamily="sans-serif-condensed"
             android:gravity="center"
             android:text="0"
             android:textColor="@color/white"
-            android:textSize="@dimen/text_22" />
+            android:textSize="24sp"
+            android:textStyle="bold" />
     </RelativeLayout>
 
     <include layout="@layout/common_rv" />

plugin_points/src/main/res/layout/activity_sign.xml

@@ -79,7 +79,7 @@
                     android:layout_centerVertical="true"
                     android:layout_marginLeft="@dimen/dp_10"
                     android:layout_toRightOf="@+id/img_icon"
-                    android:text="你已累计签到9天" />
+                    android:text="你已累计签到0天" />
 
                 <Button
                     android:id="@+id/btn_sign"

plugin_points/src/main/res/layout/item_point.xml

@@ -29,15 +29,24 @@
             android:textColor="#000000"
             android:textSize="@dimen/text_15" />
 
+        <ImageView
+            android:id="@+id/img_points_icon"
+            android:layout_width="@dimen/size_10"
+            android:layout_height="@dimen/size_10"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="@dimen/dp_10"
+            android:layout_marginRight="@dimen/size_3"
+            android:layout_toRightOf="@id/tv_name"
+            android:src="@drawable/icon_point" />
+
+
         <TextView
             android:id="@+id/tv_points"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:layout_marginLeft="@dimen/dp_10"
-            android:layout_toRightOf="@id/tv_name"
-            android:drawableLeft="@drawable/icon_point"
-            android:drawablePadding="@dimen/size_2"
+            android:layout_marginRight="@dimen/dp_10"
+            android:layout_toRightOf="@id/img_points_icon"
             android:text="10分"
             android:textColor="@color/tv_gr999999"
             android:textSize="@dimen/sp_12" />
@@ -47,7 +56,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:layout_marginLeft="@dimen/dp_10"
             android:layout_marginRight="@dimen/dp_10"
             android:layout_toLeftOf="@+id/btn_state"
             android:layout_toRightOf="@id/tv_points"

plugin_share/src/main/AndroidManifest.xml

@@ -6,16 +6,18 @@
         <activity android:name=".ShareActivity" />
         <activity android:name=".BillActivity" />
         <activity android:name=".WebViewActivity">
-            <!--<intent-filter>-->
-            <!--<data android:scheme="rv" android:host="xxfc" android:path="/activity" />-->
-            <!--&lt;!&ndash;下面这几行也必须得设置&ndash;&gt;-->
-            <!--<category android:name="android.intent.category.DEFAULT"/>-->
-            <!--<action android:name="android.intent.action.VIEW"/>-->
-            <!--<category android:name="android.intent.category.BROWSABLE"/>-->
-            <!--</intent-filter>-->
+
+            <!-- <intent-filter> -->
+            <!-- <data android:scheme="rv" android:host="xxfc" android:path="/activity" /> -->
+            <!-- &lt;!&ndash;下面这几行也必须得设置&ndash;&gt; -->
+            <!-- <category android:name="android.intent.category.DEFAULT"/> -->
+            <!-- <action android:name="android.intent.action.VIEW"/> -->
+            <!-- <category android:name="android.intent.category.BROWSABLE"/> -->
+            <!-- </intent-filter> -->
         </activity>
         <activity android:name=".ReativeBillActivity" />
-        <activity android:name=".PopularizeActivity"></activity>
+        <activity android:name=".PopularizeActivity" />
+        <activity android:name=".ShareRulerActivity"></activity>
     </application>
 
 </manifest>
\ No newline at end of file

plugin_share/src/main/java/com/rv/share/ReativeBillActivity.java

@@ -87,11 +87,12 @@ public class ReativeBillActivity extends BaseStatusActivity<ReativeBillPresenter
 
     }
 
-    @OnClick({R2.id.btn_save_bill, R2.id.btn_share})
+    @OnClick({R2.id.btn_save_bill, R2.id.btn_share,R2.id.tv_back_title})
     public void onViewClicked(View view) {
         int id = view.getId();
-
-        if (id == R.id.btn_save_bill) {
+        if (id == R.id.tv_back_title) {
+            finish();
+        } else if (id == R.id.btn_save_bill) {
             mPresenter.saveBill(llContent);
         } else if (id == R.id.btn_share) {
             mPresenter.saveShare(llContent);

plugin_share/src/main/java/com/rv/share/ShareActivity.java

@@ -115,13 +115,13 @@ public class ShareActivity extends BaseStatusActivity<SharePresenter> {
             shareUrl = RvFrameConfig.HOST + "/h5/appHtml/view/invitationCourtesyShare.html?code=" + code + "_P0101";
         }
         if (id == R.id.tv_weixin) {
-            mPresenter.shareWx(shareUrl, "【滴房车】", "新人专享大礼包，快去领！");
+            mPresenter.shareWx(shareUrl, "新人专享大礼包，快去领！", "  ");
         } else if (id == R.id.tv_weixin_circle) {
-            mPresenter.shareWxC(shareUrl, "【滴房车】", "新人专享大礼包，快去领！");
+            mPresenter.shareWxC(shareUrl, "新人专享大礼包，快去领！", "  ");
         } else if (id == R.id.tv_bill) {
             startActivity(ReativeBillActivity.getIntent(this, shareUrl));
         } else if (id == R.id.tv_more) {
-            mPresenter.shareMore(shareUrl, "【滴房车】", "新人专享大礼包，快去领！");
+            mPresenter.shareMore(shareUrl, "新人专享大礼包，快去领！", "  ");
         } else if (id == R.id.tv_more_detail) {
             startActivity(PopularizeActivity.getIntent(getApplicationContext(), 0));
         } else if (id == R.id.ll_activation) {
@@ -130,6 +130,8 @@ public class ShareActivity extends BaseStatusActivity<SharePresenter> {
             startActivity(PopularizeActivity.getIntent(getApplicationContext(), 1));
         } else if (id == R.id.ll_comein) {
             startActivity(PopularizeActivity.getIntent(getApplicationContext(), 0));
+        } else if (id == R.id.tv_ruler) {
+            startActivity(new Intent(getApplicationContext(), ShareRulerActivity.class));
         }
     }
 

plugin_share/src/main/java/com/rv/share/ShareRulerActivity.java

+package com.rv.share;
+
+import android.content.Intent;
+import android.os.Bundle;
+
+import com.ruiwenliu.wrapper.base.BaseBean;
+import com.ruiwenliu.wrapper.weight.TitleView;
+import com.rv.home.rv.module.basic.BaseStatusActivity;
+import com.rv.home.rv.module.basic.presenter.CommonPresenter;
+
+public class ShareRulerActivity extends BaseStatusActivity<CommonPresenter> {
+
+    @Override
+    protected int setLayout() {
+        return R.layout.activity_share_ruler;
+    }
+
+    @Override
+    protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
+        titleView.setTitle("推广有奖规则");
+    }
+
+    @Override
+    public void onShowResult(int requestType, BaseBean result) {
+
+    }
+}

plugin_share/src/main/java/com/rv/share/view/PromotionDialog.java

@@ -62,11 +62,11 @@ public class PromotionDialog extends Dialog {
             dialog.addContentView(layout, new WindowManager.LayoutParams(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.WRAP_CONTENT));
             this.button = layout.findViewById(R.id.button);
             if (this.act != null && !TextUtils.isEmpty(this.act.getButtonImages())) {
-                GlideManager.getInstance(mContext).loadImage(this.act.getButtonImages(), this.button);
+                GlideManager.getInstance(mContext).loadImage2(this.act.getButtonImages(), this.button);
             }
             this.imgBg = layout.findViewById(R.id.img_bg);
             if (this.act != null && !TextUtils.isEmpty(this.act.getBackground())) {
-                GlideManager.getInstance(mContext).loadImage(this.act.getBackground(), this.imgBg);
+                GlideManager.getInstance(mContext).loadImage2(this.act.getBackground(), this.imgBg);
             }
             this.imgClose = layout.findViewById(R.id.img_close);
             this.button.setOnClickListener(mListener);

plugin_share/src/main/java/com/rv/share/view/RvWebView.java

@@ -4,12 +4,14 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.webkit.ConsoleMessage;
 import android.webkit.JavascriptInterface;
 import android.webkit.WebChromeClient;
 import android.webkit.WebResourceRequest;
+import android.webkit.WebResourceResponse;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
@@ -90,6 +92,12 @@ public class RvWebView extends WebView {
         public boolean shouldOverrideUrlLoading(WebView view, String url) {
             return super.shouldOverrideUrlLoading(view, url);
         }
+
+        @Override
+        public WebResourceResponse shouldInterceptRequest(WebView view, WebResourceRequest request) {
+            WebResourceResponse response = super.shouldInterceptRequest(view, request);
+            return response;
+        }
     };
 
     public WebChromeClient webChromeClient = new WebChromeClient() {

plugin_share/src/main/res/drawable-xhdpi/bg_share_ruler_tab.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#ffff9e74" />
+    <corners
+        android:bottomLeftRadius="80dp"
+        android:bottomRightRadius="80dp"
+        android:topLeftRadius="0dp"
+        android:topRightRadius="80dp" />
+</shape>

plugin_share/src/main/res/drawable-xhdpi/icon_line_share_ruler.xml

+<?xml version="1.0" encoding="utf-8"?>
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <stroke
+        android:width="2dp"
+        android:color="#fffe6e2f" />
+</shape>
\ No newline at end of file

plugin_share/src/main/res/drawable/icon_triangle_share_ruler.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#ffffffff" />
+    <stroke
+        android:width="2dp"
+        android:color="#fffe6e2f" />
+</shape>
\ No newline at end of file

plugin_share/src/main/res/layout/activity_reative_bill.xml

@@ -10,8 +10,9 @@
     tools:context=".ReativeBillActivity">
 
     <TextView
+        android:id="@+id/tv_back_title"
         android:layout_width="wrap_content"
-        android:layout_height="@dimen/size_48"
+        android:layout_height="@dimen/size_55"
         android:drawableLeft="@drawable/rv_common_icon_back_dark"
         android:drawablePadding="5dp"
         android:gravity="center"
@@ -24,9 +25,9 @@
     <include layout="@layout/common_line" />
 
     <FrameLayout
-        android:background="#55eeeeee"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:background="#55eeeeee">
 
         <LinearLayout
             android:id="@+id/ll_content"

plugin_share/src/main/res/layout/activity_share.xml

@@ -4,28 +4,29 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#FEE4A9"
+    android:background="#FCE2A8"
     android:gravity="center_horizontal"
     android:orientation="vertical"
 
     tools:context=".ShareActivity">
 
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:weightSum="19">
+            android:orientation="vertical">
 
             <FrameLayout
                 android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="7">
+                android:layout_height="wrap_content">
 
                 <ImageView
                     android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:scaleType="fitXY"
-                android:src="@drawable/bg_share_new1" />
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/bg_share_top" />
 
                 <TextView
                     android:id="@+id/tv_ruler"
@@ -43,15 +44,17 @@
 
             <android.support.v7.widget.CardView
                 android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_margin="@dimen/dp_10"
-            android:layout_weight="5"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/size_15"
+                android:layout_marginTop="@dimen/size_10"
+                android:layout_marginRight="@dimen/size_15"
+                android:layout_marginBottom="@dimen/size_10"
                 android:background="@color/white"
                 app:cardCornerRadius="5dp">
 
                 <LinearLayout
                     android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                    android:layout_height="wrap_content"
                     android:orientation="vertical">
 
                     <TextView
@@ -66,9 +69,9 @@
 
                     <LinearLayout
                         android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_marginTop="@dimen/size_10"
-                    android:layout_marginBottom="10dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/size_20"
+                        android:layout_marginBottom="@dimen/size_15"
                         android:gravity="center"
                         android:orientation="horizontal">
 
@@ -79,6 +82,7 @@
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
                             android:drawableTop="@drawable/icon_share_weixin"
+                            android:drawablePadding="@dimen/size_10"
                             android:gravity="center"
                             android:text="微信" />
 
@@ -88,6 +92,7 @@
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
+                            android:drawablePadding="@dimen/size_10"
                             android:drawableTop="@drawable/icon_share_wx_circle"
                             android:gravity="center"
                             android:text="朋友圈" />
@@ -99,6 +104,7 @@
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
                             android:drawableTop="@drawable/icon_share_code"
+                            android:drawablePadding="@dimen/size_10"
                             android:gravity="center"
                             android:text="邀请码" />
 
@@ -107,7 +113,7 @@
                             android:id="@+id/tv_more"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
-
+                            android:drawablePadding="@dimen/size_10"
                             android:layout_weight="1"
                             android:drawableTop="@drawable/icon_share_more"
                             android:gravity="center"
@@ -122,17 +128,16 @@
 
             <android.support.v7.widget.CardView
                 android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_marginLeft="@dimen/dp_10"
-            android:layout_marginRight="@dimen/dp_10"
-            android:layout_marginBottom="@dimen/dp_10"
-            android:layout_weight="5"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/size_15"
+                android:layout_marginRight="@dimen/size_15"
+                android:layout_marginBottom="@dimen/size_10"
                 android:background="@color/white"
                 app:cardCornerRadius="5dp">
 
                 <LinearLayout
                     android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                    android:layout_height="wrap_content"
                     android:orientation="vertical">
 
                     <RelativeLayout
@@ -157,22 +162,25 @@
                             android:layout_height="wrap_content"
                             android:layout_alignParentRight="true"
                             android:layout_centerVertical="true"
-                        android:drawableRight="@drawable/common_icon_rig_black"
+                            android:drawableRight="@drawable/common_icon_rig_gray"
                             android:drawablePadding="3dp"
-                        android:text="查看详情" />
+                            android:text="查看详情"
+                            android:textSize="@dimen/sp_12" />
                     </RelativeLayout>
 
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/size_20"
+                        android:layout_marginBottom="@dimen/size_15"
+                        android:gravity="center"
                         android:orientation="horizontal"
                         android:weightSum="3">
 
                         <LinearLayout
                             android:id="@+id/ll_comein"
                             android:layout_width="0dp"
-                        android:layout_height="match_parent"
+                            android:layout_height="wrap_content"
                             android:layout_weight="1"
                             android:gravity="center"
                             android:orientation="vertical">
@@ -200,7 +208,7 @@
                         <LinearLayout
                             android:id="@+id/ll_invite"
                             android:layout_width="0dp"
-                        android:layout_height="match_parent"
+                            android:layout_height="wrap_content"
                             android:layout_weight="1"
                             android:gravity="center"
                             android:orientation="vertical">
@@ -228,7 +236,7 @@
                         <LinearLayout
                             android:id="@+id/ll_activation"
                             android:layout_width="0dp"
-                        android:layout_height="match_parent"
+                            android:layout_height="wrap_content"
                             android:layout_weight="1"
                             android:gravity="center"
                             android:orientation="vertical">
@@ -257,11 +265,10 @@
 
             <android.support.v7.widget.CardView
                 android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_marginLeft="@dimen/dp_10"
-            android:layout_marginRight="@dimen/dp_10"
-            android:layout_marginBottom="@dimen/dp_10"
-            android:layout_weight="2"
+                android:layout_height="48dp"
+                android:layout_marginLeft="@dimen/size_15"
+                android:layout_marginRight="@dimen/size_15"
+                android:layout_marginBottom="@dimen/size_10"
                 android:background="@color/white"
                 app:cardCornerRadius="5dp">
 
@@ -308,4 +315,6 @@
 
         </LinearLayout>
 
+    </ScrollView>
+
 </LinearLayout>
\ No newline at end of file