yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shunyi_vr_map

Browse Source 
# Conflicts:
#	modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/PushCameraLiveWindow.java
This commit is contained in:
董宏宇
2020-12-21 10:16:12 +08:00
parent 44b04063f2 2fdedef33c
commit ff993d113c
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/PushCameraLiveWindow.java
View File

@@ -29,7 +29,7 @@ public class PushCameraLiveWindow extends RelativeLayout implements ICameraWindo
private ImageView pushVideoClose;
// 弹窗状态监听
private CameraLiveWindowStatusListener mWindowStatusListener;
// private CameraLiveWindowStatusListener mWindowStatusListener;
// 直播30秒自动关闭
private static Handler handlerV2XEvent = new Handler();
@@ -84,9 +84,9 @@ public class PushCameraLiveWindow extends RelativeLayout implements ICameraWindo
}
countDownV2XEvent(entity);
if (mWindowStatusListener != null) {
mWindowStatusListener.onViewShow();
}
// if (mWindowStatusListener != null) {
// mWindowStatusListener.onViewShow();
// }
}
}
@@ -103,9 +103,9 @@ public class PushCameraLiveWindow extends RelativeLayout implements ICameraWindo
// MarkerUtils.resetMapZoom(16);
// 如果窗体处于展示的时候
if (mWindowStatusListener != null) {
mWindowStatusListener.onViewClose();
}
// if (mWindowStatusListener != null) {
// mWindowStatusListener.onViewClose();
// }
// 停止倒计时
if (handlerV2XEvent != null && runnableV2XEvent != null) {
@@ -120,9 +120,10 @@ public class PushCameraLiveWindow extends RelativeLayout implements ICameraWindo
}
public void setWindowStatusListener(CameraLiveWindowStatusListener listener) {
this.mWindowStatusListener = listener;
}
// @Override
// public void setWindowStatusListener(CameraLiveWindowStatusListener listener) {
// this.mWindowStatusListener = listener;
// }
/**
* 窗体倒计时 TODO