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;
 
@@ -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,43 @@ 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;
+                            }
+                            EventBus.getDefault().post(new LiveRoomChangeEvent(liveBean, liveType, Integer.parseInt(liveTypeVal)).setLiveEnd(true));
+                        }
+
+                        @Override
+                        public void onCheckError(String contextError) {
+
+                        }
+                    });
+                } else {
+                    RouteUtil.forwardUserHome(mContext, live_id, 0);
+                }
+            }
+        });
+
+
+    }
 }

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/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/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()
+                        Bus.get().post(new LiveErrorEvent());
-                                .setType(LiveAudienceEvent.LiveAudienceType.LIVE_ROOM_EXCEPTION));
                         ToastUtil.show(error);
                     }
                 });
@@ -162,8 +157,7 @@ public class LiveRoomCheckLivePresenter {
                 }
             } else {
                 Log.e("直播间异常", "Error: " + msg);
-                Bus.get().post(new LiveAudienceEvent()
+                Bus.get().post(new LiveErrorEvent());
-                        .setType(LiveAudienceEvent.LiveAudienceType.LIVE_ROOM_EXCEPTION));
                 ToastUtil.show(msg);
             }
         }

config.gradle

@@ -9,9 +9,9 @@ ext {
     ]
     manifestPlaceholders = [
             //正式、
-//            serverHost       : "https://napi.yaoulive.com",
+            serverHost       : "https://napi.yaoulive.com",
 //            测试
-            serverHost       : "https://ceshi.yaoulive.com",
+//            serverHost       : "https://ceshi.yaoulive.com",
 
 
 

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/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.common.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+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.common.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+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.common.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpUtil;
-import com.yunbao.live.presenter.LiveRoomCheckLivePresenter;
+import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
 import com.yunbao.live.views.LiveRoomPlayViewHolder;
 import com.yunbao.live.views.PortraitLiveManager;
 import com.yunbao.share.ui.SharePopDialog;
@@ -1469,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.common.http.LiveHttpConsts;
-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/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.common.http.LiveHttpConsts;
-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/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.common.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+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.common.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+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.common.http.LiveHttpConsts;
-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/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.common.http.LiveHttpUtil;
-import com.yunbao.live.presenter.LiveRoomCheckLivePresenter;
+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.common.http.LiveHttpUtil;
-import com.yunbao.live.presenter.LiveRoomCheckLivePresenter;
+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;
 
@@ -374,8 +381,45 @@ public class ZhuangBanActivity extends AbsActivity {
                 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;
+                            }
+                            EventBus.getDefault().post(new LiveRoomChangeEvent(liveBean, liveType, Integer.parseInt(liveTypeVal)).setLiveEnd(true));
+                        }
+
+                        @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.common.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+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.common.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+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.common.http.LiveHttpUtil;
-import com.yunbao.live.presenter.LiveRoomCheckLivePresenter;
+import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
 
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;

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.common.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+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.common.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+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

@@ -78,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;
 

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.common.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+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.common.http.LiveHttpConsts;
-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/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.common.event.LiveRoomChangeEvent;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpUtil;
-import com.yunbao.live.presenter.LiveRoomCheckLivePresenter;
+import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;

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.common.http.LiveHttpConsts;
-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/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.common.http.LiveHttpConsts;
-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/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.common.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+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.common.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpConsts;
+import com.yunbao.common.http.LiveHttpUtil;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
-import com.yunbao.live.presenter.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.common.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+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.common.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpUtil;
 
 /**
  * Created by cxf on 2018/11/19.

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.common.event.LiveRoomChangeEvent;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpUtil;
-import com.yunbao.live.presenter.LiveRoomCheckLivePresenter;
+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.common.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+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.common.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+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.common.event.LiveRoomChangeEvent;
-import com.yunbao.live.http.LiveHttpUtil;
+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.common.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+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/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.common.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+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.common.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+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.common.event.LiveRoomChangeEvent;
-import com.yunbao.live.http.LiveHttpConsts;
+import com.yunbao.common.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpUtil;
-import com.yunbao.live.presenter.LiveRoomCheckLivePresenter;
+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.common.http.LiveHttpConsts;
-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/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.common.http.LiveHttpConsts;
-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/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/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.common.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpUtil;
-
-import cn.qqtheme.framework.util.ScreenUtils;
 
 /**
  * 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.common.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+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.common.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+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.common.http.LiveHttpConsts;
-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.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.common.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+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.common.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+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.common.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+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.common.http.LiveHttpConsts;
-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/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.common.event.LiveRoomChangeEvent;
-import com.yunbao.live.http.LiveHttpConsts;
+import com.yunbao.common.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+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;

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.common.event.LiveRoomChangeEvent;
-import com.yunbao.live.http.LiveHttpConsts;
+import com.yunbao.common.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+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.common.http.LiveHttpUtil;
-import com.yunbao.live.presenter.LiveRoomCheckLivePresenter;
+import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
 
 import java.util.List;
 

main/src/main/java/com/yunbao/main/activity/EntryActivity.java

@@ -76,7 +76,6 @@ import com.yunbao.common.bean.IMLoginModel;
 import com.yunbao.common.bean.LiveBean;
 import com.yunbao.common.bean.LoginData;
 import com.yunbao.common.bean.UserBean;
-import com.yunbao.common.event.CompleteInformationEvent;
 import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.http.HttpClient;
 import com.yunbao.common.http.main.MainNetManager;
@@ -87,8 +86,8 @@ import com.yunbao.common.manager.imrongcloud.RongcloudIMManager;
 import com.yunbao.common.utils.DialogUitl;
 import com.yunbao.common.utils.RouteUtil;
 import com.yunbao.common.utils.ToastUtil;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpUtil;
-import com.yunbao.live.presenter.LiveRoomCheckLivePresenter;
+import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
 import com.yunbao.main.R;
 import com.yunbao.main.dialog.LoginTipsDialog;
 import com.yunbao.main.http.MainHttpUtil;

main/src/main/java/com/yunbao/main/activity/LiveClassActivity.java

@@ -15,7 +15,7 @@ import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.interfaces.OnItemClickListener;
 import com.yunbao.common.bean.LiveBean;
 import com.yunbao.common.utils.RouteUtil;
-import com.yunbao.live.presenter.LiveRoomCheckLivePresenter;
+import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
 import com.yunbao.live.utils.LiveStorge;
 import com.yunbao.main.R;
 import com.yunbao.main.adapter.MainHomeFollowAdapter;

main/src/main/java/com/yunbao/main/activity/LoginActivity.java

@@ -51,8 +51,8 @@ import com.yunbao.common.manager.imrongcloud.RongcloudIMManager;
 import com.yunbao.common.utils.RouteUtil;
 import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.views.weight.ViewClicksAntiShake;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpUtil;
-import com.yunbao.live.presenter.LiveRoomCheckLivePresenter;
+import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
 import com.yunbao.main.R;
 import com.yunbao.main.event.RegSuccessEvent;
 import com.yunbao.main.http.MainHttpConsts;

main/src/main/java/com/yunbao/main/activity/MainActivity.java

@@ -101,11 +101,10 @@ import com.yunbao.common.views.AbsMainViewHolder;
 import com.yunbao.common.views.floatingview.APPEasyFloat;
 import com.yunbao.common.views.weight.LiveFloatView;
 import com.yunbao.live.activity.LiveAudienceActivity;
-import com.yunbao.live.http.LiveHttpConsts;
+import com.yunbao.common.http.LiveHttpConsts;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpUtil;
-import com.yunbao.live.presenter.LiveRoomCheckLivePresenter;
+import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
 import com.yunbao.live.utils.LiveStorge;
-import com.yunbao.live.views.ChatListViewHolder;
 import com.yunbao.main.R;
 import com.yunbao.main.adapter.FullAdToBannerTransition;
 import com.yunbao.main.dialog.AnchorStartLiveNotifyDialog;
@@ -121,8 +120,6 @@ import com.yunbao.main.utils.GenerateTestUserSig;
 import com.yunbao.main.views.FloatBannerView;
 import com.yunbao.main.views.MainHomeCommunityViewHolder;
 import com.yunbao.main.views.MainHomeLiveViewHolder;
-import com.yunbao.main.views.MainHomeShopViewHolder;
-import com.yunbao.main.views.MainHomeVideoViewHolder;
 import com.yunbao.main.views.MainHomeViewHolder;
 import com.yunbao.main.views.MainMeViewHolder;
 import com.yunbao.main.views.MainMessageViewHolder;

main/src/main/java/com/yunbao/main/activity/MyWebViewActivity.java

@@ -53,12 +53,10 @@ import com.yunbao.common.utils.ProcessImageUtil;
 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.activity.LiveAudienceActivity;
-import com.yunbao.live.event.LiveAudienceEvent;
+import com.yunbao.common.event.LiveRoomChangeEvent;
-import com.yunbao.live.event.LiveRoomChangeEvent;
+import com.yunbao.common.http.LiveHttpUtil;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
-import com.yunbao.live.presenter.LiveRoomCheckLivePresenter;
 import com.yunbao.live.views.LiveRoomViewHolder;
 import com.yunbao.main.dialog.EncourageDialog;
 import com.yunbao.main.http.MainHttpUtil;

main/src/main/java/com/yunbao/main/activity/MyWebViewActivity2.java

@@ -38,11 +38,10 @@ import com.yunbao.common.utils.L;
 import com.yunbao.common.utils.MicStatusManager;
 import com.yunbao.common.utils.RouteUtil;
 import com.yunbao.common.utils.ToastUtil;
-import com.yunbao.common.utils.WordUtil;
 import com.yunbao.live.activity.SystemMessageActivity;
-import com.yunbao.live.event.LiveRoomChangeEvent;
+import com.yunbao.common.event.LiveRoomChangeEvent;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpUtil;
-import com.yunbao.live.presenter.LiveRoomCheckLivePresenter;
+import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
 import com.yunbao.live.views.LiveRoomViewHolder;
 import com.yunbao.main.dialog.EncourageDialog;
 import com.yunbao.video.activity.VideoPlayActivity;

main/src/main/java/com/yunbao/main/activity/RegisterActivity.java

@@ -20,7 +20,6 @@ import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -49,9 +48,8 @@ import com.yunbao.common.manager.imrongcloud.RongcloudIMManager;
 import com.yunbao.common.utils.DialogUitl;
 import com.yunbao.common.utils.RouteUtil;
 import com.yunbao.common.utils.ToastUtil;
-import com.yunbao.common.utils.WordUtil;
+import com.yunbao.common.http.LiveHttpUtil;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
-import com.yunbao.live.presenter.LiveRoomCheckLivePresenter;
 import com.yunbao.main.R;
 import com.yunbao.main.event.RegSuccessEvent;
 import com.yunbao.main.http.MainHttpConsts;
@@ -62,7 +60,6 @@ import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
 import java.util.ArrayList;
-import java.util.Locale;
 
 /**
  * Created by cxf on 2018/9/25.

main/src/main/java/com/yunbao/main/activity/SearchActivity.java

@@ -21,13 +21,12 @@ import com.yunbao.common.activity.AbsActivity;
 import com.yunbao.common.bean.LiveBean;
 import com.yunbao.common.event.CloseEvent;
 import com.yunbao.common.http.HttpCallback;
-import com.yunbao.common.manager.NoviceInstructorManager;
 import com.yunbao.common.manager.SearchHistoryRecordManager;
 import com.yunbao.common.utils.Bus;
 import com.yunbao.common.utils.RouteUtil;
 import com.yunbao.common.utils.WordsTypeUtil;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpUtil;
-import com.yunbao.live.presenter.LiveRoomCheckLivePresenter;
+import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
 import com.yunbao.main.R;
 import com.yunbao.main.event.JumpUserHomeEvent;
 import com.yunbao.main.fragment.SearchRecommendFragment;

main/src/main/java/com/yunbao/main/activity/WeekWebViewActivity.java

@@ -35,11 +35,10 @@ 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.activity.WebViewActivityMedal;
 import com.yunbao.live.dialog.LiveUserDialogFragment;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpUtil;
-import com.yunbao.live.presenter.LiveRoomCheckLivePresenter;
+import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
 import com.yunbao.main.R;
 
 import org.greenrobot.eventbus.Subscribe;

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

@@ -25,6 +25,7 @@ import android.widget.ProgressBar;
 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;
@@ -34,17 +35,20 @@ import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.CommonAppContext;
 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.http.LiveHttpUtil;
 import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.utils.AndroidBug5497Workaround;
 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.LiveRoomCheckLivePresenter;
 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.main.R;
 
 import org.greenrobot.eventbus.Subscribe;
@@ -369,10 +373,38 @@ public class ZhuangBanActivity extends AbsActivity {
                 } catch (MalformedURLException e) {
                     e.printStackTrace();
                 }
+            } 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) {
+                            RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveSdk), Integer.parseInt(liveTypeVal));
+                        }
+
+                        @Override
+                        public void onCheckError(String contextError) {
+
+                        }
+                    });
+                } else {
+                    RouteUtil.forwardUserHome(mContext, String.valueOf(live_id), 0);
+                }
+            }
+
+        });
+
+    }
 
 }

main/src/main/java/com/yunbao/main/adapter/SearchAdapter.java

@@ -22,10 +22,9 @@ import com.yunbao.common.http.CommonHttpUtil;
 import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.utils.CommonIconUtil;
 import com.yunbao.common.utils.RouteUtil;
-import com.yunbao.common.utils.WordUtil;
 import com.yunbao.live.bean.SearchUserBean;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpUtil;
-import com.yunbao.live.presenter.LiveRoomCheckLivePresenter;
+import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
 import com.yunbao.main.R;
 
 import java.util.List;

main/src/main/java/com/yunbao/main/dialog/AnchorStartLiveNotifyDialog.java

@@ -19,8 +19,8 @@ import com.yunbao.common.glide.ImgLoader;
 import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.utils.DpUtil;
 import com.yunbao.common.utils.RouteUtil;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpUtil;
-import com.yunbao.live.presenter.LiveRoomCheckLivePresenter;
+import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
 import com.yunbao.main.R;
 
 public class AnchorStartLiveNotifyDialog extends AbsDialogPositionPopupWindow {

main/src/main/java/com/yunbao/main/dialog/MainStartDialogFragment.java

@@ -32,7 +32,7 @@ import com.yunbao.live.LiveConfig;
 import com.yunbao.live.activity.LiveAnchorActivity;
 import com.yunbao.live.activity.LiveRyAnchorActivity;
 import com.yunbao.live.bean.LiveKsyConfigBean;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpUtil;
 import com.yunbao.main.R;
 import com.yunbao.main.activity.MyWebViewActivity;
 import com.yunbao.main.interfaces.MainStartChooseCallback;

main/src/main/java/com/yunbao/main/dialog/OneLoginDialog.java

@@ -27,9 +27,8 @@ import com.yunbao.common.manager.NoviceInstructorManager;
 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.common.http.LiveHttpUtil;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
-import com.yunbao.live.presenter.LiveRoomCheckLivePresenter;
 import com.yunbao.main.R;
 import com.yunbao.main.activity.MainActivity;
 

main/src/main/java/com/yunbao/main/views/AbsMainListChildViewHolder.java

@@ -32,8 +32,8 @@ import com.yunbao.common.utils.RouteUtil;
 import com.yunbao.common.utils.SVGAViewUtils;
 import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.views.AbsMainViewHolder;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpUtil;
-import com.yunbao.live.presenter.LiveRoomCheckLivePresenter;
+import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
 import com.yunbao.main.R;
 import com.yunbao.main.activity.MainActivity;
 import com.yunbao.main.adapter.MainListAdapter;

main/src/main/java/com/yunbao/main/views/HonorViewHolder.java

@@ -10,10 +10,9 @@ import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.http.HttpClient;
-import com.yunbao.live.http.LiveHttpConsts;
+import com.yunbao.common.http.LiveHttpConsts;
 import com.yunbao.live.views.AbsUserHomeViewHolder;
 import com.yunbao.main.R;
 import com.yunbao.main.adapter.UserInfoCarAdapter;

main/src/main/java/com/yunbao/main/views/MainHomeCommunityViewHolder.java

@@ -42,8 +42,8 @@ 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.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpUtil;
-import com.yunbao.live.presenter.LiveRoomCheckLivePresenter;
+import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
 import com.yunbao.live.views.LoadingView;
 import com.yunbao.main.R;
 import com.yunbao.main.activity.MainActivity;

main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java

@@ -1,31 +1,20 @@
 package com.yunbao.main.views;
 
-import android.animation.Animator;
 import android.animation.ObjectAnimator;
 import android.app.Activity;
 import android.app.Dialog;
 import android.content.Context;
 import android.graphics.Outline;
 import android.graphics.drawable.Drawable;
-import android.net.Uri;
-import android.os.Environment;
-import android.os.Handler;
-import android.os.Looper;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewOutlineProvider;
-import android.view.WindowInsets;
-import android.view.WindowInsetsAnimation;
-import android.view.animation.AlphaAnimation;
-import android.view.animation.Animation;
 import android.widget.ImageView;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.app.ActivityCompat;
-import androidx.core.content.FileProvider;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -33,7 +22,6 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.bumptech.glide.Glide;
-import com.bumptech.glide.RequestBuilder;
 import com.bumptech.glide.load.DataSource;
 import com.bumptech.glide.load.engine.GlideException;
 import com.bumptech.glide.request.RequestListener;
@@ -52,20 +40,18 @@ import com.yunbao.common.bean.LiveClassBean;
 import com.yunbao.common.bean.WeekListBean;
 import com.yunbao.common.custom.CommonRefreshView;
 import com.yunbao.common.custom.ItemDecoration;
-import com.yunbao.common.glide.ImgLoader;
 import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.interfaces.OnItemClickListener;
 import com.yunbao.common.manager.LiveClassManager;
 import com.yunbao.common.utils.DialogUitl;
 import com.yunbao.common.utils.MicStatusManager;
 import com.yunbao.common.utils.RouteUtil;
-import com.yunbao.common.utils.ShareUtil;
 import com.yunbao.common.utils.StringUtil;
 import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.views.CustomViewHolder;
-import com.yunbao.live.event.LiveRoomChangeEvent;
+import com.yunbao.common.event.LiveRoomChangeEvent;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpUtil;
-import com.yunbao.live.presenter.LiveRoomCheckLivePresenter;
+import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
 import com.yunbao.live.utils.LiveStorge;
 import com.yunbao.live.views.LiveRoomViewHolder;
 import com.yunbao.main.R;

main/src/main/java/com/yunbao/main/views/MainMessageViewHolder.java

@@ -25,7 +25,6 @@ import com.opensource.svgaplayer.SVGADrawable;
 import com.opensource.svgaplayer.SVGAImageView;
 import com.opensource.svgaplayer.SVGAParser;
 import com.opensource.svgaplayer.SVGAVideoEntity;
-import com.yunbao.common.activity.WebViewActivity;
 import com.yunbao.common.bean.ImUserInfoModel;
 import com.yunbao.common.bean.LiveBean;
 import com.yunbao.common.glide.ImgLoader;
@@ -42,8 +41,8 @@ import com.yunbao.live.activity.SystemMessageActivity;
 import com.yunbao.live.bean.ImUserBean;
 import com.yunbao.live.event.RecommendLiveRoomEvent;
 import com.yunbao.live.http.ImHttpUtil;
-import com.yunbao.live.http.LiveHttpUtil;
+import com.yunbao.common.http.LiveHttpUtil;
-import com.yunbao.live.presenter.LiveRoomCheckLivePresenter;
+import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
 import com.yunbao.main.R;
 import com.yunbao.main.activity.MainActivity;
 import com.yunbao.main.adapter.SystemMessageAdapter;