commit

README.md

@@ -4,10 +4,9 @@
 
 
 # 一、安装 ros
-# 二、安装 pip2 并设置镜像源
 
 
-# 三、python2 安装依赖
+# 三、python2 安装依赖（先设置国内镜像源）
 1. pip2 install oss2
 2. sudo apt install ffmpeg
 3. pip2 install pyntcloud
@@ -16,17 +15,18 @@
 6. pip2 install docker 
 7. pip2 install crypto
 
-# 四、python3
-1. pip3 install /root/opencv_python-4.2.0.32-cp36-cp36m-manylinux1_x86_64.whl
-2. pip3 install pycryptodome
-3. sudo apt install python3-pip
-4. pip3 config set global.index-url https://pypi.tuna.tsinghua.edu.cn/simple
-5. pip3 install pandas
-6. pip3 install pybind11
-7. pip3 install scenariogeneration==0.3.7
-8. pip3 install matplotlib
-9. pip3 install scikit-learn
-10. pip3 install pyproj
+# 四、python3（先设置国内镜像源）
+1. apt install python3-pip
+2. pip3 install --upgrade pip
+3. pip3 config set global.index-url https://mirrors.aliyun.com/pypi/simple/
+4. pip3 install opencv-python==4.2.0.32
+5. pip3 install pycryptodome
+6. pip3 install pandas
+7. pip3 install pybind11
+8. pip3 install scenariogeneration==0.3.7
+9. pip3 install matplotlib
+10. pip3 install scikit-learn
+11. pip3 install pyproj
 
 # 阿里云oss连接
 

src/python2/pjibot/merge.py

@@ -10,7 +10,7 @@ import rospy
 
 path1 = '/mnt/disk001/dcl_data_process/src/python2/pjibot/'
 
-logging.basicConfig(filename=path1 + 'log/pjibot_merge.log', level=logging.INFO,
+logging.basicConfig(filename=path1 + 'log/merge.log', level=logging.INFO,
                     format='%(asctime)s - %(levelname)s - %(message)s')
 
 key1 = 'pjibot/'