From 711752c324d92ac9a9a930821d0aca8dfb9ac056 Mon Sep 17 00:00:00 2001 From: zlzw <583819556@qq.com> Date: Tue, 6 Sep 2022 10:58:54 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E8=9E=8D=E4=BA=91=E8=BF=94=E5=9B=9Enull?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=97=AE=E9=A2=98=20add=EF=BC=9A=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E6=A0=8F=E5=90=88=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/view_live_total.xml | 77 +++++++++++++++++- .../mipmap-xxhdpi/live_more_icon_moods.png | Bin 0 -> 23584 bytes .../mipmap-xxhdpi/live_more_icon_service.png | Bin 0 -> 5769 bytes .../mipmap-xxhdpi/live_more_icon_system.png | Bin 0 -> 4613 bytes common/src/main/res/values/strings.xml | 3 + .../live/activity/LiveAudienceActivity.java | 74 ++++++++++++++++- .../activity/MyConversationListFragment.java | 54 ------------ .../yunbao/live/dialog/LiveTotalDialog.java | 18 ++++ .../yunbao/live/event/LiveAudienceEvent.java | 5 +- .../yunbao/live/views/LiveRoomViewHolder.java | 4 +- 10 files changed, 173 insertions(+), 62 deletions(-) create mode 100644 common/src/main/res/mipmap-xxhdpi/live_more_icon_moods.png create mode 100644 common/src/main/res/mipmap-xxhdpi/live_more_icon_service.png create mode 100644 common/src/main/res/mipmap-xxhdpi/live_more_icon_system.png delete mode 100644 live/src/main/java/com/yunbao/live/activity/MyConversationListFragment.java diff --git a/common/src/main/res/layout/view_live_total.xml b/common/src/main/res/layout/view_live_total.xml index 58178fddf..a9464fad4 100644 --- a/common/src/main/res/layout/view_live_total.xml +++ b/common/src/main/res/layout/view_live_total.xml @@ -35,9 +35,31 @@ android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginTop="10dp"> + + + + + + + + + + + + + + + + + + + + + + + + + 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 Hu0mjf0G2xc literal 0 HcmV?d00001 diff --git a/common/src/main/res/mipmap-xxhdpi/live_more_icon_system.png b/common/src/main/res/mipmap-xxhdpi/live_more_icon_system.png new file mode 100644 index 0000000000000000000000000000000000000000..54f029d3c15da270ec11a7c46c7d657944478b59 GIT binary patch literal 4613 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 literal 0 HcmV?d00001 diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index 0f99673a3..814fe5ca2 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -884,5 +884,8 @@ 屏蔽座駕特效 您已在當前直播間 是否清空未讀消息 + 人氣票 + 系統通知 + 在線客服 diff --git a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java index 0d4f75635..d454a09b4 100644 --- a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java @@ -1,5 +1,8 @@ package com.yunbao.live.activity; +import static com.yunbao.live.views.LivePlayRyViewHolder.Micing; + +import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.media.AudioManager; @@ -16,12 +19,17 @@ import android.widget.ImageView; import androidx.annotation.IdRes; import androidx.viewpager.widget.ViewPager; +import com.adjust.sdk.Adjust; +import com.adjust.sdk.AdjustEvent; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.blankj.utilcode.util.GsonUtils; +import com.facebook.appevents.AppEventsLogger; +import com.google.firebase.analytics.FirebaseAnalytics; import com.yunbao.common.CommonAppConfig; import com.yunbao.common.Constants; import com.yunbao.common.HtmlConfig; +import com.yunbao.common.activity.WebViewActivity; import com.yunbao.common.bean.AnchorRecommendItemModel; import com.yunbao.common.bean.AnchorRecommendModel; import com.yunbao.common.bean.IMLoginModel; @@ -46,10 +54,10 @@ import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.views.weight.VerticalViewPager; import com.yunbao.live.R; import com.yunbao.live.adapter.VerticalPagerAdapter; +import com.yunbao.live.bean.ImUserBean; import com.yunbao.live.bean.LiveBean; import com.yunbao.live.dialog.LiveFansFragment; import com.yunbao.live.dialog.LiveGiftDialogFragment; -import com.yunbao.live.dialog.LiveGuardDialogFragment; import com.yunbao.live.dialog.LiveHDDialogFragment; import com.yunbao.live.dialog.LiveMicUserDialogFragment; import com.yunbao.live.dialog.LiveTotalDialog; @@ -58,6 +66,7 @@ import com.yunbao.live.dialog.SidebarLiveAudience; import com.yunbao.live.event.LinkMicTxAccEvent; import com.yunbao.live.event.LiveAudienceEvent; import com.yunbao.live.event.LiveRoomChangeEvent; +import com.yunbao.live.http.ImHttpUtil; import com.yunbao.live.http.LiveHttpConsts; import com.yunbao.live.http.LiveHttpUtil; import com.yunbao.live.presenter.LiveRoomCheckLivePresenter; @@ -68,10 +77,9 @@ import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; -import static com.yunbao.live.views.LivePlayRyViewHolder.Micing; - /** * Created by cxf on 2018/10/10. * 看直播 @@ -773,11 +781,71 @@ public class LiveAudienceActivity extends LiveActivity { case REPORT: LiveReportActivity.forward(mContext, event.getBean().getUid()); break; + case POPULAR: + url = CommonAppConfig.HOST + "/h5/activity/PopularityTask/index.html"; + url += "?anchorUid=" + mLiveUid + + "&stream=" + mStream + + "&uid=" + CommonAppConfig.getInstance().getUid() + + "&token=" + CommonAppConfig.getInstance().getToken(); + liveHDDialogFragment=new LiveHDDialogFragment(); + bundle.putString("url", url); + bundle.putInt("show_type", 1); + liveHDDialogFragment.show(getSupportFragmentManager(),"LiveHDDialogFragment"); + break; + case NOTICE: + toSysMsgWeb("1"); + break; + case ONLINE: + toSysMsgWeb("3"); + break; } } + /** + * 跳转到消息中心的系统信息web + * @param type 1、官方通知 2、互动信息 3、在线客服 + */ + private void toSysMsgWeb(String type){ + ImHttpUtil.getImUserInfo("", new HttpCallback() { + + @SuppressLint("MissingPermission") + @Override + public void onSuccess(int code, String msg, String[] info) { + List list = JSON.parseArray(Arrays.toString(info), ImUserBean.class); + for (ImUserBean bean : list) { + if(type.equals(bean.getType())){ + switch (type){ + case "1": + startActivity(new Intent(mContext, SystemMessageActivity.class) + .putExtra("type", bean.getType()) + .putExtra("uid", "") + .putExtra("title", bean.getTitle()) + .putExtra("headImg", "")); + break; + case "3": + FirebaseAnalytics.getInstance(mContext).logEvent("FS_customer_service", null); + AppEventsLogger.newLogger(mContext).logEvent("FB_customer_service"); + AdjustEvent adjustEvent1 = new AdjustEvent("ww5z2p"); + Adjust.trackEvent(adjustEvent1); + if (bean.getLink() != null && !"".equals(bean.getLink())) { + WebViewActivity.forward(mContext, bean.getLink()); + } else { + startActivity(new Intent(mContext, SystemMessageActivity.class) + .putExtra("type", bean.getType()) + .putExtra("uid", "") + .putExtra("title", "") + .putExtra("headImg", "")); + } + break; + } + + } + } + } + }); + } @Override public boolean canBackPressed() { return super.canBackPressed(); diff --git a/live/src/main/java/com/yunbao/live/activity/MyConversationListFragment.java b/live/src/main/java/com/yunbao/live/activity/MyConversationListFragment.java deleted file mode 100644 index 3c4a14e87..000000000 --- a/live/src/main/java/com/yunbao/live/activity/MyConversationListFragment.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.yunbao.live.activity; - -import android.os.Bundle; -import android.view.View; - - -import io.rong.common.RLog; -import io.rong.imkit.config.ConversationListBehaviorListener; -import io.rong.imkit.config.RongConfigCenter; -import io.rong.imkit.conversationlist.ConversationListFragment; -import io.rong.imkit.conversationlist.model.BaseUiConversation; -import io.rong.imkit.conversationlist.model.GatheredConversation; -import io.rong.imkit.utils.RouteUtils; -import io.rong.imkit.widget.adapter.ViewHolder; - -/** - * 会话界面需要配置参数,复写onItemClick给view这是bundle的tag,在会话界面可以获取该bundle - */ -public class MyConversationListFragment extends ConversationListFragment { - private final String TAG = ConversationListFragment.class.getSimpleName(); - private Bundle bundle=new Bundle(); - - public void setBundle(Bundle bundle) { - this.bundle = bundle; - } - - @Override - public void onItemClick(View view, ViewHolder holder, int position) { - if (position >= 0) { - BaseUiConversation baseUiConversation = (BaseUiConversation)this.mAdapter.getItem(position); - ConversationListBehaviorListener listBehaviorListener = RongConfigCenter.conversationListConfig().getListener(); - view.setTag(bundle); - if (listBehaviorListener != null && listBehaviorListener.onConversationClick(view.getContext(), view, baseUiConversation)) { - RLog.d(this.TAG, "ConversationList item click event has been intercepted by App."); - } else { - if (baseUiConversation != null && baseUiConversation.mCore != null) { - if (baseUiConversation instanceof GatheredConversation) { - RouteUtils.routeToSubConversationListActivity(view.getContext(), - ((GatheredConversation)baseUiConversation).mGatheredType, - baseUiConversation.mCore.getConversationTitle()); - } else { - RouteUtils.routeToConversationActivity(view.getContext(), - baseUiConversation.mCore.getConversationType(), - baseUiConversation.mCore.getTargetId(),bundle); - } - } else { - RLog.e(this.TAG, "invalid conversation."); - } - - } - view.setTag(null); - } - } -} diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveTotalDialog.java b/live/src/main/java/com/yunbao/live/dialog/LiveTotalDialog.java index 81850c1b7..b680d8eea 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveTotalDialog.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveTotalDialog.java @@ -126,6 +126,24 @@ public class LiveTotalDialog extends AbsDialogFragment { .setType(LiveAudienceEvent.LiveAudienceType.REPORT)); dismiss(); }); + ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.popular), () -> { + Bus.get().post(new LiveAudienceEvent() + .setBean(anchorBean) + .setType(LiveAudienceEvent.LiveAudienceType.POPULAR)); + dismiss(); + }); + ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.system_notice), () -> { + Bus.get().post(new LiveAudienceEvent() + .setBean(anchorBean) + .setType(LiveAudienceEvent.LiveAudienceType.NOTICE)); + dismiss(); + }); + ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.online), () -> { + Bus.get().post(new LiveAudienceEvent() + .setBean(anchorBean) + .setType(LiveAudienceEvent.LiveAudienceType.ONLINE)); + dismiss(); + }); } @Override diff --git a/live/src/main/java/com/yunbao/live/event/LiveAudienceEvent.java b/live/src/main/java/com/yunbao/live/event/LiveAudienceEvent.java index abd971209..7492bfb7e 100644 --- a/live/src/main/java/com/yunbao/live/event/LiveAudienceEvent.java +++ b/live/src/main/java/com/yunbao/live/event/LiveAudienceEvent.java @@ -114,7 +114,10 @@ public class LiveAudienceEvent extends BaseModel { ACTIVITY_CENTER(13, "活動中心"), LIVE_ROOM_EXCEPTION(14, "直播间异常"), REFRESH_THE_LIVEl_PAGE(15, "刷新直播页面"), - REPORT(16, "舉報"); + REPORT(16, "舉報"), + POPULAR(17, "人气票任务"), + NOTICE(18, "系统通知"), + ONLINE(19, "在线客服"); private int type; private String name; diff --git a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java index 01a6ba6e9..d576c8f3b 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java @@ -901,7 +901,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis params1.bottomMargin = 0; mChatRecyclerView.setLayoutParams(params1); }); - + // mBanner2.setVisibility(View.GONE); if (fastMsgRecyclerView.getVisibility() == View.GONE) { params1.bottomMargin = 0; mChatRecyclerView.setLayoutParams(params1); @@ -1770,7 +1770,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis RongIMClient.getInstance().getConversationListByPage(new RongIMClient.ResultCallback>() { @Override public void onSuccess(List conversations) { - if(!conversations.isEmpty()){ + if(conversations!=null&&!conversations.isEmpty()){ Conversation conversation = conversations.get(0); UserInfo userInfo = RongUserInfoManager.getInstance().getUserInfo(conversation.getTargetId()); if(userInfo!=null){