瀏覽代碼

#接通探视之后才显示左侧探视床位列表

weizhengliang 3 年之前
父節點
當前提交
c9ae405f39

+ 2 - 2
nursehome/src/main/java/com/wdkl/ncs/android/component/nursehome/fragment/FramePartFragment.kt

@@ -192,7 +192,7 @@ class FramePartFragment: BaseFragment<FramePartPresenter, FragmentFramePartBindi
             //语音呼叫
             if (frame.customerName != null && frame.bedDeviceId != null) {
                 //通话之前先判断webrtc socket是否连接上,否则不能建立通话
-                if (SocketManager.getInstance().socketOpen()) {
+                if (SocketManager.getInstance().socketOpen() || Constants.tcp_connected) {
                     VoiceUtil.startAudioCall(Integer.parseInt(Constants.ids), frame.bedDeviceId)
                     Constants.call_type = 0
                 } else {
@@ -212,7 +212,7 @@ class FramePartFragment: BaseFragment<FramePartPresenter, FragmentFramePartBindi
             //视频呼叫
             if (frame.customerName != null) {
                 //通话之前先判断webrtc socket是否连接上,否则不能建立通话
-                if (SocketManager.getInstance().socketOpen()) {
+                if (SocketManager.getInstance().socketOpen() || Constants.tcp_connected) {
                     VoiceUtil.startAudioCall(Integer.parseInt(Constants.ids), frame.bedDeviceId)
                     Constants.call_type = 1
                 } else {

+ 5 - 1
nursehome/src/main/java/com/wdkl/ncs/android/component/nursehome/fragment/SkyCallFragment.kt

@@ -54,7 +54,7 @@ class SkyCallFragment: BaseCallFragment(), CallSession.CallSessionCallback {
             bedItemAdapter = BedItemAdapter(baseActivity, CommonUtils.getInBedVOS())
             visit_list_view.setAdapter(bedItemAdapter)
             visit_list_view.setLayoutManager(VirtualLayoutManager(baseActivity))
-            visit_list_view.setVisibility(View.VISIBLE)
+            visit_list_view.setVisibility(View.GONE)
             fullscreen_video_frame.setOnClickListener(View.OnClickListener {
                 if (visit_list_view.getVisibility() == View.GONE) {
                     visit_list_view.setVisibility(View.VISIBLE)
@@ -222,6 +222,10 @@ class SkyCallFragment: BaseCallFragment(), CallSession.CallSessionCallback {
             fullscreen_video_frame.visibility = View.VISIBLE
             pip_video_frame.visibility = View.VISIBLE
             ll_voice_call.visibility = View.GONE
+
+            if (visiting) {
+                visit_list_view.setVisibility(View.VISIBLE)
+            }
         }
 
         sky_voice_call_calling_text.text = "通话中..."