兼容分机接门灯处理

build.gradle

@@ -49,12 +49,12 @@ buildscript {
     /**
      * APP版本码
      */
-    ext.app_version_code = 16
+    ext.app_version_code = 17
 
     /**
      * APP版本号
      */
-    ext.app_version = "1.1.10"
+    ext.app_version = "1.1.11"
 
     /**
      * 项目依赖库

callingbed/src/main/java/com/wdkl/app/ncs/callingbed/activity/CallingbedActivity.kt

@@ -1,5 +1,9 @@
 package com.wdkl.app.ncs.callingbed.activity
 
+//import com.wdkl.app.ncs.callingbed.sip.SipHelper
+//import com.wdkl.app.ncs.callingbed.sip.SipStatus
+//import com.vvsip.ansip.IVvsipServiceListener
+//import com.vvsip.ansip.VvsipCall
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
@@ -17,20 +21,17 @@ import com.enation.javashop.android.jrouter.external.annotation.Router
 import com.enation.javashop.net.engine.model.NetState
 import com.google.gson.Gson
 import com.wdkl.app.ncs.callingbed.BuildConfig
-//import com.wdkl.app.ncs.callingbed.sip.SipHelper
-//import com.wdkl.app.ncs.callingbed.sip.SipStatus
-//import com.vvsip.ansip.IVvsipServiceListener
-//import com.vvsip.ansip.VvsipCall
 import com.wdkl.app.ncs.callingbed.R
 import com.wdkl.app.ncs.callingbed.adapter.NurseConfigAdpter
+import com.wdkl.app.ncs.callingbed.agreement.CallingbedAgreement
 import com.wdkl.app.ncs.callingbed.databinding.CallingbedMainLayBinding
-import com.wdkl.app.ncs.callingbed.fragment.*
+import com.wdkl.app.ncs.callingbed.fragment.CostFragment
+import com.wdkl.app.ncs.callingbed.fragment.MainFragment
+import com.wdkl.app.ncs.callingbed.fragment.QrCodeFragment
+import com.wdkl.app.ncs.callingbed.fragment.SkyCallFragment
 import com.wdkl.app.ncs.callingbed.helper.*
 import com.wdkl.app.ncs.callingbed.launch.CallingbedLaunch
 import com.wdkl.app.ncs.callingbed.settings.SettingConfig
-import com.wdkl.app.ncs.callingbed.agreement.CallingbedAgreement
-import com.wdkl.app.ncs.callingbed.fragment.SkyCallFragment
-import com.wdkl.app.ncs.callingbed.helper.ScreenManagerUtil
 import com.wdkl.ncs.android.lib.base.BaseActivity
 import com.wdkl.ncs.android.lib.base.BaseApplication
 import com.wdkl.ncs.android.lib.utils.AppTool
@@ -38,7 +39,6 @@ import com.wdkl.ncs.android.lib.utils.TimeHandle
 import com.wdkl.ncs.android.lib.utils.push
 import com.wdkl.ncs.android.lib.utils.showMessage
 import com.wdkl.ncs.android.lib.vo.filter
-import com.wdkl.ncs.android.lib.widget.MenuDialog
 import com.wdkl.ncs.android.middleware.common.Constant
 import com.wdkl.ncs.android.middleware.common.MessageEvent
 import com.wdkl.ncs.android.middleware.common.SipStatus
@@ -52,11 +52,9 @@ import com.wdkl.ncs.android.middleware.model.dos.PartSettingDO
 import com.wdkl.ncs.android.middleware.model.dto.NurseConfigDto
 import com.wdkl.ncs.android.middleware.model.dto.TcpSeverDTO
 import com.wdkl.ncs.android.middleware.model.vo.BedDeviceInfoVO
-import com.wdkl.ncs.android.middleware.model.vo.CustomerInfoVO
 import com.wdkl.ncs.android.middleware.model.vo.InteractionVO
 import com.wdkl.ncs.android.middleware.tcp.TcpClient
 import com.wdkl.ncs.android.middleware.tcp.channel.OtherUtil
-import com.wdkl.ncs.android.middleware.tcp.channel.VideoUtil
 import com.wdkl.ncs.android.middleware.tcp.channel.VoiceUtil
 import com.wdkl.ncs.android.middleware.tcp.dto.TcpModel
 import com.wdkl.ncs.android.middleware.tcp.enums.TcpAction
@@ -174,6 +172,8 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, CallingbedMa
             SerialPortHelper.setSosLight("0")
             //初始化灭掉护理灯
             SerialPortHelper.dismissNurseLedLight()
+            //默认门灯白色
+            SerialPortHelper.setDoorLight(1, "111")
         }
 
         EventBus.getDefault().register(this)
@@ -1231,6 +1231,8 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, CallingbedMa
                                 EventBus.getDefault().post(MessageEvent("reject", Constant.EVENT_SERIAL_EVENT))
                                 Constant.CALL_STATE = Constant.CALL_STANDBY
                             }
+                        } else {
+                            DoorLightHelper.handleDoorLight(tcpModel)
                         }
                     } else if (tcpModel.type == TcpType.SOS) {
                         if (tcpModel.action == TcpAction.SOSAction.CANCEL) {

callingbed/src/main/java/com/wdkl/app/ncs/callingbed/helper/DoorLightHelper.java

@@ -0,0 +1,19 @@
+package com.wdkl.app.ncs.callingbed.helper;
+
+import com.wdkl.ncs.android.middleware.tcp.dto.TcpModel;
+import com.wdkl.ncs.android.middleware.tcp.enums.TcpAction;
+
+public class DoorLightHelper {
+
+    public static void handleDoorLight(TcpModel tcpModel) {
+        if (TcpAction.SideAction.CALL == tcpModel.getAction()
+            || TcpAction.SideAction.SOS_CALL == tcpModel.getAction()) {
+            //门灯红色闪烁
+            SerialPortHelper.setDoorLight(1, "200"); //红色闪烁
+        } else if (TcpAction.SideAction.ACCEPT == tcpModel.getAction()
+            || TcpAction.SideAction.CANCEL == tcpModel.getAction()
+            || TcpAction.SideAction.SOS_CANCEL == tcpModel.getAction()) {
+            SerialPortHelper.setDoorLight(1, "111"); //白色
+        }
+    }
+}

callingbed/src/main/java/com/wdkl/app/ncs/callingbed/helper/SerialPortHelper.java

@@ -42,6 +42,22 @@ public class SerialPortHelper {
     }
 
     /**
+     * 门灯控制开关
+     *
+     * @param data  0  表示灯灭   1  表示灯亮
+     * @param color 0 表示灯灭  非0表示灯的颜色
+     */
+    public static void setDoorLight(int data, String color) {
+        String command;
+        if (data == 0 || color == null) {
+            command = "000";
+        } else {
+            command = color;
+        }
+        SerialPortUtil.getInstance().sendCommand(SerialPortUtil.DOORLIGHT, command, "F");
+    }
+
+    /**
      * 设置护理灯
      */
     public static void setNurseLedLight(final int brightnessPercent, final String oneColor, final String twoColor, final String threeColor, final String fourColor, final String fiveColor) {