yutou/pandorapan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复：

Browse Source 
新人引导送礼与快捷消息布局冲突问题
This commit is contained in:
18401019693 2022-08-30 17:00:17 +08:00
parent 014ee98586
commit b755b4f3a1
4 changed files with 23 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
live/src/main/java/com/yunbao/live/presenter/LiveLinkMicPresenter.java
View File

@ -486,43 +486,6 @@ public class LiveLinkMicPresenter implements View.OnClickListener {
mLiveLinkMicPushViewHolder.addToParent();
mLiveLinkMicPushViewHolder.startPush(pushUrl);
EventBus.getDefault().post(new LinkMicTxAccEvent(true));
} else {
// LiveHttpUtil.getLiveSdk(new HttpCallback() {
// @Override
// public void onSuccess(int code, String msg, String[] info) {
// if (code == 0 && info.length > 0) {
// LiveKsyConfigBean liveKsyConfigBean = null;
// try {
// JSONObject obj = JSON.parseObject(info[0]);
// liveKsyConfigBean = JSON.parseObject(obj.getString("android"), LiveKsyConfigBean.class);
// } catch (Exception e) {
// liveKsyConfigBean = LiveConfig.getDefaultKsyConfig();
// }
// mLiveLinkMicPushViewHolder = new LiveLinkMicPushKsyViewHolder(mContext, mSmallContainer, liveKsyConfigBean);
// mLiveLinkMicPushViewHolder.setLivePushListener(new LivePushListener() {
// @Override
// public void onPreviewStart() {
// //预览成功的回调
// }
//
// @Override
// public void onPushStart() {//推流成功的回调
// SocketLinkMicUtil.audienceSendLinkMicUrl(mSocketClient, playUrl);
// }
//
// @Override
// public void onPushFailed() {//推流失败的回调
// DialogUitl.showSimpleDialog(mContext, WordUtil.getString(R.string.link_mic_failed_2), null);
// SocketLinkMicUtil.audienceCloseLinkMic(mSocketClient);
// }
// });
// mLiveLinkMicPushViewHolder.addToParent();
// mLiveLinkMicPushViewHolder.startPush(pushUrl);
//
// }
// }
// });
}
}
@ -804,32 +767,6 @@ public class LiveLinkMicPresenter implements View.OnClickListener {
//获取活动
private void getEvent() {
if (btn_onecz_event != null) {
// HttpClient.getInstance().get("Charge2.IsFirstChargeIcon", "Charge2.IsFirstChargeIcon")
// .params("uid", CommonAppConfig.getInstance().getUid())
// .params("token", CommonAppConfig.getInstance().getToken())
// .execute(new HttpCallback() {
// @Override
// public void onSuccess(int code, String msg, String[] info) {
// if (code == 200) {
// JSONObject obj = JSON.parseObject(info[0]);
// if (obj.getString("is_hidden").equals("1")) {
// btn_onecz_event.setVisibility(View.GONE);
// //首充值
// BannerBean bannerBean1 = new BannerBean();
// bannerBean1.setImageUrl("https://qny.shayucm.com/img/BTN_Firstcharge%20%282%29.png");
// bannerBean1.setLink("sc");
// mBannerList1.add(bannerBean1);
//
// } else {
// btn_onecz_event.setVisibility(View.GONE);
// }
//
// } else {
// btn_onecz_event.setVisibility(View.GONE);
// }
// }
// });
HttpClient.getInstance().get("Charge2.isFirstChargeIcons", "Charge2.isFirstChargeIcons")
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())

1
live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java
View File

@ -140,6 +140,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
Log.e("errqs", "errl");
}
}, null);
}
private void svga_new_user_double() {

60
live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
View File

@ -107,6 +107,8 @@ import com.yunbao.live.presenter.LiveGiftAnimPresenter;
import com.yunbao.live.presenter.LiveLightAnimPresenter;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import java.lang.ref.WeakReference;
import java.net.MalformedURLException;
@ -578,6 +580,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
@Override
public void init() {
EventBus.getDefault().register(this);
btnEvent = findViewById(R.id.btn_event);
imgEvent = (ImageView) findViewById(R.id.img_event);
btn_event2 = (LinearLayout) findViewById(R.id.btn_event2);
@ -713,7 +716,6 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
params.topMargin = mScreenWdith * 720 / 960 + 210;
chat_view.setLayoutParams(params);
RelativeLayout.LayoutParams params1 = (RelativeLayout.LayoutParams)
mChatRecyclerView.getLayoutParams();
params1.topMargin = 180;
@ -1741,43 +1743,6 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
((LiveRyAnchorActivity) mContext).onBackPressed();
}
}
// if (isRy == false) {
// if (forAct == 1) {
// //是否关注0==没关注
// if (isAttention == 0) {
// if (isStayRoomfive) {
// showFollowDialog(mNameText, mAvatarUrl, mContext);
// } else {
// ((LiveAudienceActivity) mContext).setBackIndex(1);
// ((LiveAudienceActivity) mContext).onBackPressed();
// }
// } else {
// ((LiveAudienceActivity) mContext).setBackIndex(1);
// ((LiveAudienceActivity) mContext).onBackPressed();
// }
// } else {
// ((LiveAudienceActivity) mContext).setBackIndex(1);
// ((LiveAnchorActivity) mContext).onBackPressed();
// }
// } else {
// if (forAct == 1) {
// //是否关注0==没关注
// if (isAttention == 0) {
// if (isStayRoomfive) {
// showFollowDialog(mNameText, mAvatarUrl, mContext);
// } else {
// LiveRyAnchorActivity.backIndex = 1;
// ((LiveRyAnchorActivity) mContext).onBackPressed();
// }
// } else {
// LiveRyAnchorActivity.backIndex = 1;
// ((LiveRyAnchorActivity) mContext).onBackPressed();
// }
// } else {
// LiveRyAnchorActivity.backIndex = 1;
// ((LiveRyAnchorActivity) mContext).onBackPressed();
// }
// }
}
/**
@ -2247,6 +2212,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
}
public void release() {
EventBus.getDefault().unregister(this);
LiveHttpUtil.cancel(LiveHttpConsts.GET_USER_LIST);
LiveHttpUtil.cancel(LiveHttpConsts.TIME_CHARGE);
CommonHttpUtil.cancel(CommonHttpConsts.SET_ATTENTION);
@ -2322,7 +2288,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
mChatRecyclerView.getLayoutParams();
if (greetings.size() > 0) {
params1.bottomMargin = 100;
}else {
} else {
params1.bottomMargin = 0;
}
@ -2384,5 +2350,21 @@ 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 = 400;
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);
}
}
}

2
live/src/main/res/layout/view_live_audience.xml
View File

@ -66,7 +66,7 @@
android:layout_height="90dp"
android:layout_gravity="right"
android:layout_marginRight="10dp"
android:layout_marginBottom="18dp"
android:layout_marginBottom="88dp"
android:background="@mipmap/live_mission_box"
android:gravity="center_horizontal"
android:orientation="vertical"