Merge branch 'dev_new_people_dialog' into dev_live_new_user_icon

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

@@ -33,9 +33,10 @@ import com.opensource.svgaplayer.SVGAVideoEntity;
 import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.Constants;
 import com.yunbao.common.bean.MsgModel;
-import com.yunbao.live.event.LiveAudienceEvent;
+import com.yunbao.common.bean.NewPeopleInfo;
 import com.yunbao.common.event.MessageIMEvent;
 import com.yunbao.common.glide.ImgLoader;
+import com.yunbao.common.http.API;
 import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.http.HttpClient;
 import com.yunbao.common.manager.imrongcloud.MessageIMManager;
@@ -50,6 +51,7 @@ import com.yunbao.live.bean.LiveChatBean;
 import com.yunbao.live.dialog.LiveHDDialogFragment;
 import com.yunbao.live.dialog.LiveMicUserDialogFragment;
 import com.yunbao.live.dialog.LivePromotionDialogFragment;
+import com.yunbao.live.event.LiveAudienceEvent;
 import com.yunbao.live.http.LiveHttpUtil;
 
 import org.greenrobot.eventbus.EventBus;
@@ -58,6 +60,9 @@ import org.greenrobot.eventbus.ThreadMode;
 
 import java.util.Locale;
 
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
+
 /**
  * Created by cxf on 2018/10/9.
  * 观众直播间逻辑
@@ -78,6 +83,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
     private int icon = 0;
     private String nobleName, nobleTtext;
     private ImageView giftImage, liveNewPeople;
+    private String newPeopleUrl=null;
 
     public LiveAudienceViewHolder(Context context, ViewGroup parentView) {
         super(context, parentView);
@@ -191,6 +197,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
         svga_station_horn = (SVGAImageView) findViewById(R.id.svga_station_horn);
         viewFlipper = (ViewFlipper) findViewById(R.id.viewflipper_banner);
         stationHornBanner = findViewById(R.id.station_horn_banner);
+        liveNewPeople.setOnClickListener(this);
         svga_new_user_double.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -355,7 +362,20 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
                 LiveRoomViewHolder.insertChat(lvBean2, 1);
             }
         }, 10000);//3秒后执行Runnable中的run方法
-
+        getNewPeopleInfo();
+    }
+    public void getNewPeopleInfo(){
+        API.get().pdLiveApi(mContext)
+                .getNewPeopleInfo()
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(stringResponseModel -> {
+                    NewPeopleInfo peopleInfo = stringResponseModel.getData().getInfo();
+                    if(peopleInfo.getIsShow()){
+                        liveNewPeople.setVisibility(View.VISIBLE);
+                         newPeopleUrl=peopleInfo.getLink();
+                    }
+                }).isDisposed();
     }
 
     @Override
@@ -384,6 +404,16 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
             openZGListWindow();
         } else if (i == R.id.lt_trickery) {
             showTrickeryDialog();
+        }else if (i==R.id.live_new_people){
+            Bundle bundle=new Bundle();
+            String url= newPeopleUrl+"?g=Appapi&m=Turntable&a=tricky";
+            url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token="
+                    + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + mLiveUid;
+            bundle.putString("url", url);
+            bundle.putInt("show_type", 0);
+            LiveHDDialogFragment liveHDDialogFragment = new LiveHDDialogFragment();
+            liveHDDialogFragment.setArguments(bundle);
+            liveHDDialogFragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveHDDialogFragment");
         }
 
     }

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

@@ -460,6 +460,7 @@
                 android:layout_marginEnd="16dp"
                 android:layout_toStartOf="@id/gift_image"
                 android:padding="4dp"
+                android:visibility="gone"
                 android:src="@mipmap/live_icon_newpeople_en" />
         </RelativeLayout>