diff --git a/live/src/main/java/com/yunbao/live/activity/LiveActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveActivity.java index 767539044..8548fca6f 100644 --- a/live/src/main/java/com/yunbao/live/activity/LiveActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/LiveActivity.java @@ -159,7 +159,7 @@ public abstract class LiveActivity extends AbsActivity implements SocketMessageL EventBus.getDefault().register(this); mDialogFragmentSet = new HashSet<>(); //解压 美颜模型 - try { + /*try { CommonAppConfig.VIDEO_TIE_MODEl_PATH = getFilesDir().getAbsolutePath() + "/model";//app安装路径 File model = new File(CommonAppConfig.VIDEO_TIE_MODEl_PATH); if (model.exists() && Objects.requireNonNull(model.listFiles()).length > 0) { @@ -169,7 +169,7 @@ public abstract class LiveActivity extends AbsActivity implements SocketMessageL } catch (Exception e) { e.printStackTrace(); Log.i("log", "beauty e=" + e); - } + }*/ } @Override diff --git a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java index 67b717693..97f534fd2 100644 --- a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java +++ b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java @@ -172,6 +172,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe private boolean mCoinNotEnough;//余额不足 private boolean mFirstConnectSocket;//是否是第一次连接成功socket private int liveBg = -1; + private int leave=-1;//是否正在休息 1为休息 0为直播 private LiveImDeletUtil liveImDeletUtil; private List greetings = new ArrayList<>(); private Handler liveHandler = new Handler(); @@ -1069,7 +1070,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe mChatLevel = obj.getIntValue("speak_limit"); mDanMuLevel = obj.getIntValue("barrage_limit"); liveBg = obj.getIntValue("live_bg"); - + leave = obj.getInteger("isleave"); if (obj.containsKey("greetings")) { greetings = JSONArray.parseArray(obj.getJSONArray("greetings").toJSONString(), String.class); } @@ -1197,10 +1198,9 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe mLiveRoomViewHolder.startRequestTimeCharge(); } } - - if (TextUtils.equals(obj.getString("isleave"), "1")) { - if (LivePlayKsyViewHolder.leave != null) { - LivePlayKsyViewHolder.leave.setVisibility(View.VISIBLE); + if (leave==1) { + if (LivePlayRyViewHolder.leave != null) { + LivePlayRyViewHolder.leave.setVisibility(View.VISIBLE); } } //判断是否有连麦,要显示连麦窗口