From: dxy15521469561 <1731678236@qq.com>
Date: Mon, 4 Mar 2024 07:07:03 +0000 (+0800)
Subject: D15:sos拨打三次
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=1067ac61f0fe20cd3fbbb0ed7a653f4df68734c4;p=mirrors%2FASR1603_G5.git

D15:sos拨打三次
---

diff --git a/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/mgr.py b/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/mgr.py
index 18c1890f..d71139fa 100644
--- a/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/mgr.py
+++ b/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/mgr.py
@@ -584,11 +584,11 @@ if EventMesh.model == "D10":
                         num_len = 0
 
                         if len(number) == 1:
-                            num_len = len(number)
+                            num_len = len(number)+1#三次
                         elif len(number) == 2:
-                            num_len = len(number)+1
+                            num_len = len(number)+1+2 #1+2+1+2
                         elif len(number) == 3:
-                            num_len = len(number)+2  
+                            num_len = len(number)+5 #1+3+5
                         # EventMesh.debug_log("number:{} number_len :{} num:{} num_len:{}".format(number,len(number),num,num_len))
                         if num > num_len :
                             if len(number) == 1:
@@ -617,24 +617,24 @@ if EventMesh.model == "D10":
                                     EventMesh.publish("set_callnumer_cb",number[0])
                                     EventMesh.debug_log("phone 1")
                             elif len(number) == 2:
-                                if num == 1 or num == 3:
+                                if num == 1 or num == 3 or num == 5: #1 2 3 4 5 
                                     if len(number[1]) != 0:
                                         EventMesh.debug_log("phone 2")
                                         EventMesh.publish("set_callnumer_cb",number[1])
-                                elif num == 2:
+                                elif num == 2 or num == 4:
                                     if len(number[0]) != 0:
                                         EventMesh.debug_log("phone 3")
                                         EventMesh.publish("set_callnumer_cb",number[0])
                             elif len(number) == 3:
-                                if num == 1 or num == 4:
+                                if num == 1 or num == 4 or num == 7:
                                     if len(number[1]) != 0:
                                         EventMesh.publish("set_callnumer_cb",number[1])
                                         EventMesh.debug_log("phone 4")
-                                elif num == 2 or num == 5:
+                                elif num == 2 or num == 5 or num == 8:
                                     if len(number[2]) != 0:
                                         EventMesh.debug_log("phone 5")
                                         EventMesh.publish("set_callnumer_cb",number[2])
-                                elif num == 3:
+                                elif num == 3 or num == 6 :
                                     if len(number[0]) != 0:
                                         EventMesh.debug_log("phone 6")
                                         EventMesh.publish("set_callnumer_cb",number[0])   
diff --git a/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/mgr_d15.py b/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/mgr_d15.py
index 8fb1e35f..96a74137 100644
--- a/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/mgr_d15.py
+++ b/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/mgr_d15.py
@@ -572,7 +572,6 @@ if EventMesh.model == "D15":
             sos_flag = EventMesh.publish("get_sos_flag")
             EventMesh.debug_log('voicecall sos_flag',sos_flag)
             if sos_flag == 0 :
-                EventMesh.publish("set_sos_state_out")
                 EventMesh.publish("set_sos_num",0)
             else:
                 num = EventMesh.publish("get_sos_num")
@@ -585,11 +584,11 @@ if EventMesh.model == "D15":
                         num_len = 0
 
                         if len(number) == 1:
-                            num_len = len(number)
+                            num_len = len(number)+1#三次
                         elif len(number) == 2:
-                            num_len = len(number)+1
+                            num_len = len(number)+1+2 #1+2+1+2
                         elif len(number) == 3:
-                            num_len = len(number)+2  
+                            num_len = len(number)+5 #1+3+5
                         # EventMesh.debug_log("number:{} number_len :{} num:{} num_len:{}".format(number,len(number),num,num_len))
                         if num > num_len :
                             if len(number) == 1:
@@ -618,27 +617,28 @@ if EventMesh.model == "D15":
                                     EventMesh.publish("set_callnumer_cb",number[0])
                                     EventMesh.debug_log("phone 1")
                             elif len(number) == 2:
-                                if num == 1 or num == 3:
+                                if num == 1 or num == 3 or num == 5: #1 2 3 4 5 
                                     if len(number[1]) != 0:
                                         EventMesh.debug_log("phone 2")
                                         EventMesh.publish("set_callnumer_cb",number[1])
-                                elif num == 2:
+                                elif num == 2 or num == 4:
                                     if len(number[0]) != 0:
                                         EventMesh.debug_log("phone 3")
                                         EventMesh.publish("set_callnumer_cb",number[0])
                             elif len(number) == 3:
-                                if num == 1 or num == 4:
+                                if num == 1 or num == 4 or num == 7:
                                     if len(number[1]) != 0:
                                         EventMesh.publish("set_callnumer_cb",number[1])
                                         EventMesh.debug_log("phone 4")
-                                elif num == 2 or num == 5:
+                                elif num == 2 or num == 5 or num == 8:
                                     if len(number[2]) != 0:
                                         EventMesh.debug_log("phone 5")
                                         EventMesh.publish("set_callnumer_cb",number[2])
-                                elif num == 3:
+                                elif num == 3 or num == 6 :
                                     if len(number[0]) != 0:
                                         EventMesh.debug_log("phone 6")
                                         EventMesh.publish("set_callnumer_cb",number[0])   
+    
     WL_timer = osTimer()   
     def WL_timer_cb(*args):   
         get_call = EventMesh.publish("get_call_state")