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

优化首页右下角悬浮层隐藏显示问题

Browse Source
This commit is contained in:
zlzw 2024-05-24 14:49:14 +08:00
parent 24170d55e2
commit c033340aad
3 changed files with 55 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
View File

@ -323,7 +323,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
public void run() { public void run() {
loading.setVisibility(View.GONE); loading.setVisibility(View.GONE);
enterRoomLeaveHandler.post(enterRoomLeaveRunnable); enterRoomLeaveHandler.post(enterRoomLeaveRunnable);
ToastUtil.show(mContext.getString(R.string.net_error) + " :500");//异常下播，等待加载时间过了后弹出 //ToastUtil.show(mContext.getString(R.string.net_error) + " :500");//异常下播，等待加载时间过了后弹出
} }
}; };

62
main/src/main/java/com/yunbao/main/activity/MainActivity.java
View File

@ -51,6 +51,7 @@ import com.tencent.imsdk.v2.V2TIMManager;
import com.tencent.imsdk.v2.V2TIMSDKConfig; import com.tencent.imsdk.v2.V2TIMSDKConfig;
import com.tencent.imsdk.v2.V2TIMSDKListener; import com.tencent.imsdk.v2.V2TIMSDKListener;
import com.tencent.imsdk.v2.V2TIMUserFullInfo; import com.tencent.imsdk.v2.V2TIMUserFullInfo;
import com.yunbao.common.dialog.DebugDialog;
import com.yunbao.common.utils.MobclickAgent; import com.yunbao.common.utils.MobclickAgent;
import com.yunbao.common.CommonAppConfig; import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.Constants; import com.yunbao.common.Constants;
@ -517,8 +518,20 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
mTabButtonGroup.addTabButtonGroupChangeListener((view, index) -> { mTabButtonGroup.addTabButtonGroupChangeListener((view, index) -> {
if (index == 0) { if (index == 0) {
isfloatBannernet = true; // isfloatBannernet = true;
initAnchorRecommendBanner(); // initAnchorRecommendBanner();
if (floatEventShow) {
if (floatWarOrder.getTag() != null) {
floatWarOrder.setVisibility(View.VISIBLE);
} else {
floatWarOrder.setVisibility(View.GONE);
if (floatBanner.getTag() != null) {
floatBanner.setVisibility(View.VISIBLE);
} else {
floatBanner.setVisibility(View.GONE);
}
}
}
} else if (index == 2) { } else if (index == 2) {
floatBanner.setVisibility(View.GONE); floatBanner.setVisibility(View.GONE);
floatRedPacket.setVisibility(View.GONE); floatRedPacket.setVisibility(View.GONE);
@ -621,30 +634,26 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
if (isFinishing()) return; if (isFinishing()) return;
if (data.getListShow() == 1 && data.getList().size() > 2) { if (data.getListShow() == 1 && data.getList().size() > 2) {
floatBanner.setVisibility(View.VISIBLE); floatBanner.setVisibility(View.VISIBLE);
floatBanner.setTag(data);
findViewById(R.id.banner_click).setVisibility(View.VISIBLE); findViewById(R.id.banner_click).setVisibility(View.VISIBLE);
floatBanner.showBanner(data.getList()); floatBanner.showBanner(data.getList());
} else { } else {
floatBanner.setVisibility(View.GONE); floatBanner.setVisibility(View.GONE);
floatBanner.setTag(null);
findViewById(R.id.banner_click).setVisibility(View.GONE); findViewById(R.id.banner_click).setVisibility(View.GONE);
} }
if (data.getShowRedPacket() == 0) {
floatRedPacket.setVisibility(View.GONE);
} else {
floatRedPacket.setVisibility(View.VISIBLE);
((ProgressBar) floatRedPacket.findViewById(R.id.progress)).setMax(data.getRedPacketTotal());
((ProgressBar) floatRedPacket.findViewById(R.id.progress)).setProgress(data.getRedPacketNum());
((TextView) floatRedPacket.findViewById(R.id.progressText)).setText(data.getRedPacketNum() + "/" + data.getRedPacketTotal());
}
if (data.getShowWarOrder() == 0) { if (data.getShowWarOrder() == 0) {
floatWarOrder.setVisibility(View.GONE); floatWarOrder.setVisibility(View.GONE);
floatWarOrder.setTag(null); floatWarOrder.setTag(null);
//战令关闭情况下，在判断一次Banner是否足够 //战令关闭情况下，在判断一次Banner是否足够
if (data.getListShow() == 1 && data.getList().size() > 2) { if (data.getListShow() == 1 && data.getList().size() > 2) {
floatBanner.setVisibility(View.VISIBLE); floatBanner.setVisibility(View.VISIBLE);
floatBanner.setTag(data);
findViewById(R.id.banner_click).setVisibility(View.VISIBLE); findViewById(R.id.banner_click).setVisibility(View.VISIBLE);
floatBanner.showBanner(data.getList()); floatBanner.showBanner(data.getList());
} else { } else {
floatBanner.setVisibility(View.GONE); floatBanner.setVisibility(View.GONE);
floatBanner.setTag(null);
findViewById(R.id.banner_click).setVisibility(View.GONE); findViewById(R.id.banner_click).setVisibility(View.GONE);
} }
} else { } else {
@ -657,8 +666,17 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
} }
floatBanner.setVisibility(View.GONE); floatBanner.setVisibility(View.GONE);
floatBanner.setTag(null);
findViewById(R.id.banner_click).setVisibility(View.GONE); findViewById(R.id.banner_click).setVisibility(View.GONE);
} }
if (data.getShowRedPacket() == 0) {
floatRedPacket.setVisibility(View.GONE);
} else if (floatWarOrder.getTag() == null && floatWarOrder.getTag() == null) {
floatRedPacket.setVisibility(View.VISIBLE);
((ProgressBar) floatRedPacket.findViewById(R.id.progress)).setMax(data.getRedPacketTotal());
((ProgressBar) floatRedPacket.findViewById(R.id.progress)).setProgress(data.getRedPacketNum());
((TextView) floatRedPacket.findViewById(R.id.progressText)).setText(data.getRedPacketNum() + "/" + data.getRedPacketTotal());
}
} }
@ -1499,18 +1517,34 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
} }
} }
boolean floatEventShow = true;
@Subscribe(threadMode = ThreadMode.MAIN) @Subscribe(threadMode = ThreadMode.MAIN)
public void onFloatWarOrderEvent(FloatWarOrderEvent event) { public void onFloatWarOrderEvent(FloatWarOrderEvent event) {
/* if (event.isFloatWarOrder()) { System.out.println("FloatWarOrderEvent:事件" + event.isFloatWarOrder());
System.out.println("战令:" + floatWarOrder.getTag());
System.out.println("Banner:" + floatBanner.getTag());
floatEventShow = event.isFloatWarOrder();
if (event.isFloatWarOrder()) {
if (floatWarOrder.getTag() == null) {
floatWarOrder.setVisibility(View.GONE); floatWarOrder.setVisibility(View.GONE);
} else { } else {
floatWarOrder.setVisibility(View.VISIBLE); floatWarOrder.setVisibility(View.VISIBLE);
}*/ }
if(floatWarOrder.getTag()!=null){ if (floatBanner.getTag() == null) {
floatWarOrder.setVisibility(View.VISIBLE); floatBanner.setVisibility(View.GONE);
} else { } else {
floatBanner.setVisibility(View.VISIBLE);
}
} else {
floatBanner.setVisibility(View.GONE);
floatWarOrder.setVisibility(View.GONE); floatWarOrder.setVisibility(View.GONE);
} }
/* if(floatWarOrder.getTag()!=null){
floatWarOrder.setVisibility(View.VISIBLE);
}else{
floatWarOrder.setVisibility(View.GONE);
}*/
} }
private void initRedPacket() { private void initRedPacket() {

8
main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java
View File

@ -85,22 +85,22 @@ public class MainHomeViewHolder extends AbsMainHomeParentViewHolder {
case 0: case 0:
floatWarOrder = false; floatWarOrder = false;
MobclickAgent.onEvent(mContext, "home_page_follow", "首页关注列表按钮"); MobclickAgent.onEvent(mContext, "home_page_follow", "首页关注列表按钮");
EventBus.getDefault().post(new FloatWarOrderEvent().setFloatWarOrder(false)); EventBus.getDefault().post(new FloatWarOrderEvent().setFloatWarOrder(true));
break; break;
case 1: case 1:
floatWarOrder = false; floatWarOrder = false;
MobclickAgent.onEvent(mContext, "home_page_hot", "首页热门列表按钮"); MobclickAgent.onEvent(mContext, "home_page_hot", "首页热门列表按钮");
EventBus.getDefault().post(new FloatWarOrderEvent().setFloatWarOrder(false)); EventBus.getDefault().post(new FloatWarOrderEvent().setFloatWarOrder(true));
break; break;
case 2: case 2:
floatWarOrder = false; floatWarOrder = false;
MobclickAgent.onEvent(mContext, "home_page_recommend", "首页推荐列表按钮"); MobclickAgent.onEvent(mContext, "home_page_recommend", "首页推荐列表按钮");
EventBus.getDefault().post(new FloatWarOrderEvent().setFloatWarOrder(false)); EventBus.getDefault().post(new FloatWarOrderEvent().setFloatWarOrder(true));
break; break;
case 3: case 3:
floatWarOrder = true; floatWarOrder = true;
MobclickAgent.onEvent(mContext, "home_page_redpk", "首页红包列表按钮"); MobclickAgent.onEvent(mContext, "home_page_redpk", "首页红包列表按钮");
EventBus.getDefault().post(new FloatWarOrderEvent().setFloatWarOrder(true)); EventBus.getDefault().post(new FloatWarOrderEvent().setFloatWarOrder(false));
break; break;
} }
if (mViewHolders == null) { if (mViewHolders == null) {