2025/6/27 第一次提交 侯雨晴
authorazao <821478748@qq.com>
Fri, 27 Jun 2025 03:01:52 +0000 (11:01 +0800)
committerazao <821478748@qq.com>
Fri, 27 Jun 2025 10:02:30 +0000 (18:02 +0800)
46 files changed:
2.sdk/project/K8/ext/static/audio.bin [new file with mode: 0644]
2.sdk/project/K8/ext/static/bj1.png [new file with mode: 0644]
2.sdk/project/K8/ext/static/bj2.png [new file with mode: 0644]
2.sdk/project/K8/ext/static/bj3.png [new file with mode: 0644]
2.sdk/project/K8/ext/static/bj4.png [new file with mode: 0644]
2.sdk/project/K8/ext/static/change.png [new file with mode: 0644]
2.sdk/project/K8/ext/static/charge_full.png [new file with mode: 0644]
2.sdk/project/K8/ext/static/charge_in.png [new file with mode: 0644]
2.sdk/project/K8/ext/static/charge_ing.png [new file with mode: 0644]
2.sdk/project/K8/ext/static/energe0.png [new file with mode: 0644]
2.sdk/project/K8/ext/static/energe1.png [new file with mode: 0644]
2.sdk/project/K8/ext/static/energe2.png [new file with mode: 0644]
2.sdk/project/K8/ext/static/energe3.png [new file with mode: 0644]
2.sdk/project/K8/ext/static/energe4.png [new file with mode: 0644]
2.sdk/project/K8/ext/static/energe5.png [new file with mode: 0644]
2.sdk/project/K8/ext/static/init1.png [new file with mode: 0644]
2.sdk/project/K8/ext/static/init2.png [new file with mode: 0644]
2.sdk/project/K8/ext/static/listen.png [new file with mode: 0644]
2.sdk/project/K8/ext/static/mpsignal1.png [new file with mode: 0644]
2.sdk/project/K8/ext/static/mpsignal2.png [new file with mode: 0644]
2.sdk/project/K8/ext/static/mpsignal3.png [new file with mode: 0644]
2.sdk/project/K8/ext/static/mpsignal4.png [new file with mode: 0644]
2.sdk/project/K8/ext/static/nosim.png [new file with mode: 0644]
2.sdk/project/K8/ext/static/open.png [new file with mode: 0644]
2.sdk/project/K8/ext/static/speak.png [new file with mode: 0644]
2.sdk/project/K8/ext/static/think.png [new file with mode: 0644]
2.sdk/project/K8/ext/static/低电量提醒.png [new file with mode: 0644]
2.sdk/project/K8/images/customer_fs.bin [new file with mode: 0644]
2.sdk/project/K8/images/ext_font.bin [new file with mode: 0644]
2.sdk/project/K8/images/ext_fs.bin [new file with mode: 0644]
2.sdk/project/K8/merge_bin.py [new file with mode: 0644]
2.sdk/project/K8/sdk/services/microPython/ports/quectel/core/Makefile
2.sdk/project/K8/sdk/services/microPython/ports/quectel/core/ai.py
2.sdk/project/K8/sdk/services/microPython/ports/quectel/core/ai_VC.py
2.sdk/project/K8/sdk/services/microPython/ports/quectel/core/lcd.py
2.sdk/project/K8/sdk/services/microPython/ports/quectel/core/main_init.py
2.sdk/project/K8/sdk/services/microPython/ports/quectel/core/mgr.py
2.sdk/project/K8/sdk/services/microPython/ports/quectel/core/ui.py
2.sdk/project/K8/sdk/services/microPython/ports/quectel/core/ui_WatchFaceScreen.py
2.sdk/project/K8/sdk/services/microPython/ports/quectel/core/ui_ai.py [new file with mode: 0644]
2.sdk/project/K8/sdk/services/microPython/ports/quectel/core/ui_main_menu.py
2.sdk/project/K8/sdk/services/microPython/ports/quectel/core/ui_setting.py
2.sdk/project/K8/sdk/services/microPython/ports/quectel/core/versions.py
2.sdk/project/K8/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/images/firmware_base_release_pack.zip
2.sdk/project/K8/usr/audio_ve.nvm
2.sdk/project/K8/usr/static/storage_file/config.json [deleted file]

diff --git a/2.sdk/project/K8/ext/static/audio.bin b/2.sdk/project/K8/ext/static/audio.bin
new file mode 100644 (file)
index 0000000..6c106cc
Binary files /dev/null and b/2.sdk/project/K8/ext/static/audio.bin differ
diff --git a/2.sdk/project/K8/ext/static/bj1.png b/2.sdk/project/K8/ext/static/bj1.png
new file mode 100644 (file)
index 0000000..2a941ef
Binary files /dev/null and b/2.sdk/project/K8/ext/static/bj1.png differ
diff --git a/2.sdk/project/K8/ext/static/bj2.png b/2.sdk/project/K8/ext/static/bj2.png
new file mode 100644 (file)
index 0000000..38c96de
Binary files /dev/null and b/2.sdk/project/K8/ext/static/bj2.png differ
diff --git a/2.sdk/project/K8/ext/static/bj3.png b/2.sdk/project/K8/ext/static/bj3.png
new file mode 100644 (file)
index 0000000..e7a2e47
Binary files /dev/null and b/2.sdk/project/K8/ext/static/bj3.png differ
diff --git a/2.sdk/project/K8/ext/static/bj4.png b/2.sdk/project/K8/ext/static/bj4.png
new file mode 100644 (file)
index 0000000..7691e48
Binary files /dev/null and b/2.sdk/project/K8/ext/static/bj4.png differ
diff --git a/2.sdk/project/K8/ext/static/change.png b/2.sdk/project/K8/ext/static/change.png
new file mode 100644 (file)
index 0000000..687a276
Binary files /dev/null and b/2.sdk/project/K8/ext/static/change.png differ
diff --git a/2.sdk/project/K8/ext/static/charge_full.png b/2.sdk/project/K8/ext/static/charge_full.png
new file mode 100644 (file)
index 0000000..435ab55
Binary files /dev/null and b/2.sdk/project/K8/ext/static/charge_full.png differ
diff --git a/2.sdk/project/K8/ext/static/charge_in.png b/2.sdk/project/K8/ext/static/charge_in.png
new file mode 100644 (file)
index 0000000..b9f19ad
Binary files /dev/null and b/2.sdk/project/K8/ext/static/charge_in.png differ
diff --git a/2.sdk/project/K8/ext/static/charge_ing.png b/2.sdk/project/K8/ext/static/charge_ing.png
new file mode 100644 (file)
index 0000000..a33f0da
Binary files /dev/null and b/2.sdk/project/K8/ext/static/charge_ing.png differ
diff --git a/2.sdk/project/K8/ext/static/energe0.png b/2.sdk/project/K8/ext/static/energe0.png
new file mode 100644 (file)
index 0000000..7d2a855
Binary files /dev/null and b/2.sdk/project/K8/ext/static/energe0.png differ
diff --git a/2.sdk/project/K8/ext/static/energe1.png b/2.sdk/project/K8/ext/static/energe1.png
new file mode 100644 (file)
index 0000000..78594c7
Binary files /dev/null and b/2.sdk/project/K8/ext/static/energe1.png differ
diff --git a/2.sdk/project/K8/ext/static/energe2.png b/2.sdk/project/K8/ext/static/energe2.png
new file mode 100644 (file)
index 0000000..881dcff
Binary files /dev/null and b/2.sdk/project/K8/ext/static/energe2.png differ
diff --git a/2.sdk/project/K8/ext/static/energe3.png b/2.sdk/project/K8/ext/static/energe3.png
new file mode 100644 (file)
index 0000000..0b3ef8d
Binary files /dev/null and b/2.sdk/project/K8/ext/static/energe3.png differ
diff --git a/2.sdk/project/K8/ext/static/energe4.png b/2.sdk/project/K8/ext/static/energe4.png
new file mode 100644 (file)
index 0000000..ccb149d
Binary files /dev/null and b/2.sdk/project/K8/ext/static/energe4.png differ
diff --git a/2.sdk/project/K8/ext/static/energe5.png b/2.sdk/project/K8/ext/static/energe5.png
new file mode 100644 (file)
index 0000000..285f51c
Binary files /dev/null and b/2.sdk/project/K8/ext/static/energe5.png differ
diff --git a/2.sdk/project/K8/ext/static/init1.png b/2.sdk/project/K8/ext/static/init1.png
new file mode 100644 (file)
index 0000000..05c62d1
Binary files /dev/null and b/2.sdk/project/K8/ext/static/init1.png differ
diff --git a/2.sdk/project/K8/ext/static/init2.png b/2.sdk/project/K8/ext/static/init2.png
new file mode 100644 (file)
index 0000000..348474f
Binary files /dev/null and b/2.sdk/project/K8/ext/static/init2.png differ
diff --git a/2.sdk/project/K8/ext/static/listen.png b/2.sdk/project/K8/ext/static/listen.png
new file mode 100644 (file)
index 0000000..445a18b
Binary files /dev/null and b/2.sdk/project/K8/ext/static/listen.png differ
diff --git a/2.sdk/project/K8/ext/static/mpsignal1.png b/2.sdk/project/K8/ext/static/mpsignal1.png
new file mode 100644 (file)
index 0000000..27dbbca
Binary files /dev/null and b/2.sdk/project/K8/ext/static/mpsignal1.png differ
diff --git a/2.sdk/project/K8/ext/static/mpsignal2.png b/2.sdk/project/K8/ext/static/mpsignal2.png
new file mode 100644 (file)
index 0000000..a7341a9
Binary files /dev/null and b/2.sdk/project/K8/ext/static/mpsignal2.png differ
diff --git a/2.sdk/project/K8/ext/static/mpsignal3.png b/2.sdk/project/K8/ext/static/mpsignal3.png
new file mode 100644 (file)
index 0000000..94e7466
Binary files /dev/null and b/2.sdk/project/K8/ext/static/mpsignal3.png differ
diff --git a/2.sdk/project/K8/ext/static/mpsignal4.png b/2.sdk/project/K8/ext/static/mpsignal4.png
new file mode 100644 (file)
index 0000000..d11d9b8
Binary files /dev/null and b/2.sdk/project/K8/ext/static/mpsignal4.png differ
diff --git a/2.sdk/project/K8/ext/static/nosim.png b/2.sdk/project/K8/ext/static/nosim.png
new file mode 100644 (file)
index 0000000..aa3f59c
Binary files /dev/null and b/2.sdk/project/K8/ext/static/nosim.png differ
diff --git a/2.sdk/project/K8/ext/static/open.png b/2.sdk/project/K8/ext/static/open.png
new file mode 100644 (file)
index 0000000..9dab238
Binary files /dev/null and b/2.sdk/project/K8/ext/static/open.png differ
diff --git a/2.sdk/project/K8/ext/static/speak.png b/2.sdk/project/K8/ext/static/speak.png
new file mode 100644 (file)
index 0000000..744d1fb
Binary files /dev/null and b/2.sdk/project/K8/ext/static/speak.png differ
diff --git a/2.sdk/project/K8/ext/static/think.png b/2.sdk/project/K8/ext/static/think.png
new file mode 100644 (file)
index 0000000..a2e03e4
Binary files /dev/null and b/2.sdk/project/K8/ext/static/think.png differ
diff --git a/2.sdk/project/K8/ext/static/低电量提醒.png b/2.sdk/project/K8/ext/static/低电量提醒.png
new file mode 100644 (file)
index 0000000..2c38529
Binary files /dev/null and "b/2.sdk/project/K8/ext/static/\344\275\216\347\224\265\351\207\217\346\217\220\351\206\222.png" differ
diff --git a/2.sdk/project/K8/images/customer_fs.bin b/2.sdk/project/K8/images/customer_fs.bin
new file mode 100644 (file)
index 0000000..87882e5
Binary files /dev/null and b/2.sdk/project/K8/images/customer_fs.bin differ
diff --git a/2.sdk/project/K8/images/ext_font.bin b/2.sdk/project/K8/images/ext_font.bin
new file mode 100644 (file)
index 0000000..fe95234
Binary files /dev/null and b/2.sdk/project/K8/images/ext_font.bin differ
diff --git a/2.sdk/project/K8/images/ext_fs.bin b/2.sdk/project/K8/images/ext_fs.bin
new file mode 100644 (file)
index 0000000..783b2ac
Binary files /dev/null and b/2.sdk/project/K8/images/ext_fs.bin differ
diff --git a/2.sdk/project/K8/merge_bin.py b/2.sdk/project/K8/merge_bin.py
new file mode 100644 (file)
index 0000000..c12eb7a
--- /dev/null
@@ -0,0 +1,46 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+"""
+@FileName : merge_bin.py
+@Author   : zhen.guo
+@Email    : zhen.guo@quectel.com
+@Date     : 2022-08-05 09:58:14
+"""
+import os
+output_list = []
+# 文件名--》下标
+def text_to_hash(filename: str) -> str:
+    output_list.append(filename.split("\\")[-1][:-4])
+    print(str(len(output_list)-1) + filename[-4:])
+    return str(len(output_list)-1) + filename[-4:]
+
+
+def merge_bin(res='res.bin', *args):
+    # 入参文件夹和文件处理
+    file_list = []
+    for i in args:
+        if os.path.isdir(i):
+            for j in os.walk(i):
+                for x in j[2]:
+                    file_list.append(j[0] + x)
+        else:
+            file_list.append(i)
+    f = open(res, 'wb')
+    fileheader = bytes("montage", 'utf-8') + bytes(1) + bytes.fromhex('%08X' % len(file_list))[::-1]
+    filebyte, bytesize, filebody = b'', 0, b''
+    for i in file_list:
+        print(i)
+        filename_byte = bytes(text_to_hash(i), 'utf-8')
+        filebyte += (filename_byte + bytes(128-len(filename_byte)) + bytes.fromhex('%08X' % (len(file_list)*136 + 12 + bytesize))[::-1] + bytes.fromhex('%08X' % os.path.getsize(i))[::-1])
+        bytesize += os.path.getsize(i)
+        filebody += open(i, 'rb').read()
+    f.write(fileheader + filebyte + filebody)
+    f.close()
+    print(output_list)
+    with open('list.json', 'w') as f:
+        f.write(str(output_list))
+    print("----MERGE SUCCESS----")
+    return output_list
+
+output_list = merge_bin(".\\usr\\static\\audio.bin", ".\\audio\\")
\ No newline at end of file
index 1baa54b..3ea119b 100644 (file)
@@ -973,6 +973,7 @@ frozen_mpy_list =   $(BUILD)/_boot.mpy \
                                        $(BUILD)/versions.mpy \
                                        $(BUILD)/motor.mpy \
                                        $(BUILD)/ai_VC.mpy \
+                                       $(BUILD)/ui_setting.mpy \
 
 endif
 
index ad46754..97fdffd 100644 (file)
@@ -2566,7 +2566,7 @@ class AIScreen(Screen):#AI_GUI
         self.clear_flag()
         num = EventMesh.publish("get_volum_size")
         if num == None:
-            num = 8
+            num = 11
         self.aud.setVolume(num)#恢复原始音量
         try:
             self.websocket_deconnect_asr()
index 77cdb57..c6510f2 100644 (file)
@@ -284,6 +284,12 @@ class AI_dev(Abstract):
         #EventMesh.publish("audio_montage_play",["xianyikaiji.mp3"])
         #EventMesh.publish("publish_AI_btnInfo",{"func":self.ntptime_cb})
         self.check_rest_timer_count = 0
+
+        #双击逻辑
+        self.last_time = 0 #上次时间
+        self.gap_time = 2000 #双击间隔时间(ms)
+        self.double_flag = 0 #双击标志
+        self.double_release_timer = osTimer()#双击释放定时器
         print("AI_dev:end")
     def ntptime_cb(self):
         #ntptime.settime(8)
@@ -306,6 +312,7 @@ class AI_dev(Abstract):
                 #self.aud.play(1,1,'U:/static/R_CHARGE_IN.mp3')
                 EventMesh.publish("open_led_red")#充电红灯常亮
                 EventMesh.publish("audio_montage_play",["R_CHARGE_IN.mp3"])
+                # EventMesh.publish("load_screen", {"screen": "charge_in"})#充电弹窗
             self.Low_power_warning_flag  = 0
             pass
         elif status == 0:#拨出usbs
@@ -416,15 +423,29 @@ class AI_dev(Abstract):
             
     def keyAI_extint_cb(self,args):#call 2
         try:
-            #print("AI_btn:keyAI_extint_cb{}".format(args[1]))
             self.KeyAI_status = int(args[1])
             if self.KeyAI_status == 0:
                 self.KeyAI_status = 1
             else:
                 self.KeyAI_status = 0
-            
+            current_time = utime.ticks_ms()
             if self.KeyAI_status == 0:#按下
                 if self.KeyAI_press == 0 :
+                    time_tiff = utime.ticks_diff(current_time,self.last_time)#计算时间差(处理溢出
+                    print("双击时间差为:{}".format(time_tiff))
+                    if time_tiff < 0 :
+                        print("双击时间已经溢出")
+                    if time_tiff > 0 and current_time - self.last_time <= self.gap_time:#鉴定为双击
+                        print("AI_key_double_press DOUBLE DOUBLE ")
+                        self.double_flag = 1#切换标志位
+                        self.KeyAI_long_press = 0
+                        self.KeyAI_press = 0
+                        self.KeyAI_timer_count = 0
+                        EventMesh.publish("publish_AI_btnInfo",{"func":self.AI_key_double_press})
+                        # 启动双击释放检测计时器
+                        self.double_release_timer.start(500, 1, self.double_release_timeout)
+                        return
+                    
                     EventMesh.publish(constants.EVENT.SYSTEM_UP)#唤醒休眠
                     self.extint_AI.disable()
                     self.KeyAI_press = 1
@@ -433,16 +454,36 @@ class AI_dev(Abstract):
                     self.KeyAI_timer_count = 0
                     #EventMesh.publish("AI_key_press")
                     if dev_type == "7PIN" or dev_type == "7PIN_coze" :
-                        self.aud.aud_tone_play(10,200)#播放按键音
-                    EventMesh.publish("publish_AI_btnInfo",{"func":self.AI_key_press})  
+                        self.aud.aud_tone_play(10,200)#播放按键音  
+                    EventMesh.publish("publish_AI_btnInfo",{"func":self.AI_key_press})
+                    self.last_time = current_time
+            else:  # 释放
+                if self.double_flag:
+                    # 双击释放处理
+                    self.double_flag = 0
+                    EventMesh.publish("publish_AI_btnInfo", {"func": self.AI_key_double_release})
+                    self.extint_AI.enable()
+                    self.KeyAI_timer.stop()
+                    self.KeyAI_timer_count = 0
+                    self.KeyAI_press = 0
+                    return            
         except Exception as e: 
             usys.print_exception(e)
+    def double_release_timeout(self, *args, **kwargs):#双击释放超时处理
+        if self.double_flag:
+            #如果超时仍未释放,重置双击状态
+            self.double_flag = 0
+
+    def AI_key_double_release(self):
+        EventMesh.publish("publish_AI_btnInfo",{"func":self.AI_key_double_press})
+
     def KeyAI_timer_cb(self, *args, **kwargs):
     #     EventMesh.publish("publish_AI_btnInfo",{"func":self.KeyAI_timer_cb_})
     # def KeyAI_timer_cb_(self):
         try:
             self.KeyAI_status = self.extint_AI.read_level()
             self.KeyAI_timer_count +=1
+            print("self.KeyAI_timer_count = {}".format(self.KeyAI_timer_count))
             if self.KeyAI_timer_count >= 10*1 : #长按1s 
                 if self.KeyAI_long_press == 0:
                     self.KeyAI_long_press = 1
@@ -459,7 +500,7 @@ class AI_dev(Abstract):
                     Power.powerDown()
             if self.KeyAI_status == 1:#松开
                 #print("KeyAI_timer_cb:{}".format(self.KeyAI_timer_count))
-                key_count = 5
+                key_count = 1
                 if dev_type == "7PIN_BK"or dev_type == "7PIN_BK_EU"or dev_type == "7PIN_BK_coze":
                     key_count = 3
                 if self.KeyAI_timer_count >= key_count: #防抖200ms
@@ -469,7 +510,23 @@ class AI_dev(Abstract):
                     self.KeyAI_timer.stop()
                     self.KeyAI_timer_count = 0
                     self.KeyAI_press = 0
-            
+                    # current_time = utime.ticks_ms()
+                    # print("current_time:{},last_time:{},current_time - self.last_time={}".format(current_time,self.last_time,current_time - self.last_time)) 
+                    # if (current_time - self.last_time <= self.gap_time):#鉴定为双击
+                    #     print("AI_key_double_press DOUBLE DOUBLE ")
+                    #     self.double_flag = 1#切换标志位
+                    #     self.KeyAI_long_press = 0
+                    #     self.KeyAI_press = 0
+                    #     self.KeyAI_timer_count = 0
+                    #     EventMesh.publish("publish_AI_btnInfo",{"func":self.AI_key_double_press})
+                    #     return
+                    # else:
+                    #     EventMesh.publish("publish_AI_btnInfo",{"func":self.AI_key_press})
+                    #     self.KeyAI_press = 1
+                    #     self.KeyAI_long_press = 0
+                    #     self.KeyAI_timer_count = 0
+
+                    # self.last_time = current_time
         except Exception as e: 
             usys.print_exception(e) 
        
@@ -478,6 +535,11 @@ class AI_dev(Abstract):
         print("AI_key_press")
         EventMesh.publish("AI_key_press")
 
+    def AI_key_double_press(self):
+        self.check_rest_timer_count = 0
+        print("AI_key_double_press")
+        EventMesh.publish("AI_key_double_press")
+
     def AI_key_long_press(self):
         self.check_rest_timer_count = 0
         print("AI_key_long_press")
@@ -491,10 +553,10 @@ class AI_dev(Abstract):
         self.check_rest_timer_count = 0
         print("pwk_key_long_press!!!!!!!")
         print("pwk_key_long_press!!!!!!!")
-        
+        EventMesh.publish("load_screen", {"screen": "poweroff_comfirm"})#关机画面
         # EventMesh.publish("paly_iccid_imei")
         # return
-        EventMesh.publish("audio_montage_play",["zhengzaiguanji.mp3"])
+        EventMesh.publish_async("audio_montage_play",["zhengzaiguanji.mp3"])
         #self.aud.play(1,0,'U:/static/zhengzaiguanji.mp3')#关机音频
         EventMesh.publish("open_led_red")
         utime.sleep_ms(3000)
@@ -531,6 +593,7 @@ class AI_dev(Abstract):
             if self.usb_charge_flag == 0 :
                 EventMesh.publish("audio_montage_play",["R_CHARGE_FULL.mp3"])
                 #self.aud.play(1,0,'U:/static/R_CHARGE_FULL.mp3')#充电已满
+                # EventMesh.publish("load_screen", {"screen": "charge_full"})#充满电弹窗
                 self.usb_charge_flag = 1
         if  self.usb_status == 0 and Vbatt<self.VBATT_tab["20"]and VC_satrt_flag == 0 and self.Low_power_warning_flag ==0:#低电报警
             self.Low_power_warning_flag  = 1
@@ -582,7 +645,7 @@ class AI_dev(Abstract):
                     usys.print_exception(e)    
         str_data = str_data[:-1]
         print("audio_montage_play:{}".format(str_data))
-        self.aud.montage_play('U:/static/audio.bin',1,1,str_data)
+        self.aud.montage_play('E:/static/audio.bin',1,1,str_data)
         
     def paly_iccid_imei(self,event,msg):
         str_data = 'mp3files={}.mp3+'.format(audio_buf.index("liuliangtishi"))#流量提示
@@ -601,7 +664,7 @@ class AI_dev(Abstract):
                 audio_buf.index("R_READ_TIME_{}".format(iccid[12])),audio_buf.index("R_READ_TIME_{}".format(iccid[13])),audio_buf.index("R_READ_TIME_{}".format(iccid[14])),audio_buf.index("R_READ_TIME_{}".format(iccid[15])),\
                 audio_buf.index("R_READ_TIME_{}".format(iccid[16])),audio_buf.index("R_READ_TIME_{}".format(iccid[17])),audio_buf.index("R_READ_TIME_{}".format(iccid[18])),audio_buf.index("R_READ_TIME_{}".format(iccid[19])))
         str_data += '{}.mp3+'.format(audio_buf.index("shouhou"))#可联系售后解决,联系方式见售后客服电话是400-886-8777或到微信公众号柒牌SEVENBRAND自行充值:
-        self.aud.montage_play('U:/static/audio.bin',1,1,str_data)
+        self.aud.montage_play('E:/static/audio.bin',1,1,str_data)
     #鉴权出错,播放imei号
     def paly_device_res_error(self,event,msg):
         str_data = 'mp3files={}.mp3+'.format(audio_buf.index("jianquancuowu"))#AI功能异常,请联系客户查询,设备号为:
@@ -613,7 +676,7 @@ class AI_dev(Abstract):
                 audio_buf.index("R_READ_TIME_{}".format(imei[8])),audio_buf.index("R_READ_TIME_{}".format(imei[9])),audio_buf.index("R_READ_TIME_{}".format(imei[10])),audio_buf.index("R_READ_TIME_{}".format(imei[11])),\
                 audio_buf.index("R_READ_TIME_{}".format(imei[12])),audio_buf.index("R_READ_TIME_{}".format(imei[13])),audio_buf.index("R_READ_TIME_{}".format(imei[14])))
         #print("str_data:{}".format(str_data))
-        self.aud.montage_play('U:/static/audio.bin',1,1,str_data)
+        self.aud.montage_play('E:/static/audio.bin',1,1,str_data)
 
 #存储信息
 class getStorageDataManager(Abstract):#获取内存数据
@@ -637,7 +700,7 @@ class getStorageDataManager(Abstract):#获取内存数据
             # EventMesh.debug_log("set_storage_data:{}".format(msg))
             if msg != None:
                 self.config_data = msg
-                with open("/usr/static/storage_file/config.json",'w+',encoding="utf-8") as fd:
+                with open("/usr/static/storage_file/config.json",'w',encoding="utf-8") as fd:
                     ujson.dump(self.config_data,fd)
         
 
@@ -649,7 +712,7 @@ class getStorageDataManager(Abstract):#获取内存数据
                 #EventMesh.publish("publish_message_event_ui",{"func":self.set_storage_save,"data":0})
                 EventMesh.publish("publish_AI_btnInfo",{"func":self.set_storage_save}) 
         def set_storage_save(self): 
-            with open("/usr/static/storage_file/config.json",'w+',encoding="utf-8") as fd:
+            with open("/usr/static/storage_file/config.json",'w',encoding="utf-8") as fd:
                 ujson.dump(self.config_data,fd)
         def get_storage_data(self, event, msg): 
             # EventMesh.debug_log("get_storage_data:{}".format(self.config_data))
@@ -948,6 +1011,7 @@ class device_res_author(Abstract):
             if dev_pass == None:
                 dev_pass = ""
             if len(dev_pass) == 0:#没有密码
+                
                 return
             #if token == None or token == "":
             if 1: #返回结果成功
@@ -1004,6 +1068,9 @@ class device_res_author(Abstract):
                                         data_tmp = data["data"]
                                         if "token" in data_tmp: #token
                                             self.dev_token = data_tmp["token"]
+                                else:
+                                    print("登陆失败,清空密钥")
+                                    EventMesh.publish("set_storage_config",["dev_pass",""])
                                 if data["code"] == 50003:#时间错误
                                     self.ntptime_flag  = 0
                 print("token:{}\r\n".format(self.dev_token))
@@ -1226,6 +1293,7 @@ VC_State_TTSError=12
 VC_State_DialogError=13
 VC_State_End=14
 
+
 VC_record_TYPE_PCM = 0
 VC_record_TYPE_AMR = 1
 VC_play_TYPE_PCM = 0
@@ -1332,7 +1400,7 @@ class AI_VC(Abstract):
             elif dev_type == "szbst":
                 self.power_on_tone = "深圳百事通来了!请问您有什么需要我帮忙的吗?" 
             elif dev_type == 'jswm'or dev_type == 'jswm_BOX':
-                self.power_on_tone = "我来陪你聊天了"
+                self.power_on_tone = "我来陪你聊天了" 
             elif dev_type == 'csh':
                 self.power_on_tone = "欢迎使用助手小福"  
             else:
@@ -1919,13 +1987,14 @@ class AI_VC(Abstract):
         self.VC_satrt_flag = 0
         self.session_id = ""
         EventMesh.subscribe("AI_key_press", self.AI_key_press)
+        EventMesh.subscribe("AI_key_double_press", self.AI_key_double_press)
         EventMesh.subscribe("AI_key_release", self.AI_key_release)
         EventMesh.subscribe("AI_key_long_press", self.AI_key_long_press)
         EventMesh.subscribe("pwk_key_release", self.pwk_key_release)
         EventMesh.subscribe("get_AI_audio_queue", self.get_AI_audio_queue)
         EventMesh.subscribe("get_VC_satrt_flag", self.get_VC_satrt_flag)
         EventMesh.subscribe("VC_error", self.VC_error)
-        
+        EventMesh.subscribe("screen_get_ai", self.screen_get_ai)
         EventMesh.publish("close_led")
 
         self.bot_name = "柒先生"
@@ -1965,12 +2034,12 @@ class AI_VC(Abstract):
                     self.AI_TTS_str = self.power_on_tone.replace("bot_name", self.bot_name)
                     print("开机提示:{}".format(self.AI_TTS_str))
                     EventMesh.publish("publish_AI_btnInfo",{"func":self.AI_VC_start}) 
+                    self.Close_flag = 1
                 
-                
-
+            
         except Exception as e:
             usys.print_exception(e)
-
+        #EventMesh.publish("publish_AI_btnInfo",{"func":self.Close}) #播报完毕直接关掉AI
         
     def post_processor_after_instantiation(self):
         pass
@@ -1978,7 +2047,8 @@ class AI_VC(Abstract):
         return self.AI_audio_queue
     def get_VC_satrt_flag(self, event, msg):
         return self.VC_satrt_flag
-
+    def screen_get_ai(self, event=None, msg=None):
+        return self.VC_state
 
     def VC_30S_timer_cb(self, *args): #
         EventMesh.publish("publish_AI_btnInfo",{"func":self.VC_30S_timer_cb_}) 
@@ -2077,6 +2147,11 @@ class AI_VC(Abstract):
             self.audio_play_state = 0
             #EventMesh.publish("set_audio_state", 0)   
             print('audio-play finish.!!!!!!')
+    def AI_key_double_press(self, event, msg):#双击按键
+        print("AI_key_double_press")
+        self.Close_flag = 1
+        self.Close()
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
 
     def AI_key_press(self, event, msg):#按键按下
         print("AI_key_press")
@@ -2095,52 +2170,29 @@ class AI_VC(Abstract):
         #     EventMesh.publish("publish_AI_btnInfo",{"func":utime.sleep_ms,'data':(10)})
         #if self.VC_record_state_flag >1:#如果在录音,就先停止录音
         self.VC_Speech_End()
-
+        # return
         self.VC_Speech_Start()    
         self.AI_VC_start() 
+        EventMesh.publish("load_screen", {"screen": "UI_ai"})#ai画面
         # if dev_type != "7PIN":
         #     self.chenggong_tone()
         # self.Close()
         # self.AI_VC_start()
         self.AI_key_long_press_flag = 0
-        
+       
 
     def AI_key_release(self, event, msg):#按键弹起
         print("AI_key_release123")
         self.key_state = 0
         if self.AI_key_long_press_flag == 1 :#有长按
-            #self.AI_client_VC_end_speech()
-            #EventMesh.publish("publish_AI_btnInfo",{"func":utime.sleep_ms,'data':(1000)})
-            #EventMesh.publish("publish_AI_btnInfo",{"func":self.AI_client_asr_StopTranscription_requset})
-            #self.AI_client_asr_StopTranscription_requset()#请求停止
-            if self.VC_mode == 1 :#长按单次问答模式
-                # if self.AI_ASR_str_tmp != "":
-                print("AI_key_release:asr_str:{}".format(self.AI_ASR_str))  
-                #     EventMesh.publish("publish_AI_btnInfo",{"func":self.AI_VC_start})
-                self.AI_client_VC_end_speech()
-                pass
-            
-        else :
-            if self.VC_mode == 1 :#长按单次问答模式
-                # try:
-                #     EventMesh.publish("publish_AI_btnInfo",{"func":self.Close}) 
-                # except Exception as e:
-                #     usys.print_exception(e)
-                #EventMesh.publish("publish_AI_btnInfo",{"func":self.key_prompt})  #提示请您按住中间的按钮开始讲话,讲完松开即可   
-                if dev_type == "7PIN_BK_EU":
-                    self.AI_TTS_str = "Please press and hold the button to speak. "
-                else:
-                    self.AI_TTS_str = "请您按住中间的按钮开始讲话,讲完松开即可 "
-                EventMesh.publish("publish_AI_btnInfo",{"func":self.AI_VC_start})
-                pass
-                
+            if dev_type == 'jswm' or dev_type == 'jswm_BOX'  :
                 #self.VC_Speech_End()
+                pass
     def AI_key_long_press(self, event, msg):#按键长按
         print("AI_key_long_press")
-        if dev_type == 'jswm' or dev_type == 'jswm_BOX'  :
-            self.Close()
-        else:
-            self.AI_key_long_press_flag = 1
+        self.Close()
+        EventMesh.publish("Power_off")
+        self.AI_key_long_press_flag = 1
 
     def pwk_key_release(self, event, msg):#电源键短按,关闭
         print("pwk_key_release")
@@ -2672,9 +2724,10 @@ class AI_VC(Abstract):
                             
                             if isinstance(data[1], str):#是字符串
                                 self.VC_pingping_timerout = 0
-                                print("VC VC: send_data:{}".format(data[1]))
+                                #print("VC VC: send_data:{}".format(data[1]))
                             else:
-                                print("VC: send_data len:{}".format(len(data[1])))
+                                #print("VC: send_data len:{}".format(len(data[1])))
+                                pass
                             if self.AI_client_VC != None and self.AI_client_VC_isconnect == 1:
                                 self.AI_client_VC.send(data[1])
                             else:
@@ -3134,6 +3187,7 @@ class AI_VC(Abstract):
                 if len(text)<20 and (text.find("再见") != -1 or text.find("拜拜") != -1 or text.find("关闭对话") != -1):
                     #EventMesh.publish("publish_AI_btnInfo",{"func":self.Close}) 
                     self.AI_TTS_str = "好嘞,再见,我们下次再聊"
+                    EventMesh.publish("load_screen", {"screen": "main_menu"})
                     self.Close_flag = 1
                     return 0
                 if len(text)<12 and (text.find("关机") != -1 ):
@@ -3436,28 +3490,28 @@ class AI_VC(Abstract):
                                 return 0
                         self.AI_TTS_str = "更改失败,没找到对应声音" 
                         return 0
-                if text.find("切换对话模式") != -1:
-                    if dev_type == "7PIN_BK_EU":
-                        if self.VC_mode == 0:
-                            self.VC_mode = 1
-                            self.AI_TTS_str = "change dialogue mode" 
-                        else:
-                            self.VC_mode = 0 
-                            self.AI_TTS_str = "pushtalk mode" 
-                    else:
-                        if self.VC_mode == 0:
-                            self.VC_mode = 1
-                            self.AI_TTS_str = "已切换到单对话模式" 
-                        else:
-                            self.VC_mode = 0 
-                            self.AI_TTS_str = "已切换到长对话模式" 
-                    EventMesh.publish("set_storage_config",["VC_mode",self.VC_mode])
-                    # EventMesh.publish("audio_montage_play",["peizhichenggong.mp3"])
-                    #self.aud.play(1,0,'U:/static/peizhichenggong.mp3')#切换成功
+                # if text.find("切换对话模式") != -1:
+                #     if dev_type == "7PIN_BK_EU":
+                #         if self.VC_mode == 0:
+                #             self.VC_mode = 1
+                #             self.AI_TTS_str = "change dialogue mode" 
+                #         else:
+                #             self.VC_mode = 0 
+                #             self.AI_TTS_str = "pushtalk mode" 
+                #     else:
+                #         if self.VC_mode == 0:
+                #             self.VC_mode = 1
+                #             self.AI_TTS_str = "已切换到单对话模式" 
+                #         else:
+                #             self.VC_mode = 0 
+                #             self.AI_TTS_str = "已切换到长对话模式" 
+                #     EventMesh.publish("set_storage_config",["VC_mode",self.VC_mode])
+                #     # EventMesh.publish("audio_montage_play",["peizhichenggong.mp3"])
+                #     #self.aud.play(1,0,'U:/static/peizhichenggong.mp3')#切换成功
 
-                    return 0
-                if text.find("音量") != -1:
-                    if  text.find("加") != -1 :
+                #     return 0
+                if text.find("音量") != -1 or text.find("声音") != -1:
+                    if  text.find("加") != -1 or text.find("增") != -1:
                         self.VC_TTS_volume += 10
                         if self.VC_TTS_volume > 100:
                             #EventMesh.publish("audio_montage_play",["yinliangyizuida.mp3"])
@@ -3590,7 +3644,6 @@ class AI_VC(Abstract):
                     else:
                         self.AI_TTS_str = "当前已是最新版本"
                     return 0
-                
                 if len(text)<16 and (text.find("再见") != -1 or text.find("拜拜") != -1 or text.find("关闭对话") != -1):
                     #EventMesh.publish("publish_AI_btnInfo",{"func":self.Close}) 
                     if dev_type != "7PIN" and dev_type != "7PIN_coze":#柒牌
@@ -3701,7 +3754,7 @@ class AI_VC(Abstract):
         EventMesh.publish("publish_AI_btnInfo",{"func":self._1S_timer_cb_}) 
 
     def _1S_timer_cb_(self):    
-    
+        #print("_1S_timer_cb_")
         EventMesh.publish("system_sleep_rest")#防止黑屏
         self.close_timerout += 1
         if self.close_timerout > 60 and self.VC_mode != 1 :#:#20秒没数据就close 长按单次问答模式不关
@@ -3726,6 +3779,7 @@ class AI_VC(Abstract):
                     if self.Close_flag == 1:
                         self.Close_flag = 0
                         EventMesh.publish("publish_AI_btnInfo",{"func":self.Close}) 
+                        EventMesh.publish("publish_message_event_ui",{"func":self.AI_key_double_press,"data":0})
                     else:
                         #utime.sleep_ms(1000)
                         EventMesh.publish("publish_AI_btnInfo",{"func":self.VC_Play_End})
@@ -4188,6 +4242,7 @@ class AI_VC(Abstract):
         self.AI_ASR_flag  = 0
         self.AI_ASR_check_timeout = 0
         self.AI_ASR_error_timeout = 0
+        self.VC_state = VC_State_None
         print("ai_VC Close1!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!")
         EventMesh.publish("close_led")
         self.tts_in_data_len = 0
index ee37908..bab8277 100644 (file)
@@ -231,17 +231,31 @@ style_font_youyuan_20_op.init()
 style_font_youyuan_20_op.set_text_color(lv.color_make(0xff, 0xff, 0xff))
 style_font_youyuan_20_op.set_text_font_v2("font_28.bin",28,0)
 
+style_img = lv.style_t()
+style_img.init()
+style_img.set_img_opa(255)
+
 power_on_screen = lv.obj()
 print("power_on_screen")
 power_on_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT)
 
+
+
+power_on_img = lv.img(power_on_screen)
+power_on_img.set_size(98,100)
+power_on_img.set_pos(71,90)
+power_on_img.set_src("E:/static/init2.png")
+power_on_img.add_flag(lv.obj.FLAG.CLICKABLE)
+power_on_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
+print("power_on_screen init...")
+
 power_on_label = lv.label(power_on_screen)
-power_on_label.set_pos(0, 150)
-power_on_label.set_size(240, 40)
-power_on_label.set_text("系统初始化中")
-power_on_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+power_on_label.set_pos(73, 206)
+power_on_label.set_size(100, 40)
+power_on_label.set_text("loading")
+power_on_label.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0)
 power_on_label.add_style(style_font_youyuan_20_op, lv.PART.MAIN | lv.STATE.DEFAULT)
-print("power_on_screen init...")
+
 lv.scr_load(power_on_screen)
 utime.sleep_ms(200)
 print("power_on_screen end...")
index 2b2d4f6..6f8eb18 100644 (file)
@@ -101,19 +101,18 @@ def main_init():
     
     # from mgr import setCallStateManager,setclassTimeManager,setSmsIndexManager,ConfigStoreManager,testSmsSetIPManager,playPowerAudioManager,sosInfoCallManager,getBootOffManager,getSosFlagManager,CountdownManager, LocationManager, getVolumSizeManager,gethistoryDataManager,getUpLoadDataManager, getplayAudiodStateManager,\
     # AddrBookManager,MsgdetailManager,PhoneCallingManager,getOldTimeManager,getStorageDataManager,getBrightnessManager,getHrTimeManager,getTempTimeManager,getLowBatManager
-    
+    import mgr
+    device = mgr.DeviceInfoManager()
+    device.post_processor_after_instantiation()#订阅事件
+
     from ui_health import HealthScreen
     import ui as _ui
 
-    
+    import ui_setting as _us
     # import ui as _ui
     EventMesh.debug_log("init4:{}".format(utime.localtime()))
     ui = _ui.UI()
     ui.post_processor_after_instantiation()
-
-
-    
-
     app = watchApp()
     app.set_ui(ui)
     # if EventMesh.model == "D15":
@@ -133,8 +132,11 @@ def main_init():
         ui.add_screen(_ui.PopupScreen()) 
         ui.add_screen(_ui.PhoneScreen()) 
         ui.add_screen(_ui.HeartrateScreen()) 
-
+        ui.add_screen(_ui.UI_ai())
         ui.add_screen(_ui.PowerOnScreen())
+        ui.add_screen(_us.PoweroffConfirmScreen()) 
+        ui.add_screen(_ui.chargeInScreen()) #充电已连接
+        ui.add_screen(_ui.chargefullScreen()) #充电已移出
     except Exception as e:
         usys.print_exception(e)
 
@@ -165,6 +167,7 @@ def main_init():
         #app.append_manager(intervManager())
         try:
             app.append_manager(_ai.getStorageDataManager())
+            
         except Exception as e:
             usys.print_exception(e)
         try:
index 920d237..9e73ed0 100644 (file)
@@ -22,18 +22,18 @@ import EventMesh
 import usys
 import audio
 from machine import I2C
-from Gsensor import SC7A20
+# from Gsensor import SC7A20
 import pm
 import ure
-try :
-    from Hsensor import GH3018
-except Exception as e:
-    print("Hsensor none GH3018:{}".format(e))   
+# try :
+#     from Hsensor import GH3018
+# except Exception as e:
+#     print("Hsensor none GH3018:{}".format(e))   
 #
-try :
-    from Hsensor import HX3918
-except Exception as e:
-    print("Hsensor none HX3918:{}".format(e))    
+# try :
+#     from Hsensor import HX3918
+# except Exception as e:
+#     print("Hsensor none HX3918:{}".format(e))    
 from machine import RTC
 import quecgnss
 import wifiScan
@@ -755,30 +755,30 @@ class DeviceInfoManager(Abstract):
         self.rtc = RTC()
         self.aud = audio.Audio(0)
         print("DeviceInfoManager:1")
-        self.gsensor = SC7A20()
-        print("DeviceInfoManager:1.0")
-        self.gsensor.activate()
-        print("DeviceInfoManager:1.1")
-        self.gsensor.init()
-        print("DeviceInfoManager:2")
-        self.gsensor.set_callback(self.gsensor_cb)
-        try :
-            self.hsensor = HX3918()
+        # self.gsensor = SC7A20()
+        # print("DeviceInfoManager:1.0")
+        # self.gsensor.activate()
+        # print("DeviceInfoManager:1.1")
+        # self.gsensor.init()
+        # print("DeviceInfoManager:2")
+        # self.gsensor.set_callback(self.gsensor_cb)
+        # try :
+        #     self.hsensor = HX3918()
             
-        except Exception as e:
-            print("Hsensor none HX3918:{}".format(e))   
-        try :
-            self.hsensor = GH3018()
-        except Exception as e:
-            print("Hsensor none GH3018:{}".format(e))   
-        #
-        self.hsensor.activate()
-        self.hsensor.init()
-        self.hsensor.close()
-        try :
-            self.hsensor.set_sar(1)
-        except Exception as e:
-            print("Hsensor none set_sar:{}".format(e)) 
+        # except Exception as e:
+        #     print("Hsensor none HX3918:{}".format(e))   
+        # try :
+        #     self.hsensor = GH3018()
+        # except Exception as e:
+        #     print("Hsensor none GH3018:{}".format(e))   
+        # #
+        # self.hsensor.activate()
+        # self.hsensor.init()
+        # self.hsensor.close()
+        # try :
+        #     self.hsensor.set_sar(1)
+        # except Exception as e:
+        #     print("Hsensor none set_sar:{}".format(e)) 
         self.old_temp_time = 0
         # #print("hsensor.open_heart:%d\r\n"%(self.hsensor.open_heart()))
         print("DeviceInfoManager:3")
@@ -827,8 +827,8 @@ class DeviceInfoManager(Abstract):
         EventMesh.subscribe(constants.EVENT.GET_BLOOD_OXYGEN, self.get_blood_oxygen)
         EventMesh.subscribe(constants.EVENT.GET_HEART, self.get_heart)
         EventMesh.subscribe(constants.EVENT.GET_WEAR, self.get_wear)
-        EventMesh.subscribe("get_Hsensor", self.get_Hsensor)
-        EventMesh.subscribe("Hsensor_set_sleep", self.Hsensor_set_sleep)
+        # EventMesh.subscribe("get_Hsensor", self.get_Hsensor)
+        # EventMesh.subscribe("Hsensor_set_sleep", self.Hsensor_set_sleep)
 
         EventMesh.subscribe(constants.EVENT.START_TEMP, self.start_temp)
         EventMesh.subscribe(constants.EVENT.STOP_TEMP, self.stop_temp)
@@ -970,17 +970,17 @@ class DeviceInfoManager(Abstract):
             if self.upload_time != None :
                 if  math.fabs(time_tmp - self.UD_time) > self.upload_time: #30分钟一次定位
                     self.UD_time = time_tmp
-                    status_tmp = self.gsensor.get_status()#获取运动次数
+                    # status_tmp = self.gsensor.get_status()#获取运动次数
                     #status_tmp = 4
                     #EventMesh.txt_log("status_count:{}".format(status_tmp))
                     if EventMesh.publish(constants.EVENT.GET_CONNECT) == 1 and status_tmp > 3 :
                         EventMesh.publish(constants.EVENT.START_LOCATION,constants.PROTOCOL.UD_SEND) #开始UD定位
-                        self.gsensor.clean_status()#清除运动次数
+                        # self.gsensor.clean_status()#清除运动次数
                     else : #关闭定位
                         #EventMesh.txt_log("NO status")
                         print("NO status")
                         EventMesh.publish(constants.EVENT.CLOSE_LOCATION)#关闭定位 
-            EventMesh.publish(constants.EVENT.PUSH_STEP, self.get_step_count())
+            # EventMesh.publish(constants.EVENT.PUSH_STEP, self.get_step_count())
         except Exception as e:
                 usys.print_exception(e)
                 EventMesh.txt_log("publish_event1:".format(e))
@@ -1031,7 +1031,7 @@ class DeviceInfoManager(Abstract):
                 year = next_alarm_time[0]
                 if month != data[1] or day != data[2] or year != data[0]:
                     step = EventMesh.publish("get_old_step_value")
-                    self.gsensor.reset_step()
+                    #self.gsensor.reset_step()
                     EventMesh.publish("set_old_step_value",0)
                     
                     hr = EventMesh.publish("get_old_hr_data",)
@@ -1047,7 +1047,7 @@ class DeviceInfoManager(Abstract):
                     step = EventMesh.publish("get_old_step_value")
                     EventMesh.publish("set_old_time_data",time_tmp)
                     EventMesh.publish("set_old_step_value",0)
-                    self.gsensor.reset_step()
+                    # self.gsensor.reset_step()
                     hr = EventMesh.publish("get_old_hr_data")
                     if hr != 0:
                         EventMesh.publish("set_old_hr_data", 0)
@@ -1783,17 +1783,18 @@ class DeviceInfoManager(Abstract):
         """
         获取步数
         """
-        XYZ = self.gsensor.get_x_y_z()
-        tmp = 0
-        step = [0,0,0,0]
-        tmp =  self.gsensor.get_step() 
-        # print("x:%d,y:%d,z:%d tmp %d",XYZ[0],XYZ[1],XYZ[2],tmp)
-        step[0]= tmp 
-        step[1] = XYZ[0]
-        step[2] = XYZ[1]
-        step[3] = XYZ[2]
+        # XYZ = self.gsensor.get_x_y_z()
+        # tmp = 0
+        # step = [0,0,0,0]
+        # tmp =  self.gsensor.get_step() 
+        # # print("x:%d,y:%d,z:%d tmp %d",XYZ[0],XYZ[1],XYZ[2],tmp)
+        # step[0]= tmp 
+        # step[1] = XYZ[0]
+        # step[2] = XYZ[1]
+        # step[3] = XYZ[2]
         
-        return step
+        # return step
+        pass
 
     def get_ic_cid(self, event, msg):
         """
@@ -1927,36 +1928,41 @@ class DeviceInfoManager(Abstract):
 
     def start_blood_oxygen(self, topic, msg):
         print("start_blood_oxygen!!!")
-        self.hsensor.open_blood_oxygen()
+        #self.hsensor.open_blood_oxygen()
 
     def start_heart(self, topic, msg):
         print("start_heart!!!")
-        self.hsensor.open_heart()
+        #self.hsensor.open_heart()
 
     def stop_blood_oxygen(self, topic, msg):
         print("stop_blood_oxygen!!!")
-        self.hsensor.close()
+        #self.hsensor.close()
 
     def stop_heart(self, topic, msg):
         print("stop_heart!!!")
-        self.hsensor.close()
+        #self.hsensor.close()
 
     def get_blood_oxygen(self, topic, msg):
-        data = self.hsensor.get_all_data()
-        return data[1]
+        #data = self.hsensor.get_all_data()
+        #return data[1]
+        pass
 
     def get_heart(self, topic, msg):
-        data = self.hsensor.get_all_data()
-        return data[0]
+        # data = self.hsensor.get_all_data()
+        # return data[0]
+        pass
     
     def get_wear(self, topic, msg):
-        return self.hsensor.get_wear()
+        #return self.hsensor.get_wear()
+        pass
     
-    def get_Hsensor(self, topic, msg):
-        return self.hsensor
+    # def get_Hsensor(self, topic, msg):
+    #     #return self.hsensor
+    #     pass
     
     def Hsensor_set_sleep(self, topic, msg):
-        self.hsensor.set_sleep()
+        # self.hsensor.set_sleep()
+        pass
 
     def start_temp(self, topic, msg):
         WHO_AM_I = bytearray([0x01, 0])
index fa3a255..c54481a 100644 (file)
@@ -1707,13 +1707,19 @@ class chargefullScreen(Screen):#充电已满弹窗提示
             charge_full_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT)
 
 
-            charge_full_screen_title = lv.label(charge_full_screen)
-            charge_full_screen_title.set_pos(0, 150)
-            charge_full_screen_title.set_size(240, 40)
-            charge_full_screen_title.set_text("充电已满")
-            charge_full_screen_title.set_long_mode(lv.label.LONG.WRAP)
-            charge_full_screen_title.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
-            charge_full_screen_title.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
+            # charge_full_screen_title = lv.label(charge_full_screen)
+            # charge_full_screen_title.set_pos(0, 150)
+            # charge_full_screen_title.set_size(240, 40)
+            # charge_full_screen_title.set_text("充电已满")
+            # charge_full_screen_title.set_long_mode(lv.label.LONG.WRAP)
+            # charge_full_screen_title.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+            # charge_full_screen_title.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
+            energe_img = lv.img(charge_full_screen)
+            energe_img.set_pos(0, 0)
+            energe_img.set_size(240, 320)
+            energe_img.set_src("E:/static/energe_full.png")
+            energe_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
+
             self.meta = charge_full_screen
         self.count = 0
         self.timer.start(1*1000,1,self.fun)
@@ -1743,9 +1749,61 @@ class chargefullScreen(Screen):#充电已满弹窗提示
     def btn8_press(self):
         EventMesh.publish("return_prev_screen")
 
+ui_screen = lv.obj()
+print("ui_screen_create")
+ui_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT)       
+ai_img = lv.img(ui_screen)
+ai_img.set_pos(0, 0)
+ai_img.set_size(240, 320)
+ai_img.set_src("E:/static/listen.png")
+ai_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) 
+class UI_ai(Screen):
+    NAME = "UI_ai"
+    #ai界面的UI
+    def __init__(self): 
+        super().__init__()
+        print("UI_ai:__init__")
+        self.meta = ui_screen
+        self.timer = osTimer()
 
+    def initialization(self):   
+        print("UI_ai:initialization") 
+        #获取ai状态
+        ai_status = EventMesh.publish("screen_get_ai")
+        if ai_status:
+            self.__ai_vc(None, ai_status)
+        self.timer.start(500,1, lambda t: self.timerout_update())
 
+    def timerout_update(self):
+        EventMesh.publish("publish_message_event_ui",{"func":self.timerout_update_cb,"data":0})
 
+    def timerout_update_cb(self,data =None):    
+        EventMesh.publish("system_sleep_rest")#防止黑屏
+        #获取ai状态
+        ai_status = EventMesh.publish("screen_get_ai")
+        # print("ai_status = {}".format(ai_status))
+        self.__ai_vc(None, ai_status)
+    def __ai_vc(self, event, msg):
+    #msg = 1:listen,2:think,3:speak
+        if msg < 6:
+           ai_img.set_src("E:/static/listen.png")#正在听    
+        elif msg == 6:
+           ai_img.set_src("E:/static/think.png")#正在想
+        elif msg == 8:
+           ai_img.set_src("E:/static/speak.png")#正在说
+        # elif msg == 14:
+        #    ai_img.set_src("E:/static/listen.png")#正在听    
+        pass
+    def post_processor_before_initialization(self):
+        pass
+    def post_processor_after_initialization(self):
+        pass
+    def load(self):
+        pass
+    def get_meta(self):
+        return self.meta
+    def Close(self):
+        self.timer.stop()
 message_popup_screen = None
 message_popup_title = None
 #信息弹窗
@@ -6265,12 +6323,19 @@ class SystemInitScreen(Screen):
             system_init_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT)
        
             system_init_label = lv.label(system_init_screen)
-            system_init_label.set_pos(0, 150)
-            system_init_label.set_size(240, 40)
-            system_init_label.set_text("系统初始化中")
+            system_init_label.set_pos(73, 206)
+            system_init_label.set_size(100, 40)
+            system_init_label.set_text("loading")
             system_init_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
             system_init_label.set_long_mode(lv.label.LONG.WRAP)
-            system_init_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+            system_init_label.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0)
+
+            self.system_init_img = lv.img(system_init_screen)
+            self.system_init_img.set_size(98,100)
+            self.system_init_img.set_pos(71,90)
+            self.system_init_img.set_src("E:/static/init2.png")
+            self.system_init_img.add_flag(lv.obj.FLAG.CLICKABLE)
+            self.system_init_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
             self.meta = system_init_screen
         self.system_init_timer_count = 0
         self.system_init_timer.start(1000, 1, self.system_init_timer_cb)
@@ -6278,32 +6343,36 @@ class SystemInitScreen(Screen):
     def system_init_timer_cb(self, *args):
         EventMesh.publish("system_sleep_rest")#防止黑屏
         self.system_init_timer_count += 1
-        if self.system_init_timer_count > 4:
+        if self.system_init_timer_count > 3:
             self.system_init_timer_count = 1
         if system_init_screen != None:
-
-            system_init_label_str = "系统初始化中"
             if self.system_init_timer_count == 1:
-                system_init_label.set_text("系统初始化中.")
+                system_init_label.set_text("loading.")
             elif self.system_init_timer_count == 2:
-                system_init_label.set_text("系统初始化中..")
-            elif self.system_init_timer_count == 3:
-                system_init_label.set_text("系统初始化中...")
-            else:
-                system_init_label.set_text("系统初始化中....")
+                system_init_label.set_text("loading..")
+            else :
+                system_init_label.set_text("loading...")
 
     def Close(self):
        self.system_init_timer.stop()
 
-
 poweron_screen = lv.obj()
 print("poweron_screen")
 poweron_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT)
 
-poweron_label = lv.label(poweron_screen)
-poweron_label.set_text("WELCOME")
-poweron_label.align(lv.ALIGN.CENTER, 0, 0)
-poweron_label.add_style(style_font_youyuan_40, lv.PART.MAIN | lv.STATE.DEFAULT)
+# poweron_label = lv.label(poweron_screen)
+# poweron_label.set_text("WELCOME")
+# poweron_label.align(lv.ALIGN.CENTER, 0, 0)
+# poweron_label.add_style(style_font_youyuan_40, lv.PART.MAIN | lv.STATE.DEFAULT)
+
+poweron_img = lv.img(poweron_screen)
+poweron_img.set_size(240,320)
+poweron_img.set_pos(0,0)
+poweron_img.add_flag(lv.obj.FLAG.CLICKABLE)
+poweron_img.set_src("E:/static/open.png")
+poweron_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
+poweron_img.set_style_img_opa(0, lv.PART.MAIN | lv.STATE.DEFAULT )#255为完全不透明
+
 class PowerOnScreen(Screen):
     NAME = "poweron"
 
@@ -6314,11 +6383,11 @@ class PowerOnScreen(Screen):
         self.aud = audio.Audio(0)
         self.aud.set_pa(Pin.GPIO29)
         self.meta_type = "popup"
-        self.volum_size = 8
+        self.volum_size = 11
         check_volum = EventMesh.publish("get_storage_config","volum")
         if check_volum != None:
             self.volum_size =  check_volum
-
+        self.aud.play(1, 1, 'E:/static/R_POWER_1.mp3')  #播放来电铃声 
 
         self.aud.setVolume(self.volum_size)
         self.count = 0
@@ -6327,22 +6396,24 @@ class PowerOnScreen(Screen):
         EventMesh.publish("set_UI_high_priority",1)
         self.count = 0
         self.aud.setVolume(11)
-        self.timer.start(1000,1,self.fun)
+        self.timer.start(200,1,self.fun)
         pass
-
+    
     def fun(self,*argc):
         EventMesh.publish("system_sleep_rest")#防止黑屏
         if self.count == 0:
-            #self.aud.play(1, 1, 'E:/static/R_POWER_1.mp3')  #播放来电铃声 
+            # self.aud.play(1, 1, 'E:/static/R_POWER_1.mp3')  #播放来电铃声 
             pass
         else:
-            if self.count >= 6:#在上一个界面在播放音频时切换界面则关闭 以免一直播放
+            if self.count >= 30:#在上一个界面在播放音频时切换界面则关闭 以免一直播放
                 self.count = 0
                 self.timer.stop()
+                utime.sleep_ms(2000)#停两秒
                 EventMesh.publish("set_UI_high_priority",0)
                 EventMesh.publish("load_screen", {"screen": "main_menu"})
                 return
         self.count+=1
+        poweron_img.set_style_img_opa(self.count*8, lv.PART.MAIN | lv.STATE.DEFAULT )#255为完全不透明
 
     def Close(self):
         EventMesh.publish("set_UI_high_priority",0)
@@ -6381,15 +6452,20 @@ class chargeInScreen(Screen):
             # add style for watchface
             charge_in_screen.add_style(style_screen, lv.PART.MAIN|lv.STATE.DEFAULT)
             #进入图片
-
-            charge_in_screen_label = lv.label(charge_in_screen)
-            charge_in_screen_label.set_pos(0, 170)
-            charge_in_screen_label.set_size(240, 20)
-            charge_in_screen_label.set_text(" ")
-            charge_in_screen_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
-            charge_in_screen_label.set_long_mode(lv.label.LONG.WRAP)
-            charge_in_screen_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
-
+            # charge_in_screen_label = lv.label(charge_in_screen)
+            # charge_in_screen_label.set_pos(0, 170)
+            # charge_in_screen_label.set_size(240, 20)
+            # charge_in_screen_label.set_text(" ")
+            # charge_in_screen_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
+            # charge_in_screen_label.set_long_mode(lv.label.LONG.WRAP)
+            # charge_in_screen_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+
+            charge_out_img = lv.img(charge_out_screen)
+            charge_out_img.set_size(240, 320)
+            charge_out_img.set_src("E:/static/charge_in.png")
+            charge_out_img.add_flag(lv.obj.FLAG.CLICKABLE)
+            charge_out_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
+            charge_out_img.set_pos(0, 0)
 
             self.meta = charge_in_screen
 
@@ -6465,13 +6541,13 @@ class chargeOutScreen(Screen):
             charge_out_screen.add_style(style_screen, lv.PART.MAIN|lv.STATE.DEFAULT)
             #进入图片
 
-            charge_out_screen_label = lv.label(charge_out_screen)
-            charge_out_screen_label.set_pos(0, 170)
-            charge_out_screen_label.set_size(240, 20)
-            charge_out_screen_label.set_text(" ")
-            charge_out_screen_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
-            charge_out_screen_label.set_long_mode(lv.label.LONG.WRAP)
-            charge_out_screen_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+            # charge_out_screen_label = lv.label(charge_out_screen)
+            # charge_out_screen_label.set_pos(0, 170)
+            # charge_out_screen_label.set_size(240, 20)
+            # charge_out_screen_label.set_text(" ")
+            # charge_out_screen_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
+            # charge_out_screen_label.set_long_mode(lv.label.LONG.WRAP)
+            # charge_out_screen_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
 
 
             self.meta = charge_out_screen
@@ -6746,9 +6822,9 @@ class UI(object):
         self.PWM_backlight.open()
         self.sleep_lock = 0
 
+
     def post_processor_after_instantiation(self):
         EventMesh.subscribe("load_screen", self.load_screen_cb)
-
         EventMesh.subscribe("btn1_press", self.btn_press)
         EventMesh.subscribe("btn8_press", self.btn_press)
         EventMesh.subscribe("btn8_long_press", self.btn_press)
@@ -7054,6 +7130,7 @@ class UI(object):
         time = EventMesh.publish("get_brightness_time")
         if time == None:
             time = 10
+        # print("system_sleep_timer_cb:{}".format(self.system_sleep_timer_count))
         self.system_sleep_timer_count += 1
         if self.system_sleep_timer_count >= time :
             self.system_sleep_timer_count = 0
@@ -7100,17 +7177,17 @@ class UI(object):
                                     EventMesh.publish("close_count_show_info")
                                 return
                             else:
-                                if screen_NAME != "dialing_noplay_popup" or  screen_NAME != "dial_no_connect_popup" or \
-                                screen_NAME != "on_call" or screen_NAME != "dialing" or screen_NAME != "incoming_call" or \
-                                screen_NAME != "charge_in" or screen_NAME != "charge_out":
+                                if screen_NAME != "dialing_noplay_popup" and  screen_NAME != "dial_no_connect_popup" and \
+                                screen_NAME != "on_call" and screen_NAME != "dialing" and screen_NAME != "incoming_call" and \
+                                screen_NAME != "charge_in" and screen_NAME != "charge_out":
                                     EventMesh.publish("load_screen", {"screen": "class_time"}) 
         if self.screen :
             if self.screen.NAME == msg["screen"]:
+                print("self.screen.NAME == msg[\"screen\"]")
                 return
         for scr in self.screen_list:
             if scr.NAME == msg["screen"]:
                 # 每次屏幕切换开始息屏倒计时
-                
                 if scr.NAME == 'main_menu':
                     self.main_flag = 1
                 else :
@@ -7146,21 +7223,21 @@ class UI(object):
                 
                 print("load_screen.load()1")
                 self.screen.load()
-                # print("load_screen.load()2")
+                #print("load_screen.load()2")
                 self.lv.scr_load(self.screen.get_meta())
-                # print("load_screen.load()3")
+                #print("load_screen.load()3")
                 
                 self.screen.post_processor_after_initialization()
-                # print("load_screen.load()4")
+                #print("load_screen.load()4")
                 if self.screen_prev == None:
                     if self.screen.meta_type != "popup":
                         self.screen_prev = self.screen
                 self.__lcd_on()
-                # print("load_screen.load()5")
+                #print("load_screen.load()5")
                 mem = gc.mem_free()
-                print('2剩余内存RAM:{} KB'.format(mem / 1024))
+                #print('2剩余内存RAM:{} KB'.format(mem / 1024))
 
                 
-
+  
 
 
index 07fc26e..74a9de8 100644 (file)
@@ -4,7 +4,7 @@ import lvgl as lv
 import EventMesh
 import osTimer
 import constants
-from ui import Screen,style_screen
+from ui import Screen,style_screen,style_font_youyuan_20
 import ql_fs
 import ujson
 from machine import RTC
@@ -75,8 +75,8 @@ watchface1_res_stat_battery_img.add_style(style_watchface_img_default, lv.PART.M
  
 watchface1_res_stat_battery_line = lv.line(Watchface1)
 watchface1_res_stat_battery_line.set_points(power_line_points,2)
-watchface1_res_stat_battery_line.set_pos(int(203),int(3))
-watchface1_res_stat_battery_line.set_size(0,16)#高度12
+watchface1_res_stat_battery_line.set_pos(int(162),int(12))
+watchface1_res_stat_battery_line.set_size(50,14)#高度14
 watchface1_res_stat_battery_line.add_style(power_line_red,0)
 
 watchface1_res_stat_charge_in_img = lv.img(Watchface1)
@@ -88,22 +88,29 @@ watchface1_res_stat_charge_in_img.add_flag(lv.obj.FLAG.CLICKABLE)
 # add style for watchface1_res_stat_charge_in_img
 watchface1_res_stat_charge_in_img.add_style(style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT)
 
+# #主图片
+# watchface1_bg_img = lv.img(Watchface1)
+# watchface1_bg_img.set_pos(int(9),int(65))
+# watchface1_bg_img.set_size(222,222)
+# watchface1_bg_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
+# watchface1_bg_img.add_flag(lv.obj.FLAG.CLICKABLE)
+# watchface1_bg_img.set_src("U:/static/bg.png")
+# watchface1_bg_img.add_style(style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT)
 #主图片
 watchface1_bg_img = lv.img(Watchface1)
-watchface1_bg_img.set_pos(int(9),int(65))
-watchface1_bg_img.set_size(222,222)
+watchface1_bg_img.set_pos(0,0)
+watchface1_bg_img.set_size(240,320)
 watchface1_bg_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
 watchface1_bg_img.add_flag(lv.obj.FLAG.CLICKABLE)
-watchface1_bg_img.set_src("U:/static/bg.png")
+watchface1_bg_img.set_src("E:/static/bj1.png")
 watchface1_bg_img.add_style(style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT)
-#时间
-
 
+#时间
 style_font_youyuan_70_black = lv.style_t()
 style_font_youyuan_70_black.init()
-style_font_youyuan_70_black.set_text_color(lv.color_make(0x32, 0xc8, 0xdb))
+style_font_youyuan_70_black.set_text_color(lv.color_make(0xFF, 0xFF, 0xFF))
 style_font_youyuan_70_black.set_text_font(lv.font_70_bold)
-#init3:(2106, 2, 7, 6, 29, 38, 6, 38)
+#init3:(2025, 6, 23, 1, 14, 21, 1, 0) 2025/6/23 monday 14:21.1
 data = RTC().datetime()
 hour = data[4]
 min = data[5]
@@ -132,50 +139,79 @@ def get_week(msg):
 
 
 watchface1_time1_text = lv.label(Watchface1)
-watchface1_time1_text.set_pos(20, 50)
-watchface1_time1_text.set_size(190, 71)
+watchface1_time1_text.set_pos(30, 139)
+watchface1_time1_text.set_size(240, 71)
 watchface1_time1_text.set_align(lv.TEXT_ALIGN.LEFT)
 watchface1_time1_text.set_text("{}:{}".format("%02d"%(hour),"%02d"%(min)))
 # watchface1_time1_text.set_text("%02d:%02d"%(hour,min))
 watchface1_time1_text.add_style(style_font_youyuan_70_black, lv.PART.MAIN|lv.STATE.DEFAULT)
+#状态栏
+# #连接情况
+# status_img1 = lv.img(Watchface1)
+# status_img1.set_pos(int(102),int(13))
+# status_img1.set_size(24,12)
+# status_img1.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
+# status_img1.add_flag(lv.obj.FLAG.CLICKABLE)
+# status_img1.set_src("E:/static/isconnect.png")
+# status_img1.add_style(style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT)
+#电量
+status_img2 = lv.img(Watchface1)
+status_img2.set_pos(int(182),int(12))
+status_img2.set_size(45,18)
+status_img2.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
+status_img2.add_flag(lv.obj.FLAG.CLICKABLE)
+status_img2.add_style(style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT)
+
+# #充电时电量
+# energe_in = lv.label(Watchface1)
+# energe_in.set_pos(162, 12)
+# energe_in.set_size(50, 14)
+# energe_in.set_text("")
+# energe_in.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+# energe_in.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
+
+#信号
+status_img3 = lv.img(Watchface1)
+status_img3.set_pos(int(142),int(12))
+status_img3.set_size(30,18)
+status_img3.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
+status_img3.add_style(style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT)
 
 #日期
 watchface1_date_span = lv.label(Watchface1)
 watchface1_date_span.set_pos(8, 122)
 watchface1_date_span.set_size(140, 30)
 watchface1_date_span.set_align(lv.TEXT_ALIGN.LEFT)
-watchface1_date_span.set_text("%d月%d日"%(date1,date2))
+watchface1_date_span.set_text("")
 watchface1_date_span.add_style(style_font_youyuan_28, lv.PART.MAIN|lv.STATE.DEFAULT)
 #星期
 watchface1_week_span = lv.label(Watchface1)
 watchface1_week_span.set_pos(8, 160)
 watchface1_week_span.set_size(100, 30)
 watchface1_week_span.set_align(lv.TEXT_ALIGN.LEFT)
-watchface1_week_span.set_text("星期%s"%(get_week(week)))
+watchface1_week_span.set_text("")
 watchface1_week_span.add_style(style_font_youyuan_28, lv.PART.MAIN|lv.STATE.DEFAULT)
 
-
-
 watchface1_step_span = lv.label(Watchface1)
 watchface1_step_span.set_pos(142, 159)
 watchface1_step_span.set_size(240-142, 30)
 watchface1_step_span.set_align(lv.TEXT_ALIGN.LEFT)
-watchface1_step_span.set_text("0")
+watchface1_step_span.set_text("")
 watchface1_step_span.add_style(style_font_youyuan_28, lv.PART.MAIN|lv.STATE.DEFAULT)
 
 
 
-# watchface1_HB_span = lv.label(Watchface1)
-# watchface1_HB_span.set_pos(52, 235)
-# watchface1_HB_span.set_size(80, 30)
-# watchface1_HB_span.set_align(lv.TEXT_ALIGN.LEFT)
-# watchface1_HB_span.set_text("0")
-# watchface1_HB_span.add_style(style_font_youyuan_28, lv.PART.MAIN|lv.STATE.DEFAULT)
+watchface1_HB_span = lv.label(Watchface1)
+watchface1_HB_span.set_pos(52, 235)
+watchface1_HB_span.set_size(80, 30)
+watchface1_HB_span.set_align(lv.TEXT_ALIGN.LEFT)
+watchface1_HB_span.set_text("")
+watchface1_HB_span.add_style(style_font_youyuan_28, lv.PART.MAIN|lv.STATE.DEFAULT)
 
 watchface1_HB_span = lv.label(Watchface1)
 watchface1_HB_span.set_pos(5, 235)
 watchface1_HB_span.set_size(115, 30)
-watchface1_HB_span.set_text("0")
+watchface1_HB_span.set_text("")
 watchface1_HB_span.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
 watchface1_HB_span.add_style(style_font_youyuan_28, lv.PART.MAIN | lv.STATE.DEFAULT)
 
@@ -183,7 +219,7 @@ watchface1_HB_span.add_style(style_font_youyuan_28, lv.PART.MAIN | lv.STATE.DEFA
 watchface1_SPO2_span = lv.label(Watchface1)
 watchface1_SPO2_span.set_pos(110, 235)
 watchface1_SPO2_span.set_size(120, 30)
-watchface1_SPO2_span.set_text("0")
+watchface1_SPO2_span.set_text("")
 watchface1_SPO2_span.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
 watchface1_SPO2_span.add_style(style_font_youyuan_28, lv.PART.MAIN|lv.STATE.DEFAULT)
 
@@ -198,7 +234,6 @@ class WatchFace1():
         
     def initialization(self,main_menu):   
         print("Watchface1:initialization") 
-        
         #获取信号
         signal = EventMesh.publish("screen_get_sig")
         if signal:
@@ -224,9 +259,7 @@ class WatchFace1():
         step = EventMesh.publish("get_old_step_value")
         self.__stepValue(None, step)
 
-        
     def timerout_update(self):
-        #获取信号
         signal = EventMesh.publish("screen_get_sig")
         if signal:
             self.__signal(None, signal)
@@ -256,8 +289,8 @@ class WatchFace1():
         #时间
         watchface1_time1_text.set_text("{}:{}".format("%02d"%(msg[0][0]),"%02d"%(msg[0][1])))
 
-        watchface1_date_span.set_text(msg[2])#日期
-        watchface1_week_span.set_text(msg[3])   #星期
+        # watchface1_date_span.set_text(msg[2])#日期
+        # watchface1_week_span.set_text(msg[3])   #星期
 
     def __signal(self, event, msg):
         #print("__signal_cb:",str(msg))
@@ -265,39 +298,41 @@ class WatchFace1():
         #print("__signal_cb:{}".format(msg//8))
         if msg:
             if msg >= 0 and msg<=31 :
-                watchface1_mpsignal_img.set_src("E:/static/mpsignal{}.png".format(msg//8+1))
+                status_img3.set_src("E:/static/mpsignal{}.png".format(msg//8+1))
             else :
-                watchface1_mpsignal_img.set_src("E:/static/mpsignal5.png") 
+                status_img3.set_src("E:/static/nosim.png")#无信号 
 
     def __battery(self, event, msg):
         #print("__battery_cb:",str(msg))
         #print(msg)
-        if msg[0] == '1':
-            
-            watchface1_res_stat_battery_line.set_pos(int(0),int(8))
-            watchface1_res_stat_battery_line.set_size(0,0)
-            watchface1_res_stat_battery_line.set_style_line_width(0,lv.PART.MAIN)
-            watchface1_res_stat_battery_img.set_src("E:/static/charge_ing.png")
+        if msg[0] == '1': 
+            # watchface1_res_stat_battery_line.set_pos(int(162),int(12))
+            # watchface1_res_stat_battery_line.set_size(50,14)
+            # watchface1_res_stat_battery_line.set_text("{}%".format(msg[1]))
+            # watchface1_res_stat_battery_line.set_style_line_width(0,lv.PART.MAIN)
+            # energe_in.set_text("{}%".format(msg[1]))#电量标识
+            status_img2.set_src("E:/static/charge_ing.png")#充电电池样式
         else:
-            watchface1_res_stat_battery_img.set_src("E:/static/vbat_0.png")
             level = msg[1]
             if level >= 100:
                 level = 100
-            line_len = int(level*(30/100))
-            # print("__battery_cb:",level,line_len,30/100)
-            if line_len >= 30:
-                line_len = 30
-            if line_len <= 6:
-                line_len = 6
-            set_x = int(199+line_len//2)
-            watchface1_res_stat_battery_line.set_pos(int(set_x),int(8))
-            watchface1_res_stat_battery_line.set_size(line_len,15)
-            watchface1_res_stat_battery_line.set_style_line_width(line_len,lv.PART.MAIN)
-            if line_len <= 6:
-                watchface1_res_stat_battery_line.set_style_line_color(lv.color_make(0xff,0x00,0x00),0)
-            else:
-                watchface1_res_stat_battery_line.set_style_line_color(lv.color_make(0x00,0xff,0x00),0) 
+            status_img2.set_src("E:/static/energe{}.png".format(level//20))
+            # line_len = int(level*(30/100))
+            # # print("__battery_cb:",level,line_len,30/100)
+            # if line_len >= 30:
+            #     line_len = 30
+            # if line_len <= 6:
+            #     line_len = 6
+            # set_x = int(199+line_len//2)
+            # watchface1_res_stat_battery_line.set_pos(int(set_x),int(8))
+            # watchface1_res_stat_battery_line.set_size(line_len,15)
+            # watchface1_res_stat_battery_line.set_style_line_width(line_len,lv.PART.MAIN)
+            # if line_len <= 6:
+            #     watchface1_res_stat_battery_line.set_style_line_color(lv.color_make(0xff,0x00,0x00),0)
+            # else:
+            #     watchface1_res_stat_battery_line.set_style_line_color(lv.color_make(0x00,0xff,0x00),0) 
             # watchface2_res_stat_battery_img.set_src("E:/static/vbat_%d.png"%(msg[1]))#"E:/vbat_60.png"
+
         pass
 
     def __oldHrValue(self, event, msg):
@@ -308,7 +343,7 @@ class WatchFace1():
 
     def __stepValue(self, event, msg):
         if msg == None:    
-            watchface1_step_span.set_text("0")
+            watchface1_step_span.set_text("")
         else:
             watchface1_step_span.set_text(str(msg))
 
@@ -426,12 +461,12 @@ watchface2_week.add_style(style_font_youyuan_28, lv.PART.MAIN|lv.STATE.DEFAULT)
 #星期
 
 
-# watchface2_week = lv.img(Watchface2)
-# watchface2_week.set_pos(int(30+56+20+25),int(y+56+30))
-# watchface2_week.set_size(90,30)
-# watchface2_week.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
-# watchface2_week.set_src("E:/static/watch_plate/style_2/week/0_week.png")
-# watchface2_week.add_style(style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT)
+watchface2_week = lv.img(Watchface2)
+watchface2_week.set_pos(int(30+56+20+25),int(y+56+30))
+watchface2_week.set_size(90,30)
+watchface2_week.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
+watchface2_week.set_src("E:/static/watch_plate/style_2/week/0_week.png")
+watchface2_week.add_style(style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT)
 
 
 
@@ -446,7 +481,7 @@ watchface2_step_txt = lv.label(Watchface2)
 watchface2_step_txt.set_pos(125, 260)
 watchface2_step_txt.set_size(240-125, 35)
 watchface2_step_txt.set_align(lv.TEXT_ALIGN.LEFT)
-watchface2_step_txt.set_text("0")
+watchface2_step_txt.set_text("")
 watchface2_step_txt.add_style(style_font_youyuan_28, lv.PART.MAIN|lv.STATE.DEFAULT)
 
 class WatchFace2():
@@ -553,7 +588,7 @@ class WatchFace2():
         pass
     def __stepValue(self, event, msg):
         if msg == None:    
-            watchface2_step_txt.set_text("0")
+            watchface2_step_txt.set_text("")
         else:
             watchface2_step_txt.set_text(str(msg))
 
@@ -593,6 +628,9 @@ class WatchFace2():
     def done_bottom_to_top(self):
         EventMesh.publish("load_screen", {"screen": "call_log"})
 
+
+
+                
 class WatchFace():
     #NAME = "Watchface"
 
@@ -600,10 +638,11 @@ class WatchFace():
         #表盘
         self.meta = None
         self.watchface_style_num = "Watchface1"
+        self.watchface_style = None
         self.watchface_list = []
         self.timer_update = osTimer()
         EventMesh.subscribe("set_change_face", self.change_face)
-        self.PWM_backlight  = None
+        self.PWM_backlight  = None     
         read_data = EventMesh.publish("get_storage_config","watchface")
         if read_data != None:
             self.watchface_style_num = read_data
@@ -613,7 +652,6 @@ class WatchFace():
     def initialization(self,main_menu):
         if self.watchface_list == [] : #第一次初始化
             self.watchface_list.append( WatchFace1(main_menu))
-            self.watchface_list.append( WatchFace2(main_menu))
         print("watchface INIT !!!!!!!!:",self.watchface_style_num)
         for wat in self.watchface_list:
             if wat.NAME == self.watchface_style_num :
@@ -623,16 +661,15 @@ class WatchFace():
         self.meta = self.watchface_style.meta
         self.watchface_style.meta.clear_flag(lv.obj.FLAG.HIDDEN)#显示
         self.watchface_style.timerout_update()
-        self.timer_update.start(10000, 1, self.timerout_update)
+        self.timer_update.start(1000, 1, self.timerout_update)
 
     def timerout_update(self, *args, **kwargs):
         self.watchface_style.timerout_update()
-
     def change_face(self, event=None, msg=None):
         print("change_face :",msg)
         self.watchface_style_num = str(msg)
-
         EventMesh.publish("load_screen", {"screen": "main_menu"})
+        # EventMesh.publish("load_screen", {"screen": "main_menu"})
         
     
     # def done_left_to_right(self):
diff --git a/2.sdk/project/K8/sdk/services/microPython/ports/quectel/core/ui_ai.py b/2.sdk/project/K8/sdk/services/microPython/ports/quectel/core/ui_ai.py
new file mode 100644 (file)
index 0000000..144805e
--- /dev/null
@@ -0,0 +1,105 @@
+
+import lvgl as lv
+import ql_fs
+import EventMesh
+from misc import Power
+from ui import style_screen,style_font_youyuan_20,style_btn,style_img,Screen,style_contact_btn
+import constants
+import osTimer
+import audio
+from machine import Pin
+import ujson
+from lcd import style_font_youyuan_40
+# -------------------------------------------setting screen----------------------------------------------------------
+
+style_bar = lv.style_t() 
+style_bar.init()
+style_bar.set_radius(10)
+style_bar.set_bg_color(lv.color_make(0xA0, 0xA0, 0xA0))
+style_bar.set_bg_grad_color(lv.color_make(0xA0, 0xA0, 0xA0))
+style_bar.set_bg_grad_dir(lv.GRAD_DIR.VER)
+style_bar.set_bg_opa(60)
+style_bar.set_pad_left(0)
+style_bar.set_pad_right(0)
+style_bar.set_pad_top(0)
+style_bar.set_pad_bottom(0)
+
+style_volume_btn =  lv.style_t()
+style_volume_btn.init()
+style_volume_btn.set_shadow_opa(0)
+style_volume_btn.set_border_width(0)
+style_volume_btn.set_bg_color(lv.color_make(0x80, 0x80, 0x80))
+
+style_bar_indic = lv.style_t()
+style_bar_indic.init()
+style_bar_indic.set_radius(10)
+style_bar_indic.set_bg_color(lv.color_make(0xff, 0x61, 0x3a))
+style_bar_indic.set_bg_grad_color(lv.color_make(0xff, 0x61, 0x3a))
+style_bar_indic.set_bg_grad_dir(lv.GRAD_DIR.VER)
+style_bar_indic.set_bg_opa(255)
+
+ai_cont_y = 0
+ai_screen = lv.obj()
+print("ai_screen")
+ai_screen.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
+ai_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT)
+
+ai_title_img = lv.img(ai_screen)
+ai_title_img.set_pos(58, 10)
+ai_title_img.set_size(124, 30)
+ai_title_img.set_src("E:/static/ai/ai_text.png")
+ai_title_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
+
+
+
+setting_cont_style = lv.style_t()
+setting_cont_style.init()
+setting_cont_style.set_radius(0)
+setting_cont_style.set_bg_color(lv.color_make(0x00, 0x00, 0x00))
+setting_cont_style.set_bg_grad_color(lv.color_make(0x00, 0x00, 0x00))
+setting_cont_style.set_bg_grad_dir(lv.GRAD_DIR.VER)
+setting_cont_style.set_bg_opa(255)
+setting_cont_style.set_border_width(0)
+setting_cont_style.set_pad_left(0)
+setting_cont_style.set_pad_right(0)
+setting_cont_style.set_pad_top(0)
+setting_cont_style.set_pad_bottom(0)
+
+ai_list_screen = lv.obj(ai_screen)
+ai_list_screen.set_pos(0, 50)
+ai_list_screen.set_size(240, 270)
+ai_list_screen.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
+ai_list_screen.add_style(setting_cont_style,lv.PART.MAIN | lv.STATE.DEFAULT)
+
+setting_cont = lv.obj(ai_list_screen)
+setting_cont.set_pos(0, 0)
+setting_cont.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
+setting_cont.set_size(240, 271)
+setting_cont.add_style(setting_cont_style,lv.PART.MAIN | lv.STATE.DEFAULT)
+
+
+
+
+
+class AI_Screen(Screen):#健康测量
+    NAME = "health"
+
+    def __init__(self):
+        super().__init__()
+        self.is_sliding = 0
+        # self.meta = health_screen
+        # # setting_language.add_event_cb(lambda e: self.load_screen(e, {"screen": "language"}), lv.EVENT.SHORT_CLICKED, None)
+        # health_hr_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.health_cb(e, "heartrate")), lv.EVENT.SHORT_CLICKED, None)
+        # # setting_themeswitch.add_event_cb(lambda e: self.load_screen(e, {"screen": "themeswitch"}), lv.EVENT.SHORT_CLICKED, None)
+        # health_spo2_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.health_cb(e, "spo2")), lv.EVENT.SHORT_CLICKED, None)
+        # health_temp_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.health_cb(e, "temperature")), lv.EVENT.SHORT_CLICKED, None)
+
+       
+        # health_hr_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.health_cb(e,"heartrate")), lv.EVENT.PRESSING, None)
+        # # setting_themeswitch.add_event_cb(lambda e: self.load_screen(e, {"screen": "themeswitch"}), lv.EVENT.PRESSING, None)
+        # health_spo2_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.health_cb(e, "spo2")), lv.EVENT.PRESSING, None)
+        # health_temp_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.health_cb(e, "temperature")), lv.EVENT.PRESSING, None)
+    
+    
+##################################################################
+# -------------------------------------------language screen----------------------------------------------------------
index 3ebc0ed..adc9acd 100644 (file)
@@ -9,7 +9,7 @@ import osTimer
 import constants
 from misc import Power
 import pm
-from ui import Screen,style_font_youyuan_20_gray,style_font_youyuan_40
+from ui import Screen,UI_ai,style_font_youyuan_20_gray,style_font_youyuan_40
 from ui_WatchFaceScreen import WatchFace
 style_MainMenu_screen_default = lv.style_t()
 style_MainMenu_screen_default.init()
@@ -477,7 +477,7 @@ class MainMenuScreen(Screen):
         
     def lcd_on(self):
         self.watchface.watchface_style.timerout_update()
-        self.watchface.timer_update.start(10000, 1, self.watchface.timerout_update)
+        self.watchface.timer_update.start(1000, 1, self.watchface.timerout_update)
 
     def lcd_off(self):
         self.watchface.timer_update.stop()
index a0444b7..8f28604 100644 (file)
@@ -775,46 +775,10 @@ print("poweroff_screen")
 poweroff_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT)
 
 poweroff_img = lv.img(poweroff_screen)
-poweroff_img.set_pos(100, 30)
-poweroff_img.set_size(61, 61)
+poweroff_img.set_pos(0, 0)
+poweroff_img.set_size(240, 320)
 poweroff_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
-poweroff_img.set_src("E:/static/poweroff_icon.png")
-
-poweroff_label = lv.label(poweroff_screen)
-poweroff_label.set_text("是否关机?")
-poweroff_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
-poweroff_label.set_size(240, 20)
-poweroff_label.set_pos(0,120)
-poweroff_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
-
-poweroff_confirm_img = lv.img(poweroff_screen)
-poweroff_confirm_img.set_size(176, 46)
-poweroff_confirm_img.set_pos(32, 160)
-poweroff_confirm_img.set_src("E:/static/off_icon.png")
-poweroff_confirm_img.add_flag(lv.obj.FLAG.CLICKABLE)
-poweroff_confirm_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
-
-poweroff_confirm_label = lv.label(poweroff_confirm_img)
-poweroff_confirm_label.set_text("关机")
-poweroff_confirm_label.align(lv.ALIGN.CENTER, 0, 5)
-poweroff_confirm_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
-
-poweroff_return = lv.img(poweroff_screen)
-poweroff_return.set_size(176, 46)
-poweroff_return.set_pos(32, 240)
-poweroff_return.set_src("E:/static/cancel_icon.png")
-
-poweroff_return.add_flag(lv.obj.FLAG.CLICKABLE)
-poweroff_return.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
-poweroff_return_label = lv.label(poweroff_return)
-poweroff_return_label.set_text("返回")
-poweroff_return_label.align(lv.ALIGN.CENTER, 0, 5)
-poweroff_return_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
-poweroff_return.set_ext_click_area(20)
-
-
-
-
+poweroff_img.set_src("E:/static/open.png")
 
 
 class PoweroffScreen(Screen):
@@ -823,8 +787,6 @@ class PoweroffScreen(Screen):
     def __init__(self):
         super().__init__()
         self.meta = poweroff_screen
-        poweroff_confirm_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.confirm(e)),lv.EVENT.CLICKED, None)
-        poweroff_return.add_event_cb(lambda e: EventMesh.callback_wrapper(self.concel(e)),lv.EVENT.CLICKED, None)
 
     def initialization(self):
         pass
@@ -914,10 +876,15 @@ poweroff_confirm_screen = lv.obj()
 print("poweroff_confirm_screen")
 poweroff_confirm_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT)
 
-poweroff_confirm_label = lv.label(poweroff_confirm_screen)
-poweroff_confirm_label.set_text("Goodbye")
-poweroff_confirm_label.align(lv.ALIGN.CENTER, 0, 0)
-poweroff_confirm_label.add_style(style_font_youyuan_40, lv.PART.MAIN | lv.STATE.DEFAULT)
+# poweroff_confirm_label = lv.label(poweroff_confirm_screen)
+# poweroff_confirm_label.set_text("Goodbye")
+# poweroff_confirm_label.align(lv.ALIGN.CENTER, 0, 0)
+# poweroff_confirm_label.add_style(style_font_youyuan_40, lv.PART.MAIN | lv.STATE.DEFAULT)
+poweroff_img = lv.img(poweroff_confirm_screen)
+poweroff_img.set_pos(0, 0)
+poweroff_img.set_size(240, 320)
+poweroff_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
+poweroff_img.set_src("E:/static/open.png")
 
 import utime
 class PoweroffConfirmScreen(Screen):
@@ -963,6 +930,10 @@ class PoweroffConfirmScreen(Screen):
         
     def btn8_press(self):
         pass
+    def post_processor_before_initialization(self):
+        pass
+    def post_processor_after_initialization(self):
+        pass
 from common import Abstract
 class TimePoweroffScreen(Abstract):
     
index be2018b..14def22 100644 (file)
Binary files a/2.sdk/project/K8/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/images/firmware_base_release_pack.zip and b/2.sdk/project/K8/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/images/firmware_base_release_pack.zip differ
index c5e0ce4..a33dd45 100644 (file)
Binary files a/2.sdk/project/K8/usr/audio_ve.nvm and b/2.sdk/project/K8/usr/audio_ve.nvm differ
diff --git a/2.sdk/project/K8/usr/static/storage_file/config.json b/2.sdk/project/K8/usr/static/storage_file/config.json
deleted file mode 100644 (file)
index e69de29..0000000