From: d15521469561 Date: Tue, 25 Apr 2023 08:17:27 +0000 (+0800) Subject: 修改图片 X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=2fea0627d6830605bd47536230026bcfd11eeba7;p=mirrors%2FASR1603_G5.git 修改图片 --- diff --git a/3.code/1.watch/2.code/constants.py b/3.code/1.watch/2.code/constants.py index c3d9fd0d..28380488 100644 --- a/3.code/1.watch/2.code/constants.py +++ b/3.code/1.watch/2.code/constants.py @@ -47,6 +47,8 @@ class PROTOCOL: OXSTART_SEND = "oxstart_SEND" OXSTART_RECV = "oxstart_RECV" + TEMP_SEND = "temp_SEND" + TEMP_RECV = "temp_RECV" class EVENT: CHANNEL_SOCKET_SEND = "CHANNEL_SOCKET_SEND" diff --git a/3.code/1.watch/2.code/main_1.py b/3.code/1.watch/2.code/main_1.py index 9c8289ba..2f2d22a9 100644 --- a/3.code/1.watch/2.code/main_1.py +++ b/3.code/1.watch/2.code/main_1.py @@ -51,7 +51,8 @@ if __name__ == '__main__': from ext.common import Abstract from ext.lcd import tp_cst816 from ext.btn_device_ec800m import BtnDevice - from ext.protocol import LK_ProtoCol,PING_ProtoCol,HEART_ProtoCol,OXYGEN_ProtoCol,OXYGEN_One_ProtoCol,HRSTART_ProtoCol,WT_ProtoCol,UD_ProtoCol,REMIND_ProtoCol, CR_ProtoCol,KA_ProtoCol,FIND_ProtoCol,POWEROFF_ProtoCol,ProtoColResolver,PHL_ProtoCol + from ext.protocol import LK_ProtoCol,PING_ProtoCol,HEART_ProtoCol,OXYGEN_ProtoCol,OXYGEN_One_ProtoCol,HRSTART_ProtoCol,temp_ProtoCol,\ + WT_ProtoCol,UD_ProtoCol,REMIND_ProtoCol, CR_ProtoCol,KA_ProtoCol,FIND_ProtoCol,POWEROFF_ProtoCol,ProtoColResolver,PHL_ProtoCol import ext.mgr as mgr print("init1:{}".format(utime.localtime())) import ext.ui as _ui @@ -186,6 +187,7 @@ if __name__ == '__main__': pcr.add_support(HEART_ProtoCol()) pcr.add_support(OXYGEN_ProtoCol()) pcr.add_support(OXYGEN_One_ProtoCol()) + pcr.add_support(temp_ProtoCol()) sm = SockManager() sm.add_support_resolver(pcr) app.append_manager(sm) diff --git a/3.code/1.watch/2.code/protocol.py b/3.code/1.watch/2.code/protocol.py index 4fdd0674..ec8fc11c 100644 --- a/3.code/1.watch/2.code/protocol.py +++ b/3.code/1.watch/2.code/protocol.py @@ -87,7 +87,7 @@ class ProtoCol(Abstract): def handler(self, event, msg): self.password = EventMesh.publish(constants.EVENT.GET_PASSWORD) - self.imei = EventMesh.publish(constants.EVENT.GET_IMEI)#"867387060319166" #EventMesh.publish(constants.EVENT.GET_IMEI)#"867387060319166"#EventMesh.publish(constants.EVENT.GET_IMEI) #"867387060319166"#EventMesh.publish(constants.EVENT.GET_IMEI) #"867387060319166"#"867387060319188"#"867387060319177"#"867387060319166"#"860132060004322"#"867387060319166"#"860132060004322"#EventMesh.publish(constants.EVENT.GET_IMEI) + self.imei = "867387060319166" #EventMesh.publish(constants.EVENT.GET_IMEI)#"867387060319166" #EventMesh.publish(constants.EVENT.GET_IMEI)#"867387060319166"#EventMesh.publish(constants.EVENT.GET_IMEI) #"867387060319166"#EventMesh.publish(constants.EVENT.GET_IMEI) #"867387060319166"#"867387060319188"#"867387060319177"#"867387060319166"#"860132060004322"#"867387060319166"#"860132060004322"#EventMesh.publish(constants.EVENT.GET_IMEI) self.cid = EventMesh.publish(constants.EVENT.GET_CID) self.imsi = EventMesh.publish(constants.EVENT.GET_IMSI) self.key = EventMesh.publish(constants.EVENT.GET_KEY) @@ -666,7 +666,7 @@ class OXYGEN_ProtoCol(ProtoCol): #EventMesh.publish(constants.PROTOCOL.OXYGEN_SEND) class OXYGEN_One_ProtoCol(ProtoCol):#单次测量 - """上传血氧测试数据""" + """上传单次测量测试数据""" TYPE = "oxstart" # 终端发送[XT*YYYYYYYYYYYYYYY*LEN*oxygen,x] @@ -702,8 +702,31 @@ class OXYGEN_One_ProtoCol(ProtoCol):#单次测量 EventMesh.publish("set_spo2_state",3)#3代表单次测量 EventMesh.publish(constants.PROTOCOL.OXSTART_SEND) -#设置和获取心率上传频率时间 +class temp_ProtoCol(ProtoCol): + """上传体温测试数据""" + TYPE = "temp" + def send(self, event, msg): + # [SZKW*334588000000156*len*heart,x] + # print("temp:send:{}".format(msg)) + len_size = len(str(msg))+5 + # 实例：[XT*334588000000156*0009*temp,36.2] + # 代表终端的温度为：36.2 + # 平台回复： + # [XT*334588000000156*0004*temp] + send_data = "SZKW*%s*%04X*temp"%(self.imei,len_size) + MD5_SIGN = self.pack_MD5_head(send_data) + data = "[%s%s,%d.%d]"%(str(MD5_SIGN),send_data,msg[0],msg[1]) + # print("temp: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 ProtoColResolver(object): def __init__(self): self.protocol_list = [] diff --git a/3.code/1.watch/2.code/static/setting/menu_app_qrcode.png b/3.code/1.watch/2.code/static/setting/menu_app_qrcode.png index 5f2d1559..71c92154 100644 Binary files a/3.code/1.watch/2.code/static/setting/menu_app_qrcode.png and b/3.code/1.watch/2.code/static/setting/menu_app_qrcode.png differ diff --git a/3.code/1.watch/2.code/static/setting/menu_bright.png b/3.code/1.watch/2.code/static/setting/menu_bright.png index a95706b0..c64fb441 100644 Binary files a/3.code/1.watch/2.code/static/setting/menu_bright.png and b/3.code/1.watch/2.code/static/setting/menu_bright.png differ diff --git a/3.code/1.watch/2.code/static/setting/menu_imei_qrcode.png b/3.code/1.watch/2.code/static/setting/menu_imei_qrcode.png index 8de9e4ee..a564ba5b 100644 Binary files a/3.code/1.watch/2.code/static/setting/menu_imei_qrcode.png and b/3.code/1.watch/2.code/static/setting/menu_imei_qrcode.png differ diff --git a/3.code/1.watch/2.code/static/setting/menu_language.png b/3.code/1.watch/2.code/static/setting/menu_language.png index f86bbf29..f6deb97f 100644 Binary files a/3.code/1.watch/2.code/static/setting/menu_language.png and b/3.code/1.watch/2.code/static/setting/menu_language.png differ diff --git a/3.code/1.watch/2.code/static/setting/menu_poweroff.png b/3.code/1.watch/2.code/static/setting/menu_poweroff.png index 16862bed..df5b92cb 100644 Binary files a/3.code/1.watch/2.code/static/setting/menu_poweroff.png and b/3.code/1.watch/2.code/static/setting/menu_poweroff.png differ diff --git a/3.code/1.watch/2.code/static/setting/menu_restore.png b/3.code/1.watch/2.code/static/setting/menu_restore.png index da81cc6f..34c01a21 100644 Binary files a/3.code/1.watch/2.code/static/setting/menu_restore.png and b/3.code/1.watch/2.code/static/setting/menu_restore.png differ diff --git a/3.code/1.watch/2.code/static/setting/menu_theme_switch.png b/3.code/1.watch/2.code/static/setting/menu_theme_switch.png index bba9bd1f..e57ae268 100644 Binary files a/3.code/1.watch/2.code/static/setting/menu_theme_switch.png and b/3.code/1.watch/2.code/static/setting/menu_theme_switch.png differ diff --git a/3.code/1.watch/2.code/static/setting/menu_upgrade.png b/3.code/1.watch/2.code/static/setting/menu_upgrade.png index bc1ccea4..83ee667b 100644 Binary files a/3.code/1.watch/2.code/static/setting/menu_upgrade.png and b/3.code/1.watch/2.code/static/setting/menu_upgrade.png differ diff --git a/3.code/1.watch/2.code/static/setting/menu_version.png b/3.code/1.watch/2.code/static/setting/menu_version.png index 6444f5c2..f0bfd654 100644 Binary files a/3.code/1.watch/2.code/static/setting/menu_version.png and b/3.code/1.watch/2.code/static/setting/menu_version.png differ diff --git a/3.code/1.watch/2.code/static/setting/menu_volume.png b/3.code/1.watch/2.code/static/setting/menu_volume.png index d500a8bc..200367c0 100644 Binary files a/3.code/1.watch/2.code/static/setting/menu_volume.png and b/3.code/1.watch/2.code/static/setting/menu_volume.png differ diff --git a/3.code/1.watch/2.code/static/setting/menu_watch_switch.png b/3.code/1.watch/2.code/static/setting/menu_watch_switch.png index 0cfd3228..d1c21be2 100644 Binary files a/3.code/1.watch/2.code/static/setting/menu_watch_switch.png and b/3.code/1.watch/2.code/static/setting/menu_watch_switch.png differ diff --git a/3.code/1.watch/2.code/static/tool/IMAGE_SECMENU_ALARM.png b/3.code/1.watch/2.code/static/tool/IMAGE_SECMENU_ALARM.png index 9be00872..3647cae7 100644 Binary files a/3.code/1.watch/2.code/static/tool/IMAGE_SECMENU_ALARM.png and b/3.code/1.watch/2.code/static/tool/IMAGE_SECMENU_ALARM.png differ diff --git a/3.code/1.watch/2.code/static/tool/IMAGE_SECMENU_COUNTDOWN.png b/3.code/1.watch/2.code/static/tool/IMAGE_SECMENU_COUNTDOWN.png index 71e7b980..c136bacc 100644 Binary files a/3.code/1.watch/2.code/static/tool/IMAGE_SECMENU_COUNTDOWN.png and b/3.code/1.watch/2.code/static/tool/IMAGE_SECMENU_COUNTDOWN.png differ diff --git a/3.code/1.watch/2.code/static/tool/IMAGE_SECMENU_STEP.png b/3.code/1.watch/2.code/static/tool/IMAGE_SECMENU_STEP.png index af0acbe2..9f0a6f3b 100644 Binary files a/3.code/1.watch/2.code/static/tool/IMAGE_SECMENU_STEP.png and b/3.code/1.watch/2.code/static/tool/IMAGE_SECMENU_STEP.png differ diff --git a/3.code/1.watch/2.code/static/tool/IMAGE_SECMENU_STOPWATCH.png b/3.code/1.watch/2.code/static/tool/IMAGE_SECMENU_STOPWATCH.png index 0d8e1ade..ebde8323 100644 Binary files a/3.code/1.watch/2.code/static/tool/IMAGE_SECMENU_STOPWATCH.png and b/3.code/1.watch/2.code/static/tool/IMAGE_SECMENU_STOPWATCH.png differ diff --git a/3.code/1.watch/2.code/static/tool/IMAGE_SECMENU_WEATHER.png b/3.code/1.watch/2.code/static/tool/IMAGE_SECMENU_WEATHER.png index e869cb6c..6e113c3d 100644 Binary files a/3.code/1.watch/2.code/static/tool/IMAGE_SECMENU_WEATHER.png and b/3.code/1.watch/2.code/static/tool/IMAGE_SECMENU_WEATHER.png differ diff --git a/3.code/1.watch/2.code/static/tool/sms_setting.png b/3.code/1.watch/2.code/static/tool/sms_setting.png index 8af1b34d..acdc5fc5 100644 Binary files a/3.code/1.watch/2.code/static/tool/sms_setting.png and b/3.code/1.watch/2.code/static/tool/sms_setting.png differ