From: dxy15521469561 <1731678236@qq.com> Date: Thu, 24 Aug 2023 10:17:54 +0000 (+0800) Subject: 优化 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=1932ba95c47f1d39a602b73570240e60e0c5860d;p=mirrors%2FASR1603_G5.git 优化 --- diff --git a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/constants.py b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/constants.py index 6d39e8b0..2fdc3fbd 100644 --- a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/constants.py +++ b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/constants.py @@ -84,6 +84,9 @@ class PROTOCOL: 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/K01/sdk/services/microPython/ports/quectel/core/main_init.py b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/main_init.py index 85187acd..7b21e42e 100644 --- a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/main_init.py +++ b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/main_init.py @@ -58,7 +58,7 @@ def main_init(): from appFactoryMode import FactoryModeLocationScreen,FactoryModeScreen ,FactoryModeBatTestScreen import ui as _ui - from mgr import testSmsSetIPManager,ConfigStoreManager,sosInfoCallManager,getBootOffManager,getSosFlagManager,CountdownManager, LocationManager, getVolumSizeManager,gethistoryDataManager,getUpLoadDataManager, getplayAudiodStateManager,\ + from mgr import setclassTimeManager,setkeyboardManager,testSmsSetIPManager,ConfigStoreManager,sosInfoCallManager,getBootOffManager,getSosFlagManager,CountdownManager, LocationManager, getVolumSizeManager,gethistoryDataManager,getUpLoadDataManager, getplayAudiodStateManager,\ AddrBookManager,MsgdetailManager,PhoneCallingManager,getOldTimeManager,getStorageDataManager,getBrightnessManager,getHrTimeManager,getTempTimeManager,getLowBatManager # import ui as _ui @@ -143,12 +143,15 @@ def main_init(): ui.add_screen(_ui.chargeInScreen()) ui.add_screen(_ui.chargeOutScreen()) ui.add_screen(_ui.RemoveMessageScreen()) + ui.add_screen(_ui.keyboardScreen()) + ui.add_screen(_ui.classMgrPopupScreen()) + ui.add_screen(_ui.calculatorScreen()) ui.add_screen(NewWechatPopupScreen()) ui.add_screen(HealthScreen()) # ui.add_screen(_ui.Setting3Screen()) print("init6:{}".format(utime.localtime())) - from protocol import SILENCETIME2_ProtoCol,KEYBRD_ProtoCol,LK_ProtoCol,PING_ProtoCol,HEART_ProtoCol,OXYGEN_ProtoCol,OXYGEN_One_ProtoCol,HRSTART_ProtoCol,CENTER_ProtoCol,UPLOAD_ProtoCol,\ + from protocol import WLKEY_ProtoCol,SILENCETIME2_ProtoCol,KEYBRD_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 @@ -179,7 +182,7 @@ def main_init(): # .append_manager(mgr.StopwatchManager()) \ # .append_manager(mgr.CountdownManager()) \ - + app.append_manager(setkeyboardManager()) app.append_manager(ConfigStoreManager()) app.append_manager(NetManager()) app.append_manager(LocationManager()) @@ -204,6 +207,7 @@ def main_init(): app.append_manager(CountdownManager()) app.append_manager(sosInfoCallManager()) app.append_manager(testSmsSetIPManager()) + app.append_manager(setclassTimeManager()) print("init21:{}".format(utime.localtime())) @@ -238,6 +242,7 @@ def main_init(): pcr.add_support(Time_ProtoCol()) pcr.add_support(KEYBRD_ProtoCol()) pcr.add_support(SILENCETIME2_ProtoCol()) + pcr.add_support(WLKEY_ProtoCol()) sm = SockManager() sm.add_support_resolver(pcr) diff --git a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/mgr.py b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/mgr.py index abf38404..3c5602af 100644 --- a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/mgr.py +++ b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/mgr.py @@ -825,6 +825,8 @@ class DeviceInfoManager(Abstract): EventMesh.publish(constants.EVENT.START_LOCATION,constants.PROTOCOL.UD_SEND) #开始UD定位 EventMesh.publish(constants.EVENT.PUSH_STEP, self.get_step_count()) + EventMesh.publish("get_class_in_time_page") + temp = Power.getVbatt() if self.bat_count < 10: @@ -2835,6 +2837,188 @@ class testSmsSetIPManager(Abstract):# # return [self.newip,self.newcom,self.newmd5] return [self.newip,self.newcom] + + + +class setkeyboardManager(Abstract):#设置键盘开关状态 + def __init__(self): + self.key_state = 0 + tmp_data = EventMesh.publish("get_storage_config","key_board") + if tmp_data != None: + self.key_state = tmp_data + + + def post_processor_after_instantiation(self): + EventMesh.subscribe("set_key_board", self.set_key_board)#设置关机时间 + EventMesh.subscribe("get_key_board", self.get_key_board) + + def set_key_board(self, event, msg): + self.key_state = msg + EventMesh.publish("set_storage_config",["key_board",self.key_state]) + + + def get_key_board(self, event, msg): + + return self.key_state + +class setclassTimeManager(Abstract):#设置上课禁用时间 + def __init__(self): + self.class_buf = {} + self.class_state = 0 + check_json = ql_fs.path_exists("/usr/static/storage_file/class_msg.json") + + if check_json == True: + with open("/usr/static/storage_file/class_msg.json","r",encoding="utf-8") as fd: + self.class_buf = ujson.load(fd) + print("读取上课禁用时间段") + # print("self.class_buf:",self.class_buf) + + + + def post_processor_after_instantiation(self): + EventMesh.subscribe("set_class_time", self.set_class_time)#设置上课禁用时间段 + EventMesh.subscribe("get_class_time", self.get_class_time) + EventMesh.subscribe("get_cur_class_time_state", self.get_cur_class_time_state) + EventMesh.subscribe("get_class_in_time_page",self.get_class_in_time_page) + + def set_class_time(self, event, msg): + self.class_buf = msg + # print("self.class_buf",self.class_buf) + + + def get_class_time(self, event, msg): + + return self.class_buf + + def get_cur_class_time_state(self, event, msg): + data = RTC().datetime() + hour = data[4]#当前小时 + min = data[5]#当前分钟 + + cur_week = data[3]#星期几 + + + + cur_hour = hour + cur_min = min + cur_total_min = cur_hour*60+cur_min + #print("cur_total_min",cur_total_min) + + start_time1 = 0 + end_time1 = 0 + week1 = [] + enable1 = 0 + + start_time2 = 0 + end_time2 = 0 + week2 = [] + enable2 = 0 + + start_time3 = 0 + end_time3 = 0 + week3 = [] + enable3 = 0 + + start_time4 = 0 + end_time4 = 0 + week4 = [] + enable4 = 0 + + self.class_state = 0 + # {'1': {'enabled': 1, 'end_hour': '17:00', 'start_hour': '10:00', 'week': [1, 2, 3, 4, 5]}, + # '0': {'enabled': 1, 'end_hour': '17:00', 'start_hour': '08:00', 'week': [1, 2, 3, 4, 5]}, + # '3': {'enabled': 1, 'end_hour': '17:00', 'start_hour': '08:00', 'week': [1, 2, 3, 4, 5]}, + # '2': {'enabled': 1, 'end_hour': '17:00', 'start_hour': '08:00', 'week': [1, 2, 3, 4, 5]}} + # print("self.class_buf time:",self.class_buf) + if len(self.class_buf) != 0: + #19:56; 9:16 + data1 = self.class_buf["0"] + start_time1 = int(data1["start_time"].split(":")[0])*60+int(data1["start_time"].split(":")[1]) + end_time1 = int(data1["end_time"].split(":")[0])*60 + int(data1["end_time"].split(":")[1]) + + week1 = data1["week"] + enable1 = data1["enable"] + + data2 = self.class_buf["1"] + start_time2 = int(data2["start_time"].split(":")[0])*60 + int(data2["start_time"].split(":")[1]) + end_time2 = int(data2["end_time"].split(":")[0])*60 + int(data2["end_time"].split(":")[1]) + + week2 = data2["week"] + enable2 = data2["enable"] + + data3 = self.class_buf["2"] + start_time3 = int(data3["start_time"].split(":")[0])*60 + int(data3["start_time"].split(":")[1]) + end_time3= int(data3["end_time"].split(":")[0])*60 + int(data3["end_time"].split(":")[1]) + + week3 = data3["week"] + enable3 = data3["enable"] + + data4 = self.class_buf["3"] + start_time4= int(data4["start_time"].split(":")[0])*60 + int(data4["start_time"].split(":")[1]) + end_time4 = int(data4["end_time"].split(":")[0])*60 + int(data4["end_time"].split(":")[1]) + + week4 = data4["week"] + enable4 = data4["enable"] + week1_state = 0 + week2_state = 0 + week3_state = 0 + week4_state = 0 + # print("end_time1 ",start_time1,end_time1,start_time2,end_time2,start_time3,end_time3,start_time4,end_time4) + for i in range(0,7): + if ((cur_week in week1) and enable1 == 1): + week1_state = 1 + if ((cur_week in week2) and enable2 == 1): + week2_state = 1 + + if ((cur_week in week3) and enable3 == 1): + week3_state = 1 + + if ((cur_week in week4) and enable4 == 1): + week4_state = 1 + + if ((cur_week in week1) and enable1 == 1) or ((cur_week in week2) and enable2 == 1) or\ + ((cur_week in week3) and enable3 == 1) or ((cur_week in week4) and enable4 == 1): + if enable1 == 1 or enable2 == 1 or enable3 == 1 or enable4 == 1: + if week1 != [] or week2 != [] or week3 != [] or week4 != []: + if (end_time1 > start_time1 and enable1 == 1 and week1_state == 1) or (end_time2 > start_time2 and enable2 == 1 and week2_state == 1) or\ + (end_time3 > start_time3 and enable3 == 1 and week3_state == 1) or (end_time4 > start_time4 and enable4 == 1 and week4_state == 1): + if (cur_total_min <= end_time1 and cur_total_min >= start_time1 and enable1 == 1) or (cur_total_min <= end_time2 and cur_total_min >= start_time2 and enable2 == 1) or\ + (cur_total_min <= end_time3 and cur_total_min >= start_time3 and enable3 == 1) or (cur_total_min <= end_time4 and cur_total_min >= start_time4 and enable3 == 1): + self.class_state = 1 + print("class_in1") + break + else:#开始时间小于结束时间属于垮天 9:00 -7:00 7*60 6:00 + + # print("end_time1!!!!!!!!!",start_time1,end_time1,start_time2,end_time2,start_time3,end_time3,start_time4,end_time4) + if (((end_time1 >= cur_total_min or cur_total_min >= start_time1) and enable1 == 1 and week1_state == 1)or \ + ((end_time2 >= cur_total_min or cur_total_min >= start_time2) and enable2 == 1 and week2_state == 1) or\ + ((end_time3 >= cur_total_min or cur_total_min >= start_time3) and enable3 == 1 and week3_state == 1) or \ + ((end_time4 >= cur_total_min or cur_total_min >= start_time4) and enable4 == 1 and week4_state == 1)): + self.class_state = 1 + print("class_in2") + break + + + return self.class_state + + def get_class_in_time_page(self, event, msg): + EventMesh.publish("get_cur_class_time_state") + phone_call = EventMesh.publish("get_UI_high_priority") + + screen_NAME = EventMesh.publish("get_screen_NAME") + if self.class_state == 1: + if screen_NAME != None: + if screen_NAME != "system_init" or screen_NAME != "poweron": + if screen_NAME != "class_time" and phone_call == 0: + EventMesh.publish("load_screen", {"screen": "class_time"}) + else: + if screen_NAME != None: + if screen_NAME == "class_time": + EventMesh.publish("load_screen", {"screen": "main_menu"}) + + pass + + \ No newline at end of file diff --git a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/protocol.py b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/protocol.py index ac65269d..b6238020 100644 --- a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/protocol.py +++ b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/protocol.py @@ -1225,16 +1225,17 @@ class LOWBAT_ProtoCol(ProtoCol): EventMesh.publish("set_low_bat_btn",on_bt) EventMesh.publish(constants.PROTOCOL.LOWBAT_SEND) -#KEYBRD -class KEYBRD_ProtoCol(ProtoCol): - """低电提醒""" +#拒接模式来电 +class WLKEY_ProtoCol(ProtoCol): + """""" TYPE = "WLKEY" def send(self, event, msg): - # [XT*334588000000156*0006*LOWBAT] + # [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("KEYBRD:data:%s"%(data)) + # print("WLKEY:data:%s"%(data)) + # print("WLKEY!!!!!!!!!!!!!") # 通过socket发送到服务器端 EventMesh.publish(constants.EVENT.CHANNEL_SOCKET_SEND,data) @@ -1244,19 +1245,20 @@ class KEYBRD_ProtoCol(ProtoCol): @param msg: 接收到的下行数据 """ # b'[SZKW*867387060319166*000A*KEYBRD]' - + # print("WLKEY!!!!!!!!!!!!!",msg) EventMesh.publish(constants.PROTOCOL.WLKEY_SEND) -#SILENCETIME2 +#免打扰 class SILENCETIME2_ProtoCol(ProtoCol): - """低电提醒""" + """免打扰""" TYPE = "SILENCETIME2" def send(self, event, msg): - # [XT*334588000000156*0006*LOWBAT] + # [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("KEYBRD:data:%s"%(data)) + # print("SILENCETIME2!!!!!!!!!!!!!",msg) # 通过socket发送到服务器端 EventMesh.publish(constants.EVENT.CHANNEL_SOCKET_SEND,data) @@ -1265,9 +1267,96 @@ class SILENCETIME2_ProtoCol(ProtoCol): @param event: @param msg: 接收到的下行数据 """ - # b'[SZKW*867387060319166*000A*KEYBRD]' - + 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 = 1 + k = 0 + + for i in range(len(str(msg_tmp_d))): + if msg_tmp_d[i] == ',': + count+=1 + + 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("/usr/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) + +#键盘开关 +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,1]' + msg = msg[1:-1] + msg_tmp = msg.decode('ascii') + msg_tmp = msg_tmp.split(',') + on_bt = int(msg_tmp[1]) + EventMesh.publish("set_key_board", on_bt)#设置键盘开关 + EventMesh.publish(constants.PROTOCOL.KEYBRD_SEND) # 低电提醒 #[XT*334588000000156*0008*LOWBAT,1] class Time_ProtoCol(ProtoCol): @@ -1319,7 +1408,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/K01/sdk/services/microPython/ports/quectel/core/ui.py b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui.py index 36b7e1c1..35671c22 100644 --- a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui.py +++ b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui.py @@ -1638,6 +1638,8 @@ class MessageFullScreen(Screen): super().__init__() self.meta = None self.meta_type = "popup" + EventMesh.subscribe("remove_all_sms_cb",self.remove_all_sms_cb) + def initialization(self): global message_full_screen,message_full_label,message_full_confirm,message_full_cancel if message_full_screen == None : @@ -1737,6 +1739,7 @@ class RemoveMessageScreen(Screen):#删除短信弹窗框 self.meta = remove_message_popup_screen self.timer.start(1000,1,self.timer_cb) def timer_cb(self,*argc): + EventMesh.publish("system_sleep_rest")#防止黑屏 msg_nums = sms.getMsgNums() # print("timer_cb remove!!!!!!!!!",msg_nums) if msg_nums == 0: @@ -5985,7 +5988,7 @@ class StopwatchScreen(Screen): self.total_time+=1 if self.sec_value > 59: self.sec_value = 0 - if self.total_time > 99*60: + if self.total_time >= 99*60: self.total_time = 99*60 self.timer.stop() stopwatch_start_img.clear_flag(lv.obj.FLAG.HIDDEN) @@ -5999,6 +6002,7 @@ class StopwatchScreen(Screen): stopwatch_start_imgbtn, stopwatch_stop_img if self.total_time >= 99*60: self.total_time = 99*60 + self.ms_value = 0 test_s = self.total_time % 60 test_m = self.total_time//60 # print("test_s:{} test_m:{} self.total_time:{}".format(test_s,test_m,self.total_time)) @@ -6657,8 +6661,83 @@ class noSosDataScreen(Screen): def btn1_release(self): EventMesh.publish("return_prev_screen") pass +key_borad_screen = None +key_borad_screen_label = None + +#键盘弹窗 +class keyboardScreen(Screen):#键盘弹窗 + NAME = "keyboard_popup" + def __init__(self): + super().__init__() + self.meta = None + self.meta_type = "popup" + self.count = 0 + self.timer = osTimer() + + def initialization(self): + global key_borad_screen ,no_sos_screen_label + if key_borad_screen == None : + key_borad_screen = lv.obj() + print("keyboard_popup") + key_borad_screen.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) + # add style for watchface + key_borad_screen.add_style(style_screen, lv.PART.MAIN|lv.STATE.DEFAULT) + #进入图片 + + key_borad_screen_label = lv.label(key_borad_screen) + key_borad_screen_label.set_pos(0, 40) + key_borad_screen_label.set_size(128, 80) + key_borad_screen_label.set_text("如使用拨号盘,\n请在手机app上开启") + key_borad_screen_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) + key_borad_screen_label.set_long_mode(lv.label.LONG.WRAP) + key_borad_screen_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) + self.meta = key_borad_screen + def post_processor_before_initialization(self): + self.count = 0 + self.timer.start(1000,1,self.timer_cb_onescond) + + def Close(self): + self.timer.stop() + + def timer_cb_onescond(self,e): + EventMesh.publish("system_sleep_rest")#防止黑屏 + self.count+=1 + if self.count >= 5: + self.count = 0 + EventMesh.publish("return_prev_screen") + + + def done_left_to_right(self): + EventMesh.publish("return_prev_screen") + pass + def done_right_to_left(self): + EventMesh.publish("return_prev_screen") + pass + def done_bottom_to_top(self): + EventMesh.publish("return_prev_screen") + pass + def done_top_to_bottom(self): + EventMesh.publish("return_prev_screen") + pass + def done_return(self): + EventMesh.publish("return_prev_screen") + pass + def done_click(self): + EventMesh.publish("return_prev_screen") + pass + + def btn8_press(self): + + pass + def btn1_press(self): + EventMesh.publish("return_prev_screen") + pass + def btn1_release(self): + EventMesh.publish("return_prev_screen") + pass + no_sim_auto_screen = None no_sim_auto_screen_title = None no_sim_auto_screen_label =None @@ -6819,8 +6898,712 @@ class SystemInitScreen(Screen): def Close(self): self.system_init_timer.stop() +style_font_youyuan_30 = lv.style_t() +style_font_youyuan_30.init() +style_font_youyuan_30.set_text_color(lv.color_make(0xFF, 0xFF, 0xFF)) +style_font_youyuan_30.set_text_font(lv.K01_font_30_DIAL) + +class_mgr_popup_screen = None +class_mgr_popup_label = None +class_mgr_popup_time1_text = None +class classMgrPopupScreen(Screen):#上课禁用时间界面 + #上课禁用 + NAME = "class_time" + + def __init__(self): + super().__init__() + self.meta = None + self.timer = osTimer() + def initialization(self): + global class_mgr_popup_screen ,class_mgr_popup_label ,class_mgr_popup_time1_text + if class_mgr_popup_screen == None: + class_mgr_popup_screen = lv.obj() + print("Lowpower_screen") + class_mgr_popup_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) + + class_mgr_popup_time1_text = lv.label(class_mgr_popup_screen) + class_mgr_popup_time1_text.set_pos(0, 15) + class_mgr_popup_time1_text.set_size(128, 71) + class_mgr_popup_time1_text.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) + class_mgr_popup_time1_text.set_text(" ") + class_mgr_popup_time1_text.add_style(style_font_youyuan_30, lv.PART.MAIN|lv.STATE.DEFAULT) + + class_mgr_popup_label = lv.label(class_mgr_popup_screen) + class_mgr_popup_label.set_pos(0, 60) + class_mgr_popup_label.set_size(128, 50) + class_mgr_popup_label.set_text("现在是上课时间点,禁用手表功能") + class_mgr_popup_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) + class_mgr_popup_label.set_long_mode(lv.label.LONG.WRAP) + class_mgr_popup_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) + self.meta = class_mgr_popup_screen + + data = RTC().datetime() + hour = data[4] + min = data[5] + class_mgr_popup_time1_text.set_text("{}:{}".format("%02d"%(hour),"%02d"%(min))) + self.timer.start(1*1000,1,self.fun) + + def lcd_on(self): + self.timer.start(1*1000,1,self.fun) + + def lcd_off(self): + self.timer.stop() + + def fun(self,*argc): + global class_mgr_popup_time1_text + data = RTC().datetime() + hour = data[4] + min = data[5] + class_mgr_popup_time1_text.set_text("{}:{}".format("%02d"%(hour),"%02d"%(min))) + + + def btn1_release(self): + flag = EventMesh.publish("get_lcd_state") + if flag == 1: + EventMesh.publish(constants.EVENT.SYSTEM_SLEEP) + else: + EventMesh.publish(constants.EVENT.SYSTEM_UP) + + def btn8_press(self): + flag = EventMesh.publish("get_lcd_state") + if flag == 1: + EventMesh.publish(constants.EVENT.SYSTEM_SLEEP) + else: + EventMesh.publish(constants.EVENT.SYSTEM_UP) + +calculator_CALL_MAX_DATA = 18 + +calculator_line_points = [{"x":0,"y":0},{"x":0,"y":40}] +calculator_screen = None +calculator_line = None +calculator_label = None +calculator_one = None +calculator_two = None +calculator_three = None +calculator_four = None +calculator_five = None +calculator_six = None +calculator_seven = None +calculator_eight = None +calculator_nine = None +calculator_start = None +calculator_zero = None +calculator_hash = None +calculator_call = None +calculator_call_btn = None +calculator_contact = None +calculator_contact_btn = None +calculator_delete = None +calculator_delete_btn = None + +class calculatorScreen(Screen): + NAME = "calculator" + + def __init__(self): + + super().__init__() + self.meta = None + self.phone_num = '' + self.phone_list = [] + self.button = 0 + self.timer = osTimer() + self.timer_cb = 0 + self.count = 0 + + def initialization(self): + self.phone_num='' + self.phone_list = [] + global calculator_screen ,calculator_line,calculator_label,calculator_one,calculator_two,calculator_three,calculator_four,calculator_five,calculator_six,calculator_seven,calculator_eight,calculator_nine,calculator_start,\ + calculator_zero,calculator_hash,calculator_call,calculator_call_btn,calculator_contact,calculator_contact_btn,calculator_delete,calculator_delete_btn + + size_x = 36 #按钮大小 + size_y = 22 + start_x = 5 + start_y = 25 + + offset_y = 4 + if calculator_screen == None: + calculator_screen = lv.obj() + print("phone_screen") + calculator_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) + + # phone_line = lv.line(phone_screen) + # phone_line.set_points(phone_line_points,2) + # phone_line.set_pos(125,5) + # phone_line.set_size(2,18) + # phone_line.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) + # phone_line.add_style(style_line,0) + + calculator_label = lv.label(calculator_screen) + calculator_label.set_pos(0, 5) + calculator_label.set_size(128, 20) + calculator_label.set_text(" ") + calculator_label.add_style(style_font_youyuan_40, lv.PART.MAIN | lv.STATE.DEFAULT) + calculator_label.set_long_mode(lv.label.LONG.CLIP) + calculator_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) + + calculator_one = lv.img(calculator_screen) + calculator_one.set_src("U:/static/IMAGE_NUMBER_KEY1_ICON.png") + calculator_one.add_flag(lv.obj.FLAG.CLICKABLE) + calculator_one.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) + calculator_one.set_pos(start_x, start_y) + calculator_one.set_size(size_x, size_y) + + calculator_two = lv.img(calculator_screen) + calculator_two.set_size(size_x, size_y) + calculator_two.set_src("U:/static/IMAGE_NUMBER_KEY2_ICON.png") + calculator_two.add_flag(lv.obj.FLAG.CLICKABLE) + calculator_two.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) + calculator_two.set_pos(start_x+size_x+5*1, start_y) + + calculator_three = lv.img(calculator_screen) + calculator_three.set_size(size_x, size_y) + calculator_three.set_src("U:/static/IMAGE_NUMBER_KEY3_ICON.png") + calculator_three.add_flag(lv.obj.FLAG.CLICKABLE) + calculator_three.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) + calculator_three.set_pos(start_x+size_x*2+5*2, start_y) + + calculator_four = lv.img(calculator_screen) + calculator_four.set_size(size_x, size_y) + calculator_four.set_src("U:/static/IMAGE_NUMBER_KEY4_ICON.png") + calculator_four.add_flag(lv.obj.FLAG.CLICKABLE) + calculator_four.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) + calculator_four.set_pos(start_x, start_y+size_y+offset_y) + + calculator_five = lv.img(calculator_screen) + calculator_five.set_size(size_x, size_y) + calculator_five.set_src("U:/static/IMAGE_NUMBER_KEY5_ICON.png") + calculator_five.add_flag(lv.obj.FLAG.CLICKABLE) + calculator_five.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) + calculator_five.set_pos(start_x+size_x+5*1, start_y+size_y+offset_y) + + calculator_six = lv.img(calculator_screen) + calculator_six.set_size(size_x, size_y) + calculator_six.set_src("U:/static/IMAGE_NUMBER_KEY6_ICON.png") + calculator_six.add_flag(lv.obj.FLAG.CLICKABLE) + calculator_six.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) + calculator_six.set_pos(start_x+size_x*2+5*2, start_y+size_y+offset_y) + + calculator_seven = lv.img(calculator_screen) + calculator_seven.set_size(size_x, size_y) + calculator_seven.set_src("U:/static/IMAGE_NUMBER_KEY7_ICON.png") + calculator_seven.add_flag(lv.obj.FLAG.CLICKABLE) + calculator_seven.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) + calculator_seven.set_pos(start_x, start_y+size_y*2+offset_y*2) + + calculator_eight = lv.img(calculator_screen) + calculator_eight.set_size(size_x, size_y) + calculator_eight.set_src("U:/static/IMAGE_NUMBER_KEY8_ICON.png") + calculator_eight.add_flag(lv.obj.FLAG.CLICKABLE) + calculator_eight.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) + calculator_eight.set_pos(start_x+size_x+5*1, start_y+size_y*2+offset_y*2) + + calculator_nine = lv.img(calculator_screen) + calculator_nine.set_size(size_x, size_y) + calculator_nine.set_src("U:/static/IMAGE_NUMBER_KEY9_ICON.png") + calculator_nine.add_flag(lv.obj.FLAG.CLICKABLE) + calculator_nine.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) + calculator_nine.set_pos(start_x+size_x*2+5*2, start_y+size_y*2+offset_y*2) + + # phone_start = lv.img(phone_screen) + # phone_start.set_size(size_x, size_y) + # phone_start.set_src("U:/static/IMAGE_NUMBER_KEYSTAR_ICON.png") + # phone_start.add_flag(lv.obj.FLAG.CLICKABLE) + # phone_start.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) + # phone_start.set_pos(start_x, start_y+size_y*3) + + # calculator_delete = lv.img(calculator_screen) + # calculator_delete.set_size(size_x, size_y) + # calculator_delete.set_src("U:/static/IMAGE_BUTTON_DELKEY.png") + # calculator_delete.add_flag(lv.obj.FLAG.CLICKABLE) + # calculator_delete.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) + # calculator_delete.set_pos(start_x, start_y+size_y*3+offset_y*3) + + calculator_delete = lv.label(calculator_screen) + calculator_delete.set_pos(start_x, start_y+size_y*3+offset_y*3) + calculator_delete.set_size(start_x+size_x+5*1-start_x, 128-(start_y+size_y*3+offset_y*3)) + calculator_delete.set_text("/") + calculator_delete.add_style(style_font_youyuan_40, lv.PART.MAIN | lv.STATE.DEFAULT) + calculator_delete.set_long_mode(lv.label.LONG.CLIP) + calculator_delete.add_flag(lv.obj.FLAG.CLICKABLE) + calculator_delete.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) + + + + calculator_zero = lv.img(calculator_screen) + calculator_zero.set_size(size_x, size_y) + calculator_zero.set_src("U:/static/IMAGE_NUMBER_KEY0_ICON.png") + calculator_zero.add_flag(lv.obj.FLAG.CLICKABLE) + calculator_zero.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) + calculator_zero.set_pos(start_x+size_x+5*1, start_y+size_y*3+offset_y*3) + + calculator_call = lv.label(calculator_screen) + calculator_call.set_pos(start_x+size_x*2+5*2, start_y+size_y*3+offset_y*3) + calculator_call.set_size(128-(start_x+size_x*2+5*2), 128-(start_y+size_y*3+offset_y*3)) + calculator_call.set_text("-") + calculator_call.add_style(style_font_youyuan_40, lv.PART.MAIN | lv.STATE.DEFAULT) + calculator_call.set_long_mode(lv.label.LONG.CLIP) + calculator_call.add_flag(lv.obj.FLAG.CLICKABLE) + calculator_call.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) + # calculator_call = lv.img(calculator_screen) + # calculator_call.set_size(size_x, size_y) + # calculator_call.set_src("U:/static/IMAGE_BUTTON_DIAL.png") + # calculator_call.add_flag(lv.obj.FLAG.CLICKABLE) + # calculator_call.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) + # calculator_call.set_pos(start_x+size_x*2+5*2, start_y+size_y*3+offset_y*3) + + + + self.meta = calculator_screen + + calculator_one.add_event_cb(lambda e: EventMesh.callback_wrapper(self.one(e)), + lv.EVENT.CLICKED, None) + calculator_two.add_event_cb(lambda e: EventMesh.callback_wrapper(self.two(e)), + lv.EVENT.CLICKED, None) + calculator_three.add_event_cb(lambda e: EventMesh.callback_wrapper(self.three(e)), + lv.EVENT.CLICKED, None) + calculator_four.add_event_cb(lambda e: EventMesh.callback_wrapper(self.four(e)), + lv.EVENT.CLICKED, None) + calculator_five.add_event_cb(lambda e: EventMesh.callback_wrapper(self.five(e)), + lv.EVENT.CLICKED, None) + calculator_six.add_event_cb(lambda e: EventMesh.callback_wrapper(self.six(e)), + lv.EVENT.CLICKED, None) + calculator_seven.add_event_cb(lambda e: EventMesh.callback_wrapper(self.start(e)), + lv.EVENT.CLICKED, None) + + calculator_seven.add_event_cb(lambda e: EventMesh.callback_wrapper(self.pressed_start(e)), + lv.EVENT.LONG_PRESSED, None)#长按显示+ + + calculator_seven.add_event_cb(lambda e: EventMesh.callback_wrapper(self.endpressed_start(e)), + lv.EVENT.RELEASED, None)#释放按键 + + calculator_eight.add_event_cb(lambda e: EventMesh.callback_wrapper(self.eight(e)), + lv.EVENT.CLICKED, None) + calculator_nine.add_event_cb(lambda e: EventMesh.callback_wrapper(self.start(e)), + lv.EVENT.CLICKED, None) + + calculator_nine.add_event_cb(lambda e: EventMesh.callback_wrapper(self.pressed_start(e)), + lv.EVENT.LONG_PRESSED, None)#长按显示+ + + calculator_nine.add_event_cb(lambda e: EventMesh.callback_wrapper(self.nine_endpressed_start(e)), + lv.EVENT.RELEASED, None)#释放按键 + + # phone_zero.add_event_cb(lambda e: EventMesh.callback_wrapper(self.zero(e)), + # lv.EVENT.CLICKED, None) + + calculator_zero.add_event_cb(lambda e: EventMesh.callback_wrapper(self.start(e)), + lv.EVENT.CLICKED, None)#短按显示* + + calculator_zero.add_event_cb(lambda e: EventMesh.callback_wrapper(self.pressed_start(e)), + lv.EVENT.LONG_PRESSED, None)#长按显示+ + + calculator_zero.add_event_cb(lambda e: EventMesh.callback_wrapper(self.zero_endpressed_start(e)), + lv.EVENT.RELEASED, None)#释放按键 + + calculator_call.add_event_cb(lambda e: EventMesh.callback_wrapper(self.call(e)), + lv.EVENT.CLICKED, None) + # phone_contact_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.contact(e)), + # lv.EVENT.CLICKED, None) + calculator_delete.add_event_cb(lambda e: EventMesh.callback_wrapper(self.delete(e)), + lv.EVENT.CLICKED, None) + + # phone_start.add_event_cb(lambda e: EventMesh.callback_wrapper(self.start(e)), + # lv.EVENT.CLICKED, None)#短按显示* + + # phone_start.add_event_cb(lambda e: EventMesh.callback_wrapper(self.pressed_start(e)), + # lv.EVENT.LONG_PRESSED, None)#长按显示+ + + # phone_start.add_event_cb(lambda e: EventMesh.callback_wrapper(self.endpressed_start(e)), + # lv.EVENT.RELEASED, None)#释放按键 + + + # phone_hash.add_event_cb(lambda e: EventMesh.callback_wrapper(self.hash(e)), + # lv.EVENT.CLICKED, None) + + + self.phone_num='' + self.calcul_num='' + self.phone_list = [] + self.count = 0 + if calculator_label != None: + calculator_label.set_pos(0, 0) + calculator_label.set_size(0, 0) + calculator_label.set_text(" ") + #phone_label.set_text(" ") + # print("self.phone_list :{} self.phone_num:{}".format(self.phone_list,self.phone_num)) + if self.timer_cb == 0: + self.timer_cb = 1 + # self.timer.start(1000,1,self.refresh_line) + + + def refresh_line(self,e): + return + if self.count > 2 : + self.count = 1 + if self.count%2 == 0: + phone_line.clear_flag(lv.obj.FLAG.HIDDEN) + else: + phone_line.add_flag(lv.obj.FLAG.HIDDEN) + self.count+=1 + def one(self,e): + self.calculator_fun("1") + + def two(self,e): + self.calculator_fun("2") + + def three(self,e): + self.calculator_fun("3") + + def four(self,e): + self.calculator_fun("4") + + def five(self,e): + self.calculator_fun("5") + + def six(self,e): + self.calculator_fun("6") + + def seven(self,e): + self.calculator_fun("7") + + def eight(self,e): + self.calculator_fun("8") + + def nine(self,e): + self.calculator_fun("9") + + def zero(self,e): + self.calculator_fun("0") + + def start(self,e): + self.button = 0 + + def pressed_start(self,e): + self.button = 1 + def Close(self): + self.timer_cb = 0 + self.timer.stop() + + def nine_endpressed_start(self,e): + + if self.button == 1:#长按 + self.calculator_fun("=") + + else:#短按 + self.calculator_fun("9") + + + + def zero_endpressed_start(self,e): + + if self.button == 1:#长按 + self.calculator_fun("+") + else:#短按 + self.calculator_fun("0") + + + + def endpressed_start(self,e): + if self.button == 1:#长按 + self.calculator_fun("X") + else:#短按 + self.calculator_fun("7") + + + def hash(self,e): + + self.calculator_fun("#") + + def is_all_zero(self,lst): + return all(element == 0 for element in lst) + + + def calculator_fun(self,msg): + result = 0 + if len(self.phone_num) >= calculator_CALL_MAX_DATA:#限制拨号数量20个数字 + #self.phone_list.pop(0) + return + if len(self.phone_num) != 0: + if len(self.calcul_num) > 0: + self.calcul_num = '' + if msg == "+" or msg == '-' or msg == 'X' or msg == '/':#如果是计算完结果再按特殊字符就让他继续加 + print("不包含特殊字符1") + + self.phone_list.append(msg) + self.phone_num = ''.join(self.phone_list) + self.show_num() + else:# + print("不包含特殊字符2",msg) + if msg == '=': + self.show_num() + else: + + self.phone_num = '' + self.phone_list = [] + self.phone_list.append(msg) + self.phone_num = ''.join(self.phone_list) + self.show_num() + + else: + if self.phone_num.find('/') != -1 or self.phone_num.find('+') != -1 or self.phone_num.find('x') != -1 or self.phone_num.find('-') != -1: + tmp_2 = '' + tmp_3 = '' + state1 = 0 + state2 = 0 + state3 = 0 + tmp_1 = '' + tmp = '' + + if self.phone_num.find('+') != -1:#加运算 + data1 = float(self.phone_num.split('+')[0]) + if len(self.phone_num.split('+')[1]) > 0 and (msg == '+' or msg =='='):#计算结果 + data2 = float(self.phone_num.split('+')[1]) + + result = data1+data2 + print("data1",data1,data2,result) + self.calcul_num = str(result) + self.calaulator_results() + + self.phone_num = self.calcul_num + self.phone_list = list(self.phone_num) + print("加数====",result) + else: + if msg == '-' or msg == '/' or msg == 'X': + self.phone_list.pop() + self.phone_list.append(msg) + self.phone_num = ''.join(self.phone_list) + self.show_num() + print("减数") + else: + if msg != '=' and msg != '+': + self.phone_list.append(msg) + self.phone_num = ''.join(self.phone_list) + self.show_num() + else: + result = data1 + result_tmp = str(result) + if result_tmp.find('.') != -1: + tmp_zero = int(result_tmp.split('.')[1]) + if tmp_zero == 0: + result = result_tmp.split('.')[0] + print("data1!!!!!!!!!!",data1,data2,result) + self.calcul_num = str(result) + self.calaulator_results() + self.phone_num = self.calcul_num + self.phone_list = list(self.phone_num) + print("减数") + print("加数") + + if self.phone_num.find('-') != -1:#减运算 + data1 = float(self.phone_num.split('-')[0]) + if len(self.phone_num.split('-')[1]) > 0 and (msg == '-' or msg =='='):#计算结果 + data2 = float(self.phone_num.split('-')[1]) + result = data1-data2 + print("data1222222222222",data1,data2,result) + self.calcul_num = str(result) + self.calaulator_results() + self.phone_num = self.calcul_num + self.phone_list = list(self.phone_num) + else: + if msg == '+' or msg == '/' or msg == 'X': + self.phone_list.pop() + self.phone_list.append(msg) + self.phone_num = ''.join(self.phone_list) + self.show_num() + print("减数") + else: + if msg != '=' and msg != '-': + self.phone_list.append(msg) + self.phone_num = ''.join(self.phone_list) + self.show_num() + else: + result = data1 + result_tmp = str(result) + if result_tmp.find('.') != -1: + tmp_zero = int(result_tmp.split('.')[1]) + if tmp_zero == 0: + result = result_tmp.split('.')[0] + print("data333333",data1) + self.calcul_num = str(result) + self.calaulator_results() + self.phone_num = self.calcul_num + self.phone_list = list(self.phone_num) + + + if self.phone_num.find('X') != -1:#乘运算 + data1 = float(self.phone_num.split('X')[0]) + if len(self.phone_num.split('X')[1]) > 0 and (msg == 'X' or msg =='='):#计算结果 + + data2 = float(self.phone_num.split('X')[1]) + result = data1*data2 + print("data44444",data1,data2) + self.calcul_num = str(result) + self.calaulator_results() + self.phone_num = self.calcul_num + self.phone_list = list(self.phone_num) + print("乘数====",result) + else: + if msg == '+' or msg == '/' or msg == '-': + self.phone_list.pop() + self.phone_list.append(msg) + self.phone_num = ''.join(self.phone_list) + self.show_num() + print("乘数") + else: + if msg != '=' and msg != 'X': + self.phone_list.append(msg) + self.phone_num = ''.join(self.phone_list) + self.show_num() + else: + result = data1 + result_tmp = str(result) + if result_tmp.find('.') != -1: + tmp_zero = int(result_tmp.split('.')[1]) + if tmp_zero == 0: + result = result_tmp.split('.')[0] + print("data5555555",data1,data2) + self.calcul_num = str(result) + self.calaulator_results() + self.phone_num = self.calcul_num + self.phone_list = list(self.phone_num) + + + if self.phone_num.find('/') != -1:#除运算 + + tmp = self.phone_num.split('/')[0] + tmp_1 = self.phone_num.split('/')[1] + if len(tmp_1) > 0 and (msg == '/' or msg == '='): + if tmp_1.find('.') != -1: + state1 = int(tmp_1.split('.')[0])#0.009 10:00 + state2 = int(tmp_1.split('.')[1])#0.009 + + else: + state1 = int(tmp_1) #10 + + print("state3",state1,state2,state3,tmp_1) + if (state1 == 0 and state2 == 0): + print("除数不可以为0") + else: + data1 = float(self.phone_num.split('/')[0]) + data2 = 0 + if len(self.phone_num.split('/')[1]) > 0: + data2 = float(self.phone_num.split('/')[1]) + if data2 != 0: + result = data1/data2 + else: + result = data1 + print("data6666666",data1,data2) + + result_tmp = str(result) + if result_tmp.find('.') != -1: + tmp_zero = int(result_tmp.split('.')[1]) + if tmp_zero == 0: + result = result_tmp.split('.')[0] + else: + pass + self.calcul_num = str(result) + self.calaulator_results() + self.phone_num = self.calcul_num + self.phone_list = list(self.phone_num) + else: + if msg == '+' or msg == 'X' or msg == '-': + self.phone_list.pop() + self.phone_list.append(msg) + self.phone_num = ''.join(self.phone_list) + self.show_num() + print("减数") + else: + if msg != '=' and msg != '/': + self.phone_list.append(msg) + self.phone_num = ''.join(self.phone_list) + self.show_num() + else: + result = float(tmp) + self.calcul_num = str(result) + print("data7777777777",result) + self.calaulator_results() + self.phone_num = self.calcul_num + self.phone_list = list(self.phone_num) + print("除数没有数字") + else: + if msg == '=': + self.show_num() + pass + else: + if msg == "+" and msg == '-' and msg == 'X' and msg == '/':#如果是计算完结果再按特殊字符就让他继续加 + print("不包含特殊字符") + self.calcul_num = '' + self.phone_list.append(msg) + self.phone_num = ''.join(self.phone_list) + self.show_num() + else:# + print("不包含特殊字符") + if len(self.calcul_num) > 0:#表示已计算了一次结果 全部置0 + self.phone_num = '' + self.phone_list = [] + self.calcul_num = '' + + self.phone_list.append(msg) + self.phone_num = ''.join(self.phone_list) + self.show_num() + + else: + if msg != "+" and msg != '-' and msg != 'X' and msg != '/': + print("数组为0时") + self.phone_list.append(msg) + self.phone_num = ''.join(self.phone_list) + self.show_num() + pass + + def delete(self,e): + self.calculator_fun("/") + # if len(self.phone_list) != 0: + # self.phone_list.pop() + # self.phone_num = ''.join(self.phone_list) + # self.show_num() + + def contact(self,e): + EventMesh.publish("load_screen", {"screen": "contacts"}) + + def call(self,e): + self.calculator_fun("-") + + def show_num(self): + print("self.phone_num ",self.phone_num,self.phone_list) + global calculator_label + calculator_label.set_pos(0, 5) + calculator_label.set_size(128, 20) + calculator_label.set_text(self.phone_num) + + def calaulator_results(self):#计算结果显示 + print("self.calcul_num ",self.calcul_num,self.phone_list) + global calculator_label + calculator_label.set_pos(0, 5) + calculator_label.set_size(128, 20) + calculator_label.set_text(self.calcul_num) + + def lcd_on(self): + if self.timer_cb != 0: + self.timer_cb = 0 + self.timer.start(1000,1,self.refresh_line) + + def lcd_off(self): + self.timer_cb = 1 + self.timer.stop() + + + def done_return(self): + EventMesh.publish("load_screen", {"screen": "main_menu"}) + + def btn1_release(self): + EventMesh.publish("load_screen", {"screen": "main_menu"}) + + def btn8_press(self): + EventMesh.publish("watch_top_show") + EventMesh.publish("load_screen", {"screen": "main_menu"}) + #from ui_WatchFaceScreen import WatchFaceScreen class UI(object): def __init__(self): @@ -7120,6 +7903,17 @@ class UI(object): def load_screen(self, msg): print("msg1={} self.UI_high_priority_flag:{}".format(msg,self.UI_high_priority_flag)) + state = EventMesh.publish("get_cur_class_time_state") + if state != None: + if state == 1: + screen_NAME = EventMesh.publish("get_screen_NAME") + if screen_NAME != None: + if screen_NAME == "class_time" :#在上课禁用界面打断其他操作界面 + print("class_time UI") + if msg["screen"] == "countdown_end": + print("countdown_end UI") + EventMesh.publish("close_count_show_info") + return if self.UI_high_priority_flag == 1:#电话界面屏蔽其他界面 return if self.screen : diff --git a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui_main_menu.py b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui_main_menu.py index 2559e32d..61284745 100644 --- a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui_main_menu.py +++ b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui_main_menu.py @@ -330,8 +330,20 @@ class MainMenuScreen(Screen): MainMenu2_til.set_tile_id(0,1,lv.ANIM.OFF) def img_cb(self, e, msg): - print("MainMenu2:img_cb:{}".format(msg)) - EventMesh.publish("load_screen", {"screen": "{}".format(msg)}) + state = EventMesh.publish("get_key_board", "key_board") + print("state",state) + if state == 1: + print("state11",state) + if msg == 'Phone': + print("Phone",state) + EventMesh.publish("load_screen", {"screen": "keyboard_popup"}) + pass + else: + EventMesh.publish("load_screen", {"screen": "{}".format(msg)}) + else: + EventMesh.publish("load_screen", {"screen": "{}".format(msg)}) + print("MainMenu2:img_cb:{} {}".format(msg,type(msg))) + def lcd_on(self): self.watchface.watchface_style.timerout_update() diff --git a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui_setting.py b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui_setting.py index a09f6645..6ccd23ea 100644 --- a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui_setting.py +++ b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui_setting.py @@ -1105,7 +1105,7 @@ class PowerOnScreen(Screen): self.count = 0 self.aud.play(1, 1, 'U:/static/R_VOLUME_SET_1.mp3') #播放开机铃声 self.timer1.start(1000,1,self.fun) - self.timer2.start(6000,0,self.open_fun) + self.timer2.start(4000,0,self.open_fun) pass diff --git a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/versions.py b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/versions.py index 2ddef655..bb5bacb2 100644 --- a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/versions.py +++ b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/versions.py @@ -1,2 +1,2 @@ Version="810M_K01_V1.0" -Build_Time="2023-08-19 9:45:12" +Build_Time="2023-08-24 18:04:18"