diff --git a/common/src/main/java/com/yunbao/common/views/CustomDrawerPopupView.java b/common/src/main/java/com/yunbao/common/views/CustomDrawerPopupView.java index 3c75b4d08..57fcb2773 100644 --- a/common/src/main/java/com/yunbao/common/views/CustomDrawerPopupView.java +++ b/common/src/main/java/com/yunbao/common/views/CustomDrawerPopupView.java @@ -197,6 +197,10 @@ public class CustomDrawerPopupView extends DrawerPopupView { @Subscribe(threadMode = ThreadMode.MAIN) public void OnCustomDrawerPopupEvent(CustomDrawerPopupEvent event) { + //是否关闭弹窗 + if (event.isDisMiss()) { + dismiss(); + } if (callBack != null) { if (!TextUtils.isEmpty(event.getRightsInterests())) { callBack.informationTransfer(event); @@ -224,9 +228,6 @@ public class CustomDrawerPopupView extends DrawerPopupView { if (event.isRefresh()) { initData(); } - //是否关闭弹窗 - if (event.isDisMiss()) { - dismiss(); - } + } } \ No newline at end of file diff --git a/common/src/main/java/com/yunbao/common/views/DrawerRecommendChildViewHolder.java b/common/src/main/java/com/yunbao/common/views/DrawerRecommendChildViewHolder.java index ec401e018..165bdcba6 100644 --- a/common/src/main/java/com/yunbao/common/views/DrawerRecommendChildViewHolder.java +++ b/common/src/main/java/com/yunbao/common/views/DrawerRecommendChildViewHolder.java @@ -43,13 +43,21 @@ public class DrawerRecommendChildViewHolder extends RecyclerView.ViewHolder { } else { IMLoginModel userInfo = IMLoginManager.get(itemView.getContext()).getUserInfo(); StringBuffer htmlUrl = new StringBuffer(); - htmlUrl.append(CommonAppConfig.HOST) - .append("/") - .append(model.getSrc()) - .append("&uid=") - .append(userInfo.getId()) - .append("&token=") - .append(userInfo.getToken()); + if (model.getSrc().contains("?")) { + htmlUrl.append(model.getSrc()) + .append("&uid=") + .append(userInfo.getId()) + .append("&token=") + .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() .setDisMiss(true) .setHtmlUrl(htmlUrl.toString()) diff --git a/common/src/main/java/com/yunbao/common/views/DrawerTaskViewHolder.java b/common/src/main/java/com/yunbao/common/views/DrawerTaskViewHolder.java index 2db91f460..72218f3e6 100644 --- a/common/src/main/java/com/yunbao/common/views/DrawerTaskViewHolder.java +++ b/common/src/main/java/com/yunbao/common/views/DrawerTaskViewHolder.java @@ -51,13 +51,21 @@ public class DrawerTaskViewHolder extends RecyclerView.ViewHolder { } else { IMLoginModel userInfo = IMLoginManager.get(itemView.getContext()).getUserInfo(); StringBuffer htmlUrl = new StringBuffer(); - htmlUrl.append(CommonAppConfig.HOST) - .append("/") - .append(model.getSrc()) - .append("&uid=") - .append(userInfo.getId()) - .append("&token=") - .append(userInfo.getToken()); + if (model.getSrc().contains("?")) { + htmlUrl.append(model.getSrc()) + .append("&uid=") + .append(userInfo.getId()) + .append("&token=") + .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() .setDisMiss(true) .setHtmlUrl(htmlUrl.toString()) diff --git a/common/src/main/java/com/yunbao/common/views/FunGamesChildViewHolder.java b/common/src/main/java/com/yunbao/common/views/FunGamesChildViewHolder.java index 2f53661f5..2848413b3 100644 --- a/common/src/main/java/com/yunbao/common/views/FunGamesChildViewHolder.java +++ b/common/src/main/java/com/yunbao/common/views/FunGamesChildViewHolder.java @@ -47,7 +47,7 @@ public class FunGamesChildViewHolder extends RecyclerView.ViewHolder { .setDisMiss(true).setRightsInterests(model.getTitle())); } else { int activityID = TextUtils.isEmpty(model.getActivityId()) ? 0 : Integer.parseInt(model.getActivityId()); - if (activityID == 0) { + if (activityID != 0) { Bus.get().post(new CustomDrawerPopupEvent() .setDisMiss(true).setActivityId(activityID)); } else { @@ -63,7 +63,7 @@ public class FunGamesChildViewHolder extends RecyclerView.ViewHolder { htmlUrl.append(CommonAppConfig.HOST) .append("/") .append(model.getSrc()) - .append("&uid=") + .append("?uid=") .append(userInfo.getId()) .append("&token=") .append(userInfo.getToken()); diff --git a/common/src/main/java/com/yunbao/common/views/FunGamesViewHolder.java b/common/src/main/java/com/yunbao/common/views/FunGamesViewHolder.java index 93304d88c..5da9ada68 100644 --- a/common/src/main/java/com/yunbao/common/views/FunGamesViewHolder.java +++ b/common/src/main/java/com/yunbao/common/views/FunGamesViewHolder.java @@ -61,13 +61,21 @@ public class FunGamesViewHolder extends RecyclerView.ViewHolder { } else { IMLoginModel userInfo = IMLoginManager.get(itemView.getContext()).getUserInfo(); StringBuffer htmlUrl = new StringBuffer(); - htmlUrl.append(CommonAppConfig.HOST) - .append("/") - .append(model.getSrc()) - .append("&uid=") - .append(userInfo.getId()) - .append("&token=") - .append(userInfo.getToken()); + if (model.getSrc().contains("?")) { + htmlUrl.append(model.getSrc()) + .append("&uid=") + .append(userInfo.getId()) + .append("&token=") + .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() .setDisMiss(true) .setHtmlUrl(htmlUrl.toString()) 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 55f0d715b..9cbb3efce 100644 --- a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java @@ -764,7 +764,7 @@ public class LiveAudienceActivity extends LiveActivity { bundle.putString("url", htmlUrl); LiveHDDialogFragment fragment = new LiveHDDialogFragment(); fragment.setArguments(bundle); - fragment.show(((LiveRyAnchorActivity) mContext).getSupportFragmentManager(), "LiveHDDialogFragment"); + fragment.show(getSupportFragmentManager(), "LiveHDDialogFragment"); } }