D15提交

diff --git a/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/Makefile b/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/Makefile
index 1d26bac..4b64252 100644 (file)
--- a/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/Makefile
+++ b/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/Makefile
@@ -967,6 +967,7 @@ frozen_mpy_list =   $(BUILD)/_boot.mpy \
                                        $(BUILD)/btn_device_ec800m_d15.mpy \
                                        $(BUILD)/led_d15.mpy \
                                        $(BUILD)/mgr_d15.mpy \
+                                       $(BUILD)/motor.mpy \
 
 endif
 

diff --git a/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/btn_device_ec800m_d15.py b/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/btn_device_ec800m_d15.py
index 0c0821a..7da0e6c 100644 (file)
--- a/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/btn_device_ec800m_d15.py
+++ b/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/btn_device_ec800m_d15.py
@@ -572,7 +572,8 @@ if EventMesh.model == "D15" :
                 # EventMesh.publish("set_led_time_arg",[1000,33000,1,led_mode.FLASH_LIGHT_GREEN,led_mode.DEFAULT_LONG_LIGHT_MODE,led_mode.OTHER_MEASURE_MODE])#设置参数
                 str_data = 'mp3files={}.mp3'.format(audio_buf.index("audio_find_haixiu"))
                 EventMesh.publish("play_audio_file",[str_data,1])#获取播放音频文件('U:/static/audio.bin',1,1,str_data)
-        
+                EventMesh.publish("set_motor_time",[1,2,8*3,8,4])#设置马达参数
+
         def stop_find_watch(self, event, msg): 
             if self.find_state == 1:
                 self.find_state = 0
@@ -580,6 +581,7 @@ if EventMesh.model == "D15" :
                 # EventMesh.publish("stop_led_timer")#设置参数
                 self.aud.stopPlayStream()  #播放声音 
                 self.alarm_timer1.stop()
+                EventMesh.publish("close_motor_infor")#关闭马达和定时器
 
         def FIND_timer_cb(self, data):
             flag = EventMesh.publish("get_call_state")#在通话或者电话拨进 或者拨出不允许寻找设备
@@ -590,6 +592,7 @@ if EventMesh.model == "D15" :
                     # EventMesh.debug_log("self.FIND_timer_count:{}".format(self.FIND_timer_count))
                     str_data = 'mp3files={}.mp3'.format(audio_buf.index("audio_find_haixiu"))
                     EventMesh.publish("play_audio_file",[str_data,1])#获取播放音频文件('U:/static/audio.bin',1,1,str_data)
+                    #EventMesh.publish("set_motor_time",[1,2,8*2,8,4])#设置马达参数
                     self.FIND_timer_count += 1
                     if self.FIND_timer_count > 10: #120秒30s
                         EventMesh.publish("STOP_FIND_WATCH")
@@ -669,6 +672,7 @@ if EventMesh.model == "D15" :
             if self.call_state == 0 and self.fall_flag == 0 and wechat_state == 0 and self.fall_flag == 0 and video_state == 0: 
                 str_data = 'mp3files={}.mp3'.format(audio_buf.index("R_WECHAT_RECV"))
                 EventMesh.publish("play_audio_file",[str_data,1])#获取播放音频文件
+                EventMesh.publish("set_motor_time",[1,2,10*3,10,5])#设置马达参数
 
 
 
@@ -796,6 +800,7 @@ if EventMesh.model == "D15" :
                 str_data = 'mp3files={}.mp3'.format(audio_buf.index("R_VIDEO_CALL_IN"))
                 EventMesh.publish("play_audio_file",[str_data,0])#获取播放音频文件
             # EventMesh.publish("play_audio_file",str_data)#获取播放音频文件('U:/static/audio.bin',1,1,str_data)
+            EventMesh.publish("set_motor_time",[1,2,10*3,10,5])#设置马达参数
         def video_in_timer_cb(self,data):
 
             open_power = EventMesh.publish("get_power_on_state")#获取开机标识
@@ -972,7 +977,8 @@ if EventMesh.model == "D15" :
             str_data = 'mp3files={}.mp3'.format(audio_buf.index("R_CALL_mp3"))
             EventMesh.publish("play_audio_file",[str_data,0])#获取播放音频文件
             # EventMesh.publish("play_audio_file",str_data)#获取播放音频文件('U:/static/audio.bin',1,1,str_data)
-        
+            EventMesh.publish("set_motor_time",[1,2,10*3,10,5])#设置马达参数
+
         def call_timer_cb(self,data):
             open_power = EventMesh.publish("get_power_on_state")#获取开机标识
             if open_power != None:
@@ -1484,6 +1490,7 @@ if EventMesh.model == "D15" :
                 # EventMesh.publish("play_audio_file",[str_data,0])#获取播放音频文件('U:/static/audio.bin',1,1,str_data)
                 self.pwk_timer1.start(1000,0,self.power_on_audio_cb)
                 
+                print("open_power_on!!!!!!!\n\n\n\n")
             elif msg == 2:
                 flag = EventMesh.publish("get_call_state") 
                 if flag != 0:#电话呼叫中
@@ -1593,6 +1600,7 @@ if EventMesh.model == "D15" :
             self.power_on_flag = 1
             # EventMesh.debug_log("power_on_audio_cb")
             power_state = EventMesh.publish("get_storage_config","power_state")
+            #EventMesh.publish("set_motor_time",[1,2,10*2,10,5])#设置马达参数
             if power_state == None:
                 power_state = 0
             # print("power_state",power_state)
@@ -2656,7 +2664,7 @@ if EventMesh.model == "D15" :
                     video_state = EventMesh.publish("get_video_state")
                     if video_state != 0:#视频通话打入或者接听后允许挂断视频通话
                         if video_state != 6:#6是app打手表需要接通
-                            EventMesh.publish("video_dev_reject_cb",2)#挂断视频通话
+                            # EventMesh.publish("video_dev_reject_cb",2)#挂断视频通话
                             return
             self.WeChatKey_status = self.wechatKey.read_level()
             self.GPIO26_status = self.pwk_key26.read_level()
@@ -2671,13 +2679,14 @@ if EventMesh.model == "D15" :
                                 if video_state == 6:#6 是app拨打手表 1 是手表打app 3 是正在视频通话中 0 关闭只有第一次视频通话打入才允许接听 接通之后不允许接听了
                                     EventMesh.publish("video_answer_cb")
                                 else:
-                                    EventMesh.publish("video_dev_reject_cb",2)#挂断视频通话
-                                    self.Keycall1_press_count=0
-                                    self.wechatKey_timer.stop()
-                                    self.pwkey_timer.stop()
-                                    self.sosKey_timer.stop()
-                                    self.Keycall2_timer.stop()
-                                    self.Keycall1_timer.stop()
+                                    pass
+                                    # EventMesh.publish("video_dev_reject_cb",2)#挂断视频通话
+                                    # self.Keycall1_press_count=0
+                                    # self.wechatKey_timer.stop()
+                                    # self.pwkey_timer.stop()
+                                    # self.sosKey_timer.stop()
+                                    # self.Keycall2_timer.stop()
+                                    # self.Keycall1_timer.stop()
                             
                                 return
                     EventMesh.publish("close_wechat_btn_timer")
@@ -2849,7 +2858,7 @@ if EventMesh.model == "D15" :
                     video_state = EventMesh.publish("get_video_state")
                     if video_state != 0:#视频通话打入或者接听后允许挂断视频通话
                         if video_state != 6:#6是app打手表需要接通
-                            EventMesh.publish("video_dev_reject_cb",2)#挂断视频通话
+                            # EventMesh.publish("video_dev_reject_cb",2)#挂断视频通话
                             return
             self.WeChatKey_status = self.wechatKey.read_level()
             self.GPIO26_status = self.pwk_key26.read_level()
@@ -3027,7 +3036,8 @@ if EventMesh.model == "D15" :
                             print("pwk_extint_cb")
                             # EventMesh.publish("video_answer_cb")
                         else:
-                            EventMesh.publish("video_dev_reject_cb",2)#挂断视频通话
+                            pass
+                            # EventMesh.publish("video_dev_reject_cb",2)#挂断视频通话
                         return
                     
             self.WeChatKey_status = self.wechatKey.read_level()
@@ -3485,11 +3495,6 @@ if EventMesh.model == "D15" :
                     pass
                 elif self.sosKey_press_count == 3:#视频通话
                     self.sosKey_press_count = 0
-                    battery = EventMesh.publish("screen_get_battery")
-                    if battery != None:
-                        if battery[0] != "1":#在充电得时候
-                            return
-                            pass
                     call_state = EventMesh.publish("get_call_state")
                     battery = EventMesh.publish("screen_get_battery")
                     if call_state == None:
@@ -3545,7 +3550,7 @@ if EventMesh.model == "D15" :
                     video_state = EventMesh.publish("get_video_state")
                     if video_state != 0:#视频通话打入或者接听后允许挂断视频通话
                         if video_state != 6:#6是app打手表需要接通
-                            EventMesh.publish("video_dev_reject_cb",2)#挂断视频通话
+                            # EventMesh.publish("video_dev_reject_cb",2)#挂断视频通话
                             return
                     
             self.sosKey_status = self.sosKey.read_level()
@@ -3559,13 +3564,13 @@ if EventMesh.model == "D15" :
                     video_state = EventMesh.publish("get_video_state")
                     if video_state != 0:#视频通话打入或者接听后允许挂断视频通话
                         if video_state != 6:#6是app打手表需要接通
-                            EventMesh.publish("video_dev_reject_cb",2)#挂断视频通话
-                            self.wechatKey_press_count = 0
-                            self.wechatKey_timer.stop()
-                            self.pwkey_timer.stop()
-                            self.sosKey_timer.stop()
-                            self.Keycall2_timer.stop()
-                            self.Keycall1_timer.stop()
+                            # EventMesh.publish("video_dev_reject_cb",2)#挂断视频通话
+                            # self.wechatKey_press_count = 0
+                            # self.wechatKey_timer.stop()
+                            # self.pwkey_timer.stop()
+                            # self.sosKey_timer.stop()
+                            # self.Keycall2_timer.stop()
+                            # self.Keycall1_timer.stop()
                             return
                     if self.wechatKey_press == 0:
                         self.wechatKey_timer.stop()

diff --git a/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/main_init.py b/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/main_init.py
index 75f566c..8c4f115 100644 (file)
--- a/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/main_init.py
+++ b/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/main_init.py
@@ -109,6 +109,10 @@ def main_init():
 
     app = watchApp()
     app.set_ui(ui)
+    if EventMesh.model == "D15":
+        from motor import motorEventManager
+        app.append_manager(motorEventManager())
+
     app.append_manager(mgr.getStorageDataManager())
     app.append_manager(mgr.AlarmVolumeLevelManager()) \
         .append_manager(mgr.MsgVolumeLevelManager()) \
@@ -161,7 +165,7 @@ def main_init():
     app.append_manager(mgr.firwDownloadManager())
     if EventMesh.model == "D15":
         app.append_manager(mgr.vedioInforManager())
-
+        
     EventMesh.debug_log("init21:{}".format(utime.localtime()))    
     
     EventMesh.debug_log("init11:{}".format(utime.localtime()))    
@@ -235,6 +239,7 @@ def main_init():
     app.append_manager(sm)
     EventMesh.debug_log("init11.0:{}".format(utime.localtime()))   
     app.start()
+    
     sms_data = sms.getSaveLoc()
     if(sms_data != -1):
         sms_lacv = sms_data[0][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 8fb1e35..11cada6 100644 (file)
--- 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
@@ -707,10 +707,11 @@ if EventMesh.model == "D15":
                 b = tmp[0].isdigit()#判断是否不是数字开头 暂时不用 因为截取了+判断不了
                 if b == True and size_len > 11:
                     tmp = tmp[size_len-11:]
-                if EventMesh.publish("get_call_state") == 2:#打通了才可设置状态 防止挂断太及时，又拨出去了
-                    EventMesh.publish("set_call_state",3) 
-                else:
-                    EventMesh.publish("set_call_state",0) 
+                EventMesh.publish("set_call_state",3) 
+                # if EventMesh.publish("get_call_state") == 2:#打通了才可设置状态 防止挂断太及时，又拨出去了
+                #     EventMesh.publish("set_call_state",3) 
+                # else:
+                #     EventMesh.publish("set_call_state",0) 
                 # EventMesh.publish("load_screen", {"screen": "on_call","meta":str(tmp)})
 
         elif args[0] == 12:
@@ -730,6 +731,8 @@ if EventMesh.model == "D15":
                 if flag == 2:
                     EventMesh.publish("stop_led_timer")#设置参数
                     EventMesh.publish("close_timer_all")#
+                    EventMesh.publish("close_motor_infor")#关闭马达和定时器
+                    
                 EventMesh.publish("set_sos_state_out")
                 EventMesh.publish("set_call_state",0) 
                 EventMesh.debug_log('voicecall disconnect end')
@@ -4610,7 +4613,7 @@ if EventMesh.model == "D15":
             
             PORT = ''
             if new_com != None:
-                if len(new_com) != 0:
+                if len(str(new_com)) != 0:
                     PORT = new_com
                 else:
                     PORT = server_data[1]

diff --git a/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/ui.py b/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/ui.py
index 633d835..02482c5 100644 (file)
--- a/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/ui.py
+++ b/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/ui.py
@@ -55,6 +55,14 @@ def msg_cb(args):
         if detail.find("ts#") != -1:
             EventMesh.publish("send_devinfo_event", tmp[0])#删除短信
             pass
+        if detail.find("SETWHITEPHB:1") != -1:
+            EventMesh.publish("set_storage_config",["WLKEY","2"])#打开自动接听
+            sms.sendPduMsg(tmp[0], 'set ok', 'UCS2')
+            pass
+        if detail.find("SETWHITEPHB:0") != -1:
+            EventMesh.publish("set_storage_config",["WLKEY","0"])#关闭自动接听
+            sms.sendPduMsg(tmp[0], 'set ok', 'UCS2')
+            pass
         if detail.find("factory#") != -1:#恢复出厂设置
             EventMesh.publish("app_factory",tmp[0])#app恢复出厂
         

diff --git a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/protocol.py b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/protocol.py
index bb2db90..4de565d 100644 (file)
--- a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/protocol.py
+++ b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/protocol.py
@@ -23,9 +23,9 @@ import usys
 
 
 def server_init(server_type = None):
-    #服务器选择1，防走丢，2大锤,3三基同创,4童信，5云米,6荣为
+    #服务器选择1，防走丢，2大锤,3三基同创,4童信，5云米,6荣为，8：K5-GT
     if server_type == None:
-        server_type = 2
+        server_type = 8
     #print("server_init:server_type:{}".format(server_type))
     d_server_addr = "api.xcloudtech.com"
     d_server_port = 9000
@@ -38,36 +38,40 @@ def server_init(server_type = None):
         # md5_key = "bZld0ALsZTt15tKEZhOlLPgbsO75BLTP"
         # PID = "SZKW"
     elif server_type == 2:
-        
         d_server_addr = "iot.socket.thisiot.com"
         d_server_port = 9999
-        d_md5_key = "SZYhyGhroQ3xFKFWZq1g"
-        d_PID = "oxLwDqcwJCtiPSRu"
+        d_md5_key = "dLXQn4XGssrmLqNj51SE"
+        d_PID = "r2HdlLpBkSzvKUUN"
 
     elif server_type == 3:
         
-        d_server_addr = "8.134.110.49" 
+        d_server_addr = "8.134.110.49"
         d_server_port = 30346
         d_md5_key = "3JyCjsw4ryXKzjzudayY"
         d_PID = "qAELPTKmFanR4RHe"
-    elif server_type == 3:
+    elif server_type == 4:
         d_server_addr = "tcp.zhihuixuexiao.com"
         d_server_port = 2346
         d_md5_key = ""
         d_PID = "3G"
-    elif  server_type == 4:
+    elif  server_type == 5:
          d_server_addr = "tcp.tx.kidxin.com"
          d_server_port = 20500
-    elif server_type == 5:
+    elif server_type == 6:
         d_server_addr = "device.miwitracker.com"
         d_server_port = 8505
         d_md5_key = ""
         d_PID = "3G"
-    elif server_type == 6:
+    elif server_type == 7:
         d_server_addr = "120.26.104.21"
         d_server_port = 9968
         d_md5_key = "bZld0ALsZTt15tKEZhOlLPgbsO75BLTP"
         d_PID = "SZKW"
+    elif server_type == 8:
+        d_server_addr = "120.27.146.65"
+        d_server_port = 8852
+        d_md5_key = "bZld0ALsZTt15tKEZhOlLPgbsO75BLTP"
+        d_PID = "SZKW"
     return [d_server_addr,d_server_port,d_md5_key,d_PID]
 from queue import Queue
 def unicode_to_utf8(src):