commit

src/python2/pjibot_delivery/2xosc-pjibot_delivery.py

@@ -11,14 +11,14 @@ logging.basicConfig(filename=path1 + 'log/2xosc.log', level=logging.INFO,
                     format='%(asctime)s - %(levelname)s - %(message)s')
 
 key1 = 'pjibot_delivery/'
-sleep_time = 60  # 每多少秒扫描一次
+sleep_time = 30  # 每多少秒扫描一次
 
 
 def generate_xosc(parse_prefix, local_parse_dir, local_delete_list):
     try:
         os.chdir(path2)
         command2 = 'python3 jiqiren_outdoor.py ' + local_parse_dir[:-1] + ' 0'  # 配送机器人0 巡检机器人1
-        logging.info("调用命令2: %s" % str(command2))
+        logging.info("进入目录 %s 调用命令2: %s", path2, str(command2))
         os.system(command2)
         local_xosc_path2 = local_parse_dir + 'simulation/xosc/openx_outdoor0.xosc'
         bucket.put_object_from_file(parse_prefix + 'scenario.xosc', local_xosc_path2)

src/python2/pjibot_delivery/xosc-pjibot_delivery.py

@@ -11,14 +11,14 @@ logging.basicConfig(filename=path1 + 'log/xosc-pjibot_delivery.log', level=loggi
                     format='%(asctime)s - %(levelname)s - %(message)s')
 
 key1 = 'pjibot_delivery/'
-sleep_time = 60  # 每多少秒扫描一次
+sleep_time = 30  # 每多少秒扫描一次
 
 
 def generate_xosc(parse_prefix, local_parse_dir, local_delete_list):
     try:
         os.chdir(path2)
         command2 = 'python3 jiqiren_outdoor.py ' + local_parse_dir[:-1] + ' 0'  # 配送机器人0 巡检机器人1
-        logging.info("调用命令2: %s" % str(command2))
+        logging.info("进入目录 %s 调用命令2: %s", path2, str(command2))
         os.system(command2)
         local_xosc_path2 = local_parse_dir + 'simulation/xosc/openx_outdoor0.xosc'
         bucket.put_object_from_file(parse_prefix + 'scenario.xosc', local_xosc_path2)
@@ -80,8 +80,9 @@ if __name__ == '__main__':
                         local_dir_full = path1 + parse_prefix_full
                         if not os.path.exists(local_dir_full):
                             os.makedirs(local_dir_full)
-                        bucket.get_object_to_file(parse_prefix_full + 'objects_pji.csv', local_dir_full + 'objects_pji.csv')
-                        bucket.get_object_to_file(parse_prefix_full+'pos_pji.csv', local_dir_full+'pos_pji.csv')
+                        bucket.get_object_to_file(parse_prefix_full + 'objects_pji.csv',
+                                                  local_dir_full + 'objects_pji.csv')
+                        bucket.get_object_to_file(parse_prefix_full + 'pos_pji.csv', local_dir_full + 'pos_pji.csv')
                         generate_xosc(parse_prefix_full, local_dir_full, local_delete_list)
                 except Exception as e:
                     logging.exception("局部异常处理: %s", str(e))

src/python2/pjibot_patrol/xosc-pjibot_patrol.py

@@ -18,7 +18,7 @@ def generate_xosc(parse_prefix, local_parse_dir, local_delete_list):
     try:
         os.chdir(path2)
         command2 = 'python3 jiqiren_outdoor.py ' + local_parse_dir[:-1] + ' 0'  # 配送机器人0 巡检机器人1
-        logging.info("调用命令2: %s" % str(command2))
+        logging.info("进入目录 %s 调用命令2: %s", path2, str(command2))
         os.system(command2)
         local_xosc_path2 = local_parse_dir + 'simulation/xosc/openx_outdoor0.xosc'
         bucket.put_object_from_file(parse_prefix + 'scenario.xosc', local_xosc_path2)

src/python2/pjisuv/xosc-pjisuv.py

@@ -62,7 +62,7 @@ def generate_xosc(parse_prefix, local_parse_dir, local_delete_list):
         os.chdir(path2)
         # todo simulation_hmi 实际生成的 orig，因为多功能车没有 hmi
         command2 = 'python3 simulation_hmi.py ' + local_parse_dir[:-1]  # 生成orig
-        logging.info("调用命令2: %s" % str(command2))
+        logging.info("进入目录 %s 调用命令2: %s", path2, str(command2))
         os.system(command2)
         local_xosc_path2 = local_parse_dir + 'simulation_orig/xosc/openx0.xosc'
         bucket.put_object_from_file(parse_prefix + 'scenario_orig.xosc', local_xosc_path2)