From 030979c08b23b917a942eed09f0d6a9134c45ee1 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期一, 31 三月 2025 11:37:19 +0800
Subject: [PATCH] update
---
jh-module-ecg/jh-module-ecg-api/src/main/java/cn/lihu/jh/module/ecg/enums/RoomCallingScreenEnum.java | 3 ++-
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/room/RoomServiceImpl.java | 14 +++++++++-----
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-api/src/main/java/cn/lihu/jh/module/ecg/enums/RoomCallingScreenEnum.java b/jh-module-ecg/jh-module-ecg-api/src/main/java/cn/lihu/jh/module/ecg/enums/RoomCallingScreenEnum.java
index ab654a8..11e2dd4 100644
--- a/jh-module-ecg/jh-module-ecg-api/src/main/java/cn/lihu/jh/module/ecg/enums/RoomCallingScreenEnum.java
+++ b/jh-module-ecg/jh-module-ecg-api/src/main/java/cn/lihu/jh/module/ecg/enums/RoomCallingScreenEnum.java
@@ -18,7 +18,8 @@
CHECK_ONLY(10,"妫�鏌ュ彨鍙峰睆"),
RECEIVE_ONLY(20,"棰嗙敤鍙彿灞�"),
INSTALL_ONLY(30,"瀹夎鍙彿灞�"),
- HYBRID(40, "娣峰悎鍙彿灞�"); // 棰嗙敤 + 瀹夎
+ RECEIVE_INSTALL(40, "棰嗙敤瀹夎娣峰悎鍙彿灞�"), // 棰嗙敤 + 瀹夎
+ CHECK_INSTALL(50, "妫�鏌ュ畨瑁呮贩鍚堝彨鍙峰睆"); // 妫�鏌� + 瀹夎 杩欎釜鎯呭喌瀹為檯涓嶅瓨鍦�, 鐢ㄤ簬閰嶇疆閿欒鍙戠幇
public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(RoomCallingScreenEnum::getCallingScreenType).toArray();
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/room/RoomServiceImpl.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/room/RoomServiceImpl.java
index ead4005..a745187 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/room/RoomServiceImpl.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/room/RoomServiceImpl.java
@@ -105,21 +105,25 @@
if ( roomDO.getOpType() == 0 || roomDO.getOpType() == 1 ) {
// do nothing
} else if ( roomDO.getOpType() == 2 ) {
- roomProfile.setCallingScreenType( RoomCallingScreenEnum.HYBRID.getCallingScreenType());
+ roomProfile.setCallingScreenType( RoomCallingScreenEnum.CHECK_INSTALL.getCallingScreenType());
}
} else if (roomProfile.getCallingScreenType() == RoomCallingScreenEnum.RECEIVE_ONLY.getCallingScreenType()) {
if ( roomDO.getOpType() == 0 || roomDO.getOpType() == 1 ) {
// do nothing
} else if ( roomDO.getOpType() == 2 ) {
- roomProfile.setCallingScreenType( RoomCallingScreenEnum.HYBRID.getCallingScreenType());
+ roomProfile.setCallingScreenType( RoomCallingScreenEnum.RECEIVE_INSTALL.getCallingScreenType());
}
} else if (roomProfile.getCallingScreenType() == RoomCallingScreenEnum.INSTALL_ONLY.getCallingScreenType()) {
- if ( roomDO.getOpType() == 0 || roomDO.getOpType() == 1 ) {
- roomProfile.setCallingScreenType( RoomCallingScreenEnum.HYBRID.getCallingScreenType());
+ if ( roomDO.getOpType() == 0 ) {
+ roomProfile.setCallingScreenType( RoomCallingScreenEnum.CHECK_INSTALL.getCallingScreenType());
+ } else if ( roomDO.getOpType() == 1 ) {
+ roomProfile.setCallingScreenType( RoomCallingScreenEnum.RECEIVE_INSTALL.getCallingScreenType());
} else if ( roomDO.getOpType() == 2 ) {
// do nothing
}
- } else if (roomProfile.getCallingScreenType() == RoomCallingScreenEnum.HYBRID.getCallingScreenType()) {
+ } else if (roomProfile.getCallingScreenType() == RoomCallingScreenEnum.RECEIVE_INSTALL.getCallingScreenType()) {
+ // do nothing
+ } else if (roomProfile.getCallingScreenType() == RoomCallingScreenEnum.CHECK_INSTALL.getCallingScreenType()) {
// do nothing
}
}
--
Gitblit v1.9.3