diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/constant/Constants.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/constant/Constants.kt index f19f525..e2005f1 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/constant/Constants.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/constant/Constants.kt @@ -10,4 +10,10 @@ const val MAX_QUERY_TIME_INTERVAL = ONE_DAY_MS const val DEFAULT_QUERY_TIME_INTERVAL = ONE_HOUR_MS * 6 //摄像头RTSP地址 -const val CAMERA_URL = "rtsp://admin:123456@192.168.5.200:554/h264/ch1/main/av_stream" \ No newline at end of file +const val CAMERA_URL = "rtsp://admin:123456@192.168.5.200:554/h264/ch1/main/av_stream" + +//打开摄像头延时 +const val DELAY_TIME_OPEN_CAMERA = 10 + +//检测重连摄像头延时 +const val DELAY_TIME_CHECK_CAMERA = 5 \ No newline at end of file diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/HomeActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/HomeActivity.kt index 2f026b6..5321022 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/HomeActivity.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/HomeActivity.kt @@ -12,6 +12,8 @@ import com.yinuo.safetywatcher.R import com.yinuo.safetywatcher.databinding.ActivityHomeBinding import com.yinuo.safetywatcher.watcher.base.NoOptionsActivity import com.yinuo.safetywatcher.watcher.constant.CAMERA_URL +import com.yinuo.safetywatcher.watcher.constant.DELAY_TIME_CHECK_CAMERA +import com.yinuo.safetywatcher.watcher.constant.DELAY_TIME_OPEN_CAMERA import com.yinuo.safetywatcher.watcher.services.HeartbeatService import com.yinuo.safetywatcher.watcher.utils.BatteryHelper import com.yinuo.safetywatcher.watcher.utils.SimHelper @@ -70,11 +72,11 @@ class HomeActivity : NoOptionsActivity() { mRender?.setFrameCallBack(object : IFrameCallBack { override fun onFrame() { closeLoadingDialog() - watchCamera(5) + watchCamera(DELAY_TIME_CHECK_CAMERA) } }) - // 第一次很慢,所以30秒 - watchCamera(30) + // 第一次很慢,所以10秒 + watchCamera(DELAY_TIME_OPEN_CAMERA) showLoadingDialog(R.string.connecting_camera) } @@ -83,9 +85,9 @@ class HomeActivity : NoOptionsActivity() { LogUtils.w("reStartCamera Runnable start") showLoadingDialog(R.string.connecting_camera) mRender?.reStart() - watchCamera(30) + watchCamera(DELAY_TIME_OPEN_CAMERA) }else{ - watchCamera(5) + watchCamera(DELAY_TIME_CHECK_CAMERA) } } diff --git a/library-vlc/src/main/java/com/yinuo/library/vlc/RtspHelper.java b/library-vlc/src/main/java/com/yinuo/library/vlc/RtspHelper.java index 928e338..4bdbdb8 100644 --- a/library-vlc/src/main/java/com/yinuo/library/vlc/RtspHelper.java +++ b/library-vlc/src/main/java/com/yinuo/library/vlc/RtspHelper.java @@ -52,7 +52,7 @@ public class RtspHelper { options.add("--audio-time-stretch"); // time stretching options.add("-vvv"); // verbosity options.add("--file-caching=2000"); - options.add("--rtsp-frame-buffer-size=5000"); + options.add("--rtsp-frame-buffer-size=80000"); options.add("--rtsp-tcp"); mVlc = new LibVLC(Objects.requireNonNull(CommonApplication.Companion.getContext()), options);