6.5.4礼物冠名

common/src/main/java/com/yunbao/common/activity/WebViewActivity.java

@@ -23,12 +23,16 @@ import android.widget.ProgressBar;
 
 import androidx.annotation.RequiresApi;
 
+import com.alibaba.fastjson.JSON;
 import com.lxj.xpopup.XPopup;
 import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.CommonAppContext;
 import com.yunbao.common.Constants;
 import com.yunbao.common.R;
+import com.yunbao.common.bean.LiveBean;
 import com.yunbao.common.event.JavascriptInterfaceEvent;
+import com.yunbao.common.event.LiveRoomChangeEvent;
+import com.yunbao.common.http.LiveHttpUtil;
 import com.yunbao.common.http.base.HttpCallback;
 import com.yunbao.common.http.live.LiveNetManager;
 import com.yunbao.common.manager.IMLoginManager;
@@ -39,10 +43,13 @@ import com.yunbao.common.utils.DeviceUtils;
 import com.yunbao.common.utils.DpUtil;
 import com.yunbao.common.utils.JavascriptInterfaceUtils;
 import com.yunbao.common.utils.L;
+import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
+import com.yunbao.common.utils.MicStatusManager;
 import com.yunbao.common.utils.RouteUtil;
 import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.views.HintCustomPopup;
 
+import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
@@ -162,7 +169,7 @@ public class WebViewActivity extends AbsActivity {
         mWebView.getSettings().setJavaScriptEnabled(true);
         mWebView.getSettings().setDomStorageEnabled(true);
         String appCachePath = mContext.getCacheDir().getAbsolutePath();
-        mWebView.getSettings().setAppCachePath(appCachePath);
+//        mWebView.getSettings().setAppCachePath(appCachePath);
         mWebView.getSettings().setAllowFileAccess(true);
         mWebView.getSettings().setUseWideViewPort(true); // 关键点
         mWebView.getSettings().setAllowFileAccess(true); // 允许访问文件
@@ -253,7 +260,8 @@ public class WebViewActivity extends AbsActivity {
     }
 
     public static void forward(Context context, String url) {
-        forward(context, url, true);    }
+        forward(context, url, true);
+    }
 
 
     @Override
@@ -374,6 +382,44 @@ public class WebViewActivity extends AbsActivity {
                                 }
                             }))
                     .show();
+        } else if (TextUtils.equals(event.getMethod(), "androidMethodLookToLive")) {
+            //看直播
+            gotoLive(event.getLiveId());
         }
     }
+
+    private void gotoLive(final String live_id) {
+
+        LiveHttpUtil.getLiveInfo(live_id, new com.yunbao.common.http.HttpCallback() {
+            @Override
+            public void onSuccess(int code, String msg, String[] info) {
+                if (code == 0 && info.length > 0) {
+                    LiveBean liveBean = JSON.parseObject(info[0], LiveBean.class);
+                    new LiveRoomCheckLivePresenter(mContext, liveBean.getUid(), liveBean.getStream(), new LiveRoomCheckLivePresenter.NewActionListener() {
+                        @Override
+                        public void onLiveRoomChanged(String liveUid, String stream, int liveType, String liveTypeVal, String liveSdk) {
+                            if (liveBean == null) {
+                                return;
+                            }
+                            if (MicStatusManager.getInstance().isMic(liveUid)) {
+                                MicStatusManager.getInstance().showDownMicDialog(mContext);
+                                return;
+                            }
+                            RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveSdk),  Integer.parseInt(liveTypeVal));
+                            finish();
+                        }
+
+                        @Override
+                        public void onCheckError(String contextError) {
+
+                        }
+                    });
+                } else {
+                    RouteUtil.forwardUserHome(mContext, live_id, 0);
+                }
+            }
+        });
+
+
+    }
 }

common/src/main/java/com/yunbao/common/bean/GiftNamingInfoModel.java

@@ -0,0 +1,359 @@
+package com.yunbao.common.bean;
+
+import com.google.gson.annotations.SerializedName;
+
+public class GiftNamingInfoModel extends BaseModel {
+
+    @SerializedName("id")
+    private String id;
+    @SerializedName("sendtype")
+    private String sendtype;
+    @SerializedName("type")
+    private String type;
+    @SerializedName("name")
+    private String name;
+    @SerializedName("release_status")
+    private String releaseStatus;
+    @SerializedName("type_sort")
+    private String typeSort;
+    @SerializedName("operate_image")
+    private String operateImage;
+    @SerializedName("operate_url")
+    private String operateUrl;
+    @SerializedName("mark")
+    private String mark;
+    @SerializedName("giftname")
+    private String giftname;
+    @SerializedName("needcoin")
+    private String needcoin;
+    @SerializedName("gifticon")
+    private String gifticon;
+    @SerializedName("gift_description")
+    private String giftDescription;
+    @SerializedName("corner_mark")
+    private String cornerMark;
+    @SerializedName("swf")
+    private String swf;
+    @SerializedName("gift_uid")
+    private String giftUid;
+    @SerializedName("type_start_time")
+    private String typeStartTime;
+    @SerializedName("type_end_time")
+    private String typeEndTime;
+    @SerializedName("gift_start_time")
+    private String giftStartTime;
+    @SerializedName("gift_end_time")
+    private String giftEndTime;
+    @SerializedName("naming_liveuid")
+    private String namingLiveuid;
+    @SerializedName("naming_uid")
+    private String namingUid;
+    @SerializedName("naming_live_name")
+    private String namingLiveName;
+    @SerializedName("naming_user_name")
+    private String namingUserName;
+    @SerializedName("naming_live_avatar")
+    private String namingLiveAvatar;
+    @SerializedName("naming_user_avatar")
+    private String namingUserAvatar;
+    @SerializedName("naming_status")
+    private String namingStatus;
+    @SerializedName("naming_coin")
+    private String namingCoin;
+    @SerializedName("fans_level")
+    private String fansLevel;
+    @SerializedName("naming_user_coin")
+    private String namingUserCoin;
+    @SerializedName("naming_live_coin")
+    private String namingLiveCoin;
+    @SerializedName("isweek")
+    private String isweek;
+
+    public String getId() {
+        return id;
+    }
+
+    public GiftNamingInfoModel setId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    public String getSendtype() {
+        return sendtype;
+    }
+
+    public GiftNamingInfoModel setSendtype(String sendtype) {
+        this.sendtype = sendtype;
+        return this;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public GiftNamingInfoModel setType(String type) {
+        this.type = type;
+        return this;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public GiftNamingInfoModel setName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    public String getReleaseStatus() {
+        return releaseStatus;
+    }
+
+    public GiftNamingInfoModel setReleaseStatus(String releaseStatus) {
+        this.releaseStatus = releaseStatus;
+        return this;
+    }
+
+    public String getTypeSort() {
+        return typeSort;
+    }
+
+    public GiftNamingInfoModel setTypeSort(String typeSort) {
+        this.typeSort = typeSort;
+        return this;
+    }
+
+    public String getOperateImage() {
+        return operateImage;
+    }
+
+    public GiftNamingInfoModel setOperateImage(String operateImage) {
+        this.operateImage = operateImage;
+        return this;
+    }
+
+    public String getOperateUrl() {
+        return operateUrl;
+    }
+
+    public GiftNamingInfoModel setOperateUrl(String operateUrl) {
+        this.operateUrl = operateUrl;
+        return this;
+    }
+
+    public String getMark() {
+        return mark;
+    }
+
+    public GiftNamingInfoModel setMark(String mark) {
+        this.mark = mark;
+        return this;
+    }
+
+    public String getGiftname() {
+        return giftname;
+    }
+
+    public GiftNamingInfoModel setGiftname(String giftname) {
+        this.giftname = giftname;
+        return this;
+    }
+
+    public String getNeedcoin() {
+        return needcoin;
+    }
+
+    public GiftNamingInfoModel setNeedcoin(String needcoin) {
+        this.needcoin = needcoin;
+        return this;
+    }
+
+    public String getGifticon() {
+        return gifticon;
+    }
+
+    public GiftNamingInfoModel setGifticon(String gifticon) {
+        this.gifticon = gifticon;
+        return this;
+    }
+
+    public String getGiftDescription() {
+        return giftDescription;
+    }
+
+    public GiftNamingInfoModel setGiftDescription(String giftDescription) {
+        this.giftDescription = giftDescription;
+        return this;
+    }
+
+    public String getCornerMark() {
+        return cornerMark;
+    }
+
+    public GiftNamingInfoModel setCornerMark(String cornerMark) {
+        this.cornerMark = cornerMark;
+        return this;
+    }
+
+    public String getSwf() {
+        return swf;
+    }
+
+    public GiftNamingInfoModel setSwf(String swf) {
+        this.swf = swf;
+        return this;
+    }
+
+    public String getGiftUid() {
+        return giftUid;
+    }
+
+    public GiftNamingInfoModel setGiftUid(String giftUid) {
+        this.giftUid = giftUid;
+        return this;
+    }
+
+    public String getTypeStartTime() {
+        return typeStartTime;
+    }
+
+    public GiftNamingInfoModel setTypeStartTime(String typeStartTime) {
+        this.typeStartTime = typeStartTime;
+        return this;
+    }
+
+    public String getTypeEndTime() {
+        return typeEndTime;
+    }
+
+    public GiftNamingInfoModel setTypeEndTime(String typeEndTime) {
+        this.typeEndTime = typeEndTime;
+        return this;
+    }
+
+    public String getGiftStartTime() {
+        return giftStartTime;
+    }
+
+    public GiftNamingInfoModel setGiftStartTime(String giftStartTime) {
+        this.giftStartTime = giftStartTime;
+        return this;
+    }
+
+    public String getGiftEndTime() {
+        return giftEndTime;
+    }
+
+    public GiftNamingInfoModel setGiftEndTime(String giftEndTime) {
+        this.giftEndTime = giftEndTime;
+        return this;
+    }
+
+    public String getNamingLiveuid() {
+        return namingLiveuid;
+    }
+
+    public GiftNamingInfoModel setNamingLiveuid(String namingLiveuid) {
+        this.namingLiveuid = namingLiveuid;
+        return this;
+    }
+
+    public String getNamingUid() {
+        return namingUid;
+    }
+
+    public GiftNamingInfoModel setNamingUid(String namingUid) {
+        this.namingUid = namingUid;
+        return this;
+    }
+
+    public String getNamingLiveName() {
+        return namingLiveName;
+    }
+
+    public GiftNamingInfoModel setNamingLiveName(String namingLiveName) {
+        this.namingLiveName = namingLiveName;
+        return this;
+    }
+
+    public String getNamingUserName() {
+        return namingUserName;
+    }
+
+    public GiftNamingInfoModel setNamingUserName(String namingUserName) {
+        this.namingUserName = namingUserName;
+        return this;
+    }
+
+    public String getNamingLiveAvatar() {
+        return namingLiveAvatar;
+    }
+
+    public GiftNamingInfoModel setNamingLiveAvatar(String namingLiveAvatar) {
+        this.namingLiveAvatar = namingLiveAvatar;
+        return this;
+    }
+
+    public String getNamingUserAvatar() {
+        return namingUserAvatar;
+    }
+
+    public GiftNamingInfoModel setNamingUserAvatar(String namingUserAvatar) {
+        this.namingUserAvatar = namingUserAvatar;
+        return this;
+    }
+
+    public String getNamingStatus() {
+        return namingStatus;
+    }
+
+    public GiftNamingInfoModel setNamingStatus(String namingStatus) {
+        this.namingStatus = namingStatus;
+        return this;
+    }
+
+    public String getNamingCoin() {
+        return namingCoin;
+    }
+
+    public GiftNamingInfoModel setNamingCoin(String namingCoin) {
+        this.namingCoin = namingCoin;
+        return this;
+    }
+
+    public String getFansLevel() {
+        return fansLevel;
+    }
+
+    public GiftNamingInfoModel setFansLevel(String fansLevel) {
+        this.fansLevel = fansLevel;
+        return this;
+    }
+
+    public String getNamingUserCoin() {
+        return namingUserCoin;
+    }
+
+    public GiftNamingInfoModel setNamingUserCoin(String namingUserCoin) {
+        this.namingUserCoin = namingUserCoin;
+        return this;
+    }
+
+    public String getNamingLiveCoin() {
+        return namingLiveCoin;
+    }
+
+    public GiftNamingInfoModel setNamingLiveCoin(String namingLiveCoin) {
+        this.namingLiveCoin = namingLiveCoin;
+        return this;
+    }
+
+    public String getIsweek() {
+        return isweek;
+    }
+
+    public GiftNamingInfoModel setIsweek(String isweek) {
+        this.isweek = isweek;
+        return this;
+    }
+}

common/src/main/java/com/yunbao/common/bean/GiftWallGiftDetail.java

@@ -23,6 +23,9 @@ public class GiftWallGiftDetail extends BaseModel {
     }
 
     public String getUserNicename() {
+        if (userNicename.length() > 5) {
+            userNicename = userNicename.substring(0, 5) + "...";
+        }
         return userNicename;
     }
 

common/src/main/java/com/yunbao/common/bean/LiveGiftBean.java

@@ -64,6 +64,17 @@ public class LiveGiftBean {
     private String namingStatus;
     @JSONField(name = "naming_coin")
     private String namingCoin;
+    @JSONField(name = "naming_user_coin")
+    private String namingUserCoin;
+
+    public String getNamingUserCoin() {
+        return namingUserCoin;
+    }
+
+    public LiveGiftBean setNamingUserCoin(String namingUserCoin) {
+        this.namingUserCoin = namingUserCoin;
+        return this;
+    }
 
     public View getmView() {
         return mView;

common/src/main/java/com/yunbao/common/event/LiveErrorEvent.java

@@ -0,0 +1,6 @@
+package com.yunbao.common.event;
+
+import com.yunbao.common.bean.BaseModel;
+
+public class LiveErrorEvent extends BaseModel {
+}

common/src/main/java/com/yunbao/common/event/LiveRoomChangeEvent.java

@@ -1,4 +1,4 @@
-package com.yunbao.live.event;
+package com.yunbao.common.event;
 
 import com.yunbao.common.bean.LiveBean;
 

common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java

@@ -316,13 +316,13 @@ public class CommonHttpUtil {
                     public void onSuccess(int code, String msg, String[] info) {
                         if (code == 0 && info.length > 0 || code == 1001) {
                             int isAttention = JSON.parseObject(info[0]).getIntValue("isattent");//1是 关注  0是未关注
-                            if (code == 1001) {
+                           /* if (code == 1001) {
                                 if (WordUtil.isNewZh()) {
                                     ToastUtil.show("粉絲團等級已清零，待領取獎勵已自動領取至【個性裝扮】");
                                 } else {
                                     ToastUtil.show("The level of the fan club has been cleared, and the rewards to be claimed have been automatically received to [Personalized Dressing]");
                                 }
-                            }
+                            }*/
                             EventBus.getDefault().post(new FollowEvent(touid, isAttention));
                             if (callback != null) {
                                 callback.callback(isAttention);

common/src/main/java/com/yunbao/common/http/LiveHttpConsts.java

@@ -1,4 +1,4 @@
-package com.yunbao.live.http;
+package com.yunbao.common.http;
 
 /**
  * Created by cxf on 2019/3/21.

common/src/main/java/com/yunbao/common/http/LiveHttpUtil.java

@@ -1,4 +1,4 @@
-package com.yunbao.live.http;
+package com.yunbao.common.http;
 
 import android.text.TextUtils;
 

common/src/main/java/com/yunbao/common/http/PDLiveApi.java

@@ -17,6 +17,7 @@ import com.yunbao.common.bean.FansGroupGiftPack;
 import com.yunbao.common.bean.FansGroupGiftPackInfo;
 import com.yunbao.common.bean.GiftAlreadyWallModel;
 import com.yunbao.common.bean.GiftGuideModel;
+import com.yunbao.common.bean.GiftNamingInfoModel;
 import com.yunbao.common.bean.GiftWallGiftDetail;
 import com.yunbao.common.bean.GiftWallModel;
 import com.yunbao.common.bean.HourRank;
@@ -932,7 +933,8 @@ public interface PDLiveApi {
 
     /**
      * 获取粉丝团礼物信息
-     * @param packId  礼包id
+     *
+     * @param packId 礼包id
      */
     @GET("/api/public/?service=Fans.getFansExclusivePack")
     Observable<ResponseModel<FansGroupGiftPackInfo>> getFansExclusivePack(@Query("liveuid") String liveUid,
@@ -941,24 +943,29 @@ public interface PDLiveApi {
 
     /**
      * 购买粉丝团礼包
+     *
      * @param packId 礼包id
      */
-   @GET("/api/public/?service=Fans.buyFansExclusivePack")
+    @GET("/api/public/?service=Fans.buyFansExclusivePack")
     Observable<ResponseModel<HttpCallbackModel>> buyFansExclusivePack(@Query("liveuid") String liveUid,
                                                                       @Query("pack_id") String packId,
                                                                       @Query("stream") String stream
-   );
+    );
 
     /**
      * 获取粉丝团礼物包裹
      */
     @GET("/api/public/?service=Fans.userFansExclusivePackList")
     Observable<ResponseModel<List<FansGroupGiftPack>>> userFansExclusivePackList(@Query("liveuid") String liveUid);
+
     /**
      * 获取粉丝团礼物包裹
      */
     @GET("/api/public/?service=Fans.getCheckFansLevelUpgrade")
     Observable<ResponseModel<FansCheckRed>> getCheckFansLevelUpgrade(@Query("liveuid") String liveUid);
 
+    @GET("/api/public/?service=gift.getGiftNamingInfo")
+    Observable<ResponseModel<GiftNamingInfoModel>> getGiftNamingInfo(@Query("gift_id") String giftId);
+
 
 }

common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java

@@ -18,6 +18,7 @@ import com.yunbao.common.bean.FansGroupGiftPack;
 import com.yunbao.common.bean.FansGroupGiftPackInfo;
 import com.yunbao.common.bean.GiftAlreadyWallModel;
 import com.yunbao.common.bean.GiftGuideModel;
+import com.yunbao.common.bean.GiftNamingInfoModel;
 import com.yunbao.common.bean.GiftWallGiftDetail;
 import com.yunbao.common.bean.GiftWallModel;
 import com.yunbao.common.bean.HttpCallbackModel;
@@ -28,6 +29,7 @@ import com.yunbao.common.bean.LiveAiRobotBean;
 import com.yunbao.common.bean.LiveAnchorCallMeModel;
 import com.yunbao.common.bean.LiveAnchorSayModel;
 import com.yunbao.common.bean.LiveDataInfoModel;
+import com.yunbao.common.bean.LiveGiftBean;
 import com.yunbao.common.bean.LiveInfoModel;
 import com.yunbao.common.bean.LiveRoomActivityBanner;
 import com.yunbao.common.bean.LiveRoomVoteModel;
@@ -57,8 +59,6 @@ import com.yunbao.common.http.API;
 import com.yunbao.common.http.ResponseModel;
 import com.yunbao.common.http.base.CheckLiveCallBack;
 import com.yunbao.common.http.base.HttpCallback;
-import com.yunbao.common.utils.ToastUtil;
-import com.yunbao.common.utils.WordUtil;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -179,13 +179,13 @@ public class LiveNetManager {
                     List<SetAttentsModel> setAttentsModels = listResponseModel.getData().getInfo();
                     if (setAttentsModels.size() > 0) {
                         if (callback != null) {
-                            if (listResponseModel.getData().getCode() == 1001) {
+                           /* if (listResponseModel.getData().getCode() == 1001) {
                                 if (WordUtil.isNewZh()) {
                                     ToastUtil.show("粉絲團等級已清零，待領取獎勵已自動領取至【個性裝扮】");
                                 } else {
                                     ToastUtil.show("The level of the fan club has been cleared, and the rewards to be claimed have been automatically received to [Personalized Dressing]");
                                 }
-                            }
+                            }*/
                             callback.onSuccess(setAttentsModels.get(0));
                         }
                     } else {
@@ -2171,6 +2171,28 @@ public class LiveNetManager {
                 }).isDisposed();
     }
 
+    public void getGiftNamingInfo(String giftId,HttpCallback<GiftNamingInfoModel> callback) {
+        API.get().pdLiveApi(mContext)
+                .getGiftNamingInfo(giftId)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Consumer<ResponseModel<GiftNamingInfoModel>>() {
+                    @Override
+                    public void accept(ResponseModel<GiftNamingInfoModel> liveGiftBeanResponseModel) throws Exception {
+                        if (callback!=null){
+                            callback.onSuccess(liveGiftBeanResponseModel.getData().getInfo());
+                        }
+                    }
+                }, new Consumer<Throwable>() {
+                    @Override
+                    public void accept(Throwable throwable) throws Exception {
+                        if (callback != null) {
+                            callback.onError(mContext.getString(R.string.net_error));
+                        }
+                    }
+                }).isDisposed();
+    }
+
     /**
      * 直播间取消网络请求
      */

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

@@ -7,6 +7,7 @@ import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.FileReader;
+import java.io.IOException;
 import java.io.PrintWriter;
 
 /**
@@ -88,7 +89,11 @@ public class FileUtil {
             duration= Long.parseLong(time);
         } catch (Exception ex) {
         } finally {
-            mmr.release();
+            try {
+                mmr.release();
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
         }
         return duration;
     }

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

@@ -587,4 +587,9 @@ public class JavascriptInterfaceUtils {
                     }
                 });
     }
+    @JavascriptInterface
+    public void androidCancelAnchorAttention(){
+        Bus.get().post(new JavascriptInterfaceEvent()
+                .setMethod("androidCancelAnchorAttention"));
+    }
 }

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

@@ -1,4 +1,4 @@
-package com.yunbao.live.presenter;
+package com.yunbao.common.utils;
 
 import android.app.Activity;
 import android.app.Dialog;
@@ -10,19 +10,15 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.Constants;
+import com.yunbao.common.R;
 import com.yunbao.common.bean.CheckLiveModel;
 import com.yunbao.common.bean.LiveBean;
+import com.yunbao.common.event.LiveErrorEvent;
 import com.yunbao.common.http.HttpCallback;
+import com.yunbao.common.http.LiveHttpConsts;
+import com.yunbao.common.http.LiveHttpUtil;
 import com.yunbao.common.http.base.CheckLiveCallBack;
 import com.yunbao.common.http.live.LiveNetManager;
-import com.yunbao.common.utils.Bus;
-import com.yunbao.common.utils.DialogUitl;
-import com.yunbao.common.utils.MD5Util;
-import com.yunbao.common.utils.ToastUtil;
-import com.yunbao.live.R;
-import com.yunbao.live.event.LiveAudienceEvent;
-import com.yunbao.live.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
 
 /**
  * Created by cxf on 2017/9/29.
@@ -111,8 +107,7 @@ public class LiveRoomCheckLivePresenter {
                     @Override
                     public void onError(String error) {
                         Log.e("直播间异常", "onError: " + error);
-                        Bus.get().post(new LiveAudienceEvent()
-                                .setType(LiveAudienceEvent.LiveAudienceType.LIVE_ROOM_EXCEPTION));
+                        Bus.get().post(new LiveErrorEvent());
                         ToastUtil.show(error);
                     }
                 });
@@ -162,8 +157,7 @@ public class LiveRoomCheckLivePresenter {
                 }
             } else {
                 Log.e("直播间异常", "Error: " + msg);
-                Bus.get().post(new LiveAudienceEvent()
-                        .setType(LiveAudienceEvent.LiveAudienceType.LIVE_ROOM_EXCEPTION));
+                Bus.get().post(new LiveErrorEvent());
                 ToastUtil.show(msg);
             }
         }

common/src/main/java/com/yunbao/common/views/weight/NobleNoticeView.java

@@ -250,7 +250,8 @@ public class NobleNoticeView extends FrameLayout {
         @Override
         public void onStep(int frame, double v) {
             System.out.println("frame = " + frame);
-            if (frame == 20) {
+            System.out.println("scrollLayout.getMeasuredWidth() = " + scrollLayout.getMeasuredWidth());
+            if (frame == 21) {
                 setButtonPosition(roleType);
                 observable.observeOn(AndroidSchedulers.mainThread())
                         .subscribe(bitmap -> {

common/src/main/res/layout/dialog_live_gift_popup.xml

@@ -15,9 +15,9 @@
             android:id="@+id/operate_image"
             android:layout_width="122dp"
             android:layout_height="50dp"
+            android:layout_gravity="end|bottom"
             android:layout_marginEnd="5dp"
-            android:scaleType="fitXY"
-            android:layout_gravity="end|bottom" />
+            android:scaleType="fitXY" />
 
         <FrameLayout
             android:id="@+id/blind_box"
@@ -95,7 +95,7 @@
     <RelativeLayout
         android:id="@+id/gift_list"
         android:layout_width="match_parent"
-        android:layout_height="361dp"
+        android:layout_height="323dp"
         android:animateLayoutChanges="true"
         android:orientation="vertical">
 
@@ -195,7 +195,6 @@
                 android:layout_marginStart="15dp"
                 android:layout_marginEnd="16dp"
                 android:layout_weight="1"
-                android:background="@drawable/background_gift_description"
                 android:ellipsize="marquee"
                 android:focusable="true"
                 android:focusableInTouchMode="true"
@@ -203,7 +202,7 @@
                 android:marqueeRepeatLimit="marquee_forever"
                 android:scrollHorizontally="true"
                 android:singleLine="true"
-                android:textColor="#FFFFFFFF"
+                android:textColor="#80FFFFFF"
                 android:textSize="12sp" />
 
             <FrameLayout
@@ -222,7 +221,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
-            android:layout_marginBottom="17dp"
+            android:layout_marginBottom="8dp"
             android:paddingStart="16dp">
 
             <LinearLayout
@@ -358,8 +357,8 @@
                         android:id="@+id/gift_title"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:layout_marginEnd="10dp"
-                        android:layout_marginStart="8dp" />
+                        android:layout_marginStart="8dp"
+                        android:layout_marginEnd="10dp" />
 
                     <ImageView
                         android:layout_width="27dp"
@@ -406,7 +405,7 @@
             <FrameLayout
                 android:id="@+id/context_layout_gift"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="196dp"
                 android:layout_marginTop="12dp" />
 
 

common/src/main/res/layout/popup_achievement_details.xml

@@ -128,15 +128,21 @@
             android:text="@string/regular_bubble"
             android:textColor="#6F43FF"
             android:textSize="12sp" />
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/achievement_img_list"
+        <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="60dp"
             android:layout_marginStart="8dp"
-            android:background="@drawable/background_achievement_details_list"
             android:layout_marginTop="6dp"
-            android:layout_marginEnd="8dp" />
+            android:background="@drawable/background_achievement_details_list"
+            android:layout_marginEnd="8dp">
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/achievement_img_list"
+                android:layout_width="wrap_content"
+                android:layout_gravity="center"
+                android:layout_height="match_parent" />
+        </FrameLayout>
+
+
 
         <TextView
             android:id="@+id/gift_details_btn2"

config.gradle

@@ -1,17 +1,17 @@
 ext {
     android = [
-            compileSdkVersion: 31,
+            compileSdkVersion: 33,
             buildToolsVersion: "29.0.2",
             minSdkVersion    : 21,
-            targetSdkVersion : 31,
-            versionCode      : 440,
+            targetSdkVersion : 33,
+            versionCode      : 445,
             versionName      : "6.5.4"
     ]
     manifestPlaceholders = [
             //正式、
             serverHost       : "https://napi.yaoulive.com",
 //            测试
-//            serverHost       : "https://ceshi.yaoulive.com",
+//            serverHost       : " https://ceshi.yaoulive.com",
 
 
 
@@ -21,10 +21,10 @@ ext {
             baiduAppKey      : "zgCgFhUKEOV7I3ZXDFpTfnRB",
             baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S",
 //            true表示谷歌支付 false
-            isGooglePlay     :  false,
+            isGooglePlay     :  true,
             //是否上报异常日志
             isUploadLog      :  true,
             //是否打包成插件包模式
-            isPluginModel    :  true,
+            isPluginModel    :  false,
     ]
 }

live/src/main/java/com/yunbao/live/activity/EditNameRemarksActivity.java

@@ -14,10 +14,9 @@ import com.yunbao.common.http.CommonHttpUtil;
 import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.manager.InstructorRemarkManager;
 import com.yunbao.common.utils.ToastUtil;
-import com.yunbao.common.utils.WordUtil;
 import com.yunbao.live.R;
 import com.yunbao.live.bean.SearchUserBean;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpUtil;
 
 import org.greenrobot.eventbus.EventBus;
 

live/src/main/java/com/yunbao/live/activity/GiftWallActivity.java

@@ -118,7 +118,7 @@ public class GiftWallActivity extends AbsActivity {
             public void onViewClicks() {
                 new XPopup.Builder(GiftWallActivity.this)
                         .enableDrag(false)
-                        .asCustom(new CodexDialog(GiftWallActivity.this, mStream, mLiveUid, mLiveUid,isLive,false))
+                        .asCustom(new CodexDialog(GiftWallActivity.this, mStream, mLiveUid, mLiveUid,false,false))
                         .show();
             }
         });

live/src/main/java/com/yunbao/live/activity/LiveActivity.java

@@ -1,7 +1,5 @@
 package com.yunbao.live.activity;
 
-import static com.yunbao.live.views.LiveRoomViewHolder.mLiveUid;
-
 import android.app.Dialog;
 import android.content.ClipData;
 import android.content.ClipboardManager;
@@ -73,8 +71,8 @@ import com.yunbao.live.dialog.LiveShareDialogFragment;
 import com.yunbao.live.dialog.LiveUserAnchorMailBoxPopDialog;
 import com.yunbao.live.dialog.LiveUserDialogFragment;
 import com.yunbao.live.dialog.LiveUserMoreDialogFragment;
-import com.yunbao.live.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpConsts;
+import com.yunbao.common.http.LiveHttpUtil;
 import com.yunbao.live.presenter.LiveLinkMicAnchorPresenter;
 import com.yunbao.live.presenter.LiveLinkMicPkPresenter;
 import com.yunbao.live.presenter.LiveLinkMicPresenter;

live/src/main/java/com/yunbao/live/activity/LiveAnchorActivity.java

@@ -51,8 +51,8 @@ import com.yunbao.live.dialog.LiveFunctionDialogFragment;
 import com.yunbao.live.dialog.LiveLinkMicListDialogFragment;
 import com.yunbao.live.dialog.LiveWishListDialogFragment;
 import com.yunbao.live.event.LinkMicTxMixStreamEvent;
-import com.yunbao.live.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpConsts;
+import com.yunbao.common.http.LiveHttpUtil;
 import com.yunbao.live.interfaces.LiveFunctionClickListener;
 import com.yunbao.live.interfaces.LivePushListener;
 import com.yunbao.live.momo.BeautyManager;

live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java

@@ -38,14 +38,12 @@ import com.lxj.xpopup.enums.PopupPosition;
 import com.lxj.xpopup.interfaces.XPopupCallback;
 import com.lzf.easyfloat.EasyFloat;
 import com.yunbao.common.CommonAppConfig;
-import com.yunbao.common.CommonAppContext;
 import com.yunbao.common.Constants;
 import com.yunbao.common.HtmlConfig;
 import com.yunbao.common.activity.WebViewActivity;
 import com.yunbao.common.bean.AnchorRecommendItemModel;
 import com.yunbao.common.bean.AnchorRecommendModel;
 import com.yunbao.common.bean.CrashSaveBean;
-import com.yunbao.common.bean.FansCheckRed;
 import com.yunbao.common.bean.IMLoginModel;
 import com.yunbao.common.bean.LinkMicUserBean;
 import com.yunbao.common.bean.LiveBean;
@@ -64,6 +62,7 @@ import com.yunbao.common.event.CustomDrawerPopupEvent;
 import com.yunbao.common.event.FollowEvent;
 import com.yunbao.common.event.GiftWallIlluminateEvent;
 import com.yunbao.common.event.JavascriptInterfaceEvent;
+import com.yunbao.common.event.LiveErrorEvent;
 import com.yunbao.common.glide.ImgLoader;
 import com.yunbao.common.http.CommonHttpConsts;
 import com.yunbao.common.http.CommonHttpUtil;
@@ -80,7 +79,6 @@ import com.yunbao.common.utils.DialogUitl;
 import com.yunbao.common.utils.GiftCacheUtil;
 import com.yunbao.common.utils.L;
 import com.yunbao.common.utils.MicStatusManager;
-import com.yunbao.common.utils.NobleUtil;
 import com.yunbao.common.utils.ProcessResultUtil;
 import com.yunbao.common.utils.RouteUtil;
 import com.yunbao.common.utils.StringUtil;
@@ -103,11 +101,11 @@ import com.yunbao.live.dialog.LiveWishListDialogFragment4Audience;
 import com.yunbao.live.dialog.SignDialogFragment;
 import com.yunbao.live.event.LinkMicTxAccEvent;
 import com.yunbao.live.event.LiveAudienceEvent;
-import com.yunbao.live.event.LiveRoomChangeEvent;
+import com.yunbao.common.event.LiveRoomChangeEvent;
 import com.yunbao.live.http.ImHttpUtil;
-import com.yunbao.live.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
-import com.yunbao.live.presenter.LiveRoomCheckLivePresenter;
+import com.yunbao.common.http.LiveHttpConsts;
+import com.yunbao.common.http.LiveHttpUtil;
+import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
 import com.yunbao.live.views.LiveRoomPlayViewHolder;
 import com.yunbao.live.views.PortraitLiveManager;
 import com.yunbao.share.ui.SharePopDialog;
@@ -752,6 +750,12 @@ public class LiveAudienceActivity extends LiveActivity {
         if (manager != null) {
             manager.onResume();
         }
+        if (manager != null && !StringUtil.isEmpty(is_fans)) {
+            if (is_fans.equals("-2")) {
+                manager.setAttention(0);
+                is_fans = "2";
+            }
+        }
         GiftCacheUtil.getInstance().restart();
     }
 
@@ -1463,6 +1467,12 @@ public class LiveAudienceActivity extends LiveActivity {
         }
     }
 
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onLiveErrorEvent(LiveErrorEvent event){
+        //主播未直播时自动下滑至下一个直播间
+        mCurrentPage = mCurrentPage + 1;
+        liveHandler.post(liveRunnable);
+    }
     /**
      * 跳转到消息中心的系统信息web
      *

live/src/main/java/com/yunbao/live/activity/LiveBlackActivity.java

@@ -13,12 +13,11 @@ import com.yunbao.common.custom.CommonRefreshView;
 import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.interfaces.OnItemClickListener;
 import com.yunbao.common.utils.ToastUtil;
-import com.yunbao.common.utils.WordUtil;
 import com.yunbao.live.R;
 import com.yunbao.live.adapter.LiveBlackAdapter;
 import com.yunbao.live.bean.LiveShutUpBean;
-import com.yunbao.live.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpConsts;
+import com.yunbao.common.http.LiveHttpUtil;
 
 import java.util.Arrays;
 import java.util.List;

live/src/main/java/com/yunbao/live/activity/LiveGuardListActivity.java

@@ -13,11 +13,10 @@ import com.yunbao.common.activity.AbsActivity;
 import com.yunbao.common.adapter.RefreshAdapter;
 import com.yunbao.common.custom.CommonRefreshView;
 import com.yunbao.common.http.HttpCallback;
-import com.yunbao.common.utils.WordUtil;
 import com.yunbao.live.adapter.GuardAdapter;
 import com.yunbao.live.bean.GuardUserBean;
-import com.yunbao.live.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpConsts;
+import com.yunbao.common.http.LiveHttpUtil;
 
 import java.util.Arrays;
 import java.util.List;

live/src/main/java/com/yunbao/live/activity/LiveReportActivity.java

@@ -16,12 +16,11 @@ import com.yunbao.common.interfaces.KeyBoardHeightChangeListener;
 import com.yunbao.common.utils.KeyBoardHeightUtil;
 import com.yunbao.common.utils.RouteUtil;
 import com.yunbao.common.utils.ToastUtil;
-import com.yunbao.common.utils.WordUtil;
 import com.yunbao.live.R;
 import com.yunbao.live.adapter.LiveReportAdapter;
 import com.yunbao.live.bean.LiveReportBean;
-import com.yunbao.live.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpConsts;
+import com.yunbao.common.http.LiveHttpUtil;
 
 import java.io.File;
 import java.util.Arrays;

live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java

@@ -86,8 +86,8 @@ import com.yunbao.live.dialog.LiveWishListDialogFragment4Audience;
 import com.yunbao.live.dialog.RandomPkDialogFragment;
 import com.yunbao.live.event.LinkMicTxMixStreamEvent;
 import com.yunbao.live.event.LiveAudienceEvent;
-import com.yunbao.live.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpConsts;
+import com.yunbao.common.http.LiveHttpUtil;
 import com.yunbao.live.interfaces.LiveFunctionClickListener;
 import com.yunbao.live.interfaces.LivePushListener;
 import com.yunbao.live.music.LiveMusicDialogFragment;

live/src/main/java/com/yunbao/live/activity/LiveShutUpActivity.java

@@ -13,12 +13,11 @@ import com.yunbao.common.custom.CommonRefreshView;
 import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.interfaces.OnItemClickListener;
 import com.yunbao.common.utils.ToastUtil;
-import com.yunbao.common.utils.WordUtil;
 import com.yunbao.live.R;
 import com.yunbao.live.adapter.LiveShutUpAdapter;
 import com.yunbao.live.bean.LiveShutUpBean;
-import com.yunbao.live.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpConsts;
+import com.yunbao.common.http.LiveHttpUtil;
 
 import java.util.Arrays;
 import java.util.List;

live/src/main/java/com/yunbao/live/activity/LiveTRTCAnchorActivity.java

@@ -29,12 +29,11 @@ import com.yunbao.common.utils.DialogUitl;
 import com.yunbao.common.utils.L;
 import com.yunbao.common.utils.StringUtil;
 import com.yunbao.common.utils.ToastUtil;
-import com.yunbao.common.utils.WordUtil;
 import com.yunbao.live.R;
 import com.yunbao.common.bean.LiveRoomTypeBean;
 import com.yunbao.live.dialog.LiveBeautyDialogFragment;
 import com.yunbao.live.dialog.LiveRoomTypeDialogFragment;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpUtil;
 import com.yunbao.live.momo.GenerateTestUserSig;
 import com.yunbao.live.momo.TencentTRTCBeautyManager;
 import com.yunbao.live.utils.TRTCBaseActivity;

live/src/main/java/com/yunbao/live/activity/PDLIiveChatActivity.java

@@ -27,8 +27,8 @@ import com.yunbao.live.R;
 import com.yunbao.live.adapter.SystemChatMessageAdapter;
 import com.yunbao.live.bean.ImUserBean;
 import com.yunbao.live.event.RecommendLiveRoomEvent;
-import com.yunbao.live.http.LiveHttpUtil;
-import com.yunbao.live.presenter.LiveRoomCheckLivePresenter;
+import com.yunbao.common.http.LiveHttpUtil;
+import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;

live/src/main/java/com/yunbao/live/activity/WebViewActivityMedal.java

@@ -39,10 +39,9 @@ import com.yunbao.common.utils.JavascriptInterfaceUtils;
 import com.yunbao.common.utils.L;
 import com.yunbao.common.utils.RouteUtil;
 import com.yunbao.common.utils.ToastUtil;
-import com.yunbao.common.utils.WordUtil;
 import com.yunbao.live.dialog.LiveUserDialogFragment;
-import com.yunbao.live.http.LiveHttpUtil;
-import com.yunbao.live.presenter.LiveRoomCheckLivePresenter;
+import com.yunbao.common.http.LiveHttpUtil;
+import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
 
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;

live/src/main/java/com/yunbao/live/activity/ZhuangBanActivity.java

@@ -28,6 +28,7 @@ import android.widget.TextView;
 import androidx.annotation.RequiresApi;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
+import com.alibaba.fastjson.JSON;
 import com.opensource.svgaplayer.SVGACallback;
 import com.opensource.svgaplayer.SVGADrawable;
 import com.opensource.svgaplayer.SVGAImageView;
@@ -36,18 +37,24 @@ import com.opensource.svgaplayer.SVGAVideoEntity;
 import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.Constants;
 import com.yunbao.common.activity.AbsActivity;
+import com.yunbao.common.bean.LiveBean;
 import com.yunbao.common.event.JavascriptInterfaceEvent;
+import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.utils.Bus;
 import com.yunbao.common.utils.DpUtil;
 import com.yunbao.common.utils.JavascriptInterfaceUtils;
 import com.yunbao.common.utils.L;
+import com.yunbao.common.utils.MicStatusManager;
 import com.yunbao.common.utils.RouteUtil;
 import com.yunbao.common.utils.SVGAViewUtils;
 import com.yunbao.common.utils.ToastUtil;
-import com.yunbao.common.utils.WordUtil;
 import com.yunbao.live.R;
+import com.yunbao.common.event.LiveRoomChangeEvent;
+import com.yunbao.common.http.LiveHttpUtil;
+import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
 import com.yunbao.share.ui.InvitePopDialog;
 
+import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
@@ -216,7 +223,7 @@ public class ZhuangBanActivity extends AbsActivity {
             intent.setData(MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
         }
         intent.setType("image/*");
-        startActivityForResult(Intent.createChooser(intent,mContext.getString(R.string.choose_flie)), CHOOSE);
+        startActivityForResult(Intent.createChooser(intent, mContext.getString(R.string.choose_flie)), CHOOSE);
     }
 
     @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
@@ -296,7 +303,7 @@ public class ZhuangBanActivity extends AbsActivity {
         Intent intent = new Intent(context, ZhuangBanActivity.class);
         Log.i("tag", url);
         intent.putExtra(Constants.URL, url);
-        if (url.contains("Noble/index.html")||url.contains("RongYuQiang")) {
+        if (url.contains("Noble/index.html") || url.contains("RongYuQiang")) {
             intent.putExtra("title", "");
         }
         context.startActivity(intent);
@@ -370,12 +377,50 @@ public class ZhuangBanActivity extends AbsActivity {
                 } catch (MalformedURLException e) {
                     e.printStackTrace();
                 }
-            }else if (event.getMethod().equals("androidInviteShare")) {
+            } else if (event.getMethod().equals("androidInviteShare")) {
                 new InvitePopDialog(mContext)
                         .setUrl(event.getData())
                         .showDialog();
+            } else if (TextUtils.equals(event.getMethod(), "androidMethodLookToLive")) {
+                //看直播
+                gotoLive(event.getLiveId());
             }
         }
 
     }
+
+    private void gotoLive(final String live_id) {
+
+        LiveHttpUtil.getLiveInfo(live_id, new HttpCallback() {
+            @Override
+            public void onSuccess(int code, String msg, String[] info) {
+                if (code == 0 && info.length > 0) {
+                    LiveBean liveBean = JSON.parseObject(info[0], LiveBean.class);
+                    new LiveRoomCheckLivePresenter(mContext, liveBean.getUid(), liveBean.getStream(), new LiveRoomCheckLivePresenter.NewActionListener() {
+                        @Override
+                        public void onLiveRoomChanged(String liveUid, String stream, int liveType, String liveTypeVal, String liveSdk) {
+                            if (liveBean == null) {
+                                return;
+                            }
+                            if (MicStatusManager.getInstance().isMic(liveUid)) {
+                                MicStatusManager.getInstance().showDownMicDialog(mContext);
+                                return;
+                            }
+                            RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveSdk),  Integer.parseInt(liveTypeVal));
+                            finish();
+                        }
+
+                        @Override
+                        public void onCheckError(String contextError) {
+
+                        }
+                    });
+                } else {
+                    RouteUtil.forwardUserHome(mContext, live_id, 0);
+                }
+            }
+        });
+
+
+    }
 }

live/src/main/java/com/yunbao/live/adapter/FreePkRecyclerAdapter.java

@@ -20,7 +20,7 @@ import com.yunbao.common.http.live.LiveNetManager;
 import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.live.R;
 import com.yunbao.live.activity.LiveRyAnchorActivity;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpUtil;
 
 import java.util.Arrays;
 

live/src/main/java/com/yunbao/live/adapter/LiveFansGroupSendGiftAdapter.java

@@ -15,7 +15,6 @@ import com.yunbao.common.glide.ImgLoader;
 import com.yunbao.common.interfaces.OnItemClickListener;
 import com.yunbao.common.views.weight.ViewClicksAntiShake;
 import com.yunbao.live.R;
-import com.yunbao.live.http.LiveHttpUtil;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -19,7 +19,7 @@ import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.live.R;
 import com.yunbao.live.activity.LiveActivity;
 import com.yunbao.live.activity.LiveAudienceActivity;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpUtil;
 
 import java.lang.reflect.Field;
 

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

@@ -31,7 +31,7 @@ import com.yunbao.common.utils.WordsTypeUtil;
 import com.yunbao.live.R;
 import com.yunbao.live.adapter.FreePkRecyclerAdapter;
 import com.yunbao.live.bean.LivePkBean;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpUtil;
 
 import java.util.ArrayList;
 import java.util.Arrays;

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

@@ -2,14 +2,9 @@ package com.yunbao.live.dialog;
 
 import android.app.Dialog;
 import android.content.Context;
-import android.graphics.drawable.ColorDrawable;
-import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewParent;
 import android.view.inputmethod.InputMethodManager;
-import android.widget.PopupWindow;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
 import android.widget.TextView;
@@ -31,7 +26,7 @@ import com.yunbao.live.adapter.GiftTopAdapter;
 import com.yunbao.live.adapter.LiveGiftPagerAdapter;
 import com.yunbao.live.adapter.LiveGiftPagerAdapter.ActionListener;
 import com.yunbao.live.bean.GiftTopBean;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpUtil;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -12,10 +12,9 @@ import com.alibaba.fastjson.JSONObject;
 import com.yunbao.common.dialog.AbsDialogFragment;
 import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.utils.DpUtil;
-import com.yunbao.common.utils.WordUtil;
 import com.yunbao.live.R;
-import com.yunbao.live.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpConsts;
+import com.yunbao.common.http.LiveHttpUtil;
 
 /**
  * Created by cxf on 2019/4/30.

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

@@ -25,7 +25,7 @@ import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.utils.DialogUitl;
 import com.yunbao.common.views.weight.ViewClicksAntiShake;
 import com.yunbao.live.R;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpUtil;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -10,12 +10,11 @@ import com.yunbao.common.bean.FansGroupGiftPack;
 import com.yunbao.common.dialog.AbsDialogCenterPopupWindow;
 import com.yunbao.common.http.base.HttpCallback;
 import com.yunbao.common.http.live.LiveNetManager;
-import com.yunbao.common.interfaces.OnItemClickListener;
 import com.yunbao.common.utils.DpUtil;
 import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.live.R;
 import com.yunbao.live.adapter.LiveFansGroupSendGiftAdapter;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpUtil;
 
 import java.util.List;
 

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

@@ -21,8 +21,8 @@ import com.yunbao.common.glide.ImgLoader;
 import com.yunbao.common.http.HttpCallback;
 import com.yunbao.live.R;
 import com.yunbao.live.activity.LiveAudienceActivity;
-import com.yunbao.live.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpConsts;
+import com.yunbao.common.http.LiveHttpUtil;
 
 /**
  * Created by cxf on 2018/10/15.

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

@@ -43,8 +43,8 @@ import com.yunbao.live.R;
 import com.yunbao.live.activity.LiveActivity;
 import com.yunbao.live.activity.LiveAudienceActivity;
 import com.yunbao.live.activity.LiveRyAnchorActivity;
-import com.yunbao.live.http.LiveHttpUtil;
-import com.yunbao.live.presenter.LiveRoomCheckLivePresenter;
+import com.yunbao.common.http.LiveHttpUtil;
+import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
 
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
@@ -160,9 +160,9 @@ public class LiveGameDialogFragment extends AbsDialogFragment {
         mWebView.getSettings().setJavaScriptEnabled(true);
         mWebView.getSettings().setDomStorageEnabled(true);
         String appCachePath = mContext.getCacheDir().getAbsolutePath();
-        mWebView.getSettings().setAppCachePath(appCachePath);
+//        mWebView.getSettings().setAppCachePath(appCachePath);
         mWebView.getSettings().setAllowFileAccess(true);
-        mWebView.getSettings().setAppCacheEnabled(true);
+//        mWebView.getSettings().setAppCacheEnabled(true);
 
         mWebView.getSettings().setJavaScriptCanOpenWindowsAutomatically(true); // 是否允许JS打开新窗口
         mWebView.getSettings().setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);

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

@@ -81,8 +81,8 @@ import com.yunbao.live.bean.LiveGuardInfo;
 import com.yunbao.live.custom.GiftViewPager;
 import com.yunbao.live.event.LiveAudienceEvent;
 import com.yunbao.common.event.LiveGiftDialogEvent;
-import com.yunbao.live.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpConsts;
+import com.yunbao.common.http.LiveHttpUtil;
 import com.yunbao.live.utils.ToolsButton;
 
 import org.greenrobot.eventbus.EventBus;

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

@@ -36,8 +36,8 @@ import com.yunbao.live.R;
 import com.yunbao.live.adapter.LiveGiftCountAdapter;
 import com.yunbao.live.adapter.LiveGiftPagerAdapter;
 import com.yunbao.live.bean.LiveGuardInfo;
-import com.yunbao.live.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpConsts;
+import com.yunbao.common.http.LiveHttpUtil;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;

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

@@ -43,6 +43,7 @@ import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.Constants;
 import com.yunbao.common.R;
 import com.yunbao.common.bean.BlindBoxInfoModel;
+import com.yunbao.common.bean.GiftNamingInfoModel;
 import com.yunbao.common.bean.IMLoginModel;
 import com.yunbao.common.bean.LiveGiftBean;
 import com.yunbao.common.bean.LiveGiftBean2;
@@ -77,7 +78,7 @@ import com.yunbao.live.event.GiftTitleEvent;
 import com.yunbao.live.event.LiveAudienceEvent;
 import com.yunbao.live.event.LiveGiftItemEvent;
 import com.yunbao.live.event.LiveParcelItemRefreshEvent;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpUtil;
 import com.yunbao.live.views.LiveGiftFragment;
 import com.yunbao.live.views.LiveParcelFragment;
 
@@ -85,6 +86,7 @@ import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
+import java.math.BigDecimal;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
@@ -211,17 +213,19 @@ public class LiveGiftPopup extends AbsDialogFragment {
             }
         });
         //；连送
-        ViewClicksAntiShake.clicksAntiShake(mBtnSendGroup, new ViewClicksAntiShake.ViewClicksCallBack() {
+        mBtnSendGroup.setOnClickListener(new View.OnClickListener() {
             @Override
-            public void onViewClicks() {
-                sendGift();
+            public void onClick(View v) {
+                sendGiftHandler.post(sendGiftRunnble);
             }
         });
+
         //送礼
         ViewClicksAntiShake.clicksAntiShake(liveGiftSend, new ViewClicksAntiShake.ViewClicksCallBack() {
             @Override
             public void onViewClicks() {
-                sendGift();
+                sendGiftHandler.post(sendGiftRunnble);
+
             }
         });
         // 跳转充值
@@ -339,45 +343,27 @@ public class LiveGiftPopup extends AbsDialogFragment {
             by = bundle.getString("by");
             isPk = bundle.getBoolean("pk");
         }
-
         //判断是否缓存礼物列表
-        String giftListJson = CommonAppConfig.getInstance().getGiftListJson();
-        if (!TextUtils.isEmpty(giftListJson)) {
-            try {
-                liveGiftList = JSON.parseArray(giftListJson);
-                Bus.getOn(this);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-        if (liveGiftList == null) {
-            LiveHttpUtil.getNewGiftList(new HttpCallback() {
-                @Override
-                public void onSuccess(int code, String msg, String[] info) {
-                    if (code == 0 && info.length > 0) {
-                        JSONObject obj = JSON.parseObject(info[0]);
-                        liveGiftList = obj.getJSONArray("listarray");
-                        CommonAppConfig.getInstance().setGiftListJson(obj.getString("listarray"));
-                        getCoin();
-                        goldText.setText(obj.getString("gold"));
-                        diamondText.setText(obj.getString("coin"));
-                        setTitleData();
-
-                    }
-                }
-
-                @Override
-                public void onFinish() {
+        LiveHttpUtil.getNewGiftList(new HttpCallback() {
+            @Override
+            public void onSuccess(int code, String msg, String[] info) {
+                if (code == 0 && info.length > 0) {
+                    JSONObject obj = JSON.parseObject(info[0]);
+                    liveGiftList = obj.getJSONArray("listarray");
+                    CommonAppConfig.getInstance().setGiftListJson(obj.getString("listarray"));
                     getCoin();
-//                    if (mLoading != null) {
-//                        mLoading.setVisibility(View.INVISIBLE);
-//                    }
+                    goldText.setText(obj.getString("gold"));
+                    diamondText.setText(obj.getString("coin"));
+                    setTitleData();
+
                 }
-            });
-        } else {
-            getCoin();
-            setTitleData();
-        }
+            }
+
+            @Override
+            public void onFinish() {
+                getCoin();
+            }
+        });
         getBlindBoxInfo();
         loadUserVip();
     }
@@ -464,34 +450,54 @@ public class LiveGiftPopup extends AbsDialogFragment {
                         goldText.setText(coinModel.getGold());
                         diamondText.setText(coinModel.getCoin());
                         lvStr.setText("Lv." + coinModel.getUserLevel());
-                        int nextLeve = Integer.parseInt(coinModel.getUserNextLevelRewards());
-                        int maxLeve = Integer.parseInt(coinModel.getUserLevelMax());
+
                         findViewById(R.id.red_point).setVisibility((!TextUtils.isEmpty(coinModel.getUsersPackRedDot())) &&
                                 TextUtils.equals(coinModel.getUsersPackRedDot(), "1") ? View.VISIBLE : View.GONE);
-                        if (!TextUtils.equals(coinModel.getUserLevel(),coinModel.getUserLevelMax())) {
-                            String leveNext = String.valueOf(nextLeve);
-                            String userNextLevel = coinModel.getUserLevelUpgrades();
-                            String hint = String.format(getString(R.string.leveling_points),
-                                    userNextLevel, leveNext);
-                            int leveNextIndexOf = hint.indexOf(leveNext);
-                            int leveNextSize = leveNext.length();
-                            int userNextLevelIndexOf = hint.indexOf(userNextLevel);
-                            int userNextLevelSize = userNextLevel.length();
-                            SpannableStringBuilder builder = new SpannableStringBuilder();
-                            builder.append(hint);
-                            builder.setSpan(new
-                                            ForegroundColorSpan(Color.parseColor("#FFC722")),
-                                    leveNextIndexOf, leveNextIndexOf + leveNextSize,
-                                    Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-                            builder.setSpan(new
-                                            ForegroundColorSpan(Color.parseColor("#FFC722")),
-                                    userNextLevelIndexOf, userNextLevelIndexOf + userNextLevelSize,
-                                    Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-                            leaveHint.setText(builder);
-                            progressBar.setProgress(nextLeve);
-                            progressBar.setMax(maxLeve);
+                        if (!TextUtils.equals(coinModel.getUserLevel(), coinModel.getUserLevelMax())) {
+                            int nextLeve = Integer.parseInt(coinModel.getUserNextLevelRewards());
+
+
+                            BigDecimal  maxLeve =  new BigDecimal(coinModel.getUserLevelUpgrades()).add( new BigDecimal(coinModel.getUserLevelCurrentConsumption()));
+                            try {
+                                String leveNext = String.valueOf(nextLeve);
+                                String userNextLevel = coinModel.getUserLevelUpgrades();
+                                StringBuffer stringBuffer = new StringBuffer();
+                                if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
+                                    stringBuffer.append("升級還需")
+                                            .append(userNextLevel)
+                                            .append("經驗值，升至")
+                                            .append(leveNext)
+                                            .append("即可領取獎勵");
+                                } else {
+                                    stringBuffer.append(userNextLevel)
+                                            .append(" experience upgrade,")
+                                            .append(leveNext)
+                                            .append(" receive rewards");
+                                }
+                                String hint = stringBuffer.toString();
+
+                                int leveNextIndexOf = hint.indexOf(leveNext);
+                                int leveNextSize = leveNext.length();
+                                int userNextLevelIndexOf = hint.indexOf(userNextLevel);
+                                int userNextLevelSize = userNextLevel.length();
+                                SpannableStringBuilder builder = new SpannableStringBuilder();
+                                builder.append(hint);
+                                builder.setSpan(new
+                                                ForegroundColorSpan(Color.parseColor("#FFC722")),
+                                        leveNextIndexOf, leveNextIndexOf + leveNextSize,
+                                        Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+                                builder.setSpan(new
+                                                ForegroundColorSpan(Color.parseColor("#FFC722")),
+                                        userNextLevelIndexOf, userNextLevelIndexOf + userNextLevelSize,
+                                        Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+                                leaveHint.setText(builder);
+                                progressBar.setProgress(new BigDecimal(coinModel.getUserLevelCurrentConsumption()).intValue());
+                                progressBar.setMax(maxLeve.intValue());
+                            } catch (Exception e) {
+                                throw new RuntimeException(e);
+                            }
                         } else {
-                            String hint = getString(R.string.reach_the_top);
+                            String hint = mContext.getString(R.string.reach_the_top);
                             leaveHint.setText(hint);
                             progressBar.setMax(10);
                             progressBar.setProgress(10);
@@ -505,6 +511,14 @@ public class LiveGiftPopup extends AbsDialogFragment {
         });
     }
 
+    private Handler sendGiftHandler = new Handler();
+    private Runnable sendGiftRunnble = new Runnable() {
+        @Override
+        public void run() {
+            sendGift();
+        }
+    };
+
     /**
      * 赠送礼物
      */
@@ -624,6 +638,47 @@ public class LiveGiftPopup extends AbsDialogFragment {
         giftSendLayout.setVisibility(View.VISIBLE);
         lianSongHandler.removeCallbacks(lianSongRunnable);
         mShowLianBtn = false;
+        getCoin();
+        LiveNetManager.get(mContext)
+                .getGiftNamingInfo(liveGiftModel.getId() + "", new com.yunbao.common.http.base.HttpCallback<GiftNamingInfoModel>() {
+                    @Override
+                    public void onSuccess(GiftNamingInfoModel data) {
+                        liveGiftModel = JSONObject.parseObject(GsonUtils.toJson(data), LiveGiftBean.class);
+                        if (!TextUtils.isEmpty(liveGiftModel.getNamingLiveuid()) &&
+                                !TextUtils.isEmpty(liveGiftModel.getNamingUid()) &&
+                                !TextUtils.equals(liveGiftModel.getNamingLiveuid(), "0") &&
+                                !TextUtils.equals(liveGiftModel.getNamingUid(), "0")) {
+                            namingLayout.setVisibility(View.VISIBLE);
+                            ImgLoader.display(mContext, liveGiftModel.getNamingLiveAvatar(), namingAvatar);
+                            StringBuffer namingNameText = new StringBuffer();
+                            if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
+                                namingNameText.append("获取冠名：")
+                                        .append(liveGiftModel.getNamingUserCoin())
+                                        .append("  ");
+
+                            } else {
+                                namingNameText.append("Get title:  ")
+                                        .append(liveGiftModel.getNamingUserCoin())
+                                        .append("  ");
+                            }
+                            namingNameText.append(mContext.getText(com.yunbao.live.R.string.title_anchor))
+                                    .append(liveGiftModel.getNamingLiveName())
+                                    .append("  ")
+                                    .append(mContext.getText(com.yunbao.live.R.string.the_title_financier))
+                                    .append("  ")
+                                    .append(liveGiftModel.getNamingUserName());
+                            namingName.setText(namingNameText.toString());
+                        } else {
+                            namingLayout.setVisibility(View.GONE);
+
+                        }
+                    }
+
+                    @Override
+                    public void onError(String error) {
+
+                    }
+                });
     }
 
     /**
@@ -681,6 +736,14 @@ public class LiveGiftPopup extends AbsDialogFragment {
             namingLayout.setVisibility(View.VISIBLE);
             ImgLoader.display(mContext, liveGiftModel.getNamingLiveAvatar(), namingAvatar);
             StringBuffer namingNameText = new StringBuffer();
+            if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
+                namingNameText.append("获取冠名：")
+                        .append(liveGiftModel.getNamingUserCoin())
+                        .append("  ");
+            } else {
+                namingNameText.append("Get title:  ")
+                        .append(liveGiftModel.getNamingUserCoin());
+            }
             namingNameText.append(mContext.getText(com.yunbao.live.R.string.title_anchor))
                     .append(liveGiftModel.getNamingLiveName())
                     .append("  ")
@@ -720,6 +783,7 @@ public class LiveGiftPopup extends AbsDialogFragment {
             operateImage.setVisibility(View.VISIBLE);
             ImgLoader.display(getContext(), liveGiftModel.getOperateImage(), operateImage);
         }
+
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN)
@@ -1101,7 +1165,7 @@ public class LiveGiftPopup extends AbsDialogFragment {
                     if (goldText != null) {
                         goldText.setText(goldCoin);
                     }
-                    if (mGiftBean.getType() == LiveGiftBean2.TYPE_NORMAL && !mGiftBean.getSwf().contains("svga")) {
+                    if (!mGiftBean.getSwf().contains("svga")) {
                         showLianBtn();
                     }
                     if (mGiftBean.getType() == 7) {
@@ -1110,6 +1174,7 @@ public class LiveGiftPopup extends AbsDialogFragment {
 //                    //刷新包裹列表wrap_gift_num   -1:表示数量没有变化
 //                    mObjGiftSendback = obj;
                     isGetNewWrap = true;
+
                     if (isWrap) {
                         Bus.get().post(new LiveParcelItemRefreshEvent().setLiveGiftModel(liveGiftModel));
                     }

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

@@ -37,7 +37,7 @@ import com.yunbao.live.R;
 import com.yunbao.live.activity.LiveActivity;
 import com.yunbao.live.bean.HotBean;
 import com.yunbao.live.custom.TopGradual;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpUtil;
 import com.yunbao.live.utils.LiveTextRender;
 
 import java.net.MalformedURLException;

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

@@ -31,15 +31,14 @@ import com.yunbao.common.utils.DialogUitl;
 import com.yunbao.common.utils.RouteUtil;
 import com.yunbao.common.utils.StringUtil;
 import com.yunbao.common.utils.ToastUtil;
-import com.yunbao.common.utils.WordUtil;
 import com.yunbao.live.R;
 import com.yunbao.live.activity.LiveActivity;
 import com.yunbao.live.adapter.GuardRightAdapter;
 import com.yunbao.live.bean.GuardBuyBean;
 import com.yunbao.live.bean.GuardRightBean;
 import com.yunbao.live.bean.LiveGuardInfo;
-import com.yunbao.live.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpConsts;
+import com.yunbao.common.http.LiveHttpUtil;
 
 import java.util.List;
 

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

@@ -17,14 +17,13 @@ import com.yunbao.common.custom.CommonRefreshView;
 import com.yunbao.common.dialog.AbsDialogFragment;
 import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.utils.DpUtil;
-import com.yunbao.common.utils.WordUtil;
 import com.yunbao.live.R;
 import com.yunbao.live.activity.LiveActivity;
 import com.yunbao.live.adapter.GuardAdapter;
 import com.yunbao.live.bean.GuardUserBean;
 import com.yunbao.live.bean.LiveGuardInfo;
-import com.yunbao.live.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpConsts;
+import com.yunbao.common.http.LiveHttpUtil;
 
 import java.util.Arrays;
 import java.util.List;

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

@@ -24,7 +24,6 @@ import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -51,9 +50,9 @@ import com.yunbao.live.activity.LiveActivity;
 import com.yunbao.live.activity.LiveAudienceActivity;
 import com.yunbao.live.activity.LiveRyAnchorActivity;
 import com.yunbao.live.activity.ZhuangBanActivity;
-import com.yunbao.live.event.LiveRoomChangeEvent;
-import com.yunbao.live.http.LiveHttpUtil;
-import com.yunbao.live.presenter.LiveRoomCheckLivePresenter;
+import com.yunbao.common.event.LiveRoomChangeEvent;
+import com.yunbao.common.http.LiveHttpUtil;
+import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -158,9 +157,9 @@ public class LiveHDDialogFragment extends AbsDialogFragment {
         mWebView.getSettings().setJavaScriptEnabled(true);
         mWebView.getSettings().setDomStorageEnabled(true);
         String appCachePath = mContext.getCacheDir().getAbsolutePath();
-        mWebView.getSettings().setAppCachePath(appCachePath);
+//        mWebView.getSettings().setAppCachePath(appCachePath);
         mWebView.getSettings().setAllowFileAccess(true);
-        mWebView.getSettings().setAppCacheEnabled(true);
+//        mWebView.getSettings().setAppCacheEnabled(true);
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             mWebView.getSettings().setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);

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

@@ -34,8 +34,8 @@ import com.yunbao.live.activity.LiveRyAnchorActivity;
 import com.yunbao.live.adapter.LivePkAdapter;
 import com.yunbao.live.bean.LivePkBean;
 import com.yunbao.live.event.LiveAudienceEvent;
-import com.yunbao.live.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpConsts;
+import com.yunbao.common.http.LiveHttpUtil;
 
 import java.util.Arrays;
 import java.util.List;

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

@@ -33,7 +33,7 @@ import com.yunbao.live.adapter.AnchorUserMicInfoAdapter;
 import com.yunbao.live.bean.LiveGuardInfo;
 import com.yunbao.common.bean.LiveUserGiftBean;
 import com.yunbao.common.bean.MicUserBean;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpUtil;
 import com.yunbao.live.utils.LiveImDeletUtil;
 import com.yunbao.common.utils.MicStatusManager;
 

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

@@ -33,7 +33,7 @@ import com.yunbao.live.activity.LiveAudienceActivity;
 import com.yunbao.live.adapter.UserMicInfoAdapter;
 import com.yunbao.live.bean.LiveGuardInfo;
 import com.yunbao.common.bean.MicUserBean;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpUtil;
 import com.yunbao.live.socket.SocketSendBean;
 import com.yunbao.live.utils.LiveImDeletUtil;
 import com.yunbao.common.utils.MicStatusManager;

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

@@ -42,8 +42,8 @@ import com.yunbao.live.adapter.LiveNewGuardBuyItemsAdapter;
 import com.yunbao.live.bean.GuardBuyBean;
 import com.yunbao.live.bean.GuardRightBean;
 import com.yunbao.live.bean.LiveGuardInfo;
-import com.yunbao.live.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpConsts;
+import com.yunbao.common.http.LiveHttpUtil;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -27,13 +27,12 @@ import com.yunbao.common.dialog.AbsDialogFragment;
 import com.yunbao.common.glide.ImgLoader;
 import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.utils.CommonIconUtil;
-import com.yunbao.common.utils.WordUtil;
 import com.yunbao.live.R;
 import com.yunbao.live.activity.LiveActivity;
 import com.yunbao.live.adapter.GuardAdapter;
 import com.yunbao.live.bean.GuardUserBean;
 import com.yunbao.live.bean.LiveGuardInfo;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpUtil;
 
 import java.util.ArrayList;
 import java.util.Arrays;

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

@@ -28,8 +28,8 @@ import com.yunbao.live.activity.LiveRyAnchorActivity;
 import com.yunbao.live.adapter.LiveNewWishListAdapter;
 import com.yunbao.live.bean.LiveWishlistBean;
 import com.yunbao.live.event.LiveAudienceEvent;
-import com.yunbao.live.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpConsts;
+import com.yunbao.common.http.LiveHttpUtil;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;

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

@@ -40,20 +40,15 @@ import com.yunbao.common.utils.DialogUitl;
 import com.yunbao.common.utils.RouteUtil;
 import com.yunbao.common.utils.SVGAViewUtils;
 import com.yunbao.common.utils.ToastUtil;
-import com.yunbao.common.utils.WordUtil;
 import com.yunbao.live.R;
 import com.yunbao.live.activity.LiveActivity;
 import com.yunbao.live.activity.LiveReportActivity;
 import com.yunbao.live.bean.ImpressBean;
 import com.yunbao.live.custom.MyTextView;
-import com.yunbao.live.event.LiveRoomChangeEvent;
-import com.yunbao.live.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
-import com.yunbao.live.presenter.LiveRoomCheckLivePresenter;
+import com.yunbao.common.http.LiveHttpConsts;
+import com.yunbao.common.http.LiveHttpUtil;
+import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
 import com.yunbao.live.utils.LiveTextRender;
-import com.yunbao.live.views.LiveRoomViewHolder;
-
-import org.greenrobot.eventbus.EventBus;
 
 import java.net.MalformedURLException;
 import java.net.URL;

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

@@ -19,7 +19,7 @@ import com.yunbao.live.R;
 import com.yunbao.live.activity.LiveActivity;
 import com.yunbao.live.adapter.LivePromotionAdapter;
 import com.yunbao.live.bean.LivePromotionBean;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpUtil;
 
 import java.util.Arrays;
 import java.util.List;

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

@@ -16,12 +16,11 @@ import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.interfaces.OnItemClickListener;
 import com.yunbao.common.utils.DpUtil;
 import com.yunbao.common.utils.ToastUtil;
-import com.yunbao.common.utils.WordUtil;
 import com.yunbao.live.R;
 import com.yunbao.live.activity.LiveActivity;
 import com.yunbao.live.adapter.RedPackAdapter;
 import com.yunbao.live.bean.RedPackBean;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpUtil;
 
 import java.util.Arrays;
 import java.util.List;

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

@@ -17,12 +17,11 @@ import com.yunbao.common.dialog.AbsDialogFragment;
 import com.yunbao.common.glide.ImgLoader;
 import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.utils.DpUtil;
-import com.yunbao.common.utils.WordUtil;
 import com.yunbao.live.R;
 import com.yunbao.live.adapter.RedPackResultAdapter;
 import com.yunbao.live.bean.RedPackBean;
 import com.yunbao.live.bean.RedPackResultBean;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpUtil;
 
 import java.util.List;
 

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

@@ -19,13 +19,12 @@ import com.yunbao.common.glide.ImgLoader;
 import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.utils.DpUtil;
 import com.yunbao.common.utils.StringUtil;
-import com.yunbao.common.utils.WordUtil;
 import com.yunbao.live.R;
 import com.yunbao.live.activity.LiveActivity;
 import com.yunbao.live.adapter.RedPackAdapter;
 import com.yunbao.live.bean.RedPackBean;
-import com.yunbao.live.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpConsts;
+import com.yunbao.common.http.LiveHttpUtil;
 import com.yunbao.live.interfaces.RedPackCountDownListener;
 
 /**

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

@@ -19,11 +19,10 @@ import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.utils.DpUtil;
 import com.yunbao.common.utils.StringUtil;
 import com.yunbao.common.utils.ToastUtil;
-import com.yunbao.common.utils.WordUtil;
 import com.yunbao.live.R;
 import com.yunbao.live.activity.LiveActivity;
-import com.yunbao.live.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpConsts;
+import com.yunbao.common.http.LiveHttpUtil;
 
 /**
  * Created by cxf on 2018/11/19.

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

@@ -69,9 +69,9 @@ public class LiveUserAnchorMailBoxWebInfoPopDialog extends AbsDialogPopupWindow
         mWebView.getSettings().setJavaScriptEnabled(true);
         mWebView.getSettings().setDomStorageEnabled(true);
         String appCachePath = getContext().getCacheDir().getAbsolutePath();
-        mWebView.getSettings().setAppCachePath(appCachePath);
+//        mWebView.getSettings().setAppCachePath(appCachePath);
         mWebView.getSettings().setAllowFileAccess(true);
-        mWebView.getSettings().setAppCacheEnabled(true);
+//        mWebView.getSettings().setAppCacheEnabled(true);
         mWebView.getSettings().setJavaScriptCanOpenWindowsAutomatically(true); // 是否允许JS打开新窗口
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             mWebView.getSettings().setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);

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

@@ -26,7 +26,6 @@ import com.tencent.imsdk.v2.V2TIMCallback;
 import com.tencent.imsdk.v2.V2TIMManager;
 import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.Constants;
-import com.yunbao.common.bean.FansMedalBean;
 import com.yunbao.common.bean.FansModel;
 import com.yunbao.common.bean.LevelBean;
 import com.yunbao.common.bean.LiveBean;
@@ -53,9 +52,9 @@ import com.yunbao.live.activity.LiveActivity;
 import com.yunbao.live.activity.LiveReportActivity;
 import com.yunbao.live.activity.LiveRyAnchorActivity;
 import com.yunbao.live.event.LiveAudienceEvent;
-import com.yunbao.live.event.LiveRoomChangeEvent;
-import com.yunbao.live.http.LiveHttpUtil;
-import com.yunbao.live.presenter.LiveRoomCheckLivePresenter;
+import com.yunbao.common.event.LiveRoomChangeEvent;
+import com.yunbao.common.http.LiveHttpUtil;
+import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
 import com.yunbao.live.utils.LiveTextRender;
 
 import org.greenrobot.eventbus.EventBus;

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

@@ -39,7 +39,7 @@ import com.yunbao.live.activity.LiveActivity;
 import com.yunbao.live.activity.LiveRyAnchorActivity;
 import com.yunbao.live.adapter.UserMoreInfoAdapter;
 import com.yunbao.live.bean.LiveGuardInfo;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpUtil;
 
 import java.util.ArrayList;
 import java.util.Collections;

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

@@ -23,8 +23,8 @@ import com.yunbao.live.activity.LiveAnchorActivity;
 import com.yunbao.live.activity.LiveRyAnchorActivity;
 import com.yunbao.live.adapter.LiveWishListAdapter;
 import com.yunbao.live.bean.LiveWishlistBean;
-import com.yunbao.live.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpConsts;
+import com.yunbao.common.http.LiveHttpUtil;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;

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

@@ -18,7 +18,7 @@ import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.live.R;
 import com.yunbao.live.activity.LiveAudienceActivity;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpUtil;
 
 import org.greenrobot.eventbus.EventBus;
 

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

@@ -18,13 +18,11 @@ import com.yunbao.common.glide.ImgLoader;
 import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.http.live.LiveNetManager;
 import com.yunbao.common.utils.DialogUitl;
-import com.yunbao.common.utils.MicStatusManager;
 import com.yunbao.common.utils.ToastUtil;
-import com.yunbao.common.utils.WordUtil;
 import com.yunbao.live.R;
 import com.yunbao.common.manager.RandomPkManager;
 import com.yunbao.live.activity.LiveRyAnchorActivity;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpUtil;
 
 import java.util.Arrays;
 

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

@@ -7,22 +7,12 @@ import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
 
-import com.alibaba.fastjson.JSON;
-import com.yunbao.common.bean.LiveBean;
 import com.yunbao.common.dialog.AbsDialogFragment;
-import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.utils.Bus;
 import com.yunbao.common.utils.DeviceUtils;
-import com.yunbao.common.utils.RouteUtil;
 import com.yunbao.live.R;
 import com.yunbao.live.adapter.SidebarAdapter;
 import com.yunbao.live.event.LiveAudienceEvent;
-import com.yunbao.live.event.LiveRoomChangeEvent;
-import com.yunbao.live.http.LiveHttpUtil;
-import com.yunbao.live.presenter.LiveRoomCheckLivePresenter;
-import com.yunbao.common.utils.MicStatusManager;
-
-import org.greenrobot.eventbus.EventBus;
 
 /**
  * 直播间侧边栏

live/src/main/java/com/yunbao/live/music/LiveMusicDialogFragment.java

@@ -26,8 +26,8 @@ import com.yunbao.common.utils.DpUtil;
 import com.yunbao.common.utils.FileUtil;
 import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.live.R;
-import com.yunbao.live.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpConsts;
+import com.yunbao.common.http.LiveHttpUtil;
 import com.yunbao.live.http.MusicUrlCallback;
 import com.yunbao.live.music.db.MusicDbManager;
 

live/src/main/java/com/yunbao/live/presenter/LiveGiftAnimPresenter.java

@@ -50,6 +50,7 @@ import com.yunbao.common.utils.DpUtil;
 import com.yunbao.common.utils.GiftCacheUtil;
 import com.yunbao.common.utils.HtmlTagHandler;
 import com.yunbao.common.utils.L;
+import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
 import com.yunbao.common.utils.MicStatusManager;
 import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.live.R;
@@ -58,8 +59,8 @@ import com.yunbao.live.bean.LiveLuckGiftWinBean;
 import com.yunbao.live.bean.LiveReceiveGiftBean;
 import com.yunbao.live.custom.FrameImageView;
 import com.yunbao.live.event.LiveAudienceEvent;
-import com.yunbao.live.event.LiveRoomChangeEvent;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.event.LiveRoomChangeEvent;
+import com.yunbao.common.http.LiveHttpUtil;
 import com.yunbao.live.utils.AllMsgTextRender;
 import com.yunbao.live.utils.LiveIconUtil;
 import com.yunbao.live.views.LiveGiftLuckTopViewHolder;

live/src/main/java/com/yunbao/live/presenter/LiveLinkMicAnchorPresenter.java

@@ -27,12 +27,11 @@ import com.yunbao.common.utils.DialogUitl;
 import com.yunbao.common.utils.DpUtil;
 import com.yunbao.common.utils.L;
 import com.yunbao.common.utils.ToastUtil;
-import com.yunbao.common.utils.WordUtil;
 import com.yunbao.live.R;
 import com.yunbao.live.activity.LiveActivity;
 import com.yunbao.live.activity.LiveAnchorActivity;
 import com.yunbao.live.event.LinkMicTxMixStreamEvent;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpUtil;
 import com.yunbao.live.interfaces.ILiveLinkMicViewHolder;
 import com.yunbao.live.socket.SocketClient;
 import com.yunbao.live.socket.SocketLinkMicAnchorUtil;

live/src/main/java/com/yunbao/live/presenter/LiveLinkMicPresenter.java

@@ -37,7 +37,6 @@ import com.yunbao.common.utils.DpUtil;
 import com.yunbao.common.utils.L;
 import com.yunbao.common.utils.ProcessResultUtil;
 import com.yunbao.common.utils.ToastUtil;
-import com.yunbao.common.utils.WordUtil;
 import com.yunbao.live.R;
 import com.yunbao.live.activity.LiveActivity;
 import com.yunbao.live.activity.LiveAnchorActivity;
@@ -47,8 +46,8 @@ import com.yunbao.live.dialog.LiveTurnTableDialogFragment4Audience;
 import com.yunbao.live.dialog.LiveWishListDialogFragment4Audience;
 import com.yunbao.live.event.LinkMicTxAccEvent;
 import com.yunbao.live.event.LinkMicTxMixStreamEvent;
-import com.yunbao.live.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpConsts;
+import com.yunbao.common.http.LiveHttpUtil;
 import com.yunbao.live.interfaces.ILiveLinkMicViewHolder;
 import com.yunbao.live.interfaces.LivePushListener;
 import com.yunbao.live.socket.SocketClient;

live/src/main/java/com/yunbao/live/socket/SocketChatUtil.java

@@ -11,9 +11,8 @@ import com.yunbao.common.CommonAppContext;
 import com.yunbao.common.Constants;
 import com.yunbao.common.bean.UserBean;
 import com.yunbao.common.http.HttpCallback;
-import com.yunbao.common.utils.WordUtil;
 import com.yunbao.live.R;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpUtil;
 
 /**
  * Created by cxf on 2018/10/9.

live/src/main/java/com/yunbao/live/socket/SocketRyChatUtil.java

@@ -12,7 +12,7 @@ import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.live.R;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpUtil;
 
 import org.greenrobot.eventbus.EventBus;
 

live/src/main/java/com/yunbao/live/utils/LiveExoPlayerManager.java

@@ -4,7 +4,6 @@ import android.content.Context;
 import android.os.Handler;
 import android.os.Looper;
 import android.util.Log;
-import android.view.ViewGroup;
 import android.widget.RelativeLayout;
 
 import androidx.annotation.NonNull;
@@ -130,6 +129,7 @@ public class LiveExoPlayerManager {
             @Override
             public void onPlaybackStateChanged(int playbackState) {
                 Player.Listener.super.onPlaybackStateChanged(playbackState);
+                listener.onPlaybackStateChanged(playbackState);
                 Log.i(TAG, "onPlaybackStateChanged 1: " + playbackState);
                 if (playbackState == Player.STATE_READY && !player1.isPlaying()) {
                     player2.stop();
@@ -188,6 +188,9 @@ public class LiveExoPlayerManager {
             public void onIsLoadingChanged(boolean isLoading) {
                 Player.Listener.super.onIsLoadingChanged(isLoading);
                 Log.i(TAG, "onIsLoadingChanged: 1 " + isLoading);
+                if (listener != null) {
+                    listener.onIsLoadingChanged(isLoading);
+                }
             }
 
             @Override

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

@@ -63,20 +63,20 @@ public class FrameGiftViewHolder extends RecyclerView.ViewHolder {
     public void showData(int contextLayoutGiftHeight, LiveGiftBean model) {
 
         //设置高度
-        itemView.post(new Runnable() {
-            @Override
-            public void run() {
-                GridLayoutManager.LayoutParams linearParams = (GridLayoutManager.LayoutParams) itemView.getLayoutParams();
-                int giftHeight = 607;
-                if (contextLayoutGiftHeight > 607) {
-                    giftHeight = 607;
-                } else {
-                    giftHeight = contextLayoutGiftHeight;
-                }
-                linearParams.height = (giftHeight - 30) / 2;
-                itemView.setLayoutParams(linearParams);
-            }
-        });
+//        itemView.post(new Runnable() {
+//            @Override
+//            public void run() {
+//                GridLayoutManager.LayoutParams linearParams = (GridLayoutManager.LayoutParams) itemView.getLayoutParams();
+//                int giftHeight = 607;
+//                if (contextLayoutGiftHeight > 607) {
+//                    giftHeight = 607;
+//                } else {
+//                    giftHeight = contextLayoutGiftHeight;
+//                }
+//                linearParams.height = (giftHeight - 30) / 2;
+////                itemView.setLayoutParams(linearParams);
+//            }
+//        });
         giftLayout.setSelected(model.isChecked());
         if (model.isChecked()) {
             giftIcon.startAnimation(mAnimation);

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

@@ -7,16 +7,14 @@ import android.view.ViewGroup;
 import android.widget.LinearLayout;
 
 import com.alibaba.fastjson.JSON;
-import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.live.R;
 import com.yunbao.live.activity.LiveAddImpressActivity;
-import com.yunbao.live.activity.LiveAudienceActivity;
 import com.yunbao.live.bean.ImpressBean;
 import com.yunbao.live.custom.MyTextView;
-import com.yunbao.live.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpConsts;
+import com.yunbao.common.http.LiveHttpUtil;
 
 import java.util.Arrays;
 import java.util.LinkedList;

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

@@ -11,13 +11,12 @@ import com.alibaba.fastjson.JSONObject;
 import com.yunbao.common.bean.UserBean;
 import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.interfaces.OnItemClickListener;
-import com.yunbao.common.utils.WordUtil;
 import com.yunbao.live.R;
 import com.yunbao.live.activity.LiveActivity;
 import com.yunbao.live.activity.LiveAdminListActivity;
 import com.yunbao.live.adapter.LiveAdminListAdapter;
-import com.yunbao.live.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpConsts;
+import com.yunbao.common.http.LiveHttpUtil;
 
 import java.util.List;
 

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

@@ -12,7 +12,7 @@ import android.widget.TextView;
 import com.yunbao.common.http.HttpCallback;
 import com.yunbao.live.R;
 import com.yunbao.live.activity.LiveAnchorActivity;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpUtil;
 
 /**
  * Created by cxf on 2018/10/9.

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

@@ -38,10 +38,10 @@ import com.yunbao.live.activity.LiveAudienceActivity;
 import com.yunbao.live.activity.LiveRyAnchorActivity;
 import com.yunbao.live.adapter.SearchRecommendBodyAdapter;
 import com.yunbao.live.event.JumpUserHomeEvent;
-import com.yunbao.live.event.LiveRoomChangeEvent;
-import com.yunbao.live.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
-import com.yunbao.live.presenter.LiveRoomCheckLivePresenter;
+import com.yunbao.common.event.LiveRoomChangeEvent;
+import com.yunbao.common.http.LiveHttpConsts;
+import com.yunbao.common.http.LiveHttpUtil;
+import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;

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

@@ -13,8 +13,8 @@ import com.yunbao.live.R;
 import com.yunbao.live.activity.RoomManageDetailActivity;
 import com.yunbao.live.adapter.LiveAdminRoomAdapter;
 import com.yunbao.live.bean.LiveAdminRoomBean;
-import com.yunbao.live.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpConsts;
+import com.yunbao.common.http.LiveHttpUtil;
 
 import java.util.Arrays;
 import java.util.List;

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

@@ -63,8 +63,8 @@ import com.yunbao.live.dialog.LiveNewRoomClassDialogFragment;
 import com.yunbao.live.dialog.LiveNewRoomTypeDialogFragment;
 import com.yunbao.live.dialog.LiveTimeDialogFragment;
 import com.yunbao.live.event.LiveAudienceEvent;
-import com.yunbao.live.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpConsts;
+import com.yunbao.common.http.LiveHttpUtil;
 
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;

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

@@ -21,7 +21,7 @@ import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.utils.GiftCacheUtil;
 import com.yunbao.live.R;
 import com.yunbao.live.adapter.LiveGiftFragmentPagerAdapter;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpUtil;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -18,6 +18,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.lxj.xpopup.XPopup;
 import com.yunbao.common.bean.LiveGiftBean;
+import com.yunbao.common.event.LiveGiftDialogEvent;
 import com.yunbao.common.glide.ImgLoader;
 import com.yunbao.common.interfaces.CommonCallback;
 import com.yunbao.common.utils.Bus;
@@ -26,18 +27,17 @@ import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.views.weight.ViewClicksAntiShake;
 import com.yunbao.live.R;
 import com.yunbao.live.dialog.SendRendPacketPopup;
-import com.yunbao.common.event.LiveGiftDialogEvent;
 
 import java.io.File;
 
 public class LiveParcelItemViewHolder extends RecyclerView.ViewHolder {
     private ImageView giftIcon, cornerMark;
     private Context mContext;
-    private TextView giftName, mPrice, giftNumber;
+    private TextView giftName, mPrice, giftNumber, expire;
     private RelativeLayout giftLayout;
     private ScaleAnimation mAnimation;
     private LinearLayout mLoadingLayout;
-    private ImageView mLoading;
+    private ImageView mLoading, mPayico;
 
     public LiveParcelItemViewHolder(@NonNull View itemView) {
         super(itemView);
@@ -50,6 +50,8 @@ public class LiveParcelItemViewHolder extends RecyclerView.ViewHolder {
         cornerMark = itemView.findViewById(R.id.corner_mark);
         mLoadingLayout = itemView.findViewById(R.id.gift_loading_layout);
         mLoading = itemView.findViewById(R.id.gift_loading);
+        expire = itemView.findViewById(R.id.expire);
+        mPayico = itemView.findViewById(R.id.pay_ico);
 
         mAnimation = new ScaleAnimation(0.9f, 1.1f, 0.9f, 1.1f, Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f);
         mAnimation.setInterpolator(new AccelerateDecelerateInterpolator());
@@ -60,14 +62,14 @@ public class LiveParcelItemViewHolder extends RecyclerView.ViewHolder {
 
     public void showData(int contextLayoutGiftHeight, LiveGiftBean model) {
         //设置高度
-        itemView.post(new Runnable() {
-            @Override
-            public void run() {
-                GridLayoutManager.LayoutParams linearParams = (GridLayoutManager.LayoutParams) itemView.getLayoutParams();
-                linearParams.height = contextLayoutGiftHeight / 2;
-                itemView.setLayoutParams(linearParams);
-            }
-        });
+//        itemView.post(new Runnable() {
+//            @Override
+//            public void run() {
+//                GridLayoutManager.LayoutParams linearParams = (GridLayoutManager.LayoutParams) itemView.getLayoutParams();
+//                linearParams.height = contextLayoutGiftHeight / 2;
+////                itemView.setLayoutParams(linearParams);
+//            }
+//        });
         giftLayout.setSelected(model.isChecked());
         if (model.isChecked()) {
             giftIcon.startAnimation(mAnimation);
@@ -75,9 +77,14 @@ public class LiveParcelItemViewHolder extends RecyclerView.ViewHolder {
         ImgLoader.display(mContext, model.getIcon(), giftIcon);
         ImgLoader.display(mContext, model.getCornerMark(), cornerMark);
         giftName.setText(model.getName());
-        mPrice.setText(model.getEnd_time());
+        expire.setText(model.getEnd_time());
+        if (model.getSendType() != null && model.getSendType().equals("1")) {
+            mPayico.setImageResource(R.mipmap.gold_coin);
+        } else {
+            mPayico.setImageResource(R.mipmap.diamond);
+        }
+        mPrice.setText(model.getPrice());
         giftNumber.setText(model.getGiftNum());
-
         if (model.getSwf() != null && model.getSwf().isEmpty()) {
             mLoadingLayout.setVisibility(View.GONE);
         } else {

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

@@ -1243,9 +1243,11 @@ public class LivePlayRyViewHolder extends LiveRoomPlayViewHolder {
             Player.Listener.super.onPlaybackStateChanged(playbackState);
             if (playbackState == Player.STATE_BUFFERING) {
                 //showLoadingDialog();
+                //mLoading.setVisibility(View.VISIBLE);
                 OkDownload.getInstance().pauseAll();
                 Log.i(TAG, "onPlaybackStateChanged: 缓存中");
             } else {
+                //mLoading.setVisibility(View.INVISIBLE);
                 Log.i(TAG, "onPlaybackStateChanged: 播放中");
             }
         }

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

@@ -5,11 +5,8 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.text.TextUtils;
 import android.util.Log;
-import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.ViewParent;
-import android.widget.FrameLayout;
 import android.widget.ImageView;
 
 import com.alibaba.fastjson.JSON;
@@ -19,21 +16,14 @@ import com.tencent.live2.V2TXLivePlayer;
 import com.tencent.live2.V2TXLivePlayerObserver;
 import com.tencent.live2.impl.V2TXLivePlayerImpl;
 import com.tencent.rtmp.ITXLivePlayListener;
-import com.tencent.rtmp.TXLiveConstants;
 import com.tencent.rtmp.TXLivePlayConfig;
-import com.tencent.rtmp.TXLivePlayer;
 import com.tencent.rtmp.ui.TXCloudVideoView;
 import com.yunbao.common.glide.ImgLoader;
 import com.yunbao.common.http.HttpCallback;
-import com.yunbao.common.utils.DpUtil;
 import com.yunbao.common.utils.L;
-import com.yunbao.common.utils.ToastUtil;
-import com.yunbao.common.utils.WordUtil;
 import com.yunbao.live.R;
-import com.yunbao.live.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
-
-import cn.qqtheme.framework.util.ScreenUtils;
+import com.yunbao.common.http.LiveHttpConsts;
+import com.yunbao.common.http.LiveHttpUtil;
 
 /**
  * Created by cxf on 2018/10/10.

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

@@ -23,10 +23,9 @@ import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.utils.DpUtil;
 import com.yunbao.common.utils.L;
 import com.yunbao.common.utils.ToastUtil;
-import com.yunbao.common.utils.WordUtil;
 import com.yunbao.live.R;
-import com.yunbao.live.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpConsts;
+import com.yunbao.common.http.LiveHttpUtil;
 
 /**
  * Created by cxf on 2018/10/10.

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

@@ -4,7 +4,6 @@ import static com.lzy.okgo.utils.HttpUtils.runOnUiThread;
 import static com.yunbao.common.Constants.SOCKET_LINK_MIC_PK;
 import static com.yunbao.common.Constants.SOCKET_LIVE_DRPK;
 import static com.yunbao.live.activity.LiveActivity.mLiveRyLinkMicPkPresenter;
-import static com.yunbao.live.activity.LiveRyAnchorActivity.PKing;
 import static com.yunbao.live.presenter.LiveRyLinkMicPkPresenter.inputStreamList;
 import static com.yunbao.live.presenter.LiveRyLinkMicPkPresenter.inputStreamList1;
 import static cn.rongcloud.rtc.base.RCRTCLiveRole.BROADCASTER;
@@ -53,8 +52,8 @@ import com.yunbao.live.R;
 import com.yunbao.live.activity.LiveActivity;
 import com.yunbao.live.activity.LiveRyAnchorActivity;
 import com.yunbao.live.event.LiveAudienceEvent;
-import com.yunbao.live.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpConsts;
+import com.yunbao.common.http.LiveHttpUtil;
 import com.yunbao.live.momo.TencentTRTCBeautyManager;
 import com.yunbao.live.presenter.LiveRyLinkMicPkPresenter;
 import com.yunbao.live.socket.SocketRyClient;

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

@@ -38,8 +38,8 @@ import com.yunbao.common.utils.L;
 import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.live.R;
 import com.yunbao.live.activity.LiveActivity;
-import com.yunbao.live.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpConsts;
+import com.yunbao.common.http.LiveHttpUtil;
 import com.yunbao.live.momo.GenerateTestUserSig;
 import com.yunbao.live.momo.TencentTRTCBeautyManager;
 import com.yunbao.live.presenter.LiveLinkMicPkPresenter;

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

@@ -11,11 +11,9 @@ import android.text.TextUtils;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.TypedValue;
-import android.view.MotionEvent;
 import android.view.OrientationEventListener;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
-import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
@@ -27,22 +25,18 @@ import com.tencent.rtmp.TXLivePushConfig;
 import com.tencent.rtmp.TXLivePusher;
 import com.tencent.rtmp.ui.TXCloudVideoView;
 import com.yunbao.common.CommonAppConfig;
-import com.yunbao.common.CommonAppContext;
 import com.yunbao.common.Constants;
-import com.yunbao.common.utils.BitmapUtil;
 import com.yunbao.common.utils.DownloadUtil;
 import com.yunbao.common.utils.DpUtil;
 import com.yunbao.common.utils.L;
 import com.yunbao.common.utils.ToastUtil;
-import com.yunbao.common.utils.WordUtil;
 import com.yunbao.live.R;
 import com.yunbao.live.activity.LiveActivity;
-import com.yunbao.live.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpConsts;
+import com.yunbao.common.http.LiveHttpUtil;
 
 import java.io.File;
 
-import cn.qqtheme.framework.util.FileUtils;
 import cn.qqtheme.framework.util.ScreenUtils;
 
 

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

@@ -39,8 +39,8 @@ import com.yunbao.common.bean.LiveRoomTypeBean;
 import com.yunbao.live.dialog.LiveRoomTypeDialogFragment;
 import com.yunbao.live.dialog.LiveTimeDialogFragment;
 import com.yunbao.live.dialog.LiveWishListDialogFragment;
-import com.yunbao.live.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpConsts;
+import com.yunbao.common.http.LiveHttpUtil;
 
 import java.io.File;
 

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

@@ -50,8 +50,8 @@ import com.yunbao.live.adapter.LiveReadyShareAdapter;
 import com.yunbao.live.dialog.LiveRoomTypeDialogFragment;
 import com.yunbao.live.dialog.LiveTimeDialogFragment;
 import com.yunbao.live.dialog.LiveWishListDialogFragment;
-import com.yunbao.live.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpConsts;
+import com.yunbao.common.http.LiveHttpUtil;
 
 import java.io.File;
 

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

@@ -19,8 +19,8 @@ import com.yunbao.live.R;
 import com.yunbao.live.activity.LiveRecordPlayActivity;
 import com.yunbao.live.adapter.LiveRecordAdapter;
 import com.yunbao.live.bean.LiveRecordBean;
-import com.yunbao.live.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpConsts;
+import com.yunbao.common.http.LiveHttpUtil;
 
 import java.util.Arrays;
 import java.util.List;

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

@@ -162,14 +162,14 @@ import com.yunbao.live.dialog.ReceiveRendPacketPopup;
 import com.yunbao.live.dialog.ResultRendPacketPopup;
 import com.yunbao.live.event.LiveAnchorEvent;
 import com.yunbao.live.event.LiveAudienceEvent;
-import com.yunbao.live.event.LiveRoomChangeEvent;
-import com.yunbao.live.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.event.LiveRoomChangeEvent;
+import com.yunbao.common.http.LiveHttpConsts;
+import com.yunbao.common.http.LiveHttpUtil;
 import com.yunbao.live.presenter.LiveDanmuPresenter;
 import com.yunbao.live.presenter.LiveEnterRoomAnimPresenter;
 import com.yunbao.live.presenter.LiveGiftAnimPresenter;
 import com.yunbao.live.presenter.LiveLightAnimPresenter;
-import com.yunbao.live.presenter.LiveRoomCheckLivePresenter;
+import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
 import com.yunbao.live.utils.LiveRoomVoteManager;
 import com.yunbao.live.utils.LiveTextRender;
 import com.yunbao.live.utils.LoadDian9TuUtil;
@@ -2665,7 +2665,6 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
                 mViewMedal.setVisibility(View.GONE);
             } else {
                 if (mBtnFollow.getVisibility() == View.VISIBLE) {
-                    LiveAudienceActivity.is_fans = "2";
                     mBtnFollow.setVisibility(View.GONE);
                     mViewMedal.setVisibility(View.VISIBLE);
                 }

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

@@ -46,7 +46,7 @@ import com.yunbao.live.activity.ZhuangBanActivity;
 import com.yunbao.live.bean.WishlistModel;
 import com.yunbao.live.dialog.LiveHDDialogFragment;
 import com.yunbao.live.event.LiveAudienceEvent;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpUtil;
 
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;

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

@@ -23,7 +23,7 @@ import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.utils.WordsTypeUtil;
 import com.yunbao.live.R;
 import com.yunbao.live.adapter.OlineListAdapter;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpUtil;
 
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;

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

@@ -84,9 +84,9 @@ import com.yunbao.live.dialog.BlowkissDialog;
 import com.yunbao.live.dialog.NewUserDialog;
 import com.yunbao.live.event.LinkMicTxAccEvent;
 import com.yunbao.live.event.LiveAudienceEvent;
-import com.yunbao.live.event.LiveRoomChangeEvent;
-import com.yunbao.live.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.event.LiveRoomChangeEvent;
+import com.yunbao.common.http.LiveHttpConsts;
+import com.yunbao.common.http.LiveHttpUtil;
 import com.yunbao.live.presenter.LiveLinkMicAnchorPresenter;
 import com.yunbao.live.presenter.LiveLinkMicPresenter;
 import com.yunbao.live.presenter.LiveRyLinkMicPkPresenter;

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

@@ -19,8 +19,8 @@ import com.yunbao.common.utils.RouteUtil;
 import com.yunbao.common.views.SlideInBannerViewHolder;
 import com.yunbao.common.views.weight.ViewClicksAntiShake;
 import com.yunbao.live.R;
-import com.yunbao.live.http.LiveHttpUtil;
-import com.yunbao.live.presenter.LiveRoomCheckLivePresenter;
+import com.yunbao.common.http.LiveHttpUtil;
+import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
 
 import java.util.List;
 

live/src/main/res/layout/fragment_live_gift_item.xml

@@ -7,6 +7,7 @@
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/frame_gift_list"
         android:layout_width="match_parent"
+        android:layout_gravity="bottom"
         android:overScrollMode="never"
         android:layout_height="match_parent" />
 

live/src/main/res/layout/item_frame_gift.xml

@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/gift_layout"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="87dp"
     android:background="@drawable/background_gift_select"
     android:gravity="center"
     android:orientation="vertical">
@@ -20,8 +20,8 @@
 
             <ImageView
                 android:id="@+id/gift_icon"
-                android:layout_width="55dp"
-                android:layout_height="55dp" />
+                android:layout_width="50dp"
+                android:layout_height="50dp" />
 
 
             <TextView
@@ -30,7 +30,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="1dp"
                 android:textColor="@color/white"
-                android:textSize="11sp" />
+                android:textSize="10sp" />
 
             <LinearLayout
                 android:layout_width="wrap_content"
@@ -48,7 +48,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textColor="@color/white"
-                    android:textSize="10sp" />
+                    android:textSize="9sp" />
             </LinearLayout>
         </LinearLayout>
 
@@ -66,7 +66,7 @@
         android:layout_height="match_parent"
         android:background="#C0000000"
         android:gravity="center"
-        android:visibility="visible">
+        android:visibility="gone">
 
         <ImageView
             android:id="@+id/gift_loading"