From: dxy15521469561 <1731678236@qq.com>
Date: Wed, 2 Aug 2023 06:28:19 +0000 (+0800)
Subject: 充电已满修改
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=4dd8067665b4aa086fa2f9b6b036aa3a6bd653b4;p=mirrors%2FASR1603_G5.git

充电已满修改
---

diff --git a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/main_init.py b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/main_init.py
index faa3b3f8..113cf486 100644
--- a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/main_init.py
+++ b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/main_init.py
@@ -157,7 +157,7 @@ def main_init():
     import mgr as mgr
     print("init7:{}".format(utime.localtime()))
     
-    from mgr import ConfigStoreManager,playPowerAudioManager,sosInfoCallManager,getBootOffManager,getSosFlagManager,CountdownManager, LocationManager, getVolumSizeManager,gethistoryDataManager,getUpLoadDataManager, getplayAudiodStateManager,\
+    from mgr import setSmsIndexManager,ConfigStoreManager,testSmsSetIPManager,playPowerAudioManager,sosInfoCallManager,getBootOffManager,getSosFlagManager,CountdownManager, LocationManager, getVolumSizeManager,gethistoryDataManager,getUpLoadDataManager, getplayAudiodStateManager,\
     AddrBookManager,MsgdetailManager,PhoneCallingManager,getOldTimeManager,getStorageDataManager,getBrightnessManager,getHrTimeManager,getTempTimeManager,getLowBatManager
     print("init8:{}".format(utime.localtime()))
     
@@ -209,6 +209,8 @@ def main_init():
     app.append_manager(getSosFlagManager())
     app.append_manager(CountdownManager())
     app.append_manager(sosInfoCallManager())
+    app.append_manager(testSmsSetIPManager())
+    app.append_manager(setSmsIndexManager())
 
     print("init21:{}".format(utime.localtime()))    
     
diff --git a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/mgr.py b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/mgr.py
index 7b1a43be..3c0e0008 100644
--- a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/mgr.py
+++ b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/mgr.py
@@ -1354,18 +1354,19 @@ class DeviceInfoManager(Abstract):
                     self.no_smi_count = 0
                     self.no_smi_state = 1
                     EventMesh.publish("load_screen", {"screen": "no_sim_auto_screen"})  
-                if battery[1] >= 100:
-                    if self.charge_full_count > 60 and self.charge_full_count % (60*10) == 0:#每十分钟提醒一次
-                        EventMesh.publish("load_screen", {"screen": "charge_full"})  
-                    self.charge_full_count+=10
             else:
                 self.no_smi_count = 0
-                self.charge_full_count = 0
                 self.no_smi_state = 0
         else:
             self.no_smi_count = 0
-            self.charge_full_count = 0
             self.no_smi_state = 0
+        if battery[0] == "1":
+            if battery[1] >= 100:
+                if self.charge_full_count > 60 and self.charge_full_count % (60*10) == 0:#每十分钟提醒一次
+                    EventMesh.publish("load_screen", {"screen": "charge_full"})  
+                self.charge_full_count+=10
+        else:
+            self.charge_full_count = 0
         #quecgnss.gnssEnable(0)  
     
       
@@ -2718,6 +2719,44 @@ class getBootOffManager(Abstract):#开关机时间
                 flag = 1
             
         return [self.off_msg,flag]
+class setSmsIndexManager(Abstract):#
+    def __init__(self):
+        self.index = -1
+
+    def post_processor_after_instantiation(self):
+        EventMesh.subscribe("set_sms_index", self.set_sms_index)#设置关机时间
+        EventMesh.subscribe("get_sms_index", self.get_sms_index)
+
+    def set_sms_index(self, event, msg): 
+        self.index = msg
+        
+        # print("read_data:{} self.off_msg:{}".format(read_data,self.off_msg))
+
+    def get_sms_index(self, event, msg):
+        
+        return self.index
+
+class testSmsSetIPManager(Abstract):#
+    def __init__(self):
+        self.newip = "api.xcloudtech.com"
+        self.newcom = 9000
+        # server_addr = "tcptest.tx.kidxin.com"
+        # #SETIP:api.xcloudtech.com:9000
+        # server_port = 11500
+
+
+    def post_processor_after_instantiation(self):
+        EventMesh.subscribe("set_new_ip", self.set_new_ip)#设置关机时间
+        EventMesh.subscribe("get_new_ip", self.get_new_ip)
+
+    def set_new_ip(self, event, msg): 
+        self.newip = msg[0]
+        self.newcom = msg[1]
+        # print("read_data:{} self.off_msg:{}".format(read_data,self.off_msg))
+
+    def get_new_ip(self, event, msg):
+        
+        return [self.newip,self.newcom]
 
 
     
\ No newline at end of file
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 68f729bb..e4155def 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
@@ -75,6 +75,9 @@ def UnicodeHexStr_To_Utf8Str(str):
     return result.decode('utf-8') #返回utf8的str
 class SockManager(Abstract):
     #END = "]"
+    # server_addr = "tcptest.tx.kidxin.com"
+    # server_port = 11500
+
     server_addr = "api.xcloudtech.com"
     server_port = 9000
     # server_addr = "8.134.68.15"
@@ -288,6 +291,7 @@ class ProtoCol(Abstract):
     END = ";" + chr(0x01)
     PID = "SZKW"
     md5_key = "bZld0ALsZTt15tKEZhOlLPgbsO75BLTP"
+    #md5_key = "19ED5F01235A6B360A09C1800432C31B"
     # PID = "qAELPTKmFanR4RHe"
     # md5_key = "3JyCjsw4ryXKzjzudayY"
     def __init__(self):
diff --git a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/ui.py b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/ui.py
index 6a73a1cf..d9b95633 100644
--- a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/ui.py
+++ b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/ui.py
@@ -1663,6 +1663,14 @@ class NewMessageScreen(Screen):
             message_popup_title.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
             self.meta = message_popup_screen
         EventMesh.publish("set_sms_clear_all_data",10)
+        index = EventMesh.publish("get_sms_index")#
+        if index != -1:
+            tmp = sms.searchTextMsg(index)
+            # detail = tmp[1]#内容
+            # tmp_de = detail.split('SETIP:')
+            # print("tmp:",tmp)
+
+
 
     def done_left_to_right(self):
         EventMesh.publish("return_prev_screen")
@@ -1837,6 +1845,7 @@ def msg_cb(args):
     print("index:{}".format(index))
     sms_data = sms.getSaveLoc()
     sms_max = sms_data[0][2]
+    EventMesh.publish("set_sms_index",index)#设置关机时间
     if index >= sms_max-1:
         EventMesh.publish("load_screen", {"screen": "message_full"})
     else:
@@ -1969,7 +1978,7 @@ class PopupScreen(Screen):
             for i in range(MSG_MAX):
                 # if count > (MSG_MAX-1):#j = 12 -5 7 6 5 4 3 2 1
                 #     break
-                if i >= self.msg_nums :
+                if i >= self.msg_nums :#7
                     self.sms_detail_list_dict[i]["msg_btn"].add_flag(lv.obj.FLAG.HIDDEN)
                     continue
                 tmp = sms.searchTextMsg(j)