From 512cae0fd797fac428f07d9d955f880e9ee353c1 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期四, 30 七月 2020 19:45:01 +0800
Subject: [PATCH] 修改人脸显示
---
app/src/main/java/com/basic/security/fragment/helper/HomePlayAlarmVideo.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/app/src/main/java/com/basic/security/fragment/helper/HomePlayAlarmVideo.java b/app/src/main/java/com/basic/security/fragment/helper/HomePlayAlarmVideo.java
index 2d88735..b73861d 100644
--- a/app/src/main/java/com/basic/security/fragment/helper/HomePlayAlarmVideo.java
+++ b/app/src/main/java/com/basic/security/fragment/helper/HomePlayAlarmVideo.java
@@ -5,6 +5,8 @@
import android.view.ViewGroup;
import android.widget.VideoView;
+import com.basic.security.manager.AlarmManager;
+
import org.androidannotations.annotations.EFragment;
@EFragment
@@ -28,8 +30,16 @@
public void resumeVideoPlay() {
for (AlarmListAdapter.ViewHolder viewHolder : viewHolderSet.keySet()) {
- if ("true".equals(viewHolder.alarm.get("videoPlaying")) && !viewHolder.alarmVideo.isPlaying()) {
- playVideo(viewHolder);
+ if (AlarmManager.getAlarmPlaying(viewHolder.alarm)
+// && !viewHolder.alarmVideo.isPlaying()
+ ) {
+ mainActivity().runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ viewHolder.alarmVideo.setVisibility(View.VISIBLE);
+ playVideo(viewHolder);
+ }
+ });
} else {
viewHolder.alarmVideoOverlay.setVisibility(View.GONE);
}
@@ -39,11 +49,11 @@
public void playVideo(final AlarmListAdapter.ViewHolder viewHolder) {
if (mainActivity().notInFullscreenMode()) {
viewHolder.alarmVideoOverlay.setVisibility(View.VISIBLE);
+ viewHolder.alarmVideoOverlayVisibleTime = System.currentTimeMillis();
viewHolder.alarmPicture.setVisibility(View.INVISIBLE);
viewHolder.alarmVideo.setVisibility(View.VISIBLE);
viewHolder.alarmVideoGestureOverlayView.setVisibility(View.VISIBLE);
- viewHolder.alarm.put("videoPlaying", "true");
if (viewHolder.alarmVideo.isPlaying()) {
return;
}
@@ -69,6 +79,7 @@
@Override
public boolean onInfo(MediaPlayer mp, int what, int extra) {
if (what == MediaPlayer.MEDIA_INFO_VIDEO_RENDERING_START) {
+ viewHolder.alarmVideo.setVisibility(View.VISIBLE);
viewHolder.alarmVideoOverlay.setVisibility(View.GONE);
return true;
}
@@ -82,6 +93,7 @@
public void onCompletion(MediaPlayer mp) {
currentVideoPlayTimeMap.remove(viewHolder.alarm.get("id"));
viewHolder.alarm.put("videoPlayFinished", "true");
+ AlarmManager.putAlarmPlaying(viewHolder.alarm, false);
}
});
viewHolder.alarmVideo.start();
@@ -94,7 +106,7 @@
viewHolder.alarmPicture.setVisibility(View.VISIBLE);
viewHolder.alarmVideo.setVisibility(View.INVISIBLE);
viewHolder.alarmVideoGestureOverlayView.setVisibility(View.INVISIBLE);
- viewHolder.alarm.put("videoPlaying", "false");
+ AlarmManager.putAlarmPlaying(viewHolder.alarm, false);
if (viewHolder.alarmVideo.isPlaying()) {
viewHolder.alarmVideo.stopPlayback();
}
--
Gitblit v1.8.0