commit

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

@@ -21,8 +21,9 @@ def generate_xosc(parse_prefix, local_parse_dir, local_delete_list):
         logging.info("调用命令2: %s" % str(command2))
         os.system(command2)
         local_xosc_path2 = local_parse_dir + 'simulation/xosc/openx_outdoor0.xosc'
-        bucket.put_object_from_file(parse_prefix + 'simulation.xosc', local_xosc_path2)
-        logging.info("上传 simulation.xosc 成功: %s" % str(parse_prefix + 'simulation.xosc'))
+        bucket.put_object_from_file(parse_prefix + 'scenario.xosc', local_xosc_path2)
+        bucket.put_object_from_file(parse_prefix + 'scenario_hmi.xosc', local_xosc_path2)
+        logging.info("上传 simulation.xosc 成功: %s" % str(parse_prefix + 'scenario.xosc'))
         local_delete_list.append(local_xosc_path2)
     except Exception as e:
         logging.exception("生成xosc报错: %s" % str(e))

src/python2/pjibot_patrol/xosc-pjibot_partol.py

@@ -21,7 +21,8 @@ def generate_xosc(parse_prefix, local_parse_dir, local_delete_list):
         logging.info("调用命令2: %s" % str(command2))
         os.system(command2)
         local_xosc_path2 = local_parse_dir + 'simulation/xosc/openx_outdoor0.xosc'
-        bucket.put_object_from_file(parse_prefix + 'simulation.xosc', local_xosc_path2)
+        bucket.put_object_from_file(parse_prefix + 'scenario.xosc', local_xosc_path2)
+        bucket.put_object_from_file(parse_prefix + 'scenario_hmi.xosc', local_xosc_path2)
         logging.info("上传 simulation.xosc 成功: %s" % str(parse_prefix + 'simulation.xosc'))
         local_delete_list.append(local_xosc_path2)
     except Exception as e:
@@ -80,8 +81,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))