修复:
侧边栏问题
This commit is contained in:
parent
418be1ec67
commit
da19811ad4
Binary file not shown.
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 29 KiB |
@ -10,9 +10,9 @@ ext {
|
|||||||
manifestPlaceholders = [
|
manifestPlaceholders = [
|
||||||
//正式
|
//正式
|
||||||
|
|
||||||
serverHost : "https://napi.yaoulive.com",
|
// serverHost : "https://napi.yaoulive.com",
|
||||||
//測試
|
//測試
|
||||||
// serverHost : "https://ceshi.yaoulive.com",
|
serverHost : "https://ceshi.yaoulive.com",
|
||||||
|
|
||||||
//腾讯地图
|
//腾讯地图
|
||||||
txMapAppKey : "EOZBZ-ASLCU-4XPV3-BDCHZ-4E3Q7-H4BWB",
|
txMapAppKey : "EOZBZ-ASLCU-4XPV3-BDCHZ-4E3Q7-H4BWB",
|
||||||
|
@ -122,6 +122,7 @@ public class LiveAudienceActivity extends LiveActivity {
|
|||||||
|
|
||||||
private ViewGroup mViewGroup;
|
private ViewGroup mViewGroup;
|
||||||
private LoadingView loadingView;
|
private LoadingView loadingView;
|
||||||
|
private int liveBg = 0;
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -651,6 +652,10 @@ public class LiveAudienceActivity extends LiveActivity {
|
|||||||
manager.onRemove();
|
manager.onRemove();
|
||||||
mLiveType = e.getLiveType();
|
mLiveType = e.getLiveType();
|
||||||
mLiveTypeVal = e.getLiveTypeVal();
|
mLiveTypeVal = e.getLiveTypeVal();
|
||||||
|
mLiveBean = liveBean;
|
||||||
|
mLiveUid = liveBean.getUid();
|
||||||
|
mStream = liveBean.getStream();
|
||||||
|
mAncherName = liveBean.getUserNiceName();
|
||||||
manager.onAdd(liveBean, mLiveType, mLiveTypeVal, mLiveSDK);
|
manager.onAdd(liveBean, mLiveType, mLiveTypeVal, mLiveSDK);
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -679,6 +684,7 @@ public class LiveAudienceActivity extends LiveActivity {
|
|||||||
bundle.putString("Avatar", mLiveBean.getAvatar());
|
bundle.putString("Avatar", mLiveBean.getAvatar());
|
||||||
bundle.putString("banner", GsonUtils.toJson(slideInfoModels));
|
bundle.putString("banner", GsonUtils.toJson(slideInfoModels));
|
||||||
bundle.putString("list", GsonUtils.toJson(list));
|
bundle.putString("list", GsonUtils.toJson(list));
|
||||||
|
bundle.putInt("LiveBg", liveBg);
|
||||||
sidebarLiveAudience.setArguments(bundle);
|
sidebarLiveAudience.setArguments(bundle);
|
||||||
sidebarLiveAudience.show(getSupportFragmentManager(), "SidebarLiveAudience");
|
sidebarLiveAudience.show(getSupportFragmentManager(), "SidebarLiveAudience");
|
||||||
// manager.openDrawer();
|
// manager.openDrawer();
|
||||||
@ -797,6 +803,8 @@ public class LiveAudienceActivity extends LiveActivity {
|
|||||||
mLiveTypeVal : event.getParametersModel().getmLiveTypeVal();
|
mLiveTypeVal : event.getParametersModel().getmLiveTypeVal();
|
||||||
mLiveGuardInfo = event.getParametersModel().getmLiveGuardInfo() == null ?
|
mLiveGuardInfo = event.getParametersModel().getmLiveGuardInfo() == null ?
|
||||||
mLiveGuardInfo : event.getParametersModel().getmLiveGuardInfo();
|
mLiveGuardInfo : event.getParametersModel().getmLiveGuardInfo();
|
||||||
|
liveBg = TextUtils.equals(String.valueOf(liveBg), String.valueOf(event.getParametersModel().getLiveBg())) ?
|
||||||
|
liveBg : event.getParametersModel().getLiveBg();
|
||||||
break;
|
break;
|
||||||
case ACTIVITY_CENTER://活动中心
|
case ACTIVITY_CENTER://活动中心
|
||||||
String url = CommonAppConfig.HOST + "/h5/live/hallOfFame/index.html?g=Appapi&m=Turntable&a=tricky";
|
String url = CommonAppConfig.HOST + "/h5/live/hallOfFame/index.html?g=Appapi&m=Turntable&a=tricky";
|
||||||
|
@ -15,6 +15,16 @@ public class OpenParametersModel extends BaseModel {
|
|||||||
//收费价格,计时收费每次扣费的值
|
//收费价格,计时收费每次扣费的值
|
||||||
private int mLiveTypeVal = 0;
|
private int mLiveTypeVal = 0;
|
||||||
private LiveGuardInfo mLiveGuardInfo = null;
|
private LiveGuardInfo mLiveGuardInfo = null;
|
||||||
|
private int liveBg = 0;
|
||||||
|
|
||||||
|
public int getLiveBg() {
|
||||||
|
return liveBg;
|
||||||
|
}
|
||||||
|
|
||||||
|
public OpenParametersModel setLiveBg(int liveBg) {
|
||||||
|
this.liveBg = liveBg;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
public int getmLiveType() {
|
public int getmLiveType() {
|
||||||
return mLiveType;
|
return mLiveType;
|
||||||
|
@ -65,12 +65,18 @@ public class SidebarLiveAudience extends AbsDialogFragment {
|
|||||||
sidebarBack = (ImageView) findViewById(R.id.sidebar_back);
|
sidebarBack = (ImageView) findViewById(R.id.sidebar_back);
|
||||||
if (bundle != null) {
|
if (bundle != null) {
|
||||||
String avatar = bundle.getString("Avatar");
|
String avatar = bundle.getString("Avatar");
|
||||||
|
int liveBg = bundle.getInt("LiveBg");
|
||||||
slideInfoModels = GsonUtils.fromJson(bundle.getString("banner"), new TypeToken<List<SlideInfoModel>>() {
|
slideInfoModels = GsonUtils.fromJson(bundle.getString("banner"), new TypeToken<List<SlideInfoModel>>() {
|
||||||
}.getType());
|
}.getType());
|
||||||
list = GsonUtils.fromJson(bundle.getString("list"), new TypeToken<List<AnchorRecommendItemModel>>() {
|
list = GsonUtils.fromJson(bundle.getString("list"), new TypeToken<List<AnchorRecommendItemModel>>() {
|
||||||
}.getType());
|
}.getType());
|
||||||
//侧边栏背景
|
//侧边栏背景
|
||||||
ImgLoader.displayBlurLive(mContext, avatar, sidebarBack);
|
if (liveBg == 1) {
|
||||||
|
ImgLoader.displayBlurLive(mContext, avatar, sidebarBack);
|
||||||
|
} else {
|
||||||
|
ImgLoader.display(mContext, R.mipmap.live_bg, sidebarBack);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
sidebarList = (CommonRefreshView) findViewById(R.id.sidebarList);
|
sidebarList = (CommonRefreshView) findViewById(R.id.sidebarList);
|
||||||
|
@ -4,7 +4,6 @@ import android.app.Activity;
|
|||||||
import android.app.Dialog;
|
import android.app.Dialog;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.content.res.Configuration;
|
import android.content.res.Configuration;
|
||||||
import android.graphics.drawable.AnimationDrawable;
|
|
||||||
import android.os.CountDownTimer;
|
import android.os.CountDownTimer;
|
||||||
import android.text.TextUtils;
|
import android.text.TextUtils;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
@ -28,7 +27,6 @@ import com.tencent.imsdk.v2.V2TIMManager;
|
|||||||
import com.yunbao.common.CommonAppConfig;
|
import com.yunbao.common.CommonAppConfig;
|
||||||
import com.yunbao.common.CommonAppContext;
|
import com.yunbao.common.CommonAppContext;
|
||||||
import com.yunbao.common.Constants;
|
import com.yunbao.common.Constants;
|
||||||
import com.yunbao.common.bean.AnchorRecommendItemModel;
|
|
||||||
import com.yunbao.common.bean.UserBean;
|
import com.yunbao.common.bean.UserBean;
|
||||||
import com.yunbao.common.custom.MyViewPager;
|
import com.yunbao.common.custom.MyViewPager;
|
||||||
import com.yunbao.common.event.FollowEvent;
|
import com.yunbao.common.event.FollowEvent;
|
||||||
@ -150,6 +148,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
|
|||||||
private boolean mLighted;
|
private boolean mLighted;
|
||||||
private boolean mCoinNotEnough;//余额不足
|
private boolean mCoinNotEnough;//余额不足
|
||||||
private boolean mFirstConnectSocket;//是否是第一次连接成功socket
|
private boolean mFirstConnectSocket;//是否是第一次连接成功socket
|
||||||
|
private int liveBg;
|
||||||
|
|
||||||
public PortraitLiveManager(Activity context, Intent intent) {
|
public PortraitLiveManager(Activity context, Intent intent) {
|
||||||
this.mContext = context;
|
this.mContext = context;
|
||||||
@ -808,13 +807,19 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
|
|||||||
mSocketUserType = obj.getIntValue("usertype");
|
mSocketUserType = obj.getIntValue("usertype");
|
||||||
mChatLevel = obj.getIntValue("speak_limit");
|
mChatLevel = obj.getIntValue("speak_limit");
|
||||||
mDanMuLevel = obj.getIntValue("barrage_limit");
|
mDanMuLevel = obj.getIntValue("barrage_limit");
|
||||||
|
liveBg = obj.getIntValue("live_bg");
|
||||||
|
if (liveBg == 1) {
|
||||||
|
//直播间背景
|
||||||
|
ImgLoader.displayBlurLive(mContext, mLiveBean.getAvatar(), liveBack);
|
||||||
|
}
|
||||||
//回传参数
|
//回传参数
|
||||||
Bus.get().post(new LiveAudienceEvent()
|
Bus.get().post(new LiveAudienceEvent()
|
||||||
.setType(LiveAudienceEvent.LiveAudienceType.OPEN_PARAMETERS)
|
.setType(LiveAudienceEvent.LiveAudienceType.OPEN_PARAMETERS)
|
||||||
.setParametersModel(new OpenParametersModel().setmDanmuPrice(mDanmuPrice)
|
.setParametersModel(new OpenParametersModel().setmDanmuPrice(mDanmuPrice)
|
||||||
.setmSocketUserType(mSocketUserType)
|
.setmSocketUserType(mSocketUserType)
|
||||||
.setmChatLevel(mChatLevel)
|
.setmChatLevel(mChatLevel)
|
||||||
.setmDanMuLevel(mDanMuLevel)));
|
.setmDanMuLevel(mDanMuLevel)
|
||||||
|
.setLiveBg(liveBg)));
|
||||||
EventBus.getDefault().post("close_login");
|
EventBus.getDefault().post("close_login");
|
||||||
EventBus.getDefault().post("oneUesrOver");
|
EventBus.getDefault().post("oneUesrOver");
|
||||||
|
|
||||||
|
Binary file not shown.
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 29 KiB |
Loading…
Reference in New Issue
Block a user