雷鸟cat1Service.py去掉voicecall和audio相关代码

diff --git a/cat1modem/src/LeiNiao/cat1Service.py b/cat1modem/src/LeiNiao/cat1Service.py
index 3f2f47a..440907d 100644 (file)
--- a/cat1modem/src/LeiNiao/cat1Service.py
+++ b/cat1modem/src/LeiNiao/cat1Service.py
@@ -28,14 +28,14 @@ import usocket
 import log
 import utime
 import slip
-import audio
+# import audio
 from machine import UART
 import _thread
 from queue import Queue
 from machine import Pin
 from machine import ExtInt
 import dataCall
-import voiceCall
+# import voiceCall
 import net
 import uping
 import example
@@ -91,8 +91,8 @@ CURRENT_APP_TYPE="pysrv"
 
 
 #设置通话音量
-voiceCall.setVolume(10)
-clog.info("voice call volume {}".format(voiceCall.getVolume()))
+# voiceCall.setVolume(10)
+# clog.info("voice call volume {}".format(voiceCall.getVolume()))
 lpm_fd = pm.create_wakelock("system_lock", len("system_lock"))
 # pm.autosleep(1)
 pm.wakelock_lock(lpm_fd)
@@ -133,7 +133,7 @@ def get_version_from_json_config(app_type):
 set_version_to_json_config(CURRENT_APP_TYPE,PROJECT_VERSION)
     
 
-audio.set_qdai_cfg(1,0,0,1,0,0,1,1)
+# audio.set_qdai_cfg(1,0,0,1,0,0,1,1)
 
 # GPIO21 - 引脚 86   KP_MKOUT1   唤醒主控
 # GPIO22 - 引脚 87   KP_MKIN     被主控唤醒
@@ -274,7 +274,7 @@ class Cat1Service:
     def bootup_msg_to_bt(self):
         modem_ver = modem.getDevFwVersion() 
         self.reply_cmd('0F',"BOOTUP@pyVer:{}@modemVer:{}".format(PROJECT_VERSION,modem_ver))
-        self.reply_cmd('0F',"VOLUME:{}".format(voiceCall.getVolume()))
+        # self.reply_cmd('0F',"VOLUME:{}".format(voiceCall.getVolume()))
         self.reply_cmd('0F',"PRODUCT:LEINIAO")
 
     def btmcu_cmd_handler(self,cmd,parm):
@@ -294,9 +294,10 @@ class Cat1Service:
         elif cmd == "01":
             # UDP_CMD_DIAL_NUMB
             if eventMesh.publish("get_volte_switch") == 1: #只有BLE开了VOLTE才允许打电话
-                ret = voiceCall.callStart(str(parm))
+                # ret = voiceCall.callStart(str(parm))
                 # if ret != 0:
                 #     ret = voiceCall.callStart(str(parm))
+                ret = 0
                 clog.info("ret={} {} {}".format(ret,cmd,parm))
                 if ret != 0:
                     self.reply_cmd('0F',"callcmd_fail")
@@ -308,9 +309,10 @@ class Cat1Service:
         elif cmd == "02":
             clog.info(cmd)
             # UDP_CMD_HUNGUP
-            ret = voiceCall.callEnd()
-            if ret != 0:
-                ret = voiceCall.callEnd()
+            # ret = voiceCall.callEnd()
+            ret = 0
+            # if ret != 0:
+                # ret = voiceCall.callEnd()
             if ret != 0:
                 self.reply_cmd('0F',"callend_fail")
             else:
@@ -318,9 +320,10 @@ class Cat1Service:
         elif cmd == "03":
             clog.info(cmd)
             # UDP_CMD_ANSWER
-            ret = voiceCall.callAnswer()
-            if ret != 0:
-                ret = voiceCall.callAnswer()
+            # ret = voiceCall.callAnswer()
+            ret = 0
+            # if ret != 0:
+                # ret = voiceCall.callAnswer()
             if ret != 0:
                 self.reply_cmd('0F',"callanswer_fail")
             else:
@@ -397,7 +400,8 @@ class Cat1Service:
         elif cmd == "18":
             eventMesh.publish("set_dmp_cm_address",str(parm))
         elif cmd == "19": #DTMF功能
-            voiceCall.startDtmf(str(parm),100)  #100ms 持续时间 100-1000
+            # voiceCall.startDtmf(str(parm),100)  #100ms 持续时间 100-1000
+            pass
         elif cmd == "1A":
             eventMesh.publish("set_volte_switch",int(parm))
         elif cmd == "1B":
@@ -1041,7 +1045,7 @@ def voice_callback(args):
     if args[0] == 10:
         if eventMesh.publish("get_volte_switch") == 0: #关闭VOLTE功能
             clog.info('voicecall auto end:')
-            voiceCall.callEnd()
+            # voiceCall.callEnd()
         else:     
             # gpioWakeBT.write(1)
             cat1service.notifyIncomingcall(args[6])
@@ -1066,7 +1070,7 @@ def voice_callback(args):
         clog.info('voice_callback , args[0]: \n'.format(args[6]))
 
 #电话消息反馈
-voiceCall.setCallback(voice_callback)
+# voiceCall.setCallback(voice_callback)
 
 
 def checknet_cb(arg):