门口机升级到1.2.8

android_door/src/main/h10_3128/java/com/wdkl/app/ncs/callingdoor/fragment/SipCallFragment.kt

@@ -88,14 +88,14 @@ class SipCallFragment: BaseCallFragment() {
                 outGoing = true
                 startOutgoing()
                 Constant.CALL_STATE = Constant.CALL_OUTGOING
-                RingPlayHelper.playRingTone(baseActivity, R.raw.ring_back2, true)
+                RingPlayHelper.playRingTone(baseActivity, R.raw.ring_back2, true, 60000)
             }
 
             1 -> {
                 //来电
                 outGoing = false
                 showIncomingCall()
-                RingPlayHelper.playRingTone(baseActivity, R.raw.ring_tone, true)
+                RingPlayHelper.playRingTone(baseActivity, R.raw.ring_tone, true, 60000)
             }
 
             2 -> {
@@ -103,7 +103,7 @@ class SipCallFragment: BaseCallFragment() {
                 outGoing = true
                 startOutgoing()
                 Constant.CALL_STATE = Constant.CALL_OUTGOING
-                RingPlayHelper.playRingTone(baseActivity, R.raw.ring_back2, true)
+                RingPlayHelper.playRingTone(baseActivity, R.raw.ring_back2, true, 60000)
             }
         }
     }

android_door/src/main/h10_3128/java/com/wdkl/app/ncs/callingdoor/fragment/SkyCallFragment.kt

@@ -111,7 +111,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()
@@ -122,7 +122,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()) {
@@ -142,7 +142,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()

build.gradle

@@ -48,12 +48,12 @@ buildscript {
 
     if (app_device_type == "mk_h10_z_3128_1") {
         //rk3128 10寸门口机
-        ext.app_version_code = 56
-        ext.app_version = "1.2.7"
+        ext.app_version_code = 57
+        ext.app_version = "1.2.8"
     } else if (app_device_type == "mk_h10_a133_1") {
         //志合a133 10寸门口机
-        ext.app_version_code = 56
-        ext.app_version = "1.2.7"
+        ext.app_version_code = 57
+        ext.app_version = "1.2.8"
     } else if (app_device_type == "mk_h10_z_3128_1_chile") {
         //rk3128 10寸门口机-智利
         ext.app_version_code = 50

common/src/main/code/com/wdkl/ncs/android/lib/utils/RingPlayHelper.java

@@ -31,6 +31,7 @@ public class RingPlayHelper {
     }
 
     public static void stopRingTone() {
+        handler.removeCallbacksAndMessages(null);
         if (ringPlayer != null) {
             ringPlayer.stop();
         }