侧边栏修改,直播关播页面BUg修改

common/src/main/java/com/yunbao/common/utils/RouteUtil.java

@@ -100,6 +100,7 @@ public class RouteUtil {
         }
         Constants.myUrl = url + "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&t=" + System.currentTimeMillis();
         ARouter.getInstance().build(PATH_MYWEBVIEWACTIVTITY)
+                .withString(Constants.URL,url)
                 .navigation();
     }
 
@@ -118,7 +119,8 @@ public class RouteUtil {
      */
     public static void forwardZhuangBanActivity(String url, boolean isFull) {
         ARouter.getInstance().build(PATH_ZHUANGBANACTIVITY)
-                .withString("title", "")
+                .withString("url", url)
+                .withBoolean("isFull", isFull)
                 .navigation();
     }
 

common/src/main/java/com/yunbao/common/views/DrawerRecommendChildViewHolder.java

@@ -44,7 +44,7 @@ public class DrawerRecommendChildViewHolder extends RecyclerView.ViewHolder {
                     IMLoginModel userInfo = IMLoginManager.get(itemView.getContext()).getUserInfo();
                     StringBuffer htmlUrl = new StringBuffer();
                     if (model.getSrc().contains("?")) {
-                        htmlUrl.append(model.getSrc())
+                        htmlUrl.append(CommonAppConfig.HOST).append("/").append(model.getSrc())
                                 .append("&uid=")
                                 .append(userInfo.getId())
                                 .append("&token=")

common/src/main/java/com/yunbao/common/views/DrawerRecommendViewHolder.java

@@ -52,7 +52,7 @@ public class DrawerRecommendViewHolder extends RecyclerView.ViewHolder {
                     if (TextUtils.equals(model.getSrc(), "recharge")) {
                         htmlUrl.append("recharge");
                     } else if (model.getSrc().contains("?")) {
-                        htmlUrl.append(model.getSrc())
+                        htmlUrl.append(CommonAppConfig.HOST).append("/").append(model.getSrc())
                                 .append("&uid=")
                                 .append(userInfo.getId())
                                 .append("&token=")

common/src/main/java/com/yunbao/common/views/DrawerTaskChildViewHolder.java

@@ -38,7 +38,25 @@ public class DrawerTaskChildViewHolder extends RecyclerView.ViewHolder {
     }
 
     public void setData(CustomSidebarChildModel model, int index) {
-        ImgLoader.display2(itemView.getContext(), model.getIcon(), icon);
+        int iconImg = R.mipmap.icon_012x;
+        switch (model.getFlag()) {
+            case "send_coin_gift":
+                iconImg = R.mipmap.icon_012x;
+                break;
+            case "send_gold_gift":
+                iconImg = R.mipmap.icon_022x;
+                break;
+            case "attention":
+                iconImg = R.mipmap.icon_032x;
+                break;
+            case "bullet_screen":
+                iconImg = R.mipmap.icon_042x;
+                break;
+            case "illumine":
+                iconImg = R.mipmap.icon_052x;
+                break;
+        }
+        ImgLoader.display(itemView.getContext(), iconImg, icon);
         StringBuffer titleBuffer = new StringBuffer();
         titleBuffer
                 .append(model.getTitle())
@@ -70,7 +88,6 @@ public class DrawerTaskChildViewHolder extends RecyclerView.ViewHolder {
             public void onViewClicks() {
 
 
-
                 if (TextUtils.equals(model.getStatus(), "2")) {
                     LiveNetManager.get(itemView.getContext())
                             .sendTaskGift(model.getFlag(), new HttpCallback<String>() {
@@ -86,7 +103,7 @@ public class DrawerTaskChildViewHolder extends RecyclerView.ViewHolder {
                                     ToastUtil.show(error);
                                 }
                             });
-                }else {
+                } else {
                     Bus.get().post(new CustomDrawerPopupEvent()
                             .setDisMiss(true));
                 }

common/src/main/java/com/yunbao/common/views/DrawerTaskViewHolder.java

@@ -52,7 +52,7 @@ public class DrawerTaskViewHolder extends RecyclerView.ViewHolder {
                     IMLoginModel userInfo = IMLoginManager.get(itemView.getContext()).getUserInfo();
                     StringBuffer htmlUrl = new StringBuffer();
                     if (model.getSrc().contains("?")) {
-                        htmlUrl.append(model.getSrc())
+                        htmlUrl.append(CommonAppConfig.HOST).append("/").append(model.getSrc())
                                 .append("&uid=")
                                 .append(userInfo.getId())
                                 .append("&token=")

common/src/main/java/com/yunbao/common/views/FunGamesChildViewHolder.java

@@ -54,7 +54,7 @@ public class FunGamesChildViewHolder extends RecyclerView.ViewHolder {
                         IMLoginModel userInfo = IMLoginManager.get(itemView.getContext()).getUserInfo();
                         StringBuffer htmlUrl = new StringBuffer();
                         if (model.getSrc().contains("?")) {
-                            htmlUrl.append(model.getSrc())
+                            htmlUrl.append(CommonAppConfig.HOST).append("/").append(model.getSrc())
                                     .append("&uid=")
                                     .append(userInfo.getId())
                                     .append("&token=")

common/src/main/java/com/yunbao/common/views/FunGamesViewHolder.java

@@ -62,7 +62,7 @@ public class FunGamesViewHolder extends RecyclerView.ViewHolder {
                     IMLoginModel userInfo = IMLoginManager.get(itemView.getContext()).getUserInfo();
                     StringBuffer htmlUrl = new StringBuffer();
                     if (model.getSrc().contains("?")) {
-                        htmlUrl.append(model.getSrc())
+                        htmlUrl.append(CommonAppConfig.HOST).append("/").append(model.getSrc())
                                 .append("&uid=")
                                 .append(userInfo.getId())
                                 .append("&token=")