优化移动入库开关机逻辑

diff --git a/cat1modem/src/china_mobile_dmp.py b/cat1modem/src/china_mobile_dmp.py
index 6339858..9382f43 100644 (file)
--- a/cat1modem/src/china_mobile_dmp.py
+++ b/cat1modem/src/china_mobile_dmp.py
@@ -452,10 +452,10 @@ class chinamobile:
             if NEED_SAVE_CONFIG_FILE == 1:
                 if "reportTime_Sec" in self.config_data:
                     self.reportTime_Sec = int(self.config_data["reportTime_Sec"])
-            if "report_Num_old" in self.config_data:
-                self.report_Num_old = int(self.config_data["report_Num_old"])
-            if "retryNum_old" in self.config_data:
-                self.retryNum_old = int(self.config_data["retryNum_old"])
+                if "report_Num_old" in self.config_data:
+                    self.report_Num_old = int(self.config_data["report_Num_old"])
+                if "retryNum_old" in self.config_data:
+                    self.retryNum_old = int(self.config_data["retryNum_old"])
 
         print("read_config_file self.config_data:{} ".format(self.config_data))
     def retryTimerCb(self,*argc):#异常重试机制定时器回调
@@ -475,10 +475,9 @@ class chinamobile:
         self.reportTime_Sec = time_tmp+self.reportTime*60 #(记录时间+reportTime)标识旧的时间
         if NEED_SAVE_CONFIG_FILE == 1:
             self.config_data["reportTime_Sec"] = self.reportTime_Sec
-
-        self.config_data["retryNum_old"] = self.retryNum_old
-        self.config_data["report_Num_old"] = self.report_Num_old
-        self.write_config_msg_file(self.config_data)
+            self.config_data["retryNum_old"] = self.retryNum_old
+            self.config_data["report_Num_old"] = self.report_Num_old
+            self.write_config_msg_file(self.config_data)
         self.search_report_num_step()#重新查询
         pass
     def error_retryNum_step(self):#判读报错次数是否大于self.retryNum 步骤
@@ -492,8 +491,9 @@ class chinamobile:
             get_result = self.first_get_config_json()#发起向服务端请求配置信息下发到设备端
             if get_result == 0:#获取失败或者没有网络 走异常重试机制
                 self.report_Num_old+=1#请求错误请求失败都要保存上报次数
-                self.config_data["report_Num_old"] = self.report_Num_old
-                self.write_config_msg_file(self.config_data)
+                if NEED_SAVE_CONFIG_FILE == 1:
+                    self.config_data["report_Num_old"] = self.report_Num_old
+                    self.write_config_msg_file(self.config_data)
                 print("error_retryNum_step:self.retryTimer.start :{} {} {}\r\n".format(self.retryInterval,self.report_Num_old,self.reportNum))
                 self.checkMaxReportNum()#检查上报最大次数
                 self.retryTimer.start(self.retryInterval*60*1000,0,self.retryTimerCb)
@@ -514,9 +514,9 @@ class chinamobile:
                     return
                 
                 self.report_Num_old+=1#请求错误请求失败都要保存上报次数
-                
-                self.config_data["report_Num_old"] = self.report_Num_old
-                self.write_config_msg_file(self.config_data)
+                if NEED_SAVE_CONFIG_FILE == 1:
+                    self.config_data["report_Num_old"] = self.report_Num_old
+                    self.write_config_msg_file(self.config_data)
                 print("error_retryNum_step self.report_Num_old:{}\r\n".format(self.report_Num_old))
                 if self.checkMaxReportNum() == 1:#检查上报最大次数
                     self.search_report_num_step()#重新查询
@@ -540,9 +540,9 @@ class chinamobile:
         self.reportTime_Sec = time_tmp+self.reportTime*60#记录当前时间+reportTime的时间用于下次错判断
         if NEED_SAVE_CONFIG_FILE == 1:
             self.config_data["reportTime_Sec"] = self.reportTime_Sec
-        self.config_data["retryNum_old"] = self.retryNum_old
-        self.config_data["report_Num_old"] = self.report_Num_old
-        self.write_config_msg_file(self.config_data)
+            self.config_data["retryNum_old"] = self.retryNum_old
+            self.config_data["report_Num_old"] = self.report_Num_old
+            self.write_config_msg_file(self.config_data)
         self.retpoertTimerC.stop()#关闭定时器
         self.error_retryNum_step()#清空报错次数重新走判断报错次数
         pass
@@ -574,9 +574,9 @@ class chinamobile:
         self.reportTime_Sec = time_tmp+self.reportTime*60#记录当前时间+reportTime的时间用于下次错判断
         if NEED_SAVE_CONFIG_FILE == 1:
             self.config_data["reportTime_Sec"] = self.reportTime_Sec
-        self.config_data["retryNum_old"] = self.retryNum_old
-        self.config_data["report_Num_old"] = self.report_Num_old
-        self.write_config_msg_file(self.config_data)
+            self.config_data["retryNum_old"] = self.retryNum_old
+            self.config_data["report_Num_old"] = self.report_Num_old
+            self.write_config_msg_file(self.config_data)
         self.error_retryNum_step()#清空报错次数重新走判断报错次数
 
 
@@ -617,8 +617,9 @@ class chinamobile:
         time_tmp = utime.mktime(date_tmp)#获取时间戳
         print("onself_regist_report_cb:self.report_Num_old:{} self.reportNum:{} self.reportTime_Sec:{}\r\n".format(self.report_Num_old,self.reportNum,self.reportTime_Sec))
         self.report_Num_old+=1 ##保存本地
-        self.config_data["report_Num_old"] = self.report_Num_old
-        self.write_config_msg_file(self.config_data)
+        if NEED_SAVE_CONFIG_FILE == 1:
+            self.config_data["report_Num_old"] = self.report_Num_old
+            self.write_config_msg_file(self.config_data)
         #设备自注册上报信息
         url = "https://{}//dm-multi-accept/multi/acceptMultiTerminalRegInfo".format(self.address)#上报地址
         confing_type = "autoRegist"#上报传输配置
@@ -666,8 +667,9 @@ class chinamobile:
         date_tmp = utime.localtime()
         time_tmp = utime.mktime(date_tmp)#获取时间戳
         self.report_Num_old+=1#保存本地
-        self.config_data["report_Num_old"] = self.report_Num_old
-        self.write_config_msg_file(self.config_data)
+        if NEED_SAVE_CONFIG_FILE == 1:
+            self.config_data["report_Num_old"] = self.report_Num_old
+            self.write_config_msg_file(self.config_data)
         print("heart_report_cb:self.report_Num_old:{} self.reportNum:{} self.reportTime:{} self.reportTime_Sec:{}\r\n".format(self.report_Num_old,self.reportNum,self.reportTime,self.reportTime_Sec))
 
         url = "https://{}//dm-multi-accept/multi/acceptMultiTerminalHeartbeatInfo".format(self.address)#上报地址
@@ -724,8 +726,8 @@ class chinamobile:
                 # self.config_data["address"] = self.address
                 if NEED_SAVE_CONFIG_FILE == 1:
                     self.config_data["reportTime_Sec"] = self.reportTime_Sec
-                self.config_data["report_Num_old"] = self.report_Num_old
-                self.config_data["retryNum_old"] = self.retryNum_old
+                    self.config_data["report_Num_old"] = self.report_Num_old
+                    self.config_data["retryNum_old"] = self.retryNum_old
 
                 self.write_config_msg_file(self.config_data)
         #读配置文件