Merge remote-tracking branch 'origin/master'

live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java

@@ -79,7 +79,6 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
     private String url;
     private View v_msg_redpoint, stationHornBanner;
     private Activity context;
-    private SVGAImageView svga_new_user_gif, svga_new_user_double, svga_new_user_follow;
     private ViewFlipper viewFlipper;
     private TextView goToRomm;
     private int icon = 0;
@@ -97,95 +96,8 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
         this.context = (Activity) context;
     }
 
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onUpdata(String str) {
-        if ("svga_new_user_gif".equals(str)) {
-            svga_new_user_gif();
-        } else if ("svga_new_user_double".equals(str)) {
-            svga_new_user_double();
-        } else if ("svga_new_user_follow".equals(str)) {
-            svga_new_user_follow();
-        } else if ("stop_svga_new_user_double".equals(str)) {
-            svga_new_user_double.setVisibility(View.GONE);
-            svga_new_user_double.stopAnimation();
-            svga_new_user_double.clear();
-        } else if ("stop_svga_new_user_follow".equals(str)) {
-            svga_new_user_follow.setVisibility(View.GONE);
-            svga_new_user_follow.stopAnimation();
-            svga_new_user_follow.clear();
-        } else if ("stop_svga_new_user_gif".equals(str)) {
-            svga_new_user_gif.setVisibility(View.GONE);
-            svga_new_user_gif.stopAnimation();
-            svga_new_user_gif.clear();
-        } else if ("name_true".equals(str)) {
-            if (LiveRoomViewHolder.mName != null && LiveRoomViewHolder.mName.getText().length() <= 4) {
-                RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(DpUtil.dp2px(116), DpUtil.dp2px(40));
-                layoutParams.setMargins(DpUtil.dp2px(80), DpUtil.dp2px(80), 0, 0);
-                svga_new_user_follow.setLayoutParams(layoutParams);
-            } else {
-                RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(DpUtil.dp2px(116), DpUtil.dp2px(40));
-                layoutParams.setMargins(DpUtil.dp2px(100), DpUtil.dp2px(80), 0, 0);
-                svga_new_user_follow.setLayoutParams(layoutParams);
-            }
-        }
-
-    }
 
 
-    private void svga_new_user_gif() {
-        svga_new_user_gif.setVisibility(View.VISIBLE);
-        new SVGAParser(mContext).decodeFromAssets("free_gift_tip.svga", new SVGAParser.ParseCompletion() {
-            @Override
-            public void onComplete(SVGAVideoEntity videoItem) {
-                SVGADrawable drawable = new SVGADrawable(videoItem);
-                svga_new_user_gif.setImageDrawable(drawable);
-                SVGAViewUtils.playEndClear(svga_new_user_gif);
-
-            }
-
-            @Override
-            public void onError() {
-                Log.e("errqs", "errl");
-            }
-        }, null);
-
-    }
-
-    private void svga_new_user_double() {
-        svga_new_user_double.setVisibility(View.VISIBLE);
-        new SVGAParser(mContext).decodeFromAssets("double_click_tip.svga", new SVGAParser.ParseCompletion() {
-            @Override
-            public void onComplete(SVGAVideoEntity videoItem) {
-                SVGADrawable drawable = new SVGADrawable(videoItem);
-                svga_new_user_double.setImageDrawable(drawable);
-                svga_new_user_double.setBackgroundResource(R.mipmap.black_bg);
-                SVGAViewUtils.playEndClear(svga_new_user_double);
-            }
-
-            @Override
-            public void onError() {
-                Log.e("errqs", "errl");
-            }
-        }, null);
-    }
-
-    private void svga_new_user_follow() {
-        svga_new_user_follow.setVisibility(View.VISIBLE);
-        new SVGAParser(mContext).decodeFromAssets("live_follow_tip.svga", new SVGAParser.ParseCompletion() {
-            @Override
-            public void onComplete(SVGAVideoEntity videoItem) {
-                SVGADrawable drawable = new SVGADrawable(videoItem);
-                svga_new_user_follow.setImageDrawable(drawable);
-                SVGAViewUtils.playEndClear(svga_new_user_follow);
-            }
-
-            @Override
-            public void onError() {
-                Log.e("errqs", "errl");
-            }
-        }, null);
-
-    }
 
     @Override
     protected int getLayoutId() {
@@ -205,9 +117,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
         voiceButton = (LinearLayout) findViewById(R.id.voice_button);
         giftImage = (ImageView) findViewById(R.id.gift_image);
         liveNewPeople = (ImageView) findViewById(R.id.live_new_people);
-        svga_new_user_gif = (SVGAImageView) findViewById(R.id.svga_new_user_gif);
+
-        svga_new_user_double = (SVGAImageView) findViewById(R.id.svga_new_user_double);
-        svga_new_user_follow = (SVGAImageView) findViewById(R.id.svga_new_user_follow);
         viewFlipper = (ViewFlipper) findViewById(R.id.viewflipper_banner);
         mRole = (ImageView) findViewById(R.id.live_privilege);
         mCheat = (ImageView) findViewById(R.id.live_cheat);
@@ -218,12 +128,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
         mRole.setOnClickListener(this);
         mCheat.setOnClickListener(this);
         mPlay.setOnClickListener(this);
-        svga_new_user_double.setOnClickListener(new View.OnClickListener() {
+
-            @Override
-            public void onClick(View v) {
-                ((LiveAudienceActivity) mContext).light();
-            }
-        });
         findViewById(R.id.btn_mic).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {

live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java

@@ -353,7 +353,143 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
     private ImageView mAnchorSayHide;
     //----!主播说组件---//
     private Banner topBanner1;//心愿单&联系方式
+    public SVGAImageView svga_new_user_gif, svga_new_user_double, svga_new_user_follow;
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onUpdata(String str) {
+        if ("svga_new_user_gif".equals(str)) {
+            svga_new_user_gif();
+        } else if ("svga_new_user_double".equals(str)) {
+            svga_new_user_double();
+        } else if ("svga_new_user_follow".equals(str)) {
+            svga_new_user_follow();
+        } else if ("stop_svga_new_user_double".equals(str)) {
+            svga_new_user_double.setVisibility(View.GONE);
+            svga_new_user_double.stopAnimation();
+            svga_new_user_double.clear();
+        } else if ("stop_svga_new_user_follow".equals(str)) {
+            svga_new_user_follow.setVisibility(View.GONE);
+            svga_new_user_follow.stopAnimation();
+            svga_new_user_follow.clear();
+        } else if ("stop_svga_new_user_gif".equals(str)) {
+            svga_new_user_gif.setVisibility(View.GONE);
+            svga_new_user_gif.stopAnimation();
+            svga_new_user_gif.clear();
+        } else if ("name_true".equals(str)) {
+            if (LiveRoomViewHolder.mName != null && LiveRoomViewHolder.mName.getText().length() <= 4) {
+                RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(DpUtil.dp2px(116), DpUtil.dp2px(40));
+                layoutParams.setMargins(DpUtil.dp2px(80), DpUtil.dp2px(80), 0, 0);
+                svga_new_user_follow.setLayoutParams(layoutParams);
+            } else {
+                RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(DpUtil.dp2px(116), DpUtil.dp2px(40));
+                layoutParams.setMargins(DpUtil.dp2px(100), DpUtil.dp2px(80), 0, 0);
+                svga_new_user_follow.setLayoutParams(layoutParams);
+            }
+        }
 
+        if ("svga_new_user_gif".equals(str)) {
+            if (fastMsgRecyclerView == null) return;
+            RelativeLayout.LayoutParams params1 = (RelativeLayout.LayoutParams)
+                    fastMsgRecyclerView.getLayoutParams();
+            params1.rightMargin = DeviceUtils.getScreenWidth((Activity) mContext) / 3;
+            fastMsgRecyclerView.setLayoutParams(params1);
+        } else if ("stop_svga_new_user_gif".equals(str)) {
+            if (fastMsgRecyclerView == null) return;
+            RelativeLayout.LayoutParams params1 = (RelativeLayout.LayoutParams)
+                    fastMsgRecyclerView.getLayoutParams();
+            params1.rightMargin = 0;
+            fastMsgRecyclerView.setLayoutParams(params1);
+        } else if ("showBanner".equals(str)) {
+            showBanner3(bean1);
+        } else if ("stop_svga_new_user_double".equals(str) && mBannerList3.size() > 2) {
+
+            mBannerList3.get(2).setLink("1");
+            mBanner3.update(mBannerList3);
+            if (mBannerList3.get(0).getLink().equals("1")) {
+                if (mBannerList3.get(1).getLink().equals("1")) {
+                    if (mBannerList3.get(2).getLink().equals("1")) {
+                        btn_event3.setVisibility(View.GONE);
+                    }
+                }
+            }
+        } else if ("stop_svga_new_user_follow".equals(str) && mBannerList3.size() > 1) {
+            mBannerList3.get(1).setLink("1");
+
+            mBanner3.update(mBannerList3);
+            if (mBannerList3.get(0).getLink().equals("1")) {
+                if (mBannerList3.get(1).getLink().equals("1")) {
+                    if (mBannerList3.get(2).getLink().equals("1")) {
+                        btn_event3.setVisibility(View.GONE);
+                    }
+                }
+            }
+        } else if ("stop_new_user_gif".equals(str) && mBannerList3.size() > 0) {
+            IMLoginManager.get(mContext).setNewUserGif(false);
+            mBannerList3.get(0).setLink("1");
+            mBanner3.update(mBannerList3);
+            if (mBannerList3.get(0).getLink().equals("1")) {
+                if (mBannerList3.get(1).getLink().equals("1")) {
+                    if (mBannerList3.get(2).getLink().equals("1")) {
+                        btn_event3.setVisibility(View.GONE);
+                    }
+                }
+            }
+        }
+    }
+
+    private void svga_new_user_gif() {
+        svga_new_user_gif.setVisibility(View.VISIBLE);
+        new SVGAParser(mContext).decodeFromAssets("free_gift_tip.svga", new SVGAParser.ParseCompletion() {
+            @Override
+            public void onComplete(SVGAVideoEntity videoItem) {
+                SVGADrawable drawable = new SVGADrawable(videoItem);
+                svga_new_user_gif.setImageDrawable(drawable);
+                SVGAViewUtils.playEndClear(svga_new_user_gif);
+
+            }
+
+            @Override
+            public void onError() {
+                Log.e("errqs", "errl");
+            }
+        }, null);
+
+    }
+
+    private void svga_new_user_double() {
+        svga_new_user_double.setVisibility(View.VISIBLE);
+        new SVGAParser(mContext).decodeFromAssets("double_click_tip.svga", new SVGAParser.ParseCompletion() {
+            @Override
+            public void onComplete(SVGAVideoEntity videoItem) {
+                SVGADrawable drawable = new SVGADrawable(videoItem);
+                svga_new_user_double.setImageDrawable(drawable);
+                svga_new_user_double.setBackgroundResource(R.mipmap.black_bg);
+                SVGAViewUtils.playEndClear(svga_new_user_double);
+            }
+
+            @Override
+            public void onError() {
+                Log.e("errqs", "errl");
+            }
+        }, null);
+    }
+
+    private void svga_new_user_follow() {
+        svga_new_user_follow.setVisibility(View.VISIBLE);
+        new SVGAParser(mContext).decodeFromAssets("live_follow_tip.svga", new SVGAParser.ParseCompletion() {
+            @Override
+            public void onComplete(SVGAVideoEntity videoItem) {
+                SVGADrawable drawable = new SVGADrawable(videoItem);
+                svga_new_user_follow.setImageDrawable(drawable);
+                SVGAViewUtils.playEndClear(svga_new_user_follow);
+            }
+
+            @Override
+            public void onError() {
+                Log.e("errqs", "errl");
+            }
+        }, null);
+
+    }
     public LiveRoomViewHolder(boolean isRys, int forActivity, Context context, ViewGroup parentView, GifImageView gifImageView, SVGAImageView svgaImageView, ViewGroup liveGiftPrizePoolContainer, WindowManager windowManager) {
         super(context, parentView);
         Contexts = context;
@@ -700,8 +836,15 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
         mAnchorSayText = (TextView) findViewById(R.id.anchor_say_text);
         mAnchorSayHide = (ImageView) findViewById(R.id.anchor_say_hide);
         mAnchorSayHide.setOnClickListener(v -> hideAnchorSay());
-
+        svga_new_user_gif = (SVGAImageView) findViewById(R.id.svga_new_user_gif);
-
+        svga_new_user_double = (SVGAImageView) findViewById(R.id.svga_new_user_double);
+        svga_new_user_follow = (SVGAImageView) findViewById(R.id.svga_new_user_follow);
+        svga_new_user_double.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                ((LiveAudienceActivity) mContext).light();
+            }
+        });
         btnEvent = findViewById(R.id.btn_event);
         fullScreen = (FullServiceNotificationView) findViewById(R.id.full_screen);
         noble = (NobleNoticeView) findViewById(R.id.noble);
@@ -3809,57 +3952,6 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
         CommonHttpUtil.cancel(CommonHttpConsts.SET_ATTENTION);
     }
 
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onUpdata(String str) {
-        if ("svga_new_user_gif".equals(str)) {
-            if (fastMsgRecyclerView == null) return;
-            RelativeLayout.LayoutParams params1 = (RelativeLayout.LayoutParams)
-                    fastMsgRecyclerView.getLayoutParams();
-            params1.rightMargin = DeviceUtils.getScreenWidth((Activity) mContext) / 3;
-            fastMsgRecyclerView.setLayoutParams(params1);
-        } else if ("stop_svga_new_user_gif".equals(str)) {
-            if (fastMsgRecyclerView == null) return;
-            RelativeLayout.LayoutParams params1 = (RelativeLayout.LayoutParams)
-                    fastMsgRecyclerView.getLayoutParams();
-            params1.rightMargin = 0;
-            fastMsgRecyclerView.setLayoutParams(params1);
-        } else if ("showBanner".equals(str)) {
-            showBanner3(bean1);
-        } else if ("stop_svga_new_user_double".equals(str) && mBannerList3.size() > 2) {
-
-            mBannerList3.get(2).setLink("1");
-            mBanner3.update(mBannerList3);
-            if (mBannerList3.get(0).getLink().equals("1")) {
-                if (mBannerList3.get(1).getLink().equals("1")) {
-                    if (mBannerList3.get(2).getLink().equals("1")) {
-                        btn_event3.setVisibility(View.GONE);
-                    }
-                }
-            }
-        } else if ("stop_svga_new_user_follow".equals(str) && mBannerList3.size() > 1) {
-            mBannerList3.get(1).setLink("1");
-
-            mBanner3.update(mBannerList3);
-            if (mBannerList3.get(0).getLink().equals("1")) {
-                if (mBannerList3.get(1).getLink().equals("1")) {
-                    if (mBannerList3.get(2).getLink().equals("1")) {
-                        btn_event3.setVisibility(View.GONE);
-                    }
-                }
-            }
-        } else if ("stop_new_user_gif".equals(str) && mBannerList3.size() > 0) {
-            IMLoginManager.get(mContext).setNewUserGif(false);
-            mBannerList3.get(0).setLink("1");
-            mBanner3.update(mBannerList3);
-            if (mBannerList3.get(0).getLink().equals("1")) {
-                if (mBannerList3.get(1).getLink().equals("1")) {
-                    if (mBannerList3.get(2).getLink().equals("1")) {
-                        btn_event3.setVisibility(View.GONE);
-                    }
-                }
-            }
-        }
-    }
 
     /**
      * 全服喇叭

live/src/main/res/layout/view_live_audience.xml

@@ -408,35 +408,10 @@
         </LinearLayout>
 
 
-        <com.opensource.svgaplayer.SVGAImageView
-            android:id="@+id/svga_new_user_gif"
-            android:layout_width="116dp"
-            android:layout_height="40dp"
-            android:layout_alignParentRight="true"
-            android:layout_alignParentBottom="true"
-            android:layout_gravity="center_vertical"
-            android:layout_marginRight="5dp"
-            android:layout_marginBottom="40dp"
-            app:autoPlay="true" />
 
 
-        <com.opensource.svgaplayer.SVGAImageView
-            android:id="@+id/svga_new_user_double"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_gravity="center_vertical"
-            android:layout_marginBottom="40dp"
-            app:autoPlay="true" />
 
 
-        <com.opensource.svgaplayer.SVGAImageView
-            android:id="@+id/svga_new_user_follow"
-            android:layout_width="116dp"
-            android:layout_height="40dp"
-            android:layout_gravity="center_vertical"
-            android:layout_marginTop="80dp"
-            app:autoPlay="true" />
-
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="100dp"

live/src/main/res/layout/view_live_room.xml

@@ -2354,4 +2354,32 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="60dp"
         android:visibility="gone" />
+
+    <com.opensource.svgaplayer.SVGAImageView
+        android:id="@+id/svga_new_user_gif"
+        android:layout_width="116dp"
+        android:layout_height="40dp"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentBottom="true"
+        android:layout_gravity="center_vertical"
+        android:layout_marginRight="49dp"
+        android:layout_marginBottom="0dp"
+        app:autoPlay="true"/>
+
+    <com.opensource.svgaplayer.SVGAImageView
+        android:id="@+id/svga_new_user_double"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center_vertical"
+        android:layout_marginBottom="40dp"
+        app:autoPlay="true" />
+
+
+    <com.opensource.svgaplayer.SVGAImageView
+        android:id="@+id/svga_new_user_follow"
+        android:layout_width="116dp"
+        android:layout_height="40dp"
+        android:layout_gravity="center_vertical"
+        android:layout_marginTop="80dp"
+        app:autoPlay="true" />
 </RelativeLayout>