K01更新代码
authorp15692025051 <846603105@qq.com>
Mon, 20 May 2024 02:45:47 +0000 (10:45 +0800)
committerp15692025051 <846603105@qq.com>
Mon, 20 May 2024 02:45:47 +0000 (10:45 +0800)
2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/protocol.py
2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui.py

index 132b704..3055eb4 100644 (file)
@@ -113,6 +113,7 @@ def UnicodeHexStr_To_Utf8Str(str):
             odata = 0 
         i+=1
     return result.decode('utf-8') #返回utf8的str
+
 class SockManager(Abstract):
     def __init__(self):
         self.sock = None
@@ -165,7 +166,7 @@ class SockManager(Abstract):
 
     def connect(self):
         print("connect1{}:{}".format(self.server_addr, self.server_port))
-        if EventMesh.publish("network_state") == 0: #没注网
+        if EventMesh.publish("get_sim_Status") != 1: #没sim
             return
         try:
             if(self.sock != None) :
@@ -177,8 +178,10 @@ class SockManager(Abstract):
             
             #utime.sleep_ms(500)
             #  发送数据
-            self.publish_timer.start(1000, 0, self.publish_timer_cb)
+            self.publish_timer.start(2000, 1, self.publish_timer_cb)
             
+            EventMesh.publish(constants.PROTOCOL.LK_SEND)
+            print("connect LK_SEND!!!!!!!!!!!!!!")
         except Exception as e:
             #usys.print_exception(e)
             self.run_flag = False
@@ -187,7 +190,6 @@ class SockManager(Abstract):
         print("connect2{}:{}".format(self.server_addr, self.server_port))
         self.reconnect_flag = 0
     def publish_timer_cb(self, *args):
-        EventMesh.publish(constants.PROTOCOL.LK_SEND)
         self.authen_set()
 
     def authen_set(self):
@@ -342,7 +344,7 @@ class SockManager(Abstract):
             utime.sleep(1)
 
     def send(self, topic, msg):
-        # print("TCP:send data:{}".format(msg))
+        print("TCP:send data:{}".format(msg))
         if EventMesh.publish("network_state") == 0: #没注网,则不发送
             EventMesh.publish(constants.EVENT.SET_CONNECT, 0)#标记断网
             print("dataCall not connect")
@@ -879,7 +881,7 @@ class REMIND_ProtoCol(ProtoCol):#普通闹钟
     TYPE = "REMIND"
     
     def send(self, event, msg):
-        send_data = self.PID+"*%s*0006*REMIND"%(self.imei)
+        send_data = EventMesh.publish("get_new_pid")+"*%s*0006*REMIND"%(self.imei)
         MD5_SIGN = self.pack_MD5_head(send_data)
         data = "[%s%s]"%(str(MD5_SIGN),send_data)
         #Wechat_log("POWEROFF_ProtoCol:send:%s"%(data))
@@ -1117,6 +1119,183 @@ class TEMP_ProtoCol(ProtoCol):
         # print("HRSTART_ProtoCol RECV msg:")
         #EventMesh.publish(constants.PROTOCOL.TEMP_SEND)
 
+# 设置血压上传频率
+# 平台发送[XT*YYYYYYYYYYYYYYY*LEN*bldstart,x]
+# x为上传间隔时间,单位秒,连续上传时最小时间不小于300秒,最大不超过65535.
+# 示例[XT*334588000000156*0008*bldstart,300]
+# 终端回复:
+# [XT*334588000000156*0005*bldstart]
+# x为1则代表终端单次上传。
+# x为0则代表终端上传关闭。
+class bldstart_ProtoCol(ProtoCol):
+    """app下发血压测试频率"""
+    TYPE = "bldstart"
+    def send(self, event, msg):
+        #[XT*334588000000156*len*wdstart,300]
+        send_data = EventMesh.publish("get_new_pid")+"*%s*0008*bldstart"%(self.imei)
+        MD5_SIGN = self.pack_MD5_head(send_data)
+        data = "[%s%s]"%(str(MD5_SIGN),send_data)
+        # print("temp:data:%s"%(data))
+        # 通过socket发送到服务器端
+        EventMesh.publish(constants.EVENT.CHANNEL_SOCKET_SEND,data)
+
+    def recv(self, event, msg):
+        """
+        @param event: 体温下发频率数据
+        @param msg: 接收到的下行数据
+        """
+        # print("WDSTART_ProtoCol RECV msg:")
+        print("bldstart:{}".format(msg))
+        msg = msg[1:-1]
+        msg_tmp = msg.decode('ascii')
+        msg_tmp = msg_tmp.split(',')
+        msg_tmp = msg_tmp[1]
+
+        bldstartTotal = int(msg_tmp)
+        print("bldstartTotal:{}".format(bldstartTotal))
+        if bldstartTotal == 1:#单次测量
+            get_bp_state = EventMesh.publish("get_bp_state")
+            get_hr_state = EventMesh.publish("get_hr_state")
+            get_spo2_state = EventMesh.publish("get_spo2_state")
+            print("get_bp_state:{}".format(get_bp_state))
+            if get_bp_state == 0 and get_hr_state == 0 and get_spo2_state == 0:#只要两个不在测量 单次优先级最低
+                EventMesh.publish("set_bp_state",3)#3代表单次测量
+        else:
+            if bldstartTotal > 0 and bldstartTotal <= 300:
+                bldstartTotal = 300
+            elif bldstartTotal >= 65536:
+                bldstartTotal = 65536
+            EventMesh.publish("set_bp_time", bldstartTotal)
+           
+        EventMesh.publish(constants.PROTOCOL.BLDSTART_SEND)
+
+
+# 注:回复完后开始测量血压并上传(一般测一次90秒,app端会提醒用户两分钟后刷新页面查看)
+# 上传血压数据
+# 终端发送[XT*YYYYYYYYYYYYYYY*LEN*blood,x,y]
+# x 是收缩压(高压)
+# y 是舒张压(低压)
+# 示例[XT*334588000000156*000C*blood,150,70]
+# 平台回复:
+# [XT*334588000000156*0005*blood]
+class blood_ProtoCol(ProtoCol):
+    """上传血压测试数据"""
+    TYPE = "blood"
+    def send(self, event, msg):
+        len_size = len(str(msg[0]))+len("blood,")+1+len(str(msg[1]))
+        print("blood:send:{} len:{}".format(msg,len_size))
+        #  实例:[XT*334588000000156*0009*blood,36,2]
+        # 代表终端的
+        # 平台回复:
+        # [XT*334588000000156*0004*blood]
+        send_data = EventMesh.publish("get_new_pid")+"*%s*%04X*blood"%(self.imei,len_size)
+        MD5_head_data = EventMesh.publish("get_new_pid")+"*%s*%04X*%s"%(self.imei,len_size,"blood")
+        MD5_SIGN = self.pack_MD5_head(MD5_head_data)
+        data = "[%s%s,%d,%d]"%(str(MD5_SIGN),send_data,msg[0],msg[1])
+        print("blood:data:%s"%(data))
+        # 通过socket发送到服务器端
+        EventMesh.publish(constants.EVENT.CHANNEL_SOCKET_SEND,data)
+        
+    def recv(self, event, msg):
+        """
+        @param event: 
+        @param msg: 接收到的下行数据
+        """
+        # print("HRSTART_ProtoCol RECV msg:")
+        #EventMesh.publish(constants.PROTOCOL.TEMP_SEND)
+
+
+
+class TEMP_Hour_ProtoCol(ProtoCol): #云米服务独立指令体温
+    """上传体温频率 小时单位"""
+    TYPE = "bodytemp"
+    def send(self, event, msg):
+        #[XT*334588000000156*len*wdstart,300]
+        send_data = EventMesh.publish("get_new_pid")+"*%s*0008*bodytemp"%(self.imei)
+        MD5_SIGN = self.pack_MD5_head(send_data)
+        data = "[%s%s]"%(str(MD5_SIGN),send_data)
+        # print("temp:data:%s"%(data))
+        # 通过socket发送到服务器端
+        EventMesh.publish(constants.EVENT.CHANNEL_SOCKET_SEND,data)
+
+    def recv(self, event, msg):
+        """
+        @param event: 体温下发频率数据
+        @param msg: 接收到的下行数据
+        """
+        # print("WDSTART_ProtoCol RECV msg:")
+        #TCP recv: data:b'[3G*860132060126844*000C*bodytemp,1,2]'
+        print("bodytemp:{}".format(msg))
+        msg = msg[1:-1]
+        msg_tmp = msg.decode('ascii')
+        msg_tmp = msg_tmp.split('bodytemp,')
+        msg_tmp = msg_tmp[1]
+
+        body_time = 0
+        body_on = 0
+        body_on = msg_tmp.split(',')[0]#开关
+        body_time = msg_tmp.split(',')[1]
+
+        if int(body_on) == 0:
+            body_time = 0
+        else:
+            body_time = int(body_time)*3600
+
+        tempTotal = int(body_time)
+        
+
+        EventMesh.publish("set_temp_time",tempTotal)
+        EventMesh.publish(constants.PROTOCOL.BODYTEMP_SEND)
+
+class bodytemp2_ProtoCol(ProtoCol):
+    """立即测量"""
+    TYPE = "bodytemp2"
+    def send(self, event, msg):
+        #[XT*334588000000156*len*bodytemp2,300]
+        send_data = EventMesh.publish("get_new_pid")+"*%s*0009*bodytemp2"%(self.imei)
+        MD5_SIGN = self.pack_MD5_head(send_data)
+        data = "[%s%s]"%(str(MD5_SIGN),send_data)
+        # print("temp:data:%s"%(data))
+        # 通过socket发送到服务器端
+        EventMesh.publish(constants.EVENT.CHANNEL_SOCKET_SEND,data)
+
+    def recv(self, event, msg):
+        """
+        @param event: 体温下发频率数据
+        @param msg: 接收到的下行数据
+        """
+        # print("bodytemp2_ProtoCol RECV msg:")
+        print("bodytemp2:{}".format(msg))
+        get_temp_state = EventMesh.publish("get_temp_state")
+        print("get_temp_state:{}".format(get_temp_state))
+        if get_temp_state == 0:#只要两个不在测量 单次优先级最低
+            EventMesh.publish("set_temp_state",3)#3代表单次测量
+        EventMesh.publish(constants.PROTOCOL.BODYTEMP2_SEND)
+class btemp2_ProtoCol(ProtoCol):#上传体温数据
+    """立即测量"""
+    TYPE = "btemp2"
+    def send(self, event, msg):
+        # [3G*YYYYYYYYYY*LEN*btemp2,type,temp] Type :测量模式:0:额头模式 1: 手腕模式Temp :体温,
+        len_size = len(str(msg[0]))+len("btemp2,")+1+len(str(msg[1]))
+        print("btemp2:send:{} len:{}".format(msg,len_size))
+        #  实例:[XT*334588000000156*0009*btemp2,1,36.2]
+        # 代表终端的温度为:36.2
+        # 平台回复:
+        # [XT*334588000000156*0004*btemp2]
+        send_data = EventMesh.publish("get_new_pid")+"*%s*%04X*btemp2"%(self.imei,len_size)
+        MD5_head_data = EventMesh.publish("get_new_pid")+"*%s*%04X*%s"%(self.imei,len_size,"btemp2")
+        MD5_SIGN = self.pack_MD5_head(MD5_head_data)
+        data = "[%s%s,%d,%s]"%(str(MD5_SIGN),send_data,1,msg[1])
+        # print("btemp2:data:%s"%(data))
+        # 通过socket发送到服务器端
+        EventMesh.publish(constants.EVENT.CHANNEL_SOCKET_SEND,data)
+
+    def recv(self, event, msg):
+        """
+        @param event: 体温下发频率数据
+        @param msg: 接收到的下行数据
+        """
+        # print("btemp2_ProtoCol RECV msg:")
 class WDSTART_ProtoCol(ProtoCol):
     """上传体温频率"""
     TYPE = "wdstart"
@@ -1436,13 +1615,20 @@ class Time_ProtoCol(ProtoCol):
 
         machine.RTC().datetime((next_alarm_time[0],next_alarm_time[1],next_alarm_time[2],next_alarm_time[6],next_alarm_time[3],next_alarm_time[4],next_alarm_time[5],0))
         #next_alarm_time = utime.localtime(old_Timesec)#年月日时分秒星期365中的第几天
-
+        EventMesh.publish("set_rtc_alarm")
         #EventMesh.publish(constants.PROTOCOL.TIME_SEND)  
 
 
 #拒接模式来电
 class WLKEY_ProtoCol(ProtoCol):
-    """"""
+    """
+    白名单开关
+    [XT*YYYYYYYYYYYYYYY*LEN*WLKEY,ONOFF]  ONOFF: 1:开启,0:关闭,2:30秒后自动接听。
+    实例:[XT*334588000000156*0008*WLKEY,1]
+    终端回复
+    [XT*YYYYYYYYYYYYYYY*LEN*WLKEY]
+    实例:[XT*334588000000156*0006*WLKEY]
+    """
     TYPE = "WLKEY"
     def send(self, event, msg):
         
@@ -1456,13 +1642,14 @@ class WLKEY_ProtoCol(ProtoCol):
         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)  
+        msg = msg[1:-1]
+        msg_tmp = msg.decode('ascii')
+        msg_data = msg_tmp.split(',')
+        print("WLKEY_ProtoCol".format(msg_data[1]))
+        EventMesh.publish("set_storage_config",["WLKEY",str(msg_data[1])])
+        
+
+        EventMesh.publish(constants.PROTOCOL.WLKEY_SEND) 
 
 # [SG*5678901234*0037* SILENCETIMEFS,21:10-7:30@0111110,21:10-7:30@0111110,21:10-7:30@0111110,21:10-7:30@0111110]
 
@@ -1486,57 +1673,77 @@ class SILENCETIMEFS_ProtoCol(ProtoCol):#云米
         @param event:
         @param msg: 接收到的下行数据
         """
-        # [XT*YYYYYYYYYYYYYYY*LEN*SILENCETIME2,时间段-开关-自定义日期,时间段-开关-自定义日期,时
-        # 间段-开关-自定义日期]
-        class_in_buf = []
-        # b'[SZKW*860132060128139*004E*SILENCETIME2,00:00-09:00-1-0111110,15:00-22:00-0-1111111,00:00-23:00-0-0100001]'
+        class_in_buf = {"1": {'enable': 0, 'end_time': '00:00', 'start_time': '00:00', 'week': []},\
+        "0": {'enable': 0, 'end_time': '00:00', 'start_time': '00:00', 'week': []}, \
+        "3": {'enable': 0, 'end_time': '00:00', 'start_time': '00:00', 'week': []}, \
+        "2": {'enable': 0, 'end_time': '00:00', 'start_time': '00:00', 'week': []}}
+
         # class_in_buf.append({'start_hour': "16:54", 'week': [], 'idx': 0, 'enabled': 0, 'end_hour': "18:39"}) 
         msg = msg[1:-1]
         msg_tmp = msg.decode('ascii')
-        msg_tmp_d = str(msg_tmp.split('SILENCETIME2,')[1])
+        msg_tmp_d = str(msg_tmp.split('SILENCETIMEFS,')[1])
         
-        count = 0
+        count = 1
         k = 0
-        i = 0
+
         for i in range(len(str(msg_tmp_d))):
             if msg_tmp_d[i] == ',':
                 count+=1
-        
-        count+=1
-        if count >= 3:
-            count = 3
-        print("class count",count)
-        for i in range(0,count):#00:00-09:00-1-0111110,15:00-22:00-0-1111111,00:00-23:00-0-0100001默认是三个时间多了也不保存
-            alarm_day = []
-            alarm_data = str(msg_tmp_d.split(',')[i])
-            # print("i",i,sleep_data)
-            if len(alarm_data) != 0:
-                b = alarm_data.find('-')
-                if b != -1:
-                    start_time = alarm_data.split('-')[0]#-作为分隔符
-                    end_time = alarm_data.split('-')[1]#-作为分隔符
-                    alarm_enable = int(alarm_data.split('-')[2])#是单次还是每天 还是自定义
 
-                    start_hour = int(start_time.split(":")[0])#时间
-                    start_min = int(start_time.split(":")[1])#冒号分隔时间 时 分
+        for x in range(count):#21:10-7:30@0111110,21:10-7:30@0111110,21:10-7:30@0111110,21:10-7:30@0111110
+            week = []
+            if x >= 4:
+                break
+            if count > 1:
 
-                    end_hour = int(end_time.split(":")[0])#时间
-                    end_min = int(end_time.split(":")[1])#冒号分隔时间 时 分
-                    
-                    alarm_day_tmp = alarm_data.split('-')[3]#-作为分隔符
-                    if len(str(alarm_day_tmp)) != 0:
+                msg_data = msg_tmp_d.split(',')[x]
+                print("SILENCETIMEFS count",msg_data)
+                b = msg_data.find('-')
+                if b != -1:
+                    data = msg_data.split('-')#-作为分隔符
+                    time = data[1].split('@')#@作为分隔符
+                    print("data",data,time,data[0],time[0])
+                    start_time = data[0]#开始时间
+                    end_time = time[0]#结束时间
+                    enable = 1
+                    week_day = time[1]
+                    for i in range(0,7):
+                        if week_day[i] != '0':
+                            week.append(i)
+                    tmp={}
+                    tmp["start_time"] = start_time
+                    tmp["end_time"] = end_time
+                    tmp["week"] = week
+                    tmp["enable"] = enable
+                    class_in_buf["{}".format(x)] = tmp
+            else:
+                if len(msg_tmp_d) != 0:
+                    b = msg_tmp_d.find('-')
+                    if b != -1:
+                        
+                        data = msg_tmp_d.split('-')#-作为分隔符
+                        time = data[1].split('@')#@作为分隔符
+                        print("data",data,time,data[0],time[0])
+                        start_time = data[0]#开始时间
+                        end_time = time[0]#结束时间
+                        enable = 1
+                        week_day = time[1]
                         for i in range(0,7):
-                            if alarm_day_tmp[i] != '0':
-                                alarm_day.append(i)
-                    # if alarm_switch = 0:
-                    class_in_buf.append({"start_hour":start_hour,"start_min":start_min,"end_hour":end_hour,"end_min":end_min,"day":alarm_day,"enable":alarm_enable})
-        
-        EventMesh.publish("set_storage_config",["class_alarm",class_in_buf])
-        class_alarm = EventMesh.publish("get_storage_config","class_alarm")
-        print("class_alarm",class_alarm)
+                            if week_day[i] != '0':
+                                week.append(i)
+                        tmp={}
+                        tmp["start_time"] = start_time
+                        tmp["end_time"] = end_time
+                        tmp["week"] = week
+                        tmp["enable"] = enable
+                        class_in_buf["{}".format(x)] = tmp
+
+        with open("/ext/static/storage_file/class_msg.json", 'w+',encoding='utf-8') as fd:
+            ujson.dump(class_in_buf,fd)
+
 
         EventMesh.publish("set_class_time", class_in_buf)
-        EventMesh.publish(constants.PROTOCOL.SILENCETIME2_SEND)  
+        EventMesh.publish(constants.PROTOCOL.SILENCETIMEFS_SEND)  
         EventMesh.publish("get_class_in_time_page")
 
 
@@ -1560,54 +1767,65 @@ class SILENCETIME2_ProtoCol(ProtoCol):
         @param event:
         @param msg: 接收到的下行数据
         """
-        # [XT*YYYYYYYYYYYYYYY*LEN*SILENCETIME2,时间段-开关-自定义日期,时间段-开关-自定义日期,时
-        # 间段-开关-自定义日期]
-        class_in_buf = []
-        # b'[SZKW*860132060128139*004E*SILENCETIME2,00:00-09:00-1-0111110,15:00-22:00-0-1111111,00:00-23:00-0-0100001]'
+        class_in_buf = {"1": {'enable': 0, 'end_time': '00:00', 'start_time': '00:00', 'week': []},\
+        "0": {'enable': 0, 'end_time': '00:00', 'start_time': '00:00', 'week': []}, \
+        "3": {'enable': 0, 'end_time': '00:00', 'start_time': '00:00', 'week': []}, \
+        "2": {'enable': 0, 'end_time': '00:00', 'start_time': '00:00', 'week': []}}
+
         # class_in_buf.append({'start_hour': "16:54", 'week': [], 'idx': 0, 'enabled': 0, 'end_hour': "18:39"}) 
         msg = msg[1:-1]
         msg_tmp = msg.decode('ascii')
         msg_tmp_d = str(msg_tmp.split('SILENCETIME2,')[1])
         
-        count = 0
+        count = 1
         k = 0
-        i = 0
+
         for i in range(len(str(msg_tmp_d))):
             if msg_tmp_d[i] == ',':
                 count+=1
-        
-        count+=1
-        if count >= 3:
-            count = 3
-        print("class count",count)
-        for i in range(0,count):#00:00-09:00-1-0111110,15:00-22:00-0-1111111,00:00-23:00-0-0100001默认是三个时间多了也不保存
-            alarm_day = []
-            alarm_data = str(msg_tmp_d.split(',')[i])
-            # print("i",i,sleep_data)
-            if len(alarm_data) != 0:
-                b = alarm_data.find('-')
-                if b != -1:
-                    start_time = alarm_data.split('-')[0]#-作为分隔符
-                    end_time = alarm_data.split('-')[1]#-作为分隔符
-                    alarm_enable = int(alarm_data.split('-')[2])#是单次还是每天 还是自定义
 
-                    start_hour = int(start_time.split(":")[0])#时间
-                    start_min = int(start_time.split(":")[1])#冒号分隔时间 时 分
-
-                    end_hour = int(end_time.split(":")[0])#时间
-                    end_min = int(end_time.split(":")[1])#冒号分隔时间 时 分
-                    
-                    alarm_day_tmp = alarm_data.split('-')[3]#-作为分隔符
-                    if len(str(alarm_day_tmp)) != 0:
-                        for i in range(0,7):
-                            if alarm_day_tmp[i] != '0':
-                                alarm_day.append(i)
-                    # if alarm_switch = 0:
-                    class_in_buf.append({"start_hour":start_hour,"start_min":start_min,"end_hour":end_hour,"end_min":end_min,"day":alarm_day,"enable":alarm_enable})
-        
-        EventMesh.publish("set_storage_config",["class_alarm",class_in_buf])
-        class_alarm = EventMesh.publish("get_storage_config","class_alarm")
-        # print("class_alarm",class_alarm)
+        for x in range(count):#08:00-17:00-1-0111110,08:00-17:00-1-0111110
+            week = []
+            if count > 1:
+                msg_data = msg_tmp_d.split(',')[k]
+                # print("SILENCETIME count",msg_data)
+                k+= 1
+                b = msg_data.find('-')
+                if b != -1:
+                    data = msg_data.split('-')#-作为分隔符
+                    start_time = data[0]
+                    end_time = data[1]
+                    enable = int(data[2])
+                    week_day = data[3]
+                    for i in range(0,7):
+                        if week_day[i] != '0':
+                            week.append(i)
+                    tmp={}
+                    tmp["start_time"] = start_time
+                    tmp["end_time"] = end_time
+                    tmp["week"] = week
+                    tmp["enable"] = enable
+                    class_in_buf["{}".format(x)] = tmp
+            else:
+                b = msg_tmp_d.find('-')
+                if b != -1:
+                    data = msg_tmp_d.split('-')#-作为分隔符
+                    start_time = data[0]
+                    end_time = data[1]
+                    enable = int(data[2])
+                    week_day = data[3]
+                    for i in range(0,7):
+                        if week_day[i] != '0':
+                            week.append(i)
+                    tmp={}
+                    tmp["start_time"] = start_time
+                    tmp["end_time"] = end_time
+                    tmp["week"] = week
+                    tmp["enable"] = enable
+                    class_in_buf["{}".format(x)] = tmp
+
+        with open("/ext/static/storage_file/class_msg.json", 'w+',encoding='utf-8') as fd:
+            ujson.dump(class_in_buf,fd)
 
         EventMesh.publish("set_class_time", class_in_buf)
         EventMesh.publish(constants.PROTOCOL.SILENCETIME2_SEND)  
@@ -1635,6 +1853,7 @@ class KEYBRD_ProtoCol(ProtoCol):
         """
         # b'[SZKW*867387060319166*000A*KEYBRD]'
         # print("KEYBRD!!!!!!!!!!!!!",msg)
+  
         msg = msg[1:-1]
         msg_tmp = msg.decode('ascii')
         msg_tmp_d = int(str(msg_tmp.split('KEYBRD,')[1]))
@@ -1642,6 +1861,310 @@ class KEYBRD_ProtoCol(ProtoCol):
         EventMesh.publish("set_key_board",msg_tmp_d)
 
         EventMesh.publish(constants.PROTOCOL.KEYBRD_SEND)  
+# 平台发送:
+# [XT*YYYYYYYYYYYYYYY*LEN*SCREEN_SHOW,参数内容]
+# 实例:[XT*334588000000156*0016*SCREEN_SHOW,00000000000]
+# 参数内容用 unicode 编码呈现,设备收到后需解码。
+# 解码后的参数内容可能有多个参数,不同参数用逗号分隔,设备自己决定如何在屏幕中显示这些参数。比如 "SCREEN_SHOW,深圳第一中学,三年1班、张三"
+# 终端回复:
+# [XT*YYYYYYYYYYYYYYY*LEN*SCREEN_SHOW]
+# 实例:[XT*334588000000156*000B*SCREEN_SHOW]
+
+class SCREEN_SHOWProtoCol(ProtoCol):
+    """开屏显示"""
+    TYPE = "SCREEN_SHOW"
+    def send(self, event, msg):
+        # [XT*334588000000156*0006*SILENCETIME2]
+        send_data = EventMesh.publish("get_new_pid")+"*%s*000B*SCREEN_SHOW"%(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: 接收到的下行数据
+        """
+        msg = msg[1:-1]
+        msg_tmp = msg.decode('ascii')
+        msg_tmp = msg_tmp.split(',')
+        msg_tmp = msg_tmp[1:]
+        msg_tmp = msg_tmp[0]
+        print("screen_school_data msg",msg)
+
+        j = 0
+        i = 0
+        videobook_old = {}
+        videobook_name_tmp = UnicodeHexStr_To_Utf8Str(msg_tmp)
+        lst = videobook_name_tmp.split(",")
+        print("lst data",lst)
+
+         # 0 1 2 3
+        screen_school_data = ""#学校
+        screen_class_data = ""#班级
+        screen_fullname_data = ""#姓名
+        if len(lst) != 0: 
+            count = len(lst)
+            if count > 3:
+                count = 3
+            for i in range(count):
+                if i == 0:
+                    if len(str(lst[0])) != 0:
+                        screen_school_data = lst[0]
+                        EventMesh.publish("set_schoolname", screen_school_data)#
+                elif i == 1:
+                    if len(str(lst[1])) != 0:
+                        screen_class_data = lst[1]
+                        EventMesh.publish("set_classname", screen_class_data)#
+                else:
+                    if len(str(lst[2])) != 0:
+                        screen_fullname_data= lst[2]
+                        EventMesh.publish("set_fullname", screen_fullname_data)#
+                
+                EventMesh.publish("update_screen_show")#更新开屏显示
+
+        print("screen_school_data!!!:",screen_school_data,screen_class_data,screen_fullname_data)
+
+        EventMesh.publish(constants.PROTOCOL.SCREEN_SHOW_SEND)  
+
+class FALLDOWN_ProtoCol(ProtoCol):
+    """
+    跌倒提醒开关
+    服务器下发跌倒报警设置命令
+    [XT*334588000000156*LEN*FALLDOWN,ONOFF]
+    ONOFF: 1:开启,0:关闭。
+    终端回复
+    [XT*334588000000156*LEN*FALLDOWN]
+    """
+    TYPE = "FALLDOWN"
+    
+    def send(self, event, msg):
+       
+        #[XT*334588000000156*LEN*FALLDOWN]
+        send_data = EventMesh.publish("get_new_pid")+"*%s*0008*FALLDOWN"%(self.imei)
+        MD5_SIGN = self.pack_MD5_head(send_data)
+        data = "[%s%s]"%(str(MD5_SIGN),send_data)
+        #Wechat_log("POWEROFF_ProtoCol:send:%s"%(data))
+        # 通过socket发送到服务器端
+        EventMesh.publish(constants.EVENT.CHANNEL_SOCKET_SEND, data)
+
+    def recv(self, event, msg):
+        """
+        [SZKW*860132060341484*000A*FALLDOWN,1]
+        """
+        msg = msg[1:-1]
+        msg_tmp = msg.decode('ascii')
+        msg_data = msg_tmp.split(',')
+        
+        Falldowm = str(msg_data[1])
+        # EventMesh.debug_log("FALLDOWN:{}".format(Falldowm))
+        EventMesh.publish("set_storage_config",["fall_sw",Falldowm])
+
+        EventMesh.publish(constants.PROTOCOL.FALLDOWN_SEND)
+class REMOVE_ProtoCol(ProtoCol):
+    """
+    取下手环报警开关
+    平台发送:
+    [XT*YYYYYYYYYYYYYYY*LEN*REMOVE,0或者1]
+    实例:[XT*334588000000156*0008*REMOVE,1]
+    终端回复:
+    [XT*YYYYYYYYYYYYYYY*LEN*REMOVE]
+    """
+    TYPE = "REMOVE"
+    
+    def send(self, event, msg):
+        send_data = EventMesh.publish("get_new_pid")+"*%s*0006*REMOVE"%(self.imei)
+        MD5_SIGN = self.pack_MD5_head(send_data)
+        data = "[%s%s]"%(str(MD5_SIGN),send_data)
+        #Wechat_log("POWEROFF_ProtoCol:send:%s"%(data))
+        # 通过socket发送到服务器端
+        EventMesh.publish(constants.EVENT.CHANNEL_SOCKET_SEND, data)
+
+    def recv(self, event, msg):
+        msg = msg[1:-1]
+        msg_tmp = msg.decode('ascii')
+        msg_data = msg_tmp.split(',')
+        remove_sw = str(msg_data[1])
+        # EventMesh.debug_log("REMOVE:{}".format(remove_sw))
+        EventMesh.publish("set_storage_config",["remove_sw",remove_sw])
+        EventMesh.publish(constants.PROTOCOL.REMOVE_SEND)   
+
+class HELP_ProtoCol(ProtoCol):
+    """
+一键报警
+    [XT*YYYYYYYYYYYYYYY*LEN*HELP,状态]
+    状态值为整数:60或不带默认是普通报警,61光电式感烟火灾报警,62检测环境温度(高温报警,温度变化报警),
+    63人体活动检测报警,64电池欠压提醒功能,65设备脱落提醒功能,66离线报警,67测试报警,123气感报警,
+    124烟感报警,125水浸报警
+    实例:
+    [XT*334588000000156*0004*HELP,60]
+    """
+    TYPE = "HELP"
+    
+    def send(self, event, msg):
+        #[XT*334588000000156*LEN*FALLDOWN]
+        send_data = EventMesh.publish("get_new_pid")+"*%s*0008*HELP,%d"%(self.imei,msg)
+        MD5_SIGN = self.pack_MD5_head(send_data)
+        data = "[%s%s]"%(str(MD5_SIGN),send_data)
+        #Wechat_log("POWEROFF_ProtoCol:send:%s"%(data))
+        # 通过socket发送到服务器端
+        EventMesh.publish(constants.EVENT.CHANNEL_SOCKET_SEND, data)
+
+    def recv(self, event, msg):
+        """
+        [XT*334588000000156*0004*HELP,60]
+        """
+
+        pass   
+
+class AL_ProtoCol(ProtoCol):
+    """报警数据上报"""
+    TYPE = "AL"
+    timer_repetition_send = None
+    repetition_queue = None
+
+    def send(self, event, msg):
+        if self.timer_repetition_send == None:
+            self.timer_repetition_send = osTimer()
+        if self.repetition_queue == None:
+            self.repetition_queue = Queue(100)
+        
+
+        send_data ="AL,"+msg
+        send_len = len(send_data)
+        #wt_data = "%s"%(send_data)
+        send_data = EventMesh.publish("get_new_pid")+"*%s*%04X*%s"%(self.imei,send_len,send_data)
+        MD5_head_data = EventMesh.publish("get_new_pid")+"*%s*%04X*%s"%(self.imei,send_len,"AL")
+        
+        MD5_SIGN = self.pack_MD5_head(MD5_head_data)
+        data = "[%s%s]"%(str(MD5_SIGN),send_data)
+        #EventMesh.debug_log("AL_ProtoCol:send:%s"%(data))
+        # 通过socket发送到服务器端
+        EventMesh.publish(constants.EVENT.CHANNEL_SOCKET_SEND, data)
+        self.repetition_queue.put(data)#发送入队
+        self.timer_repetition_send.start(10000, 1, self.repetition_timer_cb)
+        EventMesh.publish("set_dev_state",0)
+    def recv(self, event, msg):
+        """
+
+        @param event: PING
+        @param msg: 接收到的下行数据
+        """
+        #EventMesh.publish(constants.PROTOCOL.CR_SEND)
+        #EventMesh.publish(constants.EVENT.START_LOCATION,constants.PROTOCOL.UD_SEND) #开始ud定位
+        print("报警数据上报:recv:%s"%(msg))   
+        #        
+        if self.repetition_queue.empty() == False:
+            self.repetition_queue.get()#出队
+        else:
+            self.timer_repetition_send.stop()
+
+    def repetition_timer_cb(self, *args, **kwargs):#每隔10秒发送一次
+        if self.repetition_queue.empty() == False:
+            data = self.repetition_queue.get()#出队
+            self.repetition_queue.put(data)#发送入队
+            EventMesh.publish(constants.EVENT.CHANNEL_SOCKET_SEND, data)
+        else:
+            self.timer_repetition_send.stop()
+
+
+# 平台发送:
+# [XT*YYYYYYYYYY*LEN*SLEEPTIME,时间段]
+# 实例:[XT*5678901234*0014*SLEEPTIME,23:30-7:30]
+# 终端回复:
+# [XT*YYYYYYYYYY*LEN*SLEEPTIME]
+# 实例:[XT*5678901234*0009*SLEEPTIME]
+# 说明: 设置翻滚检测的时间段范围.如果时间段为空,即[XT*5678901234*0014*SLEEPTIME,],表示睡眠翻滚监测功能关。
+# 在此时间段内,开启翻滚检查,默认开启时翻滚次数为0,在此时间段内累计翻滚次数,并通过心跳接口上传。翻滚时间段结束,则停止翻滚检查,心跳接口的翻滚次数可置0。
+class SLEEPTIME_ProtoCol(ProtoCol):#睡眠时间
+    """
+    
+    平台发送:
+    [XT*YYYYYYYYYY*LEN*SLEEPTIME,时间段]
+    实例:[XT*5678901234*0014*SLEEPTIME,23:30-7:30]
+    终端回复:
+    [XT*YYYYYYYYYY*LEN*SLEEPTIME]
+    实例:[XT*5678901234*0009*SLEEPTIME]
+    说明: 设置翻滚检测的时间段范围.如果时间段为空,即[XT*5678901234*0014*SLEEPTIME,],表示睡眠翻滚监测功能关。
+    在此时间段内,开启翻滚检查,默认开启时翻滚次数为0,在此时间段内累计翻滚次数,并通过心跳接口上传。翻滚时间段结束,则停止翻滚检查,心跳接口的翻滚次数可置0。
+    """
+    TYPE = "SLEEPTIME"
+    
+    def send(self, event, msg):
+        send_data = EventMesh.publish("get_new_pid")+"*%s*00009*SLEEPTIME"%(self.imei)
+        MD5_SIGN = self.pack_MD5_head(send_data)
+        data = "[%s%s]"%(str(MD5_SIGN),send_data)
+        # EventMesh.debug_log("SLEEPTIME:send:%s"%(data))
+        # 通过socket发送到服务器端
+        EventMesh.publish(constants.EVENT.CHANNEL_SOCKET_SEND, data)
+
+    def recv(self, event, msg):
+        # 实例:[XT*5678901234*0014*SLEEPTIME,23:30-7:30]
+        # EventMesh.debug_log("SLEEPTIME!!!!!!!!!")
+        msg = msg[1:-1]
+        msg_tmp = msg.decode('ascii')
+        msg_data = msg_tmp.split(',')[1]
+        data = {}
+        if len(msg_data) == 0:
+            EventMesh.publish("set_storage_config",["sleep_time",data])
+            pass
+        else:
+            sleep_start = msg_data.split("-")[0]
+            sleep_end = msg_data.split("-")[1]
+            start_hour = int(sleep_start.split(":")[0])
+            start_min = int(sleep_start.split(":")[1])
+
+            end_hour = int(sleep_end.split(":")[0])
+            end_min = int(sleep_end.split(":")[1])
+
+            data = {"start_hour":start_hour,"start_min":start_min,"end_hour":end_hour,"end_min":end_min}
+            # EventMesh.debug_log("SLEEPTIME".format(data))
+            EventMesh.publish("set_storage_config",["sleep_time",data])
+            # sleep_time = EventMesh.publish("get_storage_config","sleep_time")
+            # EventMesh.debug_log("sleep_time:{}".format(sleep_time))
+
+        EventMesh.publish(constants.PROTOCOL.SLEEPTIME_SEND) 
+
+# 平台发送:
+# [XT*YYYYYYYYYYYYYYY*LEN*FACTORY]
+# 实例:[XT*334588000000156*0007*FACTORY]
+# 终端回复:
+# [XT*YYYYYYYYYYYYYYY*LEN*FACTORY]
+# 实例:[XT*334588000000156*0007*FACTORY]
+# 说明:终端恢复出厂设置,里面设置的号码都将清空
+class FACTORY_ProtoCol(ProtoCol):#睡眠时间
+    """
+    实例:[XT*334588000000156*0008*FACTORY]
+    终端回复
+    [XT*YYYYYYYYYYYYYYY*LEN*WLKEY]
+    实例:[XT*334588000000156*0006*FACTORY]
+    """
+    TYPE = "FACTORY"
+    
+    def send(self, event, msg):
+        send_data = EventMesh.publish("get_new_pid")+"*%s*0007*FACTORY"%(self.imei)
+        MD5_SIGN = self.pack_MD5_head(send_data)
+        data = "[%s%s]"%(str(MD5_SIGN),send_data)
+        # EventMesh.debug_log("FACTORY:send:%s"%(data))
+        # 通过socket发送到服务器端
+        EventMesh.publish(constants.EVENT.CHANNEL_SOCKET_SEND, data)
+
+    def recv(self, event, msg):
+
+        # EventMesh.debug_log("FACTORY!!!!!!!!!")
+        # msg = msg[1:-1]
+        # msg_tmp = msg.decode('ascii')
+        # msg_data = msg_tmp.split(',')
+        # EventMesh.debug_log("WLKEY_ProtoCol".format(msg_data[1]))
+        # EventMesh.publish("set_storage_config",["WLKEY",msg_data[1]])
+        EventMesh.publish("app_factory_cb")
+        EventMesh.publish(constants.PROTOCOL.FACTORY_SEND) 
+        # EventMesh.publish("app_factory",None)#app恢复出厂
+
+
 
 # [CS*YYYYYYYYYY*LEN*ppdevvoicemsg,ID,AMR格式音频数据]#设备好友语音发送
 # 服务端回复
index 8966532..9d2001f 100644 (file)
@@ -7647,7 +7647,7 @@ class cameraScreen(Screen):#相机拍照二级界面
         # dec = camera.camCapture(0,240,320,1,128,128)
         # dec.callback(camCapturecallback)
         state = dec.open()
-        dec.set_rotate(0)
+        dec.set_cam_angle(0)
         if camera_popup_screen == None:
             camera_popup_screen = lv.obj()
             print("camera_popup_screen")