debug

src/core/callcenter/acd.py

@@ -37,8 +37,7 @@ class AcdService:
         call_info.answer_flag = AnswerFlag.TRANSFER_TO_AGENT.code
         self.cache.add_call_info(call_info)
         # 1. hold住并且播放等待音
-        if self.call_service.hold(call_info, device_id):
-            self.client.bot_agent.hangup(user_part)
+        self.call_service.hold(call_info, device_id)
         self.logger.info('debugger::transfer_to_agent, 1111111 ')
         # 获得空闲坐席
         agent_number = self.agent_service.assign(AgentActionRequest(saas_id=saasId, service_id=service_id))

src/core/callcenter/call.py

@@ -75,7 +75,6 @@ class CallService:
         self.client.bridge_break(call_info.call_id, custom_device_id)
         self.cache.set_need_play_hold_music(call_info.call_id)
         self.logger.info('debugger::hold success custom_device_id=%s'%custom_device_id)
-        return True
 
     def cancel_hold(self, call_info: CallInfo, device_id):
         self.client.bridge_call(call_info.call_id, call_info.device_list[0], call_info.device_list[1])

src/core/callcenter/esl/handler/channel_park_handler.py

@@ -48,7 +48,7 @@ class ChannelParkHandler(EslEventHandler):
         self.logger.info('debugger, ChannelParkHandler, hold=%s, device_info=%s' % (hold, device_info))
         if hold and "false" != hold and device_info.device_type == DeviceType.CUSTOMER.code:
             self.inbound_client.hold_play(device_id, HOLD_MUSIC_PATH)
-            self.cache.del_need_play_hold_music(call_id)
+            # self.cache.del_need_play_hold_music(call_id)
             # self.inbound_client.set_var(device_id, SIP_HEADER + sipHeaderHoldMusic, "false")
 
     def process_fxo_calling(self, event):

src/core/callcenter/views.py

@@ -13,7 +13,7 @@ from src.core.callcenter.api import AgentCallRequest, AgentActionRequest, Hangup
 from src.core.voip.bot import BotAgent
 from .acd import AcdService
 
-agent = BotAgent(app.logger)
+agent = BotAgent(app)
 inbound_client = InboundClient(agent,app)
 outbound_client = OutboundClient(agent,app)
 call_service = CallService(inbound_client, app.logger)

src/core/voip/bot.py

@@ -11,6 +11,7 @@ import sys
 import pjsua2 as pj
 from enum import Enum
 
+from src.core.callcenter.cache import Cache
 from src.core.datasource import SIP_SERVER, SERVE_HOST
 from src.core.voip.constant import *
 
@@ -479,8 +480,8 @@ class ToTextBotAgent:
 @singleton_keys
 class BotAgent:
 
-    def __init__(self, logger, user_part_range=range(1001, 1011), host=SIP_SERVER, port="5060", password="slibra@#123456"):
-        self.logger = logger
+    def __init__(self, app, user_part_range=range(1001, 1011), host=SIP_SERVER, port="5060", password="slibra@#123456"):
+        self.logger = app.logger
         self.user_part_range, self.host, self.port, self.password = user_part_range, host, port, password
         self.user_part_pool = queue.Queue(maxsize=len(user_part_range))
         self.accounts = {}
@@ -488,6 +489,7 @@ class BotAgent:
         self.ep = pj.Endpoint()
         self.is_stopping = False
         self.acd_service = None
+        self.cache = Cache(app)
         threading.Thread(target=self.create_pjsua2, daemon=True).start()
 
     def create_pjsua2(self):
@@ -548,10 +550,16 @@ class BotAgent:
 
     def transfer(self, user_part, call_id, device_id, service_id='00000000000000000'):
         if self.acd_service:
-            threading.Thread(target=self.acd_service.transfer_to_agent, args=(call_id, device_id, service_id, user_part)).start()
-            # self.acd_service.transfer_to_agent(call_id, device_id, service_id, user_part)
+            self.acd_service.transfer_to_agent(call_id, device_id, service_id, user_part)
         # sip_headers = {'P-LIBRA-HangUpReason': 'transferToAgent', 'P-LIBRA-ServiceId': service_id}
-        # self.hangup(user_part)
+        try_count = 10
+        while try_count >0:
+            if self.cache.get_need_play_hold_music(call_id):
+                self.hangup(user_part)
+                self.cache.del_need_play_hold_music(call_id)
+                break
+            time.sleep(1)
+
 
     def hangup(self, user_part, reason="NORMAL_CLEARING", **sip_headers):
         call_op_param = pj.CallOpParam(True)