Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
282790ead5
@ -287,6 +287,7 @@ public class LivePlayRyViewHolder extends LiveRoomPlayViewHolder {
|
||||
public void play(String url, int playModel) {
|
||||
srcUrl = url;
|
||||
PLAY_MODEL = playModel;
|
||||
waitNextUrl = null;
|
||||
Log.i(TAG, "play" + " url:" + url + " playModel: " + playModel + " landscape: " + landscape + " videoLandscape" + videoLandscape);
|
||||
if (playModel != PLAY_MODEL_DEF && !url.contains(videoFps[0] + ".flv")) {
|
||||
mPlayer.setViewResizeMode(landscape == VIDEO_VERTICAL);
|
||||
@ -679,7 +680,7 @@ public class LivePlayRyViewHolder extends LiveRoomPlayViewHolder {
|
||||
@Subscribe(threadMode = ThreadMode.MAIN)
|
||||
public void onUpdata(String str) {
|
||||
if ("UsertoRY".equals(str)) {
|
||||
DialogUitl.showSimpleDialog(mContext,mContext.getString(R.string.mic_tag), new DialogUitl.SimpleCallback() {
|
||||
DialogUitl.showSimpleDialog(mContext, mContext.getString(R.string.mic_tag), new DialogUitl.SimpleCallback() {
|
||||
@Override
|
||||
public void onConfirmClick(Dialog dialog, String content) {
|
||||
UsertoRY();
|
||||
@ -875,13 +876,13 @@ public class LivePlayRyViewHolder extends LiveRoomPlayViewHolder {
|
||||
.asCustom(liveClarityCustomPopup)
|
||||
.show();
|
||||
} else if (event.getType() == LiveAudienceEvent.LiveAudienceType.FONT_SIZE) {
|
||||
int fount=0;
|
||||
int fount = 0;
|
||||
try {
|
||||
fount=Integer.parseInt(SpUtil.getStringValue("pd_live_room_fount_size"));
|
||||
}catch (Exception ignored){
|
||||
fount = Integer.parseInt(SpUtil.getStringValue("pd_live_room_fount_size"));
|
||||
} catch (Exception ignored) {
|
||||
|
||||
}
|
||||
new LiveFontSizeSettingDialog(mContext,fount).setOnItemClickListener(new OnItemClickListener<Integer>() {
|
||||
new LiveFontSizeSettingDialog(mContext, fount).setOnItemClickListener(new OnItemClickListener<Integer>() {
|
||||
@Override
|
||||
public void onItemClick(Integer bean, int position) {
|
||||
EventBus.getDefault().post(new LiveAudienceEvent()
|
||||
|
Loading…
Reference in New Issue
Block a user