Jelajahi Sumber

修改门口机接紧急按钮情况点阵屏无显示问题

weizhengliang 2 tahun lalu
induk
melakukan
1cc3dc8d99

+ 1 - 1
android_host/build.gradle

@@ -124,7 +124,7 @@ dependencies {
     compile project(':janus')
 
     //linphone sip
-    implementation "org.linphone:linphone-sdk-android:5.2.10"
+    //implementation "org.linphone:linphone-sdk-android:5.2.10"
 
     //串口
     compile project(':nurseMainLib')

+ 2 - 1
android_host/src/main/h10_z3128_1h/java/com/wdkl/ncs/android/component/nursehome/util/LedHelper.java

@@ -37,7 +37,8 @@ public class LedHelper {
 
         Log.d("led", "update led info, deviceType: " + interactionVO.getFromDeviceType() + ", frameName: " + interactionVO.getFromFrameFullName() + ", data: " + interactionVO.getData());
         if (interactionVO.getFromDeviceType() == DeviceTypeEnum.DIGIT_BED_DEVICE.value()
-                || interactionVO.getFromDeviceType() == DeviceTypeEnum.SIMULATE_BED_DEVICE.value()) {
+                || interactionVO.getFromDeviceType() == DeviceTypeEnum.SIMULATE_BED_DEVICE.value()
+                || interactionVO.getFromDeviceType() == DeviceTypeEnum.DOOR_DEVICE.value()) {
             //如果交互记录中的fromdevice是分机,有可能是数字分机发送过来的紧急呼叫,需要特别处理
             if (emergency) {
                 String frameName = CommonUtils.subStringBefore(interactionVO.getFromFrameFullName(), "-");

+ 1 - 0
middleware/build.gradle

@@ -62,6 +62,7 @@ dependencies {
      */
     //compile files('libs/libvlc-armv7-3.2-eap10.aar')
     compile files('libs/common-1.1.9.aar')
+    compile files('libs/linphone-sdk-android-5.2.10.aar')
 
     compile project(':common')
     compile project(':resource')

TEMPAT SAMPAH
middleware/libs/linphone-sdk-android-5.2.10.aar