From: dxy15521469561 <1731678236@qq.com> Date: Mon, 28 Aug 2023 06:17:03 +0000 (+0800) Subject: k01:优化 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=b7603905ea9f7857088a179e96d7633dc4a763a5;p=mirrors%2FASR1603_G5.git k01:优化 --- diff --git a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py index c8872b24..e28f977f 100644 --- a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py +++ b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py @@ -109,28 +109,7 @@ class BtnDevice(Abstract): self.powerKey_status = status if self.pwk_press == 1: #按按钮时不处理 return - if status == 1:#拔出 - print("USB OUT") - screen_NAME = EventMesh.publish("get_screen_NAME") - if screen_NAME != None: - if screen_NAME == "poweron" or screen_NAME == "system_init": - return - - bat_tmp = EventMesh.publish("screen_get_battery") - if bat_tmp != None: - if bat_tmp[0] == "1": - EventMesh.publish("load_screen", {"screen": "charge_in"}) - pass - elif status == 0:#插入usb - print("USB IN") - screen_NAME = EventMesh.publish("get_screen_NAME") - if screen_NAME != None: - if screen_NAME == "poweron" or screen_NAME == "system_init": - return - bat_tmp = EventMesh.publish("screen_get_battery") - if bat_tmp != None: - if bat_tmp[0] == "0": - EventMesh.publish("load_screen", {"screen": "charge_out"}) + def start(self): 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 7b21e42e..45facf59 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 @@ -172,7 +172,7 @@ def main_init(): print("init10:{}".format(utime.localtime())) - + EventMesh.publish("load_screen", {"screen": "poweron"}) app.append_manager(mgr.AlarmVolumeLevelManager()) \ .append_manager(mgr.MsgVolumeLevelManager()) \ .append_manager(mgr.PhoneVolumeLevelManager()) \ @@ -264,6 +264,6 @@ def main_init(): 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)) - EventMesh.publish("load_screen", {"screen": "poweron"}) + 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 3c5602af..b9bba002 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 @@ -1708,6 +1708,29 @@ class DeviceInfoManager(Abstract): return sim.switchCard(slot) def usb_event_cb(self, state): + status = state + if status == 1:#拔出 + print("USB OUT") + screen_NAME = EventMesh.publish("get_screen_NAME") + if screen_NAME != None: + if screen_NAME == "poweron" or screen_NAME == "system_init": + return + + bat_tmp = EventMesh.publish("screen_get_battery") + if bat_tmp != None: + if bat_tmp[0] == "1": + EventMesh.publish("load_screen", {"screen": "charge_in"}) + pass + elif status == 0:#插入usb + print("USB IN") + screen_NAME = EventMesh.publish("get_screen_NAME") + if screen_NAME != None: + if screen_NAME == "poweron" or screen_NAME == "system_init": + return + bat_tmp = EventMesh.publish("screen_get_battery") + if bat_tmp != None: + if bat_tmp[0] == "0": + EventMesh.publish("load_screen", {"screen": "charge_out"}) EventMesh.publish("battery", self.get_battery()) def get_usb_state(self): 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 35671c22..deabefe4 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 @@ -6971,7 +6971,7 @@ class classMgrPopupScreen(Screen):#上课禁用时间界面 else: EventMesh.publish(constants.EVENT.SYSTEM_UP) -calculator_CALL_MAX_DATA = 18 +calculator_CALL_MAX_DATA = 16 calculator_line_points = [{"x":0,"y":0},{"x":0,"y":40}] calculator_screen = None @@ -7226,7 +7226,14 @@ class calculatorScreen(Screen): self.phone_num='' self.calcul_num='' self.phone_list = [] + self.one_buf = '' + self.two_buf = '' + self.operator = '' + self.result_buf = ''#计算结果 + + self.count = 0 + self.show_num() if calculator_label != None: calculator_label.set_pos(0, 0) calculator_label.set_size(0, 0) @@ -7248,34 +7255,35 @@ class calculatorScreen(Screen): phone_line.add_flag(lv.obj.FLAG.HIDDEN) self.count+=1 def one(self,e): - self.calculator_fun("1") + self.input_num("1") def two(self,e): - self.calculator_fun("2") + self.input_num("2") def three(self,e): - self.calculator_fun("3") + self.input_num(".") + # self.input_num("3") def four(self,e): - self.calculator_fun("4") + self.input_num("4") def five(self,e): - self.calculator_fun("5") + self.input_num("5") def six(self,e): - self.calculator_fun("6") + self.input_num("6") def seven(self,e): - self.calculator_fun("7") + self.input_num("7") def eight(self,e): - self.calculator_fun("8") + self.input_num("8") def nine(self,e): - self.calculator_fun("9") + self.input_num("9") def zero(self,e): - self.calculator_fun("0") + self.input_num("0") def start(self,e): self.button = 0 @@ -7289,27 +7297,27 @@ class calculatorScreen(Screen): def nine_endpressed_start(self,e): if self.button == 1:#长按 - self.calculator_fun("=") + self.input_char("=") else:#短按 - self.calculator_fun("9") + self.input_num("9") def zero_endpressed_start(self,e): if self.button == 1:#长按 - self.calculator_fun("+") + self.input_char("+") else:#短按 - self.calculator_fun("0") + self.input_num("0") def endpressed_start(self,e): if self.button == 1:#长按 - self.calculator_fun("X") + self.input_char("*") else:#短按 - self.calculator_fun("7") + self.input_num("7") def hash(self,e): @@ -7319,6 +7327,404 @@ class calculatorScreen(Screen): def is_all_zero(self,lst): return all(element == 0 for element in lst) + def input_num(self,msg):#输入数字 + if msg == '9': + if len(self.result_buf) == 0: + if self.one_buf != '': + if self.operator != '': + if self.two_buf != '': + self.phone_list = list(self.two_buf) + self.phone_list.pop() + self.two_buf = ''.join(self.phone_list) + print("two_buf!!!") + else: + self.phone_list = list(self.operator) + self.phone_list.pop() + self.operator = ''.join(self.phone_list) + print("self.operator!!!") + else: + self.phone_list = list(self.one_buf) + self.phone_list.pop() + self.one_buf = ''.join(self.phone_list) + print("self.one_buf!!!") + self.show_result()#显示计算结果以及输入结果 + return + global calculator_label + print("input_num",msg) + if len(self.result_buf) > 0: + self.result_buf = '' + self.two_buf = '' + self.one_buf = '' + + if self.one_buf == '':#第一个数字为空 + if msg == '.':#如果第一个数据为空并且输入的第一个数字是.就直接置0.开始 + self.one_buf = "0." + else: + self.one_buf = self.one_buf+msg + else: + if self.operator == '':#没有特殊字符 + - / * + if self.one_buf.find('.') == -1: + if len(self.one_buf) <= 10 and len(self.one_buf) > 0:#第二个数据超过10个数据不让输入 0 + if len(self.one_buf) == 1 and self.one_buf == '0' and msg != '.': + self.one_buf = msg + else: + self.one_buf = self.one_buf+msg#还是第一个数据继续加 0 + pass + else: + if len(self.one_buf) > 10: + print("大于是10位数字") + pass + else: + if msg == '.': + self.one_buf = '0.' + else: + self.one_buf = self.one_buf+msg#还是第一个数据继续加 0 + pass + else: + if self.one_buf.find('.') != -1:#找到一个点如果还是点的话不让点 + if msg != '.': + if len(self.one_buf) <= 10: + self.one_buf = self.one_buf+msg#还是第一个数据继续加 0 + + else: + + if self.two_buf.find('.') == -1: + if len(self.two_buf) <= 10 and len(self.two_buf) > 0:#第二个数据超过10个数据不让输入 0 + if len(self.two_buf) == 1 and self.two_buf == '0' and msg != '.': + self.two_buf = msg + else: + self.two_buf = self.two_buf+msg#还是第一个数据继续加 0 + pass + else: + if len(self.two_buf) > 10: + pass + else: + if msg == '.': + self.two_buf = '0.' + else: + self.two_buf = self.two_buf+msg#还是第一个数据继续加 0 + pass + else: + if self.two_buf.find('.') != -1: + if msg != '.': + if len(self.two_buf) <= 10: + self.two_buf = self.two_buf+msg#还是第一个数据继续加 0 + + + self.show_result()#显示计算结果以及输入结果 + pass + + + def input_char(self,msg):#输入字符 + + if self.one_buf != '': + if self.one_buf.find(".") != -1: + tmp = self.one_buf.split(".")[1] + if len(tmp) == 0: + self.one_buf = self.one_buf.split('.')[0] + if self.two_buf != '': + if self.two_buf.find(".") != -1: + tmp = self.two_buf.split(".")[1] + if len(tmp) == 0: + self.two_buf = self.two_buf.split('.')[0] + + global calculator_label + if len(self.two_buf) != 0 and float(self.two_buf) == 0:#0.000 + if self.operator == '/' and (msg == '/' or msg == '=' or msg == '*'or msg == '+' or msg =='-'):#如果第二个数据为0并且符号是除号就提示除数不为0 + print("除数不可以为0") + self.operator = '' + self.one_buf = '' + self.two_buf = '' + calculator_label.set_text("除数不可以为0") + return + else: + print("除数不为0") + self.show_result() + + self.result_buf = '' + print("input_char",msg) + if self.one_buf != '':#只有第一个数据不为空的时候才可以输入特殊字符 + if msg == "+":#加 + if self.one_buf != '': + if self.operator != '':#90 + print("operator") + if self.two_buf != '':#90+90 计算结果 -0.9 + if self.one_buf.find('.') != -1: + if int(self.one_buf.split(".")[1]) == 0: + self.one_buf = self.one_buf.split('.')[0] + + if self.two_buf.find('.') != -1: + if int(self.two_buf.split('.')[1]) == 0: + self.two_buf = self.two_buf.split('.')[0] + + str_sum = '' + if self.one_buf.find('e') != -1:#1.2e + tmp1 = (self.one_buf.split('e')[0])#2.1717041952680391897126070275863e-15 + tmp2 = (self.one_buf.split('e')[1]) + if len(tmp2) > 0: + self.result_buf = str(eval(tmp1 + "*"+"10**"+tmp2)) + else: + self.result_buf = str(eval(tmp1 + "*"+"10**"+"0")) + pass + pass + else: + str_sum = (self.one_buf.split()[0])+self.operator+(self.two_buf.split()[0]) + self.result_buf = str(eval(str_sum)) + pass + + print("str_sum",str_sum,self.result_buf) + if self.result_buf.find('e') == -1: + if self.result_buf.find('.') != -1:#有小数点 + print("input_dot",self.result_buf) + if int(self.result_buf.split(".")[1]) == 0:#小数点后面全是0 就取整数 + self.result_buf = (self.result_buf.split(".")[0]) + + if len(self.result_buf) > 14:#99978654.087766666 + self.result_buf = str(self.result_buf[:14]) + + self.one_buf = str(self.result_buf) + self.two_buf = '' + self.operator = '' + self.show_result()#显示计算结果以及输入结果 + else: + if self.operator != '+':#有+就不需要再显示+ + self.operator = msg#90 没有特殊字符则加上不计算结果 + if self.one_buf.split()[0] == 0:#如果数字是0.就显示0负数不在内 + self.one_buf = "0" + self.show_result()#显示计算结果以及输入结果 + else: + print("operator !!!!!") + self.operator = msg + self.show_result()#显示计算结果以及输入结果 + pass + elif msg == '-':#减 + if self.one_buf != '': + if self.operator != '':#90 + print("operator!!!!!!!!!!!!") + if self.two_buf != '':#90+90 计算结果 -0.9 + if self.one_buf.find('.') != -1: + if int(self.one_buf.split(".")[1]) == 0: + self.one_buf = self.one_buf.split('.')[0] + + if self.two_buf.find('.') != -1: + if int(self.two_buf.split('.')[1]) == 0: + self.two_buf = self.two_buf.split('.')[0] + str_sum = '' + if self.one_buf.find('e') != -1:#1.2e + tmp1 = (self.one_buf.split('e')[0])#2.1717041952680391897126070275863e-15 + tmp2 = (self.one_buf.split('e')[1]) + if len(tmp2) > 0: + self.result_buf = str(eval(tmp1 + "*"+"10**"+tmp2)) + else: + self.result_buf = str(eval(tmp1 + "*"+"10**"+"0")) + pass + pass + else: + str_sum = (self.one_buf.split()[0])+self.operator+(self.two_buf.split()[0]) + self.result_buf = str(eval(str_sum)) + pass + + print("str_sum",str_sum,self.result_buf) + if self.result_buf.find('e') == -1: + if self.result_buf.find('.') != -1:#有小数点 + print("input_dot",self.result_buf) + if int(self.result_buf.split(".")[1]) == 0:#小数点后面全是0 就取整数 + self.result_buf = (self.result_buf.split(".")[0]) + + if len(self.result_buf) > 14:#99978654.087766666 + self.result_buf = str(self.result_buf[:14]) + + self.one_buf = str(self.result_buf) + self.two_buf = '' + self.operator = '' + self.show_result()#显示计算结果以及输入结果 + else: + if self.operator != '-':#有+就不需要再显示+ + self.operator = msg#90 没有特殊字符则加上不计算结果 + if self.one_buf.split()[0] == 0:#如果数字是0.就显示0负数不在内 + self.one_buf = "0" + self.show_result()#显示计算结果以及输入结果 + else: + print("operator ---------") + self.operator = msg + self.show_result()#显示计算结果以及输入结果 + pass + elif msg == '*':#乘 + if self.one_buf != '': + if self.operator != '':#90 + print("operator====***********") + if self.two_buf != '':#90+90 计算结果 -0.9 + if self.one_buf.find('.') != -1: + if int(self.one_buf.split(".")[1]) == 0: + self.one_buf = self.one_buf.split('.')[0] + + if self.two_buf.find('.') != -1: + if int(self.two_buf.split('.')[1]) == 0: + self.two_buf = self.two_buf.split('.')[0] + + str_sum = '' + if self.one_buf.find('e') != -1:#1.2e + tmp1 = (self.one_buf.split('e')[0])#2.1717041952680391897126070275863e-15 + tmp2 = (self.one_buf.split('e')[1]) + if len(tmp2) > 0: + self.result_buf = str(eval(tmp1 + "*"+"10**"+tmp2)) + else: + self.result_buf = str(eval(tmp1 + "*"+"10**"+"0")) + pass + pass + else: + str_sum = (self.one_buf.split()[0])+self.operator+(self.two_buf.split()[0]) + self.result_buf = str(eval(str_sum)) + pass + + print("str_sum",str_sum,self.result_buf) + if self.result_buf.find('e') == -1:#有e + if self.result_buf.find('.') != -1:#有小数点 + print("input_dot",self.result_buf) + if int(self.result_buf.split(".")[1]) == 0:#小数点后面全是0 就取整数 + self.result_buf = (self.result_buf.split(".")[0]) + + if len(self.result_buf) > 14:#99978654.087766666 + self.result_buf = str(self.result_buf[:14]) + + self.one_buf = str(self.result_buf) + self.two_buf = '' + self.operator = '' + self.show_result()#显示计算结果以及输入结果 + else: + if self.operator != '*':#有+就不需要再显示+ + self.operator = msg#90 没有特殊字符则加上不计算结果 + if self.one_buf.split()[0] == 0:#如果数字是0.就显示0负数不在内 + self.one_buf = "0" + self.show_result()#显示计算结果以及输入结果 + else: + print("operator **********") + self.operator = msg + self.show_result()#显示计算结果以及输入结果 + pass + + elif msg == '/':#除 + if self.one_buf != '': + if self.operator != '':#90 + print("operator ==== //////////",self.two_buf) + if self.two_buf != '':#90+90 计算结果 -0.9 + if float(self.two_buf) != 0: + if self.one_buf.find('.') != -1: + if int(self.one_buf.split(".")[1]) == 0: + self.one_buf = self.one_buf.split('.')[0] + + if self.two_buf.find('.') != -1: + if int(self.two_buf.split('.')[1]) == 0: + self.two_buf = self.two_buf.split('.')[0] + + str_sum = '' + if self.one_buf.find('e') != -1:#1.2e + + tmp = (self.one_buf.split('e')[0]) + + str_sum = tmp + self.operator + self.two_buf + self.result_buf = str(eval(str_sum))+'e' + pass + else: + str_sum = (self.one_buf.split()[0])+self.operator+(self.two_buf.split()[0]) + self.result_buf = str(eval(str_sum)) + pass + + print("str_sum",str_sum,self.result_buf) + if self.result_buf.find('e') == -1:#有小数点 + if self.result_buf.find('.') != -1:#有小数点 + print("input_dot",self.result_buf) + if int(self.result_buf.split(".")[1]) == 0:#小数点后面全是0 就取整数 + self.result_buf = (self.result_buf.split(".")[0]) + + if len(self.result_buf) > 14:#99978654.087766666 + self.result_buf = str(self.result_buf[:14]) + + self.one_buf = str(self.result_buf) + self.two_buf = '' + self.operator = '' + self.show_result()#显示计算结果以及输入结果 + else: + print("除数不为0") + else: + if self.operator != '/':#有+就不需要再显示+ + self.operator = msg#90 没有特殊字符则加上不计算结果 + if self.one_buf.split()[0] == 0:#如果数字是0.就显示0负数不在内 + self.one_buf = "0" + self.show_result()#显示计算结果以及输入结果 + else: + print("operator ////////////////////") + self.operator = msg + self.show_result()#显示计算结果以及输入结果 + pass + + pass + + elif msg == '=':#等于 + if self.one_buf != '': + if self.operator != '': + print("operator ===========") + if self.two_buf != '':#90+90 计算结果 -0.9 + if float(self.two_buf) != 0: + if self.one_buf.find('.') != -1: + if int(self.one_buf.split(".")[1]) == 0: + self.one_buf = self.one_buf.split('.')[0] + + if self.two_buf.find('.') != -1: + if int(self.two_buf.split('.')[1]) == 0: + self.two_buf = self.two_buf.split('.')[0] + + str_sum = '' + if self.one_buf.find('e') != -1:#1.2e + tmp = (self.one_buf.split('e')[0]) + str_sum = tmp + self.operator + self.two_buf + self.result_buf = str(eval(str_sum))+'e' + pass + else: + str_sum = (self.one_buf.split()[0])+self.operator+(self.two_buf.split()[0]) + self.result_buf = str(eval(str_sum)) + pass + + print("str_sum",str_sum,self.result_buf) + if self.result_buf.find('e') == -1:#有小数点 + if self.result_buf.find('.') != -1:#有小数点 + print("input_dot",self.result_buf) + if int(self.result_buf.split(".")[1]) == 0:#小数点后面全是0 就取整数 + self.result_buf = (self.result_buf.split(".")[0]) + + if len(self.result_buf) > 14:#99978654.087766666 + self.result_buf = str(self.result_buf[:14]) + + self.one_buf = str(self.result_buf) + self.two_buf = '' + self.operator = '' + self.show_result()#显示计算结果以及输入结果 + else: + if self.operator != '=':#有=就不需要再显示+ 90 + self.operator = '' #90 没有特殊字符则加上不计算结果 + self.two_buf = '' + self.show_result()#显示计算结果以及输入结果 + + pass + else: + self.operator = '' + self.two_buf = '' + self.show_result()#显示计算结果以及输入结果 只显示第一个数据的内容 + + pass + else: + #无效的数据 + pass + + + + def show_result(self): + print("self.one_buf ",self.one_buf,self.two_buf,self.operator) + global calculator_label + tmp = str(self.one_buf)+str(self.operator)+str(self.two_buf) + calculator_label.set_pos(0, 5) + calculator_label.set_size(128, 20) + calculator_label.set_text(tmp) def calculator_fun(self,msg): result = 0 @@ -7347,7 +7753,12 @@ class calculatorScreen(Screen): 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 @@ -7355,14 +7766,45 @@ class calculatorScreen(Screen): state3 = 0 tmp_1 = '' tmp = '' + data1 = 0 + data2 = 0 if self.phone_num.find('+') != -1:#加运算 + if (self.phone_num.split('+')[0]).find('.') == -1:#还没有输入小数点 0.00 + tmp = self.phone_num.split('+')[0] + tmp = float(tmp.split()[0]) + + + + pass + 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) + if len(self.phone_num.split('+')[1]) > 0 and (msg == '+' or msg =='='):#计算结果 + # tmp = self.phone_num.split('+')[0] + # data1 = float(tmp.split()[0]) + # tmp2 = self.phone_num.split('+')[1] + # data2 = float(tmp2.split()[0]) + # if self.phone_num.split('+')[0].find('.') == -1: + # if int(data2) == 0: + # data1 = int(data1) + + # if self.phone_num.split('+')[1].find('.') == -1: + # if int(data2) == 0: + # data2 = int(data2) + if self.phone_num.find('e') != -1: + if (self.phone_num.split('+')[0]).split('e') != -1 or (self.phone_num.split('+')[1]).split('e') != -1: + if (self.phone_num.split('+')[0]).split('e') != -1 and (self.phone_num.split('+')[1]).split('e') != -1: + self.phone_num = "2.71828182+2.71828182" + elif (self.phone_num.split('+')[0]).split('e') != -1: + self.phone_num = self.phone_num.split('+')[0] +"2.71828182" + elif (self.phone_num.split('+')[1]).split('e') != -1: + self.phone_num = "2.71828182"+ self.phone_num.split('+')[1] + + sum = eval(self.phone_num) + + result = sum + print("data1",data1,data2,result,sum) self.calcul_num = str(result) self.calaulator_results() @@ -7400,6 +7842,13 @@ class calculatorScreen(Screen): 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]) + # if self.phone_num.split('-')[0].find('.') == -1: + # if int(data1) == 0: + # data1 = int(data1) + + # if self.phone_num.split('-')[1].find('.') == -1: + # if int(data2.slpit('.')[1]) == 0: + # data2 = int(data2) result = data1-data2 print("data1222222222222",data1,data2,result) self.calcul_num = str(result) @@ -7419,6 +7868,9 @@ class calculatorScreen(Screen): self.phone_num = ''.join(self.phone_list) self.show_num() else: + # if self.phone_num.split('-')[1].find('.') == -1: + # if int(data1.slpit('.')[1]) == 0: + # data1 = int(data1) result = data1 result_tmp = str(result) if result_tmp.find('.') != -1: @@ -7437,6 +7889,14 @@ class calculatorScreen(Screen): if len(self.phone_num.split('X')[1]) > 0 and (msg == 'X' or msg =='='):#计算结果 data2 = float(self.phone_num.split('X')[1]) + # if self.phone_num.split('X')[0].find('.') == -1: + # if int(data1.slpit('.')[1]) == 0: + # data1 = int(data1) + + # if self.phone_num.split('X')[1].find('.') == -1: + # if int(self.phone_num.split('X')[1].find('.').slpit('.')[1]) == 0: + # data2 = int(data2) + result = data1*data2 print("data44444",data1,data2) self.calcul_num = str(result) @@ -7457,6 +7917,8 @@ class calculatorScreen(Screen): self.phone_num = ''.join(self.phone_list) self.show_num() else: + # if self.phone_num.split('X')[0].find('.') == -1: + # if (self.phone_num.split('X')[1].find('.') == -1:) result = data1 result_tmp = str(result) if result_tmp.find('.') != -1: @@ -7488,6 +7950,14 @@ class calculatorScreen(Screen): else: data1 = float(self.phone_num.split('/')[0]) data2 = 0 + # if data1.find('.') == -1: + # if int(data1.slpit('.')[1]) == 0: + # data1 = int(data1) + + # if data2.find('.') == -1: + # if int(data2.slpit('.')[1]) == 0: + # data2 = int(data2) + if len(self.phone_num.split('/')[1]) > 0: data2 = float(self.phone_num.split('/')[1]) if data2 != 0: @@ -7528,6 +7998,8 @@ class calculatorScreen(Screen): self.phone_list = list(self.phone_num) print("除数没有数字") else: + + if msg == '=': self.show_num() pass @@ -7538,6 +8010,12 @@ class calculatorScreen(Screen): self.phone_list.append(msg) self.phone_num = ''.join(self.phone_list) self.show_num() + elif msg == ".": + if self.phone_num.find('.') == -1:#还没有输入小数点 + self.phone_num = '0.' + self.phone_list = list(self.phone_num) + self.show_num() + pass else:# print("不包含特殊字符") if len(self.calcul_num) > 0:#表示已计算了一次结果 全部置0 @@ -7558,7 +8036,7 @@ class calculatorScreen(Screen): pass def delete(self,e): - self.calculator_fun("/") + self.input_char("/") # if len(self.phone_list) != 0: # self.phone_list.pop() # self.phone_num = ''.join(self.phone_list) @@ -7568,7 +8046,7 @@ class calculatorScreen(Screen): EventMesh.publish("load_screen", {"screen": "contacts"}) def call(self,e): - self.calculator_fun("-") + self.input_char("-") def show_num(self): print("self.phone_num ",self.phone_num,self.phone_list) 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 bb5bacb2..f14b0cf7 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-24 18:04:18" +Build_Time="2023-08-28 11:42:25"