commit

.gitignore

@@ -26,4 +26,6 @@ temp/*
 log/*
 ./temp/
 ./log/
-*.spec
+*.spec
+./build/
+build/*

config/pjibot_delivery-2xosc.yaml

@@ -1,6 +1,8 @@
 ---
 temp-dir: /mnt/disk001/dcl_data_process/temp/pjibot_delivery/2xosc/ # 临时文件目录
-xosc-command-dir: /mnt/disk001/dcl_data_process/src/python3/pjibot_outdoor/ # 生成xosc的命令目录
+xosc:
+  dir: /mnt/disk001/simulation_outdoor/ # 生成xosc的命令目录
+  command: ./jiqiren_outdoor
 oss: # oss信息
   access-key-id: n8glvFGS25MrLY7j
   access-key-secret: xZ2Fozoarpfw0z28FUhtg8cu0yDc5d

config/pjibot_delivery-xosc.yaml

@@ -1,6 +1,8 @@
 ---
 temp-dir: /mnt/disk001/dcl_data_process/temp/pjibot_delivery/xosc/ # 临时文件目录
-xosc-command-dir: /mnt/disk001/dcl_data_process/src/python3/pjibot_outdoor/ # 生成xosc的命令目录
+xosc:
+  dir: /mnt/disk001/simulation_outdoor/ # 生成xosc的命令目录
+  command: ./jiqiren_outdoor
 oss: # oss信息
   access-key-id: n8glvFGS25MrLY7j
   access-key-secret: xZ2Fozoarpfw0z28FUhtg8cu0yDc5d

config/pjibot_patrol-2xosc.yaml

@@ -1,6 +1,8 @@
 ---
 temp-dir: /mnt/disk001/dcl_data_process/temp/pjibot_patrol/2xosc/ # 临时文件目录
-xosc-command-dir: /mnt/disk001/dcl_data_process/src/python3/pjibot_outdoor/ # 生成xosc的命令目录
+xosc:
+  dir: /mnt/disk001/simulation_outdoor/ # 生成xosc的命令目录
+  command: ./jiqiren_outdoor
 oss: # oss信息
   access-key-id: n8glvFGS25MrLY7j
   access-key-secret: xZ2Fozoarpfw0z28FUhtg8cu0yDc5d

config/pjibot_patrol-xosc.yaml

@@ -1,6 +1,8 @@
 ---
 temp-dir: /mnt/disk001/dcl_data_process/temp/pjibot_patrol/xosc/ # 临时文件目录
-xosc-command-dir: /mnt/disk001/dcl_data_process/src/python3/pjibot_outdoor/ # 生成xosc的命令目录
+xosc:
+  dir: /mnt/disk001/simulation_outdoor/ # 生成xosc的命令目录
+  command: ./jiqiren_outdoor
 oss: # oss信息
   access-key-id: n8glvFGS25MrLY7j
   access-key-secret: xZ2Fozoarpfw0z28FUhtg8cu0yDc5d

run/pjibot_delivery-2xosc-nohup.sh

@@ -1,10 +1,7 @@
 #!/bin/bash
-
-# 定义共同前缀变量
 BASE_DIR="/mnt/disk001/dcl_data_process"
-
-rm -rf "${BASE_DIR}/log/2xosc*"
-rm -rf "${BASE_DIR}/log/pjibot_delivery-2xosc*"
+rm -rf "${BASE_DIR}/build/pjibot_delivery-2xosc/" # 删除旧的可执行文件
+rm -rf "${BASE_DIR}/log/pjibot_delivery-2xosc.out"
+rm -rf "${BASE_DIR}/log/pjibot_delivery-2xosc.log"
 pyinstaller --onefile --distpath "${BASE_DIR}/build/pjibot_delivery-2xosc/" "${BASE_DIR}/src/python2/pjibot_delivery/pjibot_delivery-2xosc.py"
-#nohup python2 "${BASE_DIR}/src/python2/pjibot_delivery/pjibot_delivery-2xosc.py" "${BASE_DIR}/config/pjibot_delivery-2xosc.yaml" > "${BASE_DIR}/log/pjibot_delivery-2xosc.out" 2>&1 &
 nohup "${BASE_DIR}/build/pjibot_delivery-2xosc/pjibot_delivery-2xosc" "${BASE_DIR}/config/pjibot_delivery-2xosc.yaml" > "${BASE_DIR}/log/pjibot_delivery-2xosc.out" 2>&1 &

run/pjibot_delivery-xosc-nohup.sh

@@ -1,10 +1,7 @@
 #!/bin/bash
-
-# 定义共同前缀变量
 BASE_DIR="/mnt/disk001/dcl_data_process"
-
-rm -rf "${BASE_DIR}/log/xosc*"
-rm -rf "${BASE_DIR}/log/pjibot_delivery-xosc*"
+rm -rf "${BASE_DIR}/build/pjibot_delivery-xosc/" # 删除旧的可执行文件
+rm -rf "${BASE_DIR}/log/pjibot_delivery-xosc.out"
+rm -rf "${BASE_DIR}/log/pjibot_delivery-xosc.log"
 pyinstaller --onefile --distpath "${BASE_DIR}/build/pjibot_delivery-xosc/" "${BASE_DIR}/src/python2/pjibot_delivery/pjibot_delivery-xosc.py"
-#nohup python2 "${BASE_DIR}/src/python2/pjibot_delivery/pjibot_delivery-xosc.py" "${BASE_DIR}/config/pjibot_delivery-xosc.yaml" > "${BASE_DIR}/log/pjibot_delivery-xosc.out" 2>&1 &
 nohup "${BASE_DIR}/build/pjibot_delivery-xosc/pjibot_delivery-xosc" "${BASE_DIR}/config/pjibot_delivery-xosc.yaml" > "${BASE_DIR}/log/pjibot_delivery-xosc.out" 2>&1 &

run/pjibot_patrol-2xosc-nohup.sh

@@ -1,10 +1,7 @@
 #!/bin/bash
-
-# 定义共同前缀变量
 BASE_DIR="/mnt/disk001/dcl_data_process"
-
-rm -rf "${BASE_DIR}/log/2xosc*"
-rm -rf "${BASE_DIR}/log/pjibot_patrol-2xosc*"
+rm -rf "${BASE_DIR}/build/pjibot_patrol-2xosc/" # 删除旧的可执行文件
+rm -rf "${BASE_DIR}/log/pjibot_patrol-2xosc.out"
+rm -rf "${BASE_DIR}/log/pjibot_patrol-2xosc.log"
 pyinstaller --onefile --distpath "${BASE_DIR}/build/pjibot_patrol-2xosc/" "${BASE_DIR}/src/python2/pjibot_patrol/pjibot_patrol-2xosc.py"
-#nohup python2 "${BASE_DIR}/src/python2/pjibot_patrol/pjibot_patrol-2xosc.py" "${BASE_DIR}/config/pjibot_patrol-2xosc.yaml" > "${BASE_DIR}/log/pjibot_patrol-2xosc.out" 2>&1 &
 nohup "${BASE_DIR}/build/pjibot_patrol-2xosc/pjibot_patrol-2xosc" "${BASE_DIR}/config/pjibot_patrol-2xosc.yaml" > "${BASE_DIR}/log/pjibot_patrol-2xosc.out" 2>&1 &

run/pjibot_patrol-xosc-nohup.sh

@@ -1,10 +1,7 @@
 #!/bin/bash
-
-# 定义共同前缀变量
 BASE_DIR="/mnt/disk001/dcl_data_process"
-
-rm -rf "${BASE_DIR}/log/xosc*"
-rm -rf "${BASE_DIR}/log/pjibot_patrol-xosc*"
+rm -rf "${BASE_DIR}/build/pjibot_patrol-xosc/" # 删除旧的可执行文件
+rm -rf "${BASE_DIR}/log/pjibot_patrol-xosc.out"
+rm -rf "${BASE_DIR}/log/pjibot_patrol-xosc.log"
 pyinstaller --onefile --distpath "${BASE_DIR}/build/pjibot_patrol-xosc/" "${BASE_DIR}/src/python2/pjibot_patrol/pjibot_patrol-xosc.py"
-#nohup python2 "${BASE_DIR}/src/python2/pjibot_patrol/pjibot_patrol-xosc.py" "${BASE_DIR}/config/pjibot_patrol-xosc.yaml" > "${BASE_DIR}/log/pjibot_patrol-xosc.out" 2>&1 &
 nohup "${BASE_DIR}/build/pjibot_patrol-xosc/pjibot_patrol-xosc" "${BASE_DIR}/config/pjibot_patrol-xosc.yaml" > "${BASE_DIR}/log/pjibot_patrol-xosc.out" 2>&1 &

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

@@ -17,9 +17,9 @@ from utils import yaml_utils
 
 def generate_xosc(parse_prefix, local_parse_dir, local_delete_list):
     try:
-        os.chdir(xosc_command_dir)
-        command2 = 'python3 jiqiren_outdoor.py {} 0'.format(local_parse_dir[:-1])  # 配送机器人0 巡检机器人1
-        logging.info("进入目录 %s 调用命令2: %s", xosc_command_dir, command2)
+        os.chdir(xosc_dir)
+        command2 = '{} {} 0'.format(xosc_command,local_parse_dir[:-1])  # 配送机器人0 巡检机器人1
+        logging.info("进入目录 %s 调用命令2: %s", xosc_dir, command2)
         process = subprocess.Popen(command2, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         stdout, stderr = process.communicate()  # 等待进程执行完成并获取输出
         if process.returncode == 0:
@@ -80,7 +80,8 @@ if __name__ == '__main__':
         sys.exit(1)
     # --------------------------------------------------
     temp_dir = config['temp-dir'] # 临时文件目录
-    xosc_command_dir = config['xosc-command-dir'] # 生成xosc命令的目录
+    xosc_dir = config['xosc']['dir'] # 生成xosc命令的目录
+    xosc_command = config['xosc']['command'] # 生成xosc命令的目录
     auth = oss2.Auth(config['oss']['access-key-id'], config['oss']['access-key-secret']) # oss 账号密码
     endpoint = config['oss']['endpoint'] # oss 地址
     bucket_name = config['oss']['bucket-name'] # oss 桶
@@ -94,7 +95,8 @@ if __name__ == '__main__':
     
     # --------------------------------------------------
     logging.info("临时文件目录:%s", config['temp-dir'])
-    logging.info("生成xosc命令的目录:%s", config['xosc-command-dir'])
+    logging.info("xosc命令的执行目录:%s", xosc_dir)
+    logging.info("xosc命令:%s", xosc_command)
     logging.info("Access Key ID:%s", config['oss']['access-key-id'])
     logging.info("Access Key Secret:%s", config['oss']['access-key-secret'])
     logging.info("Endpoint:%s", config['oss']['endpoint'])

src/python2/pjibot_delivery/pjibot_delivery-xosc.py

@@ -16,9 +16,9 @@ from utils import yaml_utils
 
 def generate_xosc(parse_prefix, local_parse_dir, local_delete_list):
     try:
-        os.chdir(xosc_command_dir)
-        command2 = 'python3 jiqiren_outdoor.py {} 0'.format(local_parse_dir[:-1])  # 配送机器人0 巡检机器人1
-        logging.info("进入目录 %s 调用命令2: %s", xosc_command_dir, command2)
+        os.chdir(xosc_dir)
+        command2 = '{} {} 0'.format(xosc_command,local_parse_dir[:-1])  # 配送机器人0 巡检机器人1
+        logging.info("进入目录 %s 调用命令2: %s", xosc_dir, command2)
         process = subprocess.Popen(command2, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         stdout, stderr = process.communicate()  # 等待进程执行完成并获取输出
         if process.returncode == 0:
@@ -79,7 +79,8 @@ if __name__ == '__main__':
         sys.exit(1)
     # --------------------------------------------------
     temp_dir = config['temp-dir'] # 临时文件目录
-    xosc_command_dir = config['xosc-command-dir'] # 生成xosc命令的目录
+    xosc_dir = config['xosc']['dir'] # 生成xosc命令的目录
+    xosc_command = config['xosc']['command'] # 生成xosc命令的目录
     auth = oss2.Auth(config['oss']['access-key-id'], config['oss']['access-key-secret']) # oss 账号密码
     endpoint = config['oss']['endpoint'] # oss 地址
     bucket_name = config['oss']['bucket-name'] # oss 桶
@@ -92,7 +93,8 @@ if __name__ == '__main__':
     bucket = oss2.Bucket(auth, endpoint, bucket_name)
     # --------------------------------------------------
     logging.info("临时文件目录:%s", config['temp-dir'])
-    logging.info("生成xosc命令的目录:%s", config['xosc-command-dir'])
+    logging.info("xosc命令的执行目录:%s", xosc_dir)
+    logging.info("xosc命令:%s", xosc_command)
     logging.info("Access Key ID:%s", config['oss']['access-key-id'])
     logging.info("Access Key Secret:%s", config['oss']['access-key-secret'])
     logging.info("Endpoint:%s", config['oss']['endpoint'])

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

@@ -17,9 +17,9 @@ from utils import yaml_utils
 
 def generate_xosc(parse_prefix, local_parse_dir, local_delete_list):
     try:
-        os.chdir(xosc_command_dir)
-        command2 = 'python3 jiqiren_outdoor.py {} 0'.format(local_parse_dir[:-1])  # 配送机器人0 巡检机器人1
-        logging.info("进入目录 %s 调用命令2: %s", xosc_command_dir, command2)
+        os.chdir(xosc_dir)
+        command2 = '{} {} 1'.format(xosc_command,local_parse_dir[:-1])  # 配送机器人0 巡检机器人1
+        logging.info("进入目录 %s 调用命令2: %s", xosc_dir, command2)
         process = subprocess.Popen(command2, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         stdout, stderr = process.communicate()  # 等待进程执行完成并获取输出
         if process.returncode == 0:
@@ -80,7 +80,8 @@ if __name__ == '__main__':
         sys.exit(1)
     # --------------------------------------------------
     temp_dir = config['temp-dir'] # 临时文件目录
-    xosc_command_dir = config['xosc-command-dir'] # 生成xosc命令的目录
+    xosc_dir = config['xosc']['dir'] # 生成xosc命令的目录
+    xosc_command = config['xosc']['command'] # 生成xosc命令的目录
     auth = oss2.Auth(config['oss']['access-key-id'], config['oss']['access-key-secret']) # oss 账号密码
     endpoint = config['oss']['endpoint'] # oss 地址
     bucket_name = config['oss']['bucket-name'] # oss 桶
@@ -93,7 +94,8 @@ if __name__ == '__main__':
     bucket = oss2.Bucket(auth, endpoint, bucket_name)
     # --------------------------------------------------
     logging.info("临时文件目录:%s", config['temp-dir'])
-    logging.info("生成xosc命令的目录:%s", config['xosc-command-dir'])
+    logging.info("xosc命令的执行目录:%s", xosc_dir)
+    logging.info("xosc命令:%s", xosc_command)
     logging.info("Access Key ID:%s", config['oss']['access-key-id'])
     logging.info("Access Key Secret:%s", config['oss']['access-key-secret'])
     logging.info("Endpoint:%s", config['oss']['endpoint'])

src/python2/pjibot_patrol/pjibot_patrol-xosc.py

@@ -14,9 +14,9 @@ from utils import yaml_utils
 # --------------------------------------------------
 def generate_xosc(parse_prefix, local_parse_dir, local_delete_list):
     try:
-        os.chdir(xosc_command_dir)
-        command2 = 'python3 jiqiren_outdoor.py {} 0'.format(local_parse_dir[:-1])  # 配送机器人0 巡检机器人1
-        logging.info("进入目录 %s 调用命令2: %s", xosc_command_dir, command2)
+        os.chdir(xosc_dir)
+        command2 = '{} {} 1'.format(xosc_command,local_parse_dir[:-1])  # 配送机器人0 巡检机器人1
+        logging.info("进入目录 %s 调用命令2: %s", xosc_dir, command2)
         process = subprocess.Popen(command2, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         stdout, stderr = process.communicate()  # 等待进程执行完成并获取输出
         if process.returncode == 0:
@@ -77,7 +77,8 @@ if __name__ == '__main__':
         sys.exit(1)
     # --------------------------------------------------
     temp_dir = config['temp-dir'] # 临时文件目录
-    xosc_command_dir = config['xosc-command-dir'] # 生成xosc命令的目录
+    xosc_dir = config['xosc']['dir'] # 生成xosc命令的目录
+    xosc_command = config['xosc']['command'] # 生成xosc命令的目录
     auth = oss2.Auth(config['oss']['access-key-id'], config['oss']['access-key-secret']) # oss 账号密码
     endpoint = config['oss']['endpoint'] # oss 地址
     bucket_name = config['oss']['bucket-name'] # oss 桶
@@ -90,7 +91,8 @@ if __name__ == '__main__':
     bucket = oss2.Bucket(auth, endpoint, bucket_name)
     # --------------------------------------------------
     logging.info("临时文件目录:%s", config['temp-dir'])
-    logging.info("生成xosc命令的目录:%s", config['xosc-command-dir'])
+    logging.info("xosc命令的执行目录:%s", xosc_dir)
+    logging.info("xosc命令:%s", xosc_command)
     logging.info("Access Key ID:%s", config['oss']['access-key-id'])
     logging.info("Access Key Secret:%s", config['oss']['access-key-secret'])
     logging.info("Endpoint:%s", config['oss']['endpoint'])