1 优化二维码占用与联系人邀请角色冲突问题

YangShuai
1 parent f4d3a0b7
Showing 10 changed files with 255 additions and 457 deletions
app/src/main/java/com/cnlive/strike/xiaojiaspeaker/ButtonAnimUtil.java
app/src/main/java/com/cnlive/strike/xiaojiaspeaker/ToolBarTestActivity.java
app/src/main/java/com/cnlive/strike/xiaojiaspeaker/ViewAnimUtil.java
app/src/main/res/layout/activity_tool_bar_test1.xml
config.gradle
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/presenter/SetFriendsRolePresenter.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/model/message/EventMsg.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/InvitFriendFragment.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/SelectIMFriendFragment.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/SetFriendsRoleFragment.java
-package com.cnlive.strike.xiaojiaspeaker;
-
-import android.animation.Animator;
-import android.animation.AnimatorSet;
-import android.animation.ObjectAnimator;
-import android.os.Build;
-import android.os.Handler;
-import android.view.View;
-import android.view.ViewAnimationUtils;
-import android.view.animation.DecelerateInterpolator;
-
-/**
- * 圆形按钮点击特效
- *
- * @author ShinnyYang
- */
-public class ButtonAnimUtil {
-    public static final int DEFAULT_ZOOM_DURATION = 50;//默认缩放动画时间间隔
-    public static final int SHOW_VIEW_ZOOM_DURATION = 150;//显示控件缩放动画时间间隔
-    public static final int HIDE_VIEW_ZOOM_DURATION = 100;//隐藏控件缩放动画时间间隔
-
-    //设置控件放大动画
-    public static void setViewZoomIn(View view) {
-        try {
-            AnimatorSet animatorSetsuofang = new AnimatorSet();//组合动画
-            ObjectAnimator scaleX = ObjectAnimator.ofFloat(view, "scaleX", 1, 1.2f);
-            ObjectAnimator scaleY = ObjectAnimator.ofFloat(view, "scaleY", 1, 1.2f);
-            animatorSetsuofang.setDuration(DEFAULT_ZOOM_DURATION);
-            animatorSetsuofang.setInterpolator(new DecelerateInterpolator());
-            animatorSetsuofang.play(scaleX).with(scaleY);//两个动画同时开始
-            animatorSetsuofang.start();
-        } catch (Exception e) {
-        }
-    }
-
-    //设置控件缩小动画
-    public static void setViewZoomOut(View view) {
-        try {
-            AnimatorSet animatorSetsuofang = new AnimatorSet();//组合动画
-            ObjectAnimator scaleX = ObjectAnimator.ofFloat(view, "scaleX", 1.2f, 1);
-            ObjectAnimator scaleY = ObjectAnimator.ofFloat(view, "scaleY", 1.2f, 1);
-            animatorSetsuofang.setDuration(DEFAULT_ZOOM_DURATION);
-            animatorSetsuofang.setInterpolator(new DecelerateInterpolator());
-            animatorSetsuofang.play(scaleX).with(scaleY);//两个动画同时开始
-            animatorSetsuofang.start();
-        } catch (Exception e) {
-        }
-    }
-
-    //设置控件缩小动画
-    public static void setViewDefault(View view) {
-        try {
-            AnimatorSet animatorSetsuofang = new AnimatorSet();//组合动画
-            ObjectAnimator scaleX = ObjectAnimator.ofFloat(view, "scaleX", 1f, 1);
-            ObjectAnimator scaleY = ObjectAnimator.ofFloat(view, "scaleY", 1f, 1);
-            animatorSetsuofang.setDuration(DEFAULT_ZOOM_DURATION);
-            animatorSetsuofang.setInterpolator(new DecelerateInterpolator());
-            animatorSetsuofang.play(scaleX).with(scaleY);//两个动画同时开始
-            animatorSetsuofang.start();
-        } catch (Exception e) {
-        }
-    }
-
-    //设置控件显示放大动画
-    public static void setViewShowZoomIn(View view) {
-        try {
-            AnimatorSet animatorSetsuofang = new AnimatorSet();//组合动画
-            ObjectAnimator scaleX = ObjectAnimator.ofFloat(view, "scaleX", 0, 1.2f);
-            ObjectAnimator scaleY = ObjectAnimator.ofFloat(view, "scaleY", 0, 1.2f);
-            animatorSetsuofang.setDuration(SHOW_VIEW_ZOOM_DURATION);
-            animatorSetsuofang.setInterpolator(new DecelerateInterpolator());
-            animatorSetsuofang.play(scaleX).with(scaleY);//两个动画同时开始
-            animatorSetsuofang.start();
-            new Handler().postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    if (view == null) {
-                        return;
-                    }
-                    AnimatorSet animatorSetsuofang = new AnimatorSet();//组合动画
-                    ObjectAnimator scaleX = ObjectAnimator.ofFloat(view, "scaleX", 1.2f, 1);
-                    ObjectAnimator scaleY = ObjectAnimator.ofFloat(view, "scaleY", 1.2f, 1);
-                    animatorSetsuofang.setDuration(SHOW_VIEW_ZOOM_DURATION);
-                    animatorSetsuofang.setInterpolator(new DecelerateInterpolator());
-                    animatorSetsuofang.play(scaleX).with(scaleY);//两个动画同时开始
-                    animatorSetsuofang.start();
-                }
-            }, SHOW_VIEW_ZOOM_DURATION);
-        } catch (Exception e) {
-        }
-    }
-
-    //设置控件隐藏缩小动画
-    public static void setViewHideZoomOut(View view) {
-        try {
-            AnimatorSet animatorSetsuofang = new AnimatorSet();//组合动画
-            ObjectAnimator scaleX = ObjectAnimator.ofFloat(view, "scaleX", 1, 0);
-            ObjectAnimator scaleY = ObjectAnimator.ofFloat(view, "scaleY", 1, 0);
-            animatorSetsuofang.setDuration(HIDE_VIEW_ZOOM_DURATION);
-            animatorSetsuofang.setInterpolator(new DecelerateInterpolator());
-            animatorSetsuofang.play(scaleX).with(scaleY);//两个动画同时开始
-            animatorSetsuofang.start();
-        } catch (Exception e) {
-        }
-    }
-
-    //设置时间显示放大动画
-    public static void setTimeShowZoomIn(View view) {
-        try {
-            ObjectAnimator scaleX = ObjectAnimator.ofFloat(view, "scaleX", 0, 1.4f);
-            ObjectAnimator scaleY = ObjectAnimator.ofFloat(view, "scaleY", 0, 1.4f);
-            ObjectAnimator scaleX1 = ObjectAnimator.ofFloat(view, "scaleX", 1.4f, 1);
-            ObjectAnimator scaleY1 = ObjectAnimator.ofFloat(view, "scaleY", 1.4f, 1);
-            ObjectAnimator scaleX2 = ObjectAnimator.ofFloat(view, "scaleX", 1, 0);
-            ObjectAnimator scaleY2 = ObjectAnimator.ofFloat(view, "scaleY", 1, 0);
-            AnimatorSet animatorSetsuofang = new AnimatorSet();//组合动画
-            animatorSetsuofang.setDuration(100);
-            animatorSetsuofang.setInterpolator(new DecelerateInterpolator());
-            animatorSetsuofang.play(scaleX).with(scaleY);
-            animatorSetsuofang.start();
-            new Handler().postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    if (view == null) {
-                        return;
-                    }
-                    AnimatorSet animatorSetsuofang2 = new AnimatorSet();//组合动画
-                    animatorSetsuofang2.setDuration(100);
-                    animatorSetsuofang2.setInterpolator(new DecelerateInterpolator());
-                    animatorSetsuofang2.play(scaleX1).with(scaleY1);
-                    animatorSetsuofang2.start();
-                }
-            }, 100);
-
-            new Handler().postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    if (view == null) {
-                        return;
-                    }
-                    AnimatorSet animatorSetsuofang3 = new AnimatorSet();//组合动画
-                    animatorSetsuofang3.setDuration(10);
-                    animatorSetsuofang3.setInterpolator(new DecelerateInterpolator());
-                    animatorSetsuofang3.play(scaleX2).with(scaleY2);
-                    animatorSetsuofang3.start();
-                }
-            }, 300);
-        } catch (Exception e) {
-        }
-    }
-
-
-    /**
-     * 设置控件展开特效
-     *
-     * @param view
-     * @param closeFlag
-     */
-    public static void startAnimation(View view, boolean closeFlag) {
-        try {
-            //因为CircularReveal动画是api21之后才有的,所以加个判断语句,免得崩溃
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                int cicular_R = view.getHeight() / 2 > view.getWidth() / 2 ? view.getHeight() / 2 : view.getWidth() / 2;
-                Animator animator = null;
-                if (!closeFlag) {
-                    animator = ViewAnimationUtils.createCircularReveal(view, (int) view.getWidth() / 2, (int) view.getHeight() / 2, 0, cicular_R);
-                } else {
-                    animator = ViewAnimationUtils.createCircularReveal(view, (int) view.getWidth() / 2, (int) view.getHeight() / 2, cicular_R, 0);
-                }
-                animator.addListener(new Animator.AnimatorListener() {
-                    @Override
-                    public void onAnimationStart(Animator animator) {
-
-                    }
-
-                    @Override
-                    public void onAnimationEnd(Animator animator) {
-                        if (closeFlag) {
-                            view.setVisibility(View.GONE);
-                        }
-                    }
-
-                    @Override
-                    public void onAnimationCancel(Animator animator) {
-
-                    }
-
-                    @Override
-                    public void onAnimationRepeat(Animator animator) {
-
-                    }
-                });
-                animator.setDuration(350);
-                animator.start();
-            } else {
-                if (closeFlag) {
-                    view.setVisibility(View.GONE);
-                }
-            }
-
-        } catch (Exception e) {
-        }
-    }
-
-}
 package com.cnlive.strike.xiaojiaspeaker;
-import android.animation.AnimatorSet;
-import android.animation.ObjectAnimator;
 import android.databinding.DataBindingUtil;
 import android.os.Build;
-import android.os.Handler;
-import android.support.design.widget.AppBarLayout;
-import android.support.design.widget.CoordinatorLayout;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.view.animation.FastOutLinearInInterpolator;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.View;
-import android.view.animation.AccelerateDecelerateInterpolator;
-import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
-import android.view.animation.AnticipateInterpolator;
-import android.view.animation.BounceInterpolator;
-import android.view.animation.CycleInterpolator;
-import android.view.animation.LinearInterpolator;
-import android.view.animation.OvershootInterpolator;
-import android.view.animation.TranslateAnimation;
-import android.widget.LinearLayout;
 import com.cnlive.strike.speaker.R;
 import com.cnlive.strike.speaker.databinding.ActivityToolBarTest1Binding;
 import com.cnlive.strike.speaker.databinding.ActivityToolBarTestBinding;
-import com.cnlive.strike.xiaojiaspeaker.util.utilcode.util.ScreenUtils;
 import com.daimajia.androidanimations.library.Techniques;
 import com.daimajia.androidanimations.library.YoYo;
 public class ToolBarTestActivity extends AppCompatActivity {
-    private ActivityToolBarTestBinding binding;
+    private ActivityToolBarTest1Binding binding;
     private String TAG = "ToolBarTestActivity";
     private boolean isFirstSlide = true;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        binding = DataBindingUtil.setContentView(this, R.layout.activity_tool_bar_test);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_tool_bar_test1);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            binding.scrollView.setOnScrollChangeListener(new View.OnScrollChangeListener() {
-                @Override
-                public void onScrollChange(View v, int scrollX, int scrollY, int oldScrollX, int oldScrollY) {
-                    binding.llMenu.startAnimation(AnimationUtils.makeOutAnimation(ToolBarTestActivity.this, true));
-                    binding.llMenu.setVisibility(View.INVISIBLE);
-                }
-            });
+//            binding.scrollView.setOnScrollChangeListener(new View.OnScrollChangeListener() {
+//                @Override
+//                public void onScrollChange(View v, int scrollX, int scrollY, int oldScrollX, int oldScrollY) {
+//                    binding.llMenu.startAnimation(AnimationUtils.makeOutAnimation(ToolBarTestActivity.this, true));
+//                    binding.llMenu.setVisibility(View.INVISIBLE);
+//                }
+//            });
         }
+
+//        binding.ivAdd.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View v) {
+////                ViewAnimUtil.setViewShowZoomIn(binding.ivLife,1.15f);
+//
+//            }
+//        });
 //        LinearLayout.LayoutParams params = (LinearLayout.LayoutParams) binding.ivLife.getLayoutParams();
 //        Log.e(TAG, "onCreate: " + params.topMargin);
-//        YoYo.with(Techniques.Swing)
-//                .duration(700)
-//                .repeat(0)
-//                .playOn(binding.ivLife);
+//
 //        binding.appbar.addOnOffsetChangedListener(new AppBarLayout.OnOffsetChangedListener() {
 //            @Override
 //            public void onOffsetChanged(AppBarLayout appBarLayout, int i) {
@@ -188,7 +175,7 @@ public class ToolBarTestActivity extends AppCompatActivity {
 //                                    new Handler().postDelayed(new Runnable() {
 //                                        @Override
 //                                        public void run() {
-//                                            ButtonAnimUtil.setViewShowZoomIn(binding.ivLife);
+//                                            ViewAnimUtil.setViewShowZoomIn(binding.ivLife);
 //                                            YoYo.with(Techniques.Swing)
 //                                                    .duration(700)
 //                                                    .repeat(0)
+package com.cnlive.strike.xiaojiaspeaker;
+
+import android.animation.Animator;
+import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
+import android.os.Build;
+import android.os.Handler;
+import android.view.View;
+import android.view.ViewAnimationUtils;
+import android.view.animation.Animation;
+import android.view.animation.BounceInterpolator;
+import android.view.animation.DecelerateInterpolator;
+import android.view.animation.LinearInterpolator;
+import android.view.animation.RotateAnimation;
+
+import com.daimajia.androidanimations.library.Techniques;
+import com.daimajia.androidanimations.library.YoYo;
+
+/**
+ * 圆形按钮点击特效
+ *
+ * @author ShinnyYang
+ */
+public class ViewAnimUtil {
+
+    //设置控件显示放大动画
+    public static void setViewShowZoomIn(View view, float zoomIn) {
+        try {
+            //放大动画
+            AnimatorSet animatorSetsuofang = new AnimatorSet();//组合动画
+            ObjectAnimator scaleX = ObjectAnimator.ofFloat(view, "scaleX", 1, zoomIn);
+            ObjectAnimator scaleY = ObjectAnimator.ofFloat(view, "scaleY", 1, zoomIn);
+            //延时播放缩小动画
+            ObjectAnimator scaleXBack = ObjectAnimator.ofFloat(view, "scaleX", zoomIn, 1);
+            scaleXBack.setStartDelay(500);
+            ObjectAnimator scaleYBack = ObjectAnimator.ofFloat(view, "scaleY", zoomIn, 1);
+            scaleYBack.setStartDelay(500);
+//            ObjectAnimator rotateBack1 = ObjectAnimator.ofFloat(view, "rotation", 30f, 0f).setDuration(100);
+////            //顺时针旋转45°
+//            ObjectAnimator rotate = ObjectAnimator.ofFloat(view, "rotation", 30f, 30f).setDuration(100);
+//            rotate.setStartDelay(300);
+////            //逆时针旋转45°
+//            ObjectAnimator rotateBack = ObjectAnimator.ofFloat(view, "rotation", 30f, 0f).setDuration(100);
+//            rotateBack.setStartDelay(300);
+            //旋转
+            ObjectAnimator rotateBack = ObjectAnimator.ofFloat(view, "rotation", 0, 30, -30, 16, -16, 13, -13, 0);
+            rotateBack.setStartDelay(100);
+            animatorSetsuofang.play(scaleX).with(scaleY).with(scaleXBack).with(scaleYBack).with(rotateBack);//两个动画同时开始
+            animatorSetsuofang.setInterpolator(new DecelerateInterpolator());
+            animatorSetsuofang.setDuration(500);
+            animatorSetsuofang.start();
+
+//            YoYo.with(Techniques.Swing)
+//                    .duration(1000)
+//                    .repeat(0)
+//                    .playOn(view);
+        } catch (Exception e) {
+        }
+    }
+}
@@ -23,250 +23,168 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:fitsSystemWindows="true"
-
                 app:layout_scrollFlags="scroll|exitUntilCollapsed">
                 <!---->
                 <LinearLayout
-                    android:id="@+id/ll_menu"
                     android:layout_width="match_parent"
-                    android:layout_height="40dp"
-                    android:gravity="center|right"
-                    app:layout_collapseMode="pin">
-
+                    android:layout_height="match_parent"
+                    android:orientation="vertical">
                     <LinearLayout
-                        android:id="@+id/ll_search"
-                        android:layout_width="45dp"
-                        android:layout_height="match_parent"
-                        android:layout_marginTop="5dp"
-                        android:layout_marginBottom="5dp"
-                        android:clickable="true"
-                        android:focusable="true"
-                        android:gravity="center">
-
-                        <ImageView
-                            android:layout_width="wrap_content"
-                            android:layout_height="19dp"
-                            android:background="@drawable/icon_mian_search"
-                            android:clickable="false"
-                            android:focusable="false" />
-                    </LinearLayout>
+                        android:id="@+id/ll_menu"
+                        android:layout_width="match_parent"
+                        android:layout_height="40dp"
+                        android:gravity="center|right"
+                        app:layout_collapseMode="pin">
+
+                        <LinearLayout
+                            android:id="@+id/ll_search"
+                            android:layout_width="45dp"
+                            android:layout_height="match_parent"
+                            android:layout_marginTop="5dp"
+                            android:layout_marginBottom="5dp"
+                            android:clickable="true"
+                            android:focusable="true"
+                            android:gravity="center">
-                    <FrameLayout
-                        android:id="@+id/fl_contact"
-                        android:layout_width="45dp"
-                        android:layout_height="match_parent"
-                        android:layout_marginTop="5dp"
-                        android:layout_marginBottom="5dp"
-                        android:clickable="true"
-                        android:focusable="true">
+                            <ImageView
+                                android:layout_width="wrap_content"
+                                android:layout_height="19dp"
+                                android:background="@drawable/icon_mian_search"
+                                android:clickable="false"
+                                android:focusable="false" />
+                        </LinearLayout>
                         <FrameLayout
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:clickable="false"
-                            android:focusable="false">
+                            android:id="@+id/fl_contact"
+                            android:layout_width="45dp"
+                            android:layout_height="match_parent"
+                            android:layout_marginTop="5dp"
+                            android:layout_marginBottom="5dp"
+                            android:clickable="true"
+                            android:focusable="true">
+
+                            <FrameLayout
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:clickable="false"
+                                android:focusable="false">
+
+                                <ImageView
+                                    android:layout_width="18dp"
+                                    android:layout_height="18dp"
+                                    android:layout_gravity="center"
+                                    android:background="@drawable/icon_mian_contact"
+                                    android:clickable="false"
+                                    android:focusable="false" />
+
+                            </FrameLayout>
+                        </FrameLayout>
+
+                        <LinearLayout
+                            android:id="@+id/ll_add"
+                            android:layout_width="45dp"
+                            android:layout_height="match_parent"
+                            android:layout_marginTop="5dp"
+                            android:layout_marginRight="5dp"
+                            android:layout_marginBottom="5dp"
+                            android:clickable="true"
+                            android:focusable="true"
+                            android:gravity="center">
                             <ImageView
+                                android:id="@+id/iv_add"
                                 android:layout_width="18dp"
                                 android:layout_height="18dp"
-                                android:layout_gravity="center"
-                                android:background="@drawable/icon_mian_contact"
+                                android:background="@drawable/icon_mian_add"
                                 android:clickable="false"
                                 android:focusable="false" />
-
-                        </FrameLayout>
-                    </FrameLayout>
-
-                    <LinearLayout
-                        android:id="@+id/ll_add"
-                        android:layout_width="45dp"
-                        android:layout_height="match_parent"
-                        android:layout_marginTop="5dp"
-                        android:layout_marginRight="5dp"
-                        android:layout_marginBottom="5dp"
-                        android:clickable="true"
-                        android:focusable="true"
-                        android:gravity="center">
-
-                        <ImageView
-                            android:id="@+id/iv_add"
-                            android:layout_width="18dp"
-                            android:layout_height="18dp"
-                            android:background="@drawable/icon_mian_add"
-                            android:clickable="false"
-                            android:focusable="false" />
+                        </LinearLayout>
                     </LinearLayout>
-                </LinearLayout>
-                <!---->
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="bottom"
-                    android:orientation="horizontal"
-                    android:visibility="gone"
-                    app:layout_collapseMode="parallax">
-
+                    <!---->
                     <LinearLayout
-                        android:layout_width="0dp"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="center"
-                        android:orientation="vertical">
-
-                        <ImageView
-                            android:layout_width="55dp"
-                            android:layout_height="55dp"
-                            android:layout_gravity="center"
-                            android:background="@drawable/icon_mian_life"
-                            android:focusable="false" />
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:focusable="false"
-                            android:text="生活圈"
-                            android:textColor="@color/color_282828"
-                            android:textSize="13sp" />
-                    </LinearLayout>
+                        android:layout_gravity="bottom"
+                        android:orientation="horizontal"
+                        app:layout_collapseMode="pin">
-                    <LinearLayout
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="center"
-                        android:orientation="vertical">
-
-                        <ImageView
-                            android:layout_width="55dp"
-                            android:layout_height="55dp"
-                            android:layout_gravity="center"
-                            android:background="@drawable/icon_main_subscribe"
-                            android:focusable="false" />
-
-                        <TextView
-                            android:layout_width="wrap_content"
+                        <LinearLayout
+                            android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:focusable="false"
-                            android:text="订阅号"
-                            android:textColor="@color/color_282828"
-                            android:textSize="13sp" />
-                    </LinearLayout>
+                            android:layout_weight="1"
+                            android:gravity="center"
+                            android:orientation="vertical">
-                    <LinearLayout
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="center"
-                        android:orientation="vertical">
-
-                        <ImageView
-                            android:layout_width="55dp"
-                            android:layout_height="55dp"
-                            android:layout_gravity="center"
-                            android:background="@drawable/icon_main_shop"
-                            android:focusable="false" />
-
-                        <TextView
-                            android:layout_width="wrap_content"
+                            <ImageView
+                                android:layout_width="55dp"
+                                android:layout_height="55dp"
+                                android:layout_gravity="center"
+                                android:background="@drawable/icon_mian_life"
+                                android:focusable="false" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:focusable="false"
+                                android:text="生活圈"
+                                android:textColor="@color/color_282828"
+                                android:textSize="13sp" />
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:focusable="false"
-                            android:text="优选库"
-                            android:textColor="@color/color_282828"
-                            android:textSize="13sp" />
-                    </LinearLayout>
-                </LinearLayout>
+                            android:layout_weight="1"
+                            android:gravity="center"
+                            android:orientation="vertical">
-            </android.support.design.widget.CollapsingToolbarLayout>
-            <!--            -->
-            <LinearLayout
-                android:id="@+id/ll_root"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_gravity="bottom"
-                android:orientation="horizontal"
-                app:layout_collapseMode="parallax">
+                            <ImageView
+                                android:layout_width="55dp"
+                                android:layout_height="55dp"
+                                android:layout_gravity="center"
+                                android:background="@drawable/icon_main_subscribe"
+                                android:focusable="false" />
-                <LinearLayout
-                    android:id="@+id/ll_life"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:gravity="center"
-                    android:orientation="vertical">
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:focusable="false"
+                                android:text="订阅号"
+                                android:textColor="@color/color_282828"
+                                android:textSize="13sp" />
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:gravity="center"
+                            android:orientation="vertical">
-                    <ImageView
-                        android:id="@+id/iv_life"
-                        android:layout_width="55dp"
-                        android:layout_height="55dp"
-                        android:layout_gravity="center"
-                        android:background="@drawable/icon_mian_life"
-                        android:focusable="false" />
-
-                    <TextView
-                        android:id="@+id/tv_circle"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:focusable="false"
-                        android:text="生活圈"
-                        android:textColor="@color/color_282828"
-                        android:textSize="13sp" />
-                </LinearLayout>
+                            <ImageView
+                                android:layout_width="55dp"
+                                android:layout_height="55dp"
+                                android:layout_gravity="center"
+                                android:background="@drawable/icon_main_shop"
+                                android:focusable="false" />
-                <LinearLayout
-                    android:id="@+id/ll_sub"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:gravity="center"
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:focusable="false"
+                                android:text="优选库"
+                                android:textColor="@color/color_282828"
+                                android:textSize="13sp" />
+                        </LinearLayout>
-                    android:orientation="vertical">
+                    </LinearLayout>
-                    <ImageView
-                        android:id="@+id/iv_sub"
-                        android:layout_width="55dp"
-                        android:layout_height="55dp"
-                        android:layout_gravity="center"
-                        android:background="@drawable/icon_main_subscribe"
-                        android:focusable="false" />
-
-                    <TextView
-                        android:id="@+id/tv_sub"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:focusable="false"
-                        android:text="订阅号"
-                        android:textColor="@color/color_282828"
-                        android:textSize="13sp" />
+<!--                    -->
                 </LinearLayout>
-                <LinearLayout
-                    android:id="@+id/ll_shop"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:gravity="center"
-
-                    android:orientation="vertical">
-
-                    <ImageView
-                        android:id="@+id/iv_shop"
-                        android:layout_width="55dp"
-                        android:layout_height="55dp"
-                        android:layout_gravity="center"
-                        android:background="@drawable/icon_main_shop"
-                        android:focusable="false" />
-
-                    <TextView
-                        android:id="@+id/tv_shop"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:focusable="false"
-                        android:text="优选库"
-                        android:textColor="@color/color_282828"
-                        android:textSize="13sp" />
-                </LinearLayout>
-            </LinearLayout>
+            </android.support.design.widget.CollapsingToolbarLayout>
+            <!--            -->
             <!--            -->
         </android.support.design.widget.AppBarLayout>
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "0.2.12",
+            version: "0.2.13",
             //Lib库前缀
             packeg : "com.cnlive.module",
             //Lib库名称
@@ -79,6 +79,12 @@ public class SetFriendsRolePresenter extends MvpBasePresenter&lt;SetFriendsRoleView
                 });
     }
+    /**
+     * 设置家庭角色
+     *
+     * @param context
+     * @param contactsInvite
+     */
     public void invitFamilyMember(Context context, String contactsInvite) {
         if (null == getView()) {
             return;
@@ -103,8 +109,8 @@ public class SetFriendsRolePresenter extends MvpBasePresenter&lt;SetFriendsRoleView
                             return;
                         }
                         QMUITipDialogUtil.dismessDialog();
-                        AlertUtil.showDeftToast(context,"邀请成功");
-                        EventBus.getDefault().post(new EventMsg(EventMsg.INVIT_FRIEND_SUCCESS,null));
+                        AlertUtil.showDeftToast(context, "邀请成功");
+                        EventBus.getDefault().post(new EventMsg(EventMsg.INVIT_FRIEND_SUCCESS, null));
                     }
                 })
                 .setFailureCallback(new FailureCallback() {
@@ -116,7 +122,11 @@ public class SetFriendsRolePresenter extends MvpBasePresenter&lt;SetFriendsRoleView
                             return;
                         }
                         QMUITipDialogUtil.dismessDialog();
-                        AlertUtil.showDeftToast(context,s);
+                        AlertUtil.showDeftToast(context, s);
+                        //有角色被占用
+                        if (i == 4313) {
+                            EventBus.getDefault().post(new EventMsg(EventMsg.HAS_ROLE_USED, null));
+                        }
                     }
                 })
@@ -8,6 +8,7 @@ public class EventMsg {
     public static final int GO_TO_CHINA_LISTEN_PAGE = 4;//邀请好友成功页面
     public static final int HAS_FRIEND_JOIN_FRIMALY = 5;//有好友加入家庭
     public static final int HAS_FRIEND_REMOVE_FRIMALY = 6;//有好友移除家庭
+    public static final int HAS_ROLE_USED = 7;//已经有角色被占用了
     private int eventType;
     private Object data;
@@ -14,6 +14,11 @@ import com.cnlive.strike.xiaojiaspeaker.commonInfo.XiaoJIaCommInfo;
 import com.cnlive.strike.xiaojiaspeaker.databinding.FragmentInvitFriendBinding;
 import com.cnlive.strike.xiaojiaspeaker.frame.presenter.InvitFriendPresenter;
 import com.cnlive.strike.xiaojiaspeaker.frame.view.InvitFriendView;
+import com.cnlive.strike.xiaojiaspeaker.model.message.EventMsg;
+import com.cnlive.strike.xiaojiaspeaker.util.EventBusUtil;
+
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
 /**
  * 二维码邀请加入
@@ -63,4 +68,11 @@ public class InvitFriendFragment extends MvpBindingFragment&lt;InvitFriendView, Inv
         }
     }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+    }
+
+
 }
@@ -20,6 +20,7 @@ import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 public class SelectIMFriendFragment extends MvpBindingFragment<SelectIMFriendView, SelectIMFriendPresenter, Object, FragmentSelectImFriendBinding> {
+    private String currentSelectFamilyId;
     public static SelectIMFriendFragment newInstance(String currentSelectFamilyId) {
         SelectIMFriendFragment fragment = new SelectIMFriendFragment();
@@ -48,7 +49,7 @@ public class SelectIMFriendFragment extends MvpBindingFragment&lt;SelectIMFriendVie
         initTopBar();
         if (null != getMvpView()) {
             if (null != getArguments()) {
-                String currentSelectFamilyId = getArguments().getString("currentSelectFamilyId");
+                currentSelectFamilyId = getArguments().getString("currentSelectFamilyId");
                 if (!TextUtils.isEmpty(currentSelectFamilyId)) {
                     getMvpView().setCurrentSelectFamilyId(currentSelectFamilyId);
 //                    getMvpView().initView(null);
@@ -89,5 +90,13 @@ public class SelectIMFriendFragment extends MvpBindingFragment&lt;SelectIMFriendVie
                 getActivity().finish();
             }
         }
+        //已经有角色被占用,重新刷新列表
+        else if (EventMsg.HAS_ROLE_USED == msg.getEventType()) {
+            if (null != getMvpView()) {
+                if (!TextUtils.isEmpty(currentSelectFamilyId)) {
+                    getPresenter().getFamilyMember(getActivity(), currentSelectFamilyId);
+                }
+            }
+        }
     }
 }
@@ -91,5 +91,11 @@ public class SetFriendsRoleFragment extends MvpBindingFragment&lt;SetFriendsRoleVie
                 getActivity().finish();
             }
         }
+        //已经有角色被占用
+        else if (EventMsg.HAS_ROLE_USED == msg.getEventType()) {
+            if (null != getMvpView()) {
+                getActivity().finish();
+            }
+        }
     }
 }