修改空床未入住呼叫

android_host/src/main/h10_wke_1h/java/com/wdkl/ncs/android/component/nursehome/fragment/FramePartFragment.kt

@@ -203,7 +203,7 @@ class FramePartFragment: BaseFragment<FramePartPresenter, FragmentFramePartBindi
             if (System.currentTimeMillis() - clickTime < 3000) {
                 showMessage(R.string.call_wait)
             } else {
-                if (frame.customerName != null && frame.bedDeviceId != null) {
+                if (frame.bedDeviceId != null && (!TextUtils.isEmpty(frame.customerName) || !TextUtils.isEmpty(frame.deviceSipId))) {
                     //呼出时停止语音播报及铃声
                     SpeechUtil.getInstance().stopSpeak(true)
                     RingPlayHelper.stopRingTone()
@@ -251,7 +251,7 @@ class FramePartFragment: BaseFragment<FramePartPresenter, FragmentFramePartBindi
             if (System.currentTimeMillis() - clickTime < 3000) {
                 showMessage(R.string.call_wait)
             } else {
-                if (frame.customerName != null && frame.bedDeviceId != null) {
+                if (frame.bedDeviceId != null && (!TextUtils.isEmpty(frame.customerName) || !TextUtils.isEmpty(frame.deviceSipId))) {
                     //呼出时停止语音播报及铃声
                     SpeechUtil.getInstance().stopSpeak(true)
                     RingPlayHelper.stopRingTone()

android_host/src/main/h10_z3128_1h/java/com/wdkl/ncs/android/component/nursehome/fragment/FramePartFragment.kt

@@ -203,7 +203,7 @@ class FramePartFragment: BaseFragment<FramePartPresenter, FragmentFramePartBindi
             if (System.currentTimeMillis() - clickTime < 3000) {
                 showMessage(R.string.call_wait)
             } else {
-                if (frame.customerName != null && frame.bedDeviceId != null) {
+                if (frame.bedDeviceId != null && (!TextUtils.isEmpty(frame.customerName) || !TextUtils.isEmpty(frame.deviceSipId))) {
                     //呼出时停止语音播报及铃声
                     SpeechUtil.getInstance().stopSpeak(true)
                     RingPlayHelper.stopRingTone()
@@ -250,7 +250,7 @@ class FramePartFragment: BaseFragment<FramePartPresenter, FragmentFramePartBindi
             if (System.currentTimeMillis() - clickTime < 3000) {
                 showMessage(R.string.call_wait)
             } else {
-                if (frame.customerName != null && frame.bedDeviceId != null) {
+                if (frame.bedDeviceId != null && (!TextUtils.isEmpty(frame.customerName) || !TextUtils.isEmpty(frame.deviceSipId))) {
                     //呼出时停止语音播报及铃声
                     SpeechUtil.getInstance().stopSpeak(true)
                     RingPlayHelper.stopRingTone()