From: dxy15521469561 <1731678236@qq.com> Date: Fri, 18 Aug 2023 09:41:40 +0000 (+0800) Subject: k5:协议增加 X-Git-Url: http://git.snicker.com.cn/css/static/script.js?a=commitdiff_plain;h=890c95210c63a20a4b82a8ca31ce8262fe12c608;p=mirrors%2FASR1603_G5.git k5:协议增加 1:免打扰 2:上课禁用 --- diff --git a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/constants.py b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/constants.py index c654efc5..329e6984 100644 --- a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/constants.py +++ b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/constants.py @@ -78,6 +78,15 @@ class PROTOCOL: TIME_SEND = "Time_SEND" TIME_RECV = "Time_RECV" + WLKEY_SEND = "WLKEY_SEND" + WLKEY_RECV = "WLKEY_RECV" + + SILENCETIME2_SEND = "SILENCETIME2_SEND" + SILENCETIME2_RECV = "SILENCETIME2_RECV" + + KEYBRD_SEND = "KEYBRD_SEND" + KEYBRD_RECV = "KEYBRD_RECV" + class EVENT: CHANNEL_SOCKET_SEND = "CHANNEL_SOCKET_SEND" diff --git a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/main_init.py b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/main_init.py index b08eac7e..48a16100 100644 --- a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/main_init.py +++ b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/main_init.py @@ -158,7 +158,7 @@ def main_init(): print("init6:{}".format(utime.localtime())) - from protocol import LK_ProtoCol,PING_ProtoCol,HEART_ProtoCol,OXYGEN_ProtoCol,OXYGEN_One_ProtoCol,HRSTART_ProtoCol,CENTER_ProtoCol,UPLOAD_ProtoCol,\ + from protocol import KEYBRD_ProtoCol,SILENCETIME2_ProtoCol,WLKEY_ProtoCol,LK_ProtoCol,PING_ProtoCol,HEART_ProtoCol,OXYGEN_ProtoCol,OXYGEN_One_ProtoCol,HRSTART_ProtoCol,CENTER_ProtoCol,UPLOAD_ProtoCol,\ TEMP_ProtoCol,DLT_ProtoCol,WT_ProtoCol,UD_ProtoCol,REMIND_ProtoCol, CR_ProtoCol,KA_ProtoCol,FIND_ProtoCol,POWEROFF_ProtoCol,Time_ProtoCol,\ ProtoColResolver,PHL_ProtoCol,MONITOR_ProtoCol,bootoff_ProtoCol,WDSTART_ProtoCol,LOWBAT_ProtoCol,sosHome_dial_ProtoCol,SockManager,NetManager import mgr as mgr @@ -247,6 +247,9 @@ def main_init(): pcr.add_support(LOWBAT_ProtoCol()) pcr.add_support(sosHome_dial_ProtoCol()) pcr.add_support(Time_ProtoCol()) + pcr.add_support(WLKEY_ProtoCol()) + pcr.add_support(KEYBRD_ProtoCol()) + pcr.add_support(SILENCETIME2_ProtoCol()) sm = SockManager() sm.add_support_resolver(pcr) 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 429ea102..55e1b077 100644 --- 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 @@ -1259,8 +1259,74 @@ class Time_ProtoCol(ProtoCol): #EventMesh.publish(constants.PROTOCOL.TIME_SEND) +#拒接模式来电 +class WLKEY_ProtoCol(ProtoCol): + """""" + TYPE = "WLKEY" + def send(self, event, msg): + # [XT*334588000000156*0005*WLKEY] + send_data = self.PID+"*%s*0005*WLKEY"%(self.imei) + MD5_SIGN = self.pack_MD5_head(send_data) + data = "[%s%s]"%(str(MD5_SIGN),send_data) + # print("WLKEY:data:%s"%(data)) + # print("WLKEY!!!!!!!!!!!!!") + # 通过socket发送到服务器端 + EventMesh.publish(constants.EVENT.CHANNEL_SOCKET_SEND,data) + def recv(self, event, msg): + """ + @param event: + @param msg: 接收到的下行数据 + """ + # b'[SZKW*867387060319166*000A*KEYBRD]' + # print("WLKEY!!!!!!!!!!!!!",msg) + EventMesh.publish(constants.PROTOCOL.WLKEY_SEND) + +#免打扰 +class SILENCETIME2_ProtoCol(ProtoCol): + """免打扰""" + TYPE = "SILENCETIME2" + def send(self, event, msg): + # [XT*334588000000156*0006*SILENCETIME2] + send_data = self.PID+"*%s*000C*SILENCETIME2"%(self.imei) + MD5_SIGN = self.pack_MD5_head(send_data) + data = "[%s%s]"%(str(MD5_SIGN),send_data) + # print("KEYBRD:data:%s"%(data)) + # print("SILENCETIME2!!!!!!!!!!!!!",msg) + # 通过socket发送到服务器端 + EventMesh.publish(constants.EVENT.CHANNEL_SOCKET_SEND,data) + def recv(self, event, msg): + """ + @param event: + @param msg: 接收到的下行数据 + """ + # b'[SZKW*867387060319166*000A*KEYBRD]' + # print("SILENCETIME2!!!!!!!!!!!!!",msg) + EventMesh.publish(constants.PROTOCOL.SILENCETIME2_SEND) + +#键盘开关 +class KEYBRD_ProtoCol(ProtoCol): + """免打扰""" + TYPE = "KEYBRD" + def send(self, event, msg): + # [XT*334588000000156*0006*SILENCETIME2] + send_data = self.PID+"*%s*0006*KEYBRD"%(self.imei) + MD5_SIGN = self.pack_MD5_head(send_data) + data = "[%s%s]"%(str(MD5_SIGN),send_data) + # print("KEYBRD:data:%s"%(data)) + # print("KEYBRD!!!!!!!!!!!!!",msg) + # 通过socket发送到服务器端 + EventMesh.publish(constants.EVENT.CHANNEL_SOCKET_SEND,data) + + def recv(self, event, msg): + """ + @param event: + @param msg: 接收到的下行数据 + """ + # b'[SZKW*867387060319166*000A*KEYBRD]' + # print("KEYBRD!!!!!!!!!!!!!",msg) + EventMesh.publish(constants.PROTOCOL.KEYBRD_SEND) class ProtoColResolver(object): def __init__(self): @@ -1273,7 +1339,7 @@ class ProtoColResolver(object): def handler(self, data): # 这里接收数据 - #print("handler -> {}".format(data)) + # print("handler -> {}".format(data)) # if data.startswith('Init;'): # data = data[5:] # EventMesh.publish(constants.EVENT.SET_KEY, {"value": ujson.loads(data)['KEY']}) diff --git a/2.sdk/project/K5/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/images/firmware_base_release_pack.zip b/2.sdk/project/K5/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/images/firmware_base_release_pack.zip index a57bbb7c..3299f999 100644 Binary files a/2.sdk/project/K5/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/images/firmware_base_release_pack.zip and b/2.sdk/project/K5/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/images/firmware_base_release_pack.zip differ