weizhengliang 1 год назад
Родитель
Сommit
9804dfc901

+ 2 - 2
android_door/src/main/h10_3128_chile/java/com/wdkl/app/ncs/callingdoor/activity/CallingdoorActivity.kt

@@ -1259,12 +1259,12 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
                 //分机手柄1呼叫
                 val callTcp = VoiceUtil.voiceHCall(Utils.getInBedVOS().get(0).bedDeviceId, RoleTypeEnum.NURSE.name)
                 TcpClient.getInstance().sendTcp(callTcp, false, null)
-                RingPlayHelper.playRingTone(activity, R.raw.outgoing_call, false)
+                RingPlayHelper.playRingTone(activity, R.raw.outgoing_call, false, 30000)
             } else if (handleId == 2 && beds >= 2) {
                 //分机手柄2呼叫
                 val callTcp = VoiceUtil.voiceHCall(Utils.getInBedVOS().get(1).bedDeviceId, RoleTypeEnum.NURSE.name)
                 TcpClient.getInstance().sendTcp(callTcp, false, null)
-                RingPlayHelper.playRingTone(activity, R.raw.outgoing_call, false)
+                RingPlayHelper.playRingTone(activity, R.raw.outgoing_call, false, 30000)
             } else {
                 showMessage(R.string.call_fail)
                 SoundPoolManager.getInstance().playSound(7, 1.0f, 1.0f, 0)

+ 5 - 0
android_door/src/main/h10_3128_chile/java/com/wdkl/app/ncs/callingdoor/fragment/MainFragment.kt

@@ -6,6 +6,7 @@ import androidx.recyclerview.widget.DefaultItemAnimator
 import androidx.recyclerview.widget.GridLayoutManager
 import com.enation.javashop.net.engine.model.NetState
 import com.google.gson.Gson
+import com.google.gson.JsonObject
 import com.wdkl.app.ncs.callingdoor.R
 import com.wdkl.app.ncs.callingdoor.adapter.FrameRoomAdapter
 import com.wdkl.app.ncs.callingdoor.databinding.MainViewLayoutBinding
@@ -119,6 +120,10 @@ class MainFragment: BaseFragment<MainFragmentPresenter, MainViewLayoutBinding>()
         }
     }
 
+    override fun showClerkInfo(data: JsonObject) {
+
+    }
+
     override fun onError(message: String, type: Int) {
         showMessage(message)
     }

+ 3 - 3
android_door/src/main/h10_3128_chile/java/com/wdkl/app/ncs/callingdoor/fragment/SkyCallFragment.kt

@@ -102,7 +102,7 @@ class SkyCallFragment: BaseCallFragment(), CallSessionCallback {
                 janusClient!!.callState = EnumType.CallState.Outgoing
                 room = Room(Constant.SIP_ID.toBigInteger())
                 //呼叫主机
-                RingPlayHelper.playRingTone(baseActivity, R.raw.ring_back2, true)
+                RingPlayHelper.playRingTone(baseActivity, R.raw.ring_back2, true, 60000)
                 if (!startOutgoing()) {
                     AppTool.Time.delay(3000) {
                         cancelCall()
@@ -113,7 +113,7 @@ class SkyCallFragment: BaseCallFragment(), CallSessionCallback {
             1 -> {
                 //来电
                 showIncomingCall()
-                RingPlayHelper.playRingTone(baseActivity, R.raw.ring_tone, true)
+                RingPlayHelper.playRingTone(baseActivity, R.raw.ring_tone, true, 60000)
 
                 //如果是模拟分机呼叫则需要主机来创建房间发起通话
                 if (Constant.fromDeviceType == DeviceTypeEnum.SIMULATE_BED_DEVICE.value()) {
@@ -133,7 +133,7 @@ class SkyCallFragment: BaseCallFragment(), CallSessionCallback {
                 janusClient!!.callState = EnumType.CallState.Outgoing
                 room = Room(Constant.SIP_ID.toBigInteger())
 
-                RingPlayHelper.playRingTone(baseActivity, R.raw.ring_back2, true)
+                RingPlayHelper.playRingTone(baseActivity, R.raw.ring_back2, true, 60000)
                 if (!startOutgoing()) {
                     AppTool.Time.delay(3000) {
                         cancelCall()

+ 5 - 0
android_door/src/main/h10_a133_chile/java/com/wdkl/app/ncs/callingdoor/fragment/MainFragment.kt

@@ -7,6 +7,7 @@ import androidx.recyclerview.widget.DefaultItemAnimator
 import androidx.recyclerview.widget.GridLayoutManager
 import com.enation.javashop.net.engine.model.NetState
 import com.google.gson.Gson
+import com.google.gson.JsonObject
 import com.wdkl.app.ncs.callingdoor.R
 import com.wdkl.app.ncs.callingdoor.adapter.FrameRoomAdapter
 import com.wdkl.app.ncs.callingdoor.databinding.MainViewLayoutBinding
@@ -108,6 +109,10 @@ class MainFragment: BaseFragment<MainFragmentPresenter, MainViewLayoutBinding>()
         }
     }
 
+    override fun showClerkInfo(data: JsonObject) {
+
+    }
+
     override fun onError(message: String, type: Int) {
         showMessage(message)
     }