From: dxy15521469561 <1731678236@qq.com>
Date: Tue, 14 Nov 2023 03:03:31 +0000 (+0800)
Subject: K01:
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=d9f78b5a114b481d250b4375091a5fd8103af7fd;p=mirrors%2FASR1603_G5.git

K01:
app界面显示云米守护app二维码
远程关机充电不允许关机
K5 C06S D10充电远程不允许关机
---

diff --git a/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/protocol.py b/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/protocol.py
index e117ed9d..3bca18b8 100644
--- a/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/protocol.py
+++ b/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/protocol.py
@@ -635,9 +635,11 @@ class POWEROFF_ProtoCol(ProtoCol):
         @param msg: 接收到的下行数据
         """
         EventMesh.publish(constants.PROTOCOL.POWEROFF_SEND)
-        #print("POWEROFF_ProtoCol:recv:%s"%(msg))
-        EventMesh.publish("load_screen", {"screen": "poweroff_comfirm"})
-         
+        battery = EventMesh.publish("screen_get_battery")
+        if battery != None:
+            if battery[0] != "1":
+                EventMesh.publish("load_screen", {"screen": "poweroff_comfirm"})
+        
 class PHL_ProtoCol(ProtoCol):
     """电话本同步"""
     TYPE = "PHL"
diff --git a/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/protocol.py b/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/protocol.py
index f566b734..92cfc217 100644
--- a/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/protocol.py
+++ b/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/protocol.py
@@ -648,7 +648,10 @@ class POWEROFF_ProtoCol(ProtoCol):
         """
         EventMesh.publish(constants.PROTOCOL.POWEROFF_SEND)
         #print("POWEROFF_ProtoCol:recv:%s"%(msg))
-        EventMesh.publish("open_power_on", 2)#  #远程关机
+        battery = EventMesh.publish("screen_get_battery")
+        if battery != None:
+            if battery[0] != "1":
+                EventMesh.publish("open_power_on", 2)#  #远程关机
          
 class PHL_ProtoCol(ProtoCol):
     """电话本同步"""
diff --git a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/protocol.py b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/protocol.py
index fbfb2072..448a2cb5 100644
--- a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/protocol.py
+++ b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/protocol.py
@@ -635,7 +635,7 @@ class POWEROFF_ProtoCol(ProtoCol):
         #print("POWEROFF_ProtoCol:recv:%s"%(msg))
         battery = EventMesh.publish("screen_get_battery")
         if battery != None:
-            if battery[0] != 1:
+            if battery[0] != "1":
                 EventMesh.publish("load_screen", {"screen": "poweroff_comfirm"})
          
 class PHL_ProtoCol(ProtoCol):
@@ -1563,7 +1563,7 @@ class KEYBRD_ProtoCol(ProtoCol):
         msg_tmp = msg.decode('ascii')
         msg_tmp_d = int(str(msg_tmp.split('KEYBRD,')[1]))
         
-        EventMesh.publish("set_key_board",["key_board",msg_tmp_d])
+        EventMesh.publish("set_key_board",msg_tmp_d)
 
         EventMesh.publish(constants.PROTOCOL.KEYBRD_SEND)  
 
diff --git a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui_main_menu.py b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui_main_menu.py
index 2d97bd26..1e6c4909 100644
--- a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui_main_menu.py
+++ b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui_main_menu.py
@@ -419,11 +419,11 @@ class MainMenuScreen(Screen):
 
         elif  code == lv.EVENT.CLICKED:
             #utime.sleep_ms(10)
-            print("1self.is_sliding",self.is_sliding)
+            # print("1self.is_sliding",self.is_sliding)
             if self.is_sliding <= 5 and self.is_sliding != 0:#如果是在滑动中则不需要点击事件
                 self.is_sliding =0
                 state = EventMesh.publish("get_key_board", "key_board")
-                print("msg",type(msg),msg)
+                # print("msg",type(msg),msg,state)
                 if state == 1:
                     # print("state11",state)
                     if msg == 'Phone':
diff --git a/2.sdk/project/K01/usr/static/IMAGE_APP_QR_CODE.png b/2.sdk/project/K01/usr/static/IMAGE_APP_QR_CODE.png
index 88de1187..614869fe 100644
Binary files a/2.sdk/project/K01/usr/static/IMAGE_APP_QR_CODE.png and b/2.sdk/project/K01/usr/static/IMAGE_APP_QR_CODE.png differ
diff --git a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/protocol.py b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/protocol.py
index 7588d8f3..df381e2a 100644
--- a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/protocol.py
+++ b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/protocol.py
@@ -636,7 +636,10 @@ class POWEROFF_ProtoCol(ProtoCol):
         """
         EventMesh.publish(constants.PROTOCOL.POWEROFF_SEND)
         #print("POWEROFF_ProtoCol:recv:%s"%(msg))
-        EventMesh.publish("load_screen", {"screen": "poweroff_comfirm"})
+        battery = EventMesh.publish("screen_get_battery")
+        if battery != None:
+            if battery[0] != "1":
+                EventMesh.publish("load_screen", {"screen": "poweroff_comfirm"})
          
 class PHL_ProtoCol(ProtoCol):
     """电话本同步"""