fix(rosdocker): 修复选择错误问题

tools/tool_install_ros_with_docker.py

@@ -20,7 +20,7 @@ class RosVersions:
         RosVersion('jazzy', 'ROS2', RosVersion.STATUS_LTS, ['osrf/ros:jazzy-desktop-full'],["ros:jazzy"]),
         RosVersion('noetic',  'ROS1', RosVersion.STATUS_LTS, ['fishros2/ros:noetic-desktop-full'],["ros:noetic"]),
         RosVersion('humble',  'ROS2', RosVersion.STATUS_LTS, ['fishros2/ros:humble-desktop-full'],["ros:humble"]),
-        RosVersion('foxy',  'ROS2', RosVersion.STATUS_LTS, ['fishros2/ros:foxy-desktop'],["ros:foxy"]),
+        RosVersion('foxy',  'ROS2', RosVersion.STATUS_EOL, ['fishros2/ros:foxy-desktop'],["ros:foxy"]),
         RosVersion('galactic',  'ROS2', RosVersion.STATUS_LTS, ['osrf/ros:galactic-desktop'],["ros:galactic"]),
         RosVersion('iron',  'ROS2', RosVersion.STATUS_LTS, ['osrf/ros:iron-desktop-full'],["ros:iron"]),
         RosVersion('melodic', 'ROS1', RosVersion.STATUS_LTS, ['fishros2/ros:melodic-desktop-full'],["ros:melodic"]),
@@ -37,13 +37,18 @@ class RosVersions:
 
     @staticmethod
     def get_version_string(name):
+        names = str(name).split(' ')
+        if len(names)>=1:
+            ros_version = names[0]
+        else:
+            return None,None
         for version in RosVersions.ros_version:
-            if version.name == name:
+            if version.name == ros_version:
                 if version.status==RosVersion.STATUS_EOL:
                     eol = "停止维护"
                 else:
                     eol = "长期支持"
-                return "{}({}),该版本目前状态:{}".format(version.name,version.version,eol)
+                return "{}({}),该版本目前状态:{}".format(version.name,version.version,eol), ros_version
 
     @staticmethod
     def get_image(name):
@@ -79,7 +84,7 @@ def get_vesion_list():
         """获取可安装的ROS版本列表"""
         names = []
         for version in RosVersions.ros_version:
-            names.append(f'{version.name}    {version.version}')
+            names.append(f'{version.name} ({version.version})')
         return names
 
 
@@ -124,13 +129,13 @@ def get_container_scripts(self, name, rosversion, delete_file):
     def choose_image_version(self):
         """获取要安装的ROS版本"""
         PrintUtils.print_success("================================1.版本选择======================================")
-        code,rosname = ChooseTask(RosVersions.get_vesion_list(),"请选择你要安装的ROS版本名称(请注意ROS1和ROS2区别):",True).run()
+        code,result = ChooseTask(RosVersions.get_vesion_list(),"请选择你要安装的ROS版本名称(请注意ROS1和ROS2区别):",True).run()
         if code==0: 
             PrintUtils.print_error("你选择退出。。。。")
             return 
-        PrintUtils.print_info("你选择了{}".format(RosVersions.get_version_string(rosname)))
+        version_info,rosname = RosVersions.get_version_string(result)
+        PrintUtils.print_info("你选择了{}".format(version_info))
         return rosname
-        # TODO 检查是系统架构
 
     def install_docker(self):
         """安装Docker"""
@@ -178,10 +183,10 @@ def create_container(self,name):
             use_snd = "--device=/dev/snd"
 
         if container_name:
-            command_create_x11 = "sudo docker run -dit --name={} -v {}:{} -v /tmp/.X11-unix:/tmp/.X11-unix {} -v /dev/dri:/dev/dri {} -e DISPLAY=unix$DISPLAY -w {}  {}".format(
+            command_create_x11 = "sudo docker run -dit --name={} -v {}:{} -v /tmp/.X11-unix:/tmp/.X11-unix {} -v /dev:/dev -v /dev/dri:/dev/dri {} -e DISPLAY=unix$DISPLAY -w {}  {}".format(
                     container_name,home,home,use_dri,use_snd,home,RosVersions.get_image(name))
         else:
-            command_create_x11 = "sudo docker run -dit  -v {}:{} -v /tmp/.X11-unix:/tmp/.X11-unix {} -v /dev/dri:/dev/dri {} -e DISPLAY=unix$DISPLAY -w {}  {}".format(
+            command_create_x11 = "sudo docker run -dit  -v {}:{} -v /tmp/.X11-unix:/tmp/.X11-unix {}  -v /dev:/dev -v /dev/dri:/dev/dri {} -e DISPLAY=unix$DISPLAY -w {}  {}".format(
                     home,home,use_dri,use_snd,home,RosVersions.get_image(name))
 
         CmdTask(command_create_x11,os_command=True).run()