UI调整 主播协议部分替换

live/src/main/java/com/yunbao/live/dialog/LiveHDDialogFragment.java

@@ -129,7 +129,7 @@ public class LiveHDDialogFragment extends AbsDialogFragment {
         } else {
             params.height = WindowManager.LayoutParams.WRAP_CONTENT;
         }
-        params.gravity = Gravity.BOTTOM;
+        params.gravity = Gravity.CENTER_VERTICAL;
         window.setAttributes(params);
     }
 
@@ -190,7 +190,11 @@ public class LiveHDDialogFragment extends AbsDialogFragment {
             params.width = bundle.getInt("width", -1);
             mWebView.setLayoutParams(params);
         }
+
+
+
         String url = bundle.getString("url");
+
         //url += "&anchorUid=" + mLiveUid+"&stream="+mStream+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0);
         if (!url.contains("anchorUid")){
             url +="&anchorUid=" + mLiveUid;

live/src/main/java/com/yunbao/live/views/LiveNewReadySwViewHolder.java

@@ -29,6 +29,7 @@ import com.lxj.xpopup.core.BasePopupView;
 import com.lxj.xpopup.interfaces.XPopupCallback;
 import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.Constants;
+import com.yunbao.common.HtmlConfig;
 import com.yunbao.common.bean.IMLoginModel;
 import com.yunbao.common.bean.LiveAnchorCallMeModel;
 import com.yunbao.common.bean.LiveAnchorSayModel;
@@ -545,12 +546,7 @@ public class LiveNewReadySwViewHolder extends AbsViewHolder implements View.OnCl
             String ct = Locale.getDefault().getLanguage();
             IMLoginModel model = IMLoginManager.get(mContext).getUserInfo();
             StringBuffer url = new StringBuffer();
-            url.append(CommonAppConfig.HOST);
-            if (TextUtils.equals(ct, "zh")) {
-                url.append("/index.php?g=portal&m=page&a=index&id=671");
-            } else {
-                url.append("/index.php?g=portal&m=page&a=index&id=672");
-            }
+            url.append(HtmlConfig.ANCHOR_AGREEMENT);
             url.append("&uid=")
                     .append(model.getId())
                     .append("&token=")

live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java

@@ -2491,6 +2491,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
                 mBanner2.setAutoPlay(false).setPages(mBannerList2, new CustomViewHolder()).setDelayTime(3200).setBannerStyle(BannerConfig.NOT_INDICATOR).setOnBannerClickListener(new OnBannerClickListener() {
                     @Override
                     public void onBannerClick(List datas, int p) {
+                        Log.i("banner", "onBannerClick: 3" );
                         if (showLoadingDialog()) {
                             return;
                         }
@@ -2536,6 +2537,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
                 mBanner2.setAutoPlay(true).setPages(mBannerList2, new CustomViewHolder()).setDelayTime(3200).setBannerStyle(BannerConfig.NOT_INDICATOR).setOnBannerClickListener(new OnBannerClickListener() {
                     @Override
                     public void onBannerClick(List datas, int p) {
+                        Log.i("banner", "onBannerClick4: " );
                         if (showLoadingDialog()) {
                             return;
                         }
@@ -2707,6 +2709,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
         mBanner1.setAutoPlay(true).setPages(mBannerList1, new CustomViewHolder()).setDelayTime(3000).setBannerStyle(BannerConfig.NOT_INDICATOR).setOnBannerClickListener(new OnBannerClickListener() {
             @Override
             public void onBannerClick(List datas, int p) {
+                Log.i("banner", "onBannerClick: 5");
                 if (mBannerList1 != null) {
                     if (p >= 0 && p < mBannerList1.size()) {
                         BannerBean bean = mBannerList1.get(p);
@@ -4986,6 +4989,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
         mBanner3.setAutoPlay(true).setPages(mBannerList3, new Banner3CustomViewHolder()).setDelayTime(3000).setBannerStyle(BannerConfig.NOT_INDICATOR).setOnBannerClickListener(new OnBannerClickListener() {
             @Override
             public void onBannerClick(List datas, int p) {
+                Log.i("banner", "onBannerClick: 6");
                 if (mBannerList3 != null) {
                     if (mBannerList3.get(p).getLink().equals("BattlePass")) {
                         RouteUtil.forwardBattlePass();
@@ -5021,6 +5025,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
 
             @Override
             public void onBannerClick(List datas, int p) {
+                Log.i("banner", "onBannerClick:7 " );
                 if (mBannerList4.get(p).getLink().equals("BattlePass") || mBannerList4.get(p).getType() == 888) {
                     RouteUtil.forwardBattlePass();
                     return;
@@ -6288,6 +6293,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
         topBanner1.setAutoPlay(true).setPages(mTopBannerList, new TopBannerCustomViewHolder()).setDelayTime(3000).setBannerStyle(BannerConfig.NOT_INDICATOR).setOnBannerClickListener(new OnBannerClickListener() {
             @Override
             public void onBannerClick(List datas, int position) {
+                Log.i("banner", "onBannerClick: " + position);
                 if (datas.size() > 0 && mTopBannerList != null && mTopBannerList.size() > 0) {
                     if (mTopBannerList.get(position).getType() == TopBannerCustomViewHolder.TYPE_CALL_ANCHOR) {
                         MobclickAgent.onEvent(mContext, "live_room_contact", "联系方式按钮");
@@ -6322,7 +6328,11 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
                         IMLoginModel userInfo = IMLoginManager.get(mContext).getUserInfo();
                         String type = "";
                         StringBuffer htmlUrl = new StringBuffer();
-                        htmlUrl.append(HtmlConfig.WISHLIST_URL).append(HtmlConfig.WISHLIST_URL.contains("?") ? "&uid=" : "?uid=").append(userInfo.getId()).append("&token=").append(userInfo.getToken()).append("&anchorUid=").append(mLiveUid).append("&liveUid=").append(mLiveUid).append("&t=").append(System.currentTimeMillis()).append("&g=Appapi&m=Wish&a=index").append("&isZh=").append(((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
+                        htmlUrl.append(HtmlConfig.WISHLIST_URL).append(HtmlConfig.WISHLIST_URL.contains("?") ? "&uid=" : "?uid=")
+                                .append(userInfo.getId()).append("&token=").append(userInfo.getToken()).append("&anchorUid=")
+                                .append(mLiveUid).append("&liveUid=").append(mLiveUid).append("&t=")
+                                .append(System.currentTimeMillis()).append("&g=Appapi&m=Wish&a=index").append("&isZh=")
+                                .append(((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
                         if (TextUtils.equals(type, "1")) {
                             ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false, 1);
                         } else {
@@ -6340,6 +6350,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
         topBanner2.setAutoPlay(true).setPages(mTopBannerList, new TopBannerCustomViewHolder(false)).setDelayTime(3000).setBannerStyle(BannerConfig.NOT_INDICATOR).setOnBannerClickListener(new OnBannerClickListener() {
             @Override
             public void onBannerClick(List datas, int position) {
+                Log.i("banner", "onBannerClick2: " + position);
                 if (datas.size() > 0) {
                     if (position >= mTopBannerList.size()) {
                         position = 0;

live/src/main/java/com/yunbao/live/views/LiveRyAnchorViewHolder.java

@@ -30,6 +30,7 @@ import com.ms.banner.Banner;
 import com.ms.banner.BannerConfig;
 import com.ms.banner.listener.OnBannerClickListener;
 import com.yunbao.common.CommonAppConfig;
+import com.yunbao.common.HtmlConfig;
 import com.yunbao.common.bean.BannerBean;
 import com.yunbao.common.bean.IMLoginModel;
 import com.yunbao.common.bean.LiveBean;
@@ -625,8 +626,8 @@ public class LiveRyAnchorViewHolder extends AbsLiveViewHolder {
                                                     .append(WordUtil.isNewZh() ? "1" : 0);
                                         } else {
                                             type = bean.getShow_type();
-                                            htmlUrl.append(bean.getLink())
-                                                    .append(bean.getLink().contains("?") ? "&uid=" : "?uid=")
+                                            htmlUrl.append(HtmlConfig.WISHLIST_URL)
+                                                    .append(HtmlConfig.WISHLIST_URL.contains("?") ? "&uid=" : "?uid=")
                                                     .append(userInfo.getId())
                                                     .append("&token=")
                                                     .append(userInfo.getToken())