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-11-16 14:30:11 +08:00
parent 02a5ceaacc
commit 897a47bee7
6 changed files with 53 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/src/main/java/com/yunbao/common/views/CustomDrawerPopupView.java
View File

@ -197,6 +197,10 @@ public class CustomDrawerPopupView extends DrawerPopupView {
@Subscribe(threadMode = ThreadMode.MAIN) @Subscribe(threadMode = ThreadMode.MAIN)
public void OnCustomDrawerPopupEvent(CustomDrawerPopupEvent event) { public void OnCustomDrawerPopupEvent(CustomDrawerPopupEvent event) {
//是否关闭弹窗
if (event.isDisMiss()) {
dismiss();
}
if (callBack != null) { if (callBack != null) {
if (!TextUtils.isEmpty(event.getRightsInterests())) { if (!TextUtils.isEmpty(event.getRightsInterests())) {
callBack.informationTransfer(event); callBack.informationTransfer(event);
@ -224,9 +228,6 @@ public class CustomDrawerPopupView extends DrawerPopupView {
if (event.isRefresh()) { if (event.isRefresh()) {
initData(); initData();
} }
//是否关闭弹窗
if (event.isDisMiss()) {
dismiss();
}
} }
} }

22
common/src/main/java/com/yunbao/common/views/DrawerRecommendChildViewHolder.java
View File

@ -43,13 +43,21 @@ public class DrawerRecommendChildViewHolder extends RecyclerView.ViewHolder {
} else { } else {
IMLoginModel userInfo = IMLoginManager.get(itemView.getContext()).getUserInfo(); IMLoginModel userInfo = IMLoginManager.get(itemView.getContext()).getUserInfo();
StringBuffer htmlUrl = new StringBuffer(); StringBuffer htmlUrl = new StringBuffer();
htmlUrl.append(CommonAppConfig.HOST) if (model.getSrc().contains("?")) {
.append("/") htmlUrl.append(model.getSrc())
.append(model.getSrc()) .append("&uid=")
.append("&uid=") .append(userInfo.getId())
.append(userInfo.getId()) .append("&token=")
.append("&token=") .append(userInfo.getToken());
.append(userInfo.getToken()); } else {
htmlUrl.append(CommonAppConfig.HOST)
.append("/")
.append(model.getSrc())
.append("?uid=")
.append(userInfo.getId())
.append("&token=")
.append(userInfo.getToken());
}
Bus.get().post(new CustomDrawerPopupEvent() Bus.get().post(new CustomDrawerPopupEvent()
.setDisMiss(true) .setDisMiss(true)
.setHtmlUrl(htmlUrl.toString()) .setHtmlUrl(htmlUrl.toString())

22
common/src/main/java/com/yunbao/common/views/DrawerTaskViewHolder.java
View File

@ -51,13 +51,21 @@ public class DrawerTaskViewHolder extends RecyclerView.ViewHolder {
} else { } else {
IMLoginModel userInfo = IMLoginManager.get(itemView.getContext()).getUserInfo(); IMLoginModel userInfo = IMLoginManager.get(itemView.getContext()).getUserInfo();
StringBuffer htmlUrl = new StringBuffer(); StringBuffer htmlUrl = new StringBuffer();
htmlUrl.append(CommonAppConfig.HOST) if (model.getSrc().contains("?")) {
.append("/") htmlUrl.append(model.getSrc())
.append(model.getSrc()) .append("&uid=")
.append("&uid=") .append(userInfo.getId())
.append(userInfo.getId()) .append("&token=")
.append("&token=") .append(userInfo.getToken());
.append(userInfo.getToken()); } else {
htmlUrl.append(CommonAppConfig.HOST)
.append("/")
.append(model.getSrc())
.append("?uid=")
.append(userInfo.getId())
.append("&token=")
.append(userInfo.getToken());
}
Bus.get().post(new CustomDrawerPopupEvent() Bus.get().post(new CustomDrawerPopupEvent()
.setDisMiss(true) .setDisMiss(true)
.setHtmlUrl(htmlUrl.toString()) .setHtmlUrl(htmlUrl.toString())

4
common/src/main/java/com/yunbao/common/views/FunGamesChildViewHolder.java
View File

@ -47,7 +47,7 @@ public class FunGamesChildViewHolder extends RecyclerView.ViewHolder {
.setDisMiss(true).setRightsInterests(model.getTitle())); .setDisMiss(true).setRightsInterests(model.getTitle()));
} else { } else {
int activityID = TextUtils.isEmpty(model.getActivityId()) ? 0 : Integer.parseInt(model.getActivityId()); int activityID = TextUtils.isEmpty(model.getActivityId()) ? 0 : Integer.parseInt(model.getActivityId());
if (activityID == 0) { if (activityID != 0) {
Bus.get().post(new CustomDrawerPopupEvent() Bus.get().post(new CustomDrawerPopupEvent()
.setDisMiss(true).setActivityId(activityID)); .setDisMiss(true).setActivityId(activityID));
} else { } else {
@ -63,7 +63,7 @@ public class FunGamesChildViewHolder extends RecyclerView.ViewHolder {
htmlUrl.append(CommonAppConfig.HOST) htmlUrl.append(CommonAppConfig.HOST)
.append("/") .append("/")
.append(model.getSrc()) .append(model.getSrc())
.append("&uid=") .append("?uid=")
.append(userInfo.getId()) .append(userInfo.getId())
.append("&token=") .append("&token=")
.append(userInfo.getToken()); .append(userInfo.getToken());

22
common/src/main/java/com/yunbao/common/views/FunGamesViewHolder.java
View File

@ -61,13 +61,21 @@ public class FunGamesViewHolder extends RecyclerView.ViewHolder {
} else { } else {
IMLoginModel userInfo = IMLoginManager.get(itemView.getContext()).getUserInfo(); IMLoginModel userInfo = IMLoginManager.get(itemView.getContext()).getUserInfo();
StringBuffer htmlUrl = new StringBuffer(); StringBuffer htmlUrl = new StringBuffer();
htmlUrl.append(CommonAppConfig.HOST) if (model.getSrc().contains("?")) {
.append("/") htmlUrl.append(model.getSrc())
.append(model.getSrc()) .append("&uid=")
.append("&uid=") .append(userInfo.getId())
.append(userInfo.getId()) .append("&token=")
.append("&token=") .append(userInfo.getToken());
.append(userInfo.getToken()); } else {
htmlUrl.append(CommonAppConfig.HOST)
.append("/")
.append(model.getSrc())
.append("?uid=")
.append(userInfo.getId())
.append("&token=")
.append(userInfo.getToken());
}
Bus.get().post(new CustomDrawerPopupEvent() Bus.get().post(new CustomDrawerPopupEvent()
.setDisMiss(true) .setDisMiss(true)
.setHtmlUrl(htmlUrl.toString()) .setHtmlUrl(htmlUrl.toString())

2
live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
View File

@ -764,7 +764,7 @@ public class LiveAudienceActivity extends LiveActivity {
bundle.putString("url", htmlUrl); bundle.putString("url", htmlUrl);
LiveHDDialogFragment fragment = new LiveHDDialogFragment(); LiveHDDialogFragment fragment = new LiveHDDialogFragment();
fragment.setArguments(bundle); fragment.setArguments(bundle);
fragment.show(((LiveRyAnchorActivity) mContext).getSupportFragmentManager(), "LiveHDDialogFragment"); fragment.show(getSupportFragmentManager(), "LiveHDDialogFragment");
} }
} }