From c867f7ad89c825b5080101a4d3e64a6d8860b069 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Fri, 5 Nov 2021 10:43:52 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=BB=B6=E9=95=BF=E7=9B=B4=E6=92=AD?= =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E4=BA=BA=E6=95=B0=E6=A3=80=E6=B5=8B=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit f948cd4a9b40b68630abaaab4fc51fcf2d4d04ad) --- .idea/deploymentTargetDropDown.xml | 17 ---------------- .../live/manager/LiveStreamManagerImpl.java | 2 +- gradle.properties | 20 +++++++++---------- 3 files changed, 11 insertions(+), 28 deletions(-) delete mode 100644 .idea/deploymentTargetDropDown.xml diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml deleted file mode 100644 index 4d1200b..0000000 --- a/.idea/deploymentTargetDropDown.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/LiveStreamManagerImpl.java b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/LiveStreamManagerImpl.java index 5e2b7db..eb5eee6 100644 --- a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/LiveStreamManagerImpl.java +++ b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/LiveStreamManagerImpl.java @@ -30,7 +30,7 @@ public class LiveStreamManagerImpl implements ILiveStreamManager { // 循环上报摄像头可直播状态间隔时间 private static final int PUSH_CAM_TIME = 10 * 1000; // 检测房间在线人数，<=1代表无人观看，即可以关闭推流，1个人代表自己 - private static final int PUSH_CHECK_TIME = 60 * 1000; + private static final int PUSH_CHECK_TIME = 120 * 1000; private static volatile int sCam1LiveStatus = 0, sCam2LiveStatus = 0; private static volatile int sCam1AvailableStatus = 0, sCam2AvailableStatus = 0; private static final int PUSH_START = 0; // 开始 diff --git a/gradle.properties b/gradle.properties index 09fda77..428bd42 100644 --- a/gradle.properties +++ b/gradle.properties @@ -30,22 +30,22 @@ PASSWORD=xintai2018 RELEASE=true # AI CLOUD 云平台 # 工具类 -MOGO_UTILS_VERSION=1.1.53-live +MOGO_UTILS_VERSION=1.1.54-live # 网络请求 -MOGO_NETWORK_VERSION=1.1.53-live +MOGO_NETWORK_VERSION=1.1.54-live # 网络DNS -MOGO_HTTPDNS_VERSION=1.1.53-live +MOGO_HTTPDNS_VERSION=1.1.54-live # 鉴权 -MOGO_PASSPORT_VERSION=1.1.53-live +MOGO_PASSPORT_VERSION=1.1.54-live # 常链接 -MOGO_SOCKET_VERSION=1.1.53-live +MOGO_SOCKET_VERSION=1.1.54-live # 数据采集 -MOGO_REALTIME_VERSION=1.1.53-live +MOGO_REALTIME_VERSION=1.1.54-live # 探路，道路事件发布，获取 -MOGO_TANLU_VERSION=1.1.53-live +MOGO_TANLU_VERSION=1.1.54-live # 直播推流 -MOGO_LIVE_VERSION=1.1.53-live +MOGO_LIVE_VERSION=1.1.54-live # 直播拉流 -MOGO_TRAFFICLIVE_VERSION=1.1.53-live +MOGO_TRAFFICLIVE_VERSION=1.1.54-live # 定位服务 -MOGO_LOCATION_VERSION=1.1.53-live +MOGO_LOCATION_VERSION=1.1.54-live From f3bbbfacff414887e29c09dfd08a3ebe11ab022b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Fri, 5 Nov 2021 11:00:44 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=BB=B6=E9=95=BF=E7=9B=B4=E6=92=AD?= =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E4=BA=BA=E6=95=B0=E6=A3=80=E6=B5=8B=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gradle.properties b/gradle.properties index 428bd42..1e468c4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -30,22 +30,22 @@ PASSWORD=xintai2018 RELEASE=true # AI CLOUD 云平台 # 工具类 -MOGO_UTILS_VERSION=1.1.54-live +MOGO_UTILS_VERSION=1.1.55-live # 网络请求 -MOGO_NETWORK_VERSION=1.1.54-live +MOGO_NETWORK_VERSION=1.1.55-live # 网络DNS -MOGO_HTTPDNS_VERSION=1.1.54-live +MOGO_HTTPDNS_VERSION=1.1.55-live # 鉴权 -MOGO_PASSPORT_VERSION=1.1.54-live +MOGO_PASSPORT_VERSION=1.1.55-live # 常链接 -MOGO_SOCKET_VERSION=1.1.54-live +MOGO_SOCKET_VERSION=1.1.55-live # 数据采集 -MOGO_REALTIME_VERSION=1.1.54-live +MOGO_REALTIME_VERSION=1.1.55-live # 探路，道路事件发布，获取 -MOGO_TANLU_VERSION=1.1.54-live +MOGO_TANLU_VERSION=1.1.55-live # 直播推流 -MOGO_LIVE_VERSION=1.1.54-live +MOGO_LIVE_VERSION=1.1.55-live # 直播拉流 -MOGO_TRAFFICLIVE_VERSION=1.1.54-live +MOGO_TRAFFICLIVE_VERSION=1.1.55-live # 定位服务 -MOGO_LOCATION_VERSION=1.1.54-live +MOGO_LOCATION_VERSION=1.1.55-live From d7243f34c17dba503f6ebe01c682bd261a694dee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Fri, 5 Nov 2021 14:32:32 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=85=8D=E5=90=88=20LivePushService=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8E=AF=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 2 +- app/src/main/java/com/mogo/cloud/MoGoApplication.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 5332346..daa7ca6 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -11,7 +11,7 @@