add

2024-12-24 14:46:39 +08:00 · 2024-12-24 14:46:39 +08:00 · 80aafdb273
commit 80aafdb273
parent 31e9a8f607
15 changed files with 158 additions and 173 deletions
--- a/.DS_Store
+++ b/.DS_Store
--- a/Robo-Bus-A31-HMI/.DS_Store
+++ b/Robo-Bus-A31-HMI/.DS_Store
--- a/Robo-Bus-A31-HMI/Modules/data_panel.gd
+++ b/Robo-Bus-A31-HMI/Modules/data_panel.gd
@ -4,6 +4,7 @@ extends HBoxContainer
@onready var _3d_texture_rect: TextureRect = %"3DTextureRect"
@onready var power_texture_rect: TextureRect = %PowerTextureRect
@onready var power_label: Label = %PowerLabel
+@onready var control_mode_texture_rect: TextureRect = %control_modeTextureRect

 # Called when the node enters the scene tree for the first time.
 func _ready() -> void:
@ -16,12 +17,15 @@ func _ready() -> void:

 func connected_to_server():
 	update_bms_report()
+	Mode_Report()
+	Gear_Report()
+	Throttle_Report()
 	pass
 func message_received(data:Dictionary):
 	if data.is_empty():return
 	if !data.has("topic"):return
 	match data.topic:
-		"/pix_robobus/bms_report":#电量显示
+		"/hmi_input/pix_robobus/bms_report":#电量显示
 			power_label.text = str(data.msg.battery_soc) + "%"
 			if data.msg.battery_soc < 25:
 				power_texture_rect.texture = preload("res://pad_hmi_ui/home/battery_icon_red.png")
@ -31,13 +35,73 @@ func message_received(data:Dictionary):
 				power_texture_rect.texture = preload("res://pad_hmi_ui/home/battery_icon_green2.png")
 			else:
 				power_texture_rect.texture = preload("res://pad_hmi_ui/home/battery_icon_green.png")
+		"/hmi_input/vehicle/status/control_mode":#模式反馈
+			control_mode_texture_rect.texture = ret_mode_value(data.msg.mode)
+		"/hmi_input/vehicle/status/gear_status":#档位反馈
+			ret_gear_position(data.msg.report)
+		"/hmi_input/vehicle/status/actuation_status":#油门反馈
+			%accel_status.value = data.msg.status.accel_status * 100
+			%brake_status.value = data.msg.status.brake_status * 100
 	pass
-
-
+func ret_mode_value(mode_value):
+	match mode_value:
+		#0: return "NO_COMMAND"
+		1: return preload("res://pad_hmi_ui/home/auto_icon.png")
+		#2: return "A_STEER_ONLY"
+		#3: return "A_VELOCITY_ONLY"
+		4: return preload("res://pad_hmi_ui/home/manual_icon.png")
+		#5: return "DISENGAGED"
+		#6: return "NOT_READY"
+		_: return preload("res://pad_hmi_ui/home/unknow_icon.png")
+func ret_gear_position(report):
+	%gearPosition0.modulate = Color("767676")
+	%gearPosition2.modulate = Color("767676")
+	%gearPosition3.modulate = Color("767676")
+	%gearPosition4.modulate = Color("767676")
+	match report:
+		0: return "NONE"
+		1:
+			%gearPosition3.modulate = Color("ffffff")
+			return "N"		# "NEUTRAL"
+		2:
+			%gearPosition4.modulate = Color("ffffff")
+			return "D"		# "DRIVE"
+		20:
+			%gearPosition2.modulate = Color("ffffff")
+			return "R"  		# "REVERSE"
+		22:
+			%gearPosition0.modulate = Color("ffffff")
+			return "P"		# "PARK"
+		
+		_: return "UNKNOWN"
 func update_bms_report():#电量显示
 	var send_data = {
 		"op": "subscribe",
-		"topic": "/pix_robobus/bms_report",
+		"topic": "/hmi_input/pix_robobus/bms_report",
 		"type": "pix_robobus_driver_msgs/msg/BmsReport"
 	}
 	Websocket.send_msg(str(send_data))
+
+func Mode_Report():#模式反馈
+	var send_data = {
+	  "op": "subscribe",
+	  "topic": "/hmi_input/vehicle/status/control_mode",
+	  "Type": "autoware_auto_vehicle_msgs/msg/ControlModeReport" 
+	}
+	Websocket.send_msg(str(send_data))
+
+func Gear_Report():#档位反馈
+	var send_data = {
+	  "op": "subscribe",
+	  "topic": "/hmi_input/vehicle/status/gear_status",
+	  "Type": "autoware_auto_vehicle_msgs/msg/GearReport" 
+	}
+	Websocket.send_msg(str(send_data))
+
+func Throttle_Report():#油门/ 刹车反馈
+	var send_data = {
+	  "op": "subscribe",
+	  "topic": "/hmi_input/vehicle/status/actuation_status",
+	  "type": "tier4_vehicle_msgs/msg/ActuationStatusStamped"
+	}
+	Websocket.send_msg(str(send_data))
--- a/Robo-Bus-A31-HMI/Modules/data_panel.tscn
+++ b/Robo-Bus-A31-HMI/Modules/data_panel.tscn
@ -1,4 +1,4 @@
-[gd_scene load_steps=50 format=3 uid="uid://dx5owafvbqdec"]
+[gd_scene load_steps=48 format=3 uid="uid://dx5owafvbqdec"]

 [ext_resource type="Script" path="res://common/base/base_control.gd" id="1_gebae"]
 [ext_resource type="Script" path="res://Modules/data_panel.gd" id="1_h1ywm"]
@ -26,19 +26,16 @@
 [ext_resource type="Texture2D" uid="uid://ku2yccf0rbwk" path="res://pad_hmi_ui/home/l2_2.png" id="23_30tmj"]
 [ext_resource type="PackedScene" uid="uid://cffp3l0yvp4fg" path="res://Modules/volume_settings.tscn" id="24_xb5k6"]
 [ext_resource type="PackedScene" uid="uid://ccp1epic52e7k" path="res://Modules/margin_container_2.tscn" id="25_8qx5b"]
-[ext_resource type="FontFile" uid="uid://d1ithfx8aid4x" path="res://font/Kufam/static/Kufam-Medium.ttf" id="25_ak5wl"]
 [ext_resource type="Texture2D" uid="uid://eqerf7cx3cfa" path="res://pad_hmi_ui/home/sitechoose_bg.png" id="26_h2ca6"]
 [ext_resource type="Texture2D" uid="uid://c6y0bhe0ygnw2" path="res://pad_hmi_ui/home/pull_btn.png" id="27_mc4go"]
 [ext_resource type="Texture2D" uid="uid://c8huui56t4lo4" path="res://pad_hmi_ui/home/locate_btn_dis.png" id="28_hx0jv"]
 [ext_resource type="Texture2D" uid="uid://d3sqjh1bpfeyy" path="res://pad_hmi_ui/home/stop_btn_high.png" id="29_d8rna"]
-[ext_resource type="FontFile" uid="uid://crt0yhgcdxpfm" path="res://font/Noto_Sans_SC/static/NotoSansSC-Medium.ttf" id="30_2mjwt"]
 [ext_resource type="Script" path="res://code/hsliderPor.gd" id="30_idfpi"]
 [ext_resource type="Texture2D" uid="uid://eu54w8n46m0c" path="res://pad_hmi_ui/home/start_btn_high.png" id="31_x5wo1"]
 [ext_resource type="Texture2D" uid="uid://dgxq16wpio7r5" path="res://pad_hmi_ui/home/distance_icon.png" id="32_p3q22"]
 [ext_resource type="Texture2D" uid="uid://djyamaij5878r" path="res://pad_hmi_ui/home/time_icon.png" id="33_nsaf0"]
 [ext_resource type="Texture2D" uid="uid://f7343a0tweet" path="res://pad_hmi_ui/home/robobus_icon.png" id="34_q6dol"]
 [ext_resource type="Texture2D" uid="uid://c7xokasxsg5pv" path="res://pad_hmi_ui/home/progress_bar.png" id="35_jj74k"]
-[ext_resource type="FontFile" uid="uid://b4tmgitvmyhdo" path="res://font/Noto_Sans_SC/static/NotoSansSC-Regular.ttf" id="39_q7ixx"]

 [sub_resource type="StyleBoxTexture" id="StyleBoxTexture_ia2eh"]
 texture = ExtResource("2_oga35")
@ -91,6 +88,10 @@ shader_parameter/isBackground_color = false
 [sub_resource type="StyleBoxTexture" id="StyleBoxTexture_61ssv"]
 texture = ExtResource("23_30tmj")

+[sub_resource type="FontVariation" id="FontVariation_frbsn"]
+spacing_glyph = 2
+spacing_space = 4
+
 [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_dyppf"]
 content_margin_left = 58.0

@ -107,12 +108,8 @@ expand_margin_top = 1.0
 expand_margin_bottom = 1.0

 [node name="DataPanel" type="HBoxContainer"]
-offset_right = 2320.0
-offset_bottom = 1501.0
 theme_override_constants/separation = 30
 script = ExtResource("1_h1ywm")
-metadata/_edit_horizontal_guides_ = [352.0, 50.0, 864.0, 914.0, 1454.0]
-metadata/_edit_vertical_guides_ = [2281.0, 1705.0, 1196.0, 1588.0, 53.0]

 [node name="MediumMenu" type="MarginContainer" parent="."]
 layout_mode = 2
@ -172,8 +169,6 @@ layout_mode = 2
 layout_mode = 2
 size_flags_horizontal = 0
 size_flags_vertical = 0
-theme_override_colors/font_color = Color(0.403922, 0.403922, 0.403922, 1)
-theme_override_fonts/font = ExtResource("25_ak5wl")
 theme_override_font_sizes/font_size = 22
 theme_override_styles/normal = SubResource("StyleBoxEmpty_j2i4v")
 text = "FPS:51"
@ -226,14 +221,12 @@ theme_override_constants/separation = -3
 [node name="Speed" type="Label" parent="MediumMenu/VBoxContainer/CarInfoDisplay/3DVehicle/3DVehicleInformation/DrivingInformation/MarginContainer/VBoxContainer"]
 layout_mode = 2
 size_flags_horizontal = 4
-theme_override_fonts/font = ExtResource("25_ak5wl")
 theme_override_font_sizes/font_size = 49
 text = "20.0"

 [node name="SpeedUnit" type="Label" parent="MediumMenu/VBoxContainer/CarInfoDisplay/3DVehicle/3DVehicleInformation/DrivingInformation/MarginContainer/VBoxContainer"]
 layout_mode = 2
 size_flags_horizontal = 4
-theme_override_colors/font_color = Color(0.403922, 0.403922, 0.403922, 1)
 theme_override_font_sizes/font_size = 23
 text = "Km/h"

@ -272,7 +265,6 @@ texture = ExtResource("9_682iw")

 [node name="Label" type="Label" parent="MediumMenu/VBoxContainer/CarInfoDisplay/VehicleInformation/VBoxContainer/InformationDisplay1/OnlineStatus"]
 layout_mode = 2
-theme_override_fonts/font = ExtResource("39_q7ixx")
 theme_override_font_sizes/font_size = 25
 text = "在线"

@ -282,7 +274,8 @@ size_flags_horizontal = 4
 size_flags_vertical = 4
 texture = ExtResource("10_kebty")

-[node name="TextureRect" type="TextureRect" parent="MediumMenu/VBoxContainer/CarInfoDisplay/VehicleInformation/VBoxContainer/InformationDisplay1"]
+[node name="control_modeTextureRect" type="TextureRect" parent="MediumMenu/VBoxContainer/CarInfoDisplay/VehicleInformation/VBoxContainer/InformationDisplay1"]
+unique_name_in_owner = true
 layout_mode = 2
 size_flags_horizontal = 8
 size_flags_vertical = 4
@ -309,22 +302,26 @@ layout_mode = 2
 theme_override_constants/separation = 73
 alignment = 1

-[node name="Label" type="Label" parent="MediumMenu/VBoxContainer/CarInfoDisplay/VehicleInformation/VBoxContainer/InformationDisplay2/MarginContainer/GearAdjustment"]
+[node name="gearPosition0" type="Label" parent="MediumMenu/VBoxContainer/CarInfoDisplay/VehicleInformation/VBoxContainer/InformationDisplay2/MarginContainer/GearAdjustment"]
+unique_name_in_owner = true
 layout_mode = 2
 theme_override_font_sizes/font_size = 35
 text = "P"

-[node name="Label2" type="Label" parent="MediumMenu/VBoxContainer/CarInfoDisplay/VehicleInformation/VBoxContainer/InformationDisplay2/MarginContainer/GearAdjustment"]
+[node name="gearPosition2" type="Label" parent="MediumMenu/VBoxContainer/CarInfoDisplay/VehicleInformation/VBoxContainer/InformationDisplay2/MarginContainer/GearAdjustment"]
+unique_name_in_owner = true
 layout_mode = 2
 theme_override_font_sizes/font_size = 35
 text = "R"

-[node name="Label3" type="Label" parent="MediumMenu/VBoxContainer/CarInfoDisplay/VehicleInformation/VBoxContainer/InformationDisplay2/MarginContainer/GearAdjustment"]
+[node name="gearPosition3" type="Label" parent="MediumMenu/VBoxContainer/CarInfoDisplay/VehicleInformation/VBoxContainer/InformationDisplay2/MarginContainer/GearAdjustment"]
+unique_name_in_owner = true
 layout_mode = 2
 theme_override_font_sizes/font_size = 35
 text = "N"

-[node name="Label4" type="Label" parent="MediumMenu/VBoxContainer/CarInfoDisplay/VehicleInformation/VBoxContainer/InformationDisplay2/MarginContainer/GearAdjustment"]
+[node name="gearPosition4" type="Label" parent="MediumMenu/VBoxContainer/CarInfoDisplay/VehicleInformation/VBoxContainer/InformationDisplay2/MarginContainer/GearAdjustment"]
+unique_name_in_owner = true
 layout_mode = 2
 theme_override_font_sizes/font_size = 35
 text = "D"
@ -348,7 +345,8 @@ texture = ExtResource("13_da81j")
 layout_mode = 2
 alignment = 1

-[node name="TextureProgressBar" type="TextureProgressBar" parent="MediumMenu/VBoxContainer/CarInfoDisplay/VehicleInformation/VBoxContainer/InformationDisplay2/MarginContainer/VBoxContainer/MarginContainer/HBoxContainer"]
+[node name="accel_status" type="TextureProgressBar" parent="MediumMenu/VBoxContainer/CarInfoDisplay/VehicleInformation/VBoxContainer/InformationDisplay2/MarginContainer/VBoxContainer/MarginContainer/HBoxContainer"]
+unique_name_in_owner = true
 layout_mode = 2
 size_flags_horizontal = 3
 size_flags_vertical = 4
@ -356,7 +354,8 @@ value = 50.0
 fill_mode = 1
 texture_progress = ExtResource("14_rblgy")

-[node name="TextureProgressBar2" type="TextureProgressBar" parent="MediumMenu/VBoxContainer/CarInfoDisplay/VehicleInformation/VBoxContainer/InformationDisplay2/MarginContainer/VBoxContainer/MarginContainer/HBoxContainer"]
+[node name="brake_status" type="TextureProgressBar" parent="MediumMenu/VBoxContainer/CarInfoDisplay/VehicleInformation/VBoxContainer/InformationDisplay2/MarginContainer/VBoxContainer/MarginContainer/HBoxContainer"]
+unique_name_in_owner = true
 layout_mode = 2
 size_flags_horizontal = 3
 size_flags_vertical = 4
@ -391,22 +390,18 @@ size_flags_horizontal = 0
 [node name="Label" type="Label" parent="MediumMenu/VBoxContainer/CarInfoDisplay/VehicleInformation/VBoxContainer/InformationDisplay3/MarginContainer/BatteryLife"]
 layout_mode = 2
 size_flags_horizontal = 4
-theme_override_colors/font_color = Color(0.403922, 0.403922, 0.403922, 1)
-theme_override_fonts/font = ExtResource("39_q7ixx")
 theme_override_font_sizes/font_size = 23
 text = "续航"

 [node name="BatteryLifeLabel" type="Label" parent="MediumMenu/VBoxContainer/CarInfoDisplay/VehicleInformation/VBoxContainer/InformationDisplay3/MarginContainer/BatteryLife"]
 layout_mode = 2
 size_flags_horizontal = 4
-theme_override_fonts/font = ExtResource("25_ak5wl")
 theme_override_font_sizes/font_size = 34
 text = "60"

 [node name="Label3" type="Label" parent="MediumMenu/VBoxContainer/CarInfoDisplay/VehicleInformation/VBoxContainer/InformationDisplay3/MarginContainer/BatteryLife"]
 layout_mode = 2
 size_flags_horizontal = 4
-theme_override_colors/font_color = Color(0.403922, 0.403922, 0.403922, 1)
 theme_override_font_sizes/font_size = 23
 text = "Km"

@ -417,22 +412,18 @@ size_flags_horizontal = 4
 [node name="Label" type="Label" parent="MediumMenu/VBoxContainer/CarInfoDisplay/VehicleInformation/VBoxContainer/InformationDisplay3/MarginContainer/SmallMileage"]
 layout_mode = 2
 size_flags_horizontal = 4
-theme_override_colors/font_color = Color(0.403922, 0.403922, 0.403922, 1)
-theme_override_fonts/font = ExtResource("39_q7ixx")
 theme_override_font_sizes/font_size = 23
 text = "小里程"

 [node name="SmallMileageLabel" type="Label" parent="MediumMenu/VBoxContainer/CarInfoDisplay/VehicleInformation/VBoxContainer/InformationDisplay3/MarginContainer/SmallMileage"]
 layout_mode = 2
 size_flags_horizontal = 4
-theme_override_fonts/font = ExtResource("25_ak5wl")
 theme_override_font_sizes/font_size = 34
 text = "20"

 [node name="Label3" type="Label" parent="MediumMenu/VBoxContainer/CarInfoDisplay/VehicleInformation/VBoxContainer/InformationDisplay3/MarginContainer/SmallMileage"]
 layout_mode = 2
 size_flags_horizontal = 4
-theme_override_colors/font_color = Color(0.403922, 0.403922, 0.403922, 1)
 theme_override_font_sizes/font_size = 23
 text = "Km"

@ -444,8 +435,6 @@ theme_override_constants/separation = 13
 [node name="Label" type="Label" parent="MediumMenu/VBoxContainer/CarInfoDisplay/VehicleInformation/VBoxContainer/InformationDisplay3/MarginContainer/Power"]
 layout_mode = 2
 size_flags_horizontal = 4
-theme_override_colors/font_color = Color(0.403922, 0.403922, 0.403922, 1)
-theme_override_fonts/font = ExtResource("39_q7ixx")
 theme_override_font_sizes/font_size = 23
 text = "电量"

@ -458,8 +447,6 @@ texture = ExtResource("15_fxv8p")
 unique_name_in_owner = true
 layout_mode = 2
 size_flags_horizontal = 4
-theme_override_colors/font_color = Color(0.403922, 0.403922, 0.403922, 1)
-theme_override_fonts/font = ExtResource("25_ak5wl")
 theme_override_font_sizes/font_size = 23
 text = "70%"

@ -579,14 +566,13 @@ theme_override_constants/margin_right = 9

 [node name="Label" type="Label" parent="RightMenu/VBoxContainer/MarginContainer"]
 layout_mode = 2
-theme_override_fonts/font = ExtResource("25_ak5wl")
 theme_override_font_sizes/font_size = 30
 text = "25°C"

 [node name="Label2" type="Label" parent="RightMenu/VBoxContainer/MarginContainer"]
 layout_mode = 2
 size_flags_horizontal = 8
-theme_override_fonts/font = ExtResource("25_ak5wl")
+theme_override_fonts/font = SubResource("FontVariation_frbsn")
 theme_override_font_sizes/font_size = 31
 text = "2024-04-27 00:35:24"

@ -618,9 +604,7 @@ offset_top = -11.5
 offset_right = 576.0
 offset_bottom = 11.5
 grow_vertical = 2
-theme_override_colors/font_color = Color(0.403922, 0.403922, 0.403922, 1)
-theme_override_fonts/font = ExtResource("39_q7ixx")
-theme_override_font_sizes/font_size = 32
+theme_override_font_sizes/font_size = 28
 theme_override_styles/normal = SubResource("StyleBoxEmpty_dyppf")
 text = "站点选择"

@ -647,7 +631,6 @@ theme_override_constants/separation = 39
 [node name="Button" type="Button" parent="RightMenu/VBoxContainer/MarginContainer4/HBoxContainer"]
 layout_mode = 2
 focus_mode = 0
-theme_override_fonts/font = ExtResource("30_2mjwt")
 theme_override_font_sizes/font_size = 32
 text = "定位"
 icon = ExtResource("28_hx0jv")
@ -659,7 +642,6 @@ is_Scale = true
 [node name="Button2" type="Button" parent="RightMenu/VBoxContainer/MarginContainer4/HBoxContainer"]
 layout_mode = 2
 focus_mode = 0
-theme_override_fonts/font = ExtResource("30_2mjwt")
 theme_override_font_sizes/font_size = 32
 text = "下发"
 icon = ExtResource("28_hx0jv")
@ -692,14 +674,11 @@ theme_override_constants/separation = 230

 [node name="Label" type="Label" parent="RightMenu/VBoxContainer/MarginContainer5/HBoxContainer"]
 layout_mode = 2
-theme_override_fonts/font = ExtResource("30_2mjwt")
 theme_override_font_sizes/font_size = 29
 text = "停止"

 [node name="Label2" type="Label" parent="RightMenu/VBoxContainer/MarginContainer5/HBoxContainer"]
 layout_mode = 2
-theme_override_colors/font_color = Color(0.403922, 0.403922, 0.403922, 1)
-theme_override_fonts/font = ExtResource("30_2mjwt")
 theme_override_font_sizes/font_size = 29
 text = "启动"

@ -718,7 +697,6 @@ texture = ExtResource("32_p3q22")

 [node name="Label" type="Label" parent="RightMenu/VBoxContainer/MarginContainer7/HBoxContainer"]
 layout_mode = 2
-theme_override_fonts/font = ExtResource("25_ak5wl")
 theme_override_font_sizes/font_size = 21
 text = "500m"

@ -733,7 +711,6 @@ texture = ExtResource("33_nsaf0")

 [node name="Label" type="Label" parent="RightMenu/VBoxContainer/MarginContainer7/HBoxContainer2"]
 layout_mode = 2
-theme_override_fonts/font = ExtResource("25_ak5wl")
 theme_override_font_sizes/font_size = 21
 text = "10min"

@ -762,8 +739,7 @@ theme_override_constants/separation = 21

 [node name="Label" type="Label" parent="RightMenu/VBoxContainer/MarginContainer9/HBoxContainer"]
 layout_mode = 2
-theme_override_fonts/font = ExtResource("39_q7ixx")
-theme_override_font_sizes/font_size = 26
+theme_override_font_sizes/font_size = 25
 text = "长通集团北"

 [node name="HBoxContainer2" type="HBoxContainer" parent="RightMenu/VBoxContainer/MarginContainer9"]
@ -773,8 +749,7 @@ theme_override_constants/separation = 21

 [node name="Label" type="Label" parent="RightMenu/VBoxContainer/MarginContainer9/HBoxContainer2"]
 layout_mode = 2
-theme_override_fonts/font = ExtResource("39_q7ixx")
-theme_override_font_sizes/font_size = 26
+theme_override_font_sizes/font_size = 25
 text = "长通集团南"

 [connection signal="drag_ended" from="RightMenu/VBoxContainer/MarginContainer5/HSlider" to="RightMenu/VBoxContainer/MarginContainer5/HSlider" method="_on_drag_ended"]
--- a/Robo-Bus-A31-HMI/Modules/information.tscn
+++ b/Robo-Bus-A31-HMI/Modules/information.tscn
@ -1,16 +1,14 @@
-[gd_scene load_steps=16 format=3 uid="uid://dd5e3n5lfbffj"]
+[gd_scene load_steps=14 format=3 uid="uid://dd5e3n5lfbffj"]

 [ext_resource type="Texture2D" uid="uid://bhsjkyho6jr42" path="res://pad_hmi_ui/home/l2_1.png" id="1_c65lw"]
 [ext_resource type="Texture2D" uid="uid://cuekwjm0hawts" path="res://pad_hmi_ui/information/log_bg.png" id="2_j8yeg"]
 [ext_resource type="Script" path="res://common/base/base_control.gd" id="2_p6uk3"]
 [ext_resource type="PackedScene" uid="uid://c2jso50cp2n4t" path="res://Modules/information_item.tscn" id="3_742pl"]
-[ext_resource type="FontFile" uid="uid://crt0yhgcdxpfm" path="res://font/Noto_Sans_SC/static/NotoSansSC-Medium.ttf" id="3_x7ame"]
 [ext_resource type="Texture2D" uid="uid://crgg6n2a4ggap" path="res://pad_hmi_ui/information/radar_high.png" id="4_deb0i"]
 [ext_resource type="Texture2D" uid="uid://cppfnikc48hgo" path="res://pad_hmi_ui/information/information/l3-1.png" id="4_rew8x"]
 [ext_resource type="Texture2D" uid="uid://0car70lmas3a" path="res://pad_hmi_ui/home/speed_icon.png" id="5_cslw6"]
 [ext_resource type="Texture2D" uid="uid://b2eyfue60u1re" path="res://pad_hmi_ui/information/navigation_high.png" id="5_uxg1s"]
 [ext_resource type="Texture2D" uid="uid://c1iswmxqs1iwb" path="res://pad_hmi_ui/information/map_high.png" id="6_svo2r"]
-[ext_resource type="FontFile" uid="uid://d1ithfx8aid4x" path="res://font/Kufam/static/Kufam-Medium.ttf" id="6_wakhq"]
 [ext_resource type="Texture2D" uid="uid://dj0dwbvd1rq64" path="res://pad_hmi_ui/information/camera_high.png" id="7_2u7cb"]
 [ext_resource type="Texture2D" uid="uid://dbsxig3tbx3qm" path="res://pad_hmi_ui/information/can_high.png" id="8_qocw3"]
 [ext_resource type="Texture2D" uid="uid://bugvjbdbwqrrp" path="res://WX20241220-163247.png" id="11_bbw6o"]
@ -42,19 +40,17 @@ theme_override_constants/separation = 175

 [node name="Label" type="Label" parent="SystemInformation/HBoxContainer"]
 layout_mode = 2
-theme_override_fonts/font = ExtResource("6_wakhq")
 theme_override_font_sizes/font_size = 30
 text = "25°C"

 [node name="Label2" type="Label" parent="SystemInformation/HBoxContainer"]
 layout_mode = 2
-theme_override_fonts/font = ExtResource("6_wakhq")
 theme_override_font_sizes/font_size = 30
 text = "2024-04-27 00:35:24"

 [node name="VBoxContainer" type="VBoxContainer" parent="."]
 layout_mode = 2
-theme_override_constants/separation = 75
+theme_override_constants/separation = 40

 [node name="VehicleInformation" type="MarginContainer" parent="VBoxContainer"]
 layout_mode = 2
@ -69,14 +65,12 @@ theme_override_constants/separation = 38

 [node name="Label" type="Label" parent="VBoxContainer/VehicleInformation/VBoxContainer"]
 layout_mode = 2
-theme_override_fonts/font = ExtResource("3_x7ame")
-theme_override_font_sizes/font_size = 48
+theme_override_font_sizes/font_size = 46
 text = "车辆信息"

 [node name="Label2" type="Label" parent="VBoxContainer/VehicleInformation/VBoxContainer"]
 layout_mode = 2
-theme_override_fonts/font = ExtResource("3_x7ame")
-theme_override_font_sizes/font_size = 32
+theme_override_font_sizes/font_size = 31
 text = "车辆名：PIX001"

 [node name="MarginContainer" type="MarginContainer" parent="VBoxContainer"]
@ -131,33 +125,28 @@ size_flags_vertical = 4
 [node name="Label11" type="Label" parent="VBoxContainer/MarginContainer/HBoxContainer/MarginContainer/MarginContainer/GridContainer"]
 layout_mode = 2
 size_flags_horizontal = 0
-theme_override_fonts/font = ExtResource("3_x7ame")
-theme_override_font_sizes/font_size = 32
+theme_override_font_sizes/font_size = 31
 text = "时间"

 [node name="Label2" type="Label" parent="VBoxContainer/MarginContainer/HBoxContainer/MarginContainer/MarginContainer/GridContainer"]
 layout_mode = 2
-theme_override_fonts/font = ExtResource("3_x7ame")
-theme_override_font_sizes/font_size = 32
+theme_override_font_sizes/font_size = 31
 text = "告警二级域"

 [node name="Label3" type="Label" parent="VBoxContainer/MarginContainer/HBoxContainer/MarginContainer/MarginContainer/GridContainer"]
 layout_mode = 2
-theme_override_fonts/font = ExtResource("3_x7ame")
-theme_override_font_sizes/font_size = 32
+theme_override_font_sizes/font_size = 31
 text = "告警码"

 [node name="Label4" type="Label" parent="VBoxContainer/MarginContainer/HBoxContainer/MarginContainer/MarginContainer/GridContainer"]
 layout_mode = 2
 size_flags_horizontal = 0
-theme_override_fonts/font = ExtResource("3_x7ame")
-theme_override_font_sizes/font_size = 32
+theme_override_font_sizes/font_size = 31
 text = "告警描述内容"

 [node name="Label5" type="Label" parent="VBoxContainer/MarginContainer/HBoxContainer/MarginContainer/MarginContainer/GridContainer"]
 layout_mode = 2
-theme_override_fonts/font = ExtResource("3_x7ame")
-theme_override_font_sizes/font_size = 32
+theme_override_font_sizes/font_size = 31
 text = "处理建议"

 [node name="TextureRect" type="TextureRect" parent="VBoxContainer/MarginContainer/HBoxContainer/MarginContainer/MarginContainer/GridContainer"]
@ -168,37 +157,27 @@ texture = ExtResource("5_cslw6")

 [node name="Label6" type="Label" parent="VBoxContainer/MarginContainer/HBoxContainer/MarginContainer/MarginContainer/GridContainer"]
 layout_mode = 2
-theme_override_colors/font_color = Color(0.403922, 0.403922, 0.403922, 1)
-theme_override_fonts/font = ExtResource("3_x7ame")
 theme_override_font_sizes/font_size = 30
 text = "2024.11.20"

 [node name="Label7" type="Label" parent="VBoxContainer/MarginContainer/HBoxContainer/MarginContainer/MarginContainer/GridContainer"]
 layout_mode = 2
-theme_override_colors/font_color = Color(0.403922, 0.403922, 0.403922, 1)
-theme_override_fonts/font = ExtResource("3_x7ame")
 theme_override_font_sizes/font_size = 30
 text = "VCU"

 [node name="Label8" type="Label" parent="VBoxContainer/MarginContainer/HBoxContainer/MarginContainer/MarginContainer/GridContainer"]
 layout_mode = 2
-theme_override_colors/font_color = Color(0.403922, 0.403922, 0.403922, 1)
-theme_override_fonts/font = ExtResource("3_x7ame")
 theme_override_font_sizes/font_size = 30
 text = "0x0100001"

 [node name="Label9" type="Label" parent="VBoxContainer/MarginContainer/HBoxContainer/MarginContainer/MarginContainer/GridContainer"]
 layout_mode = 2
-theme_override_colors/font_color = Color(0.403922, 0.403922, 0.403922, 1)
-theme_override_fonts/font = ExtResource("3_x7ame")
 theme_override_font_sizes/font_size = 30
 text = "电池系统过温"

 [node name="Label10" type="Label" parent="VBoxContainer/MarginContainer/HBoxContainer/MarginContainer/MarginContainer/GridContainer"]
 layout_mode = 2
-theme_override_colors/font_color = Color(0.403922, 0.403922, 0.403922, 1)
-theme_override_fonts/font = ExtResource("3_x7ame")
-theme_override_font_sizes/font_size = 32
+theme_override_font_sizes/font_size = 30
 text = "按具体故障排查"

 [node name="VBoxContainer" type="VBoxContainer" parent="VBoxContainer/MarginContainer/HBoxContainer"]
--- a/Robo-Bus-A31-HMI/Modules/information_item.tscn
+++ b/Robo-Bus-A31-HMI/Modules/information_item.tscn
@ -2,7 +2,7 @@

 [ext_resource type="Script" path="res://Modules/information_item.gd" id="1_0kyux"]
 [ext_resource type="Texture2D" uid="uid://dcylpmda38qtn" path="res://pad_hmi_ui/information/function_bg.png" id="1_qovdi"]
-[ext_resource type="FontFile" uid="uid://crt0yhgcdxpfm" path="res://font/Noto_Sans_SC/static/NotoSansSC-Medium.ttf" id="3_fka6y"]
+[ext_resource type="Texture2D" uid="uid://crgg6n2a4ggap" path="res://pad_hmi_ui/information/radar_high.png" id="2_irolo"]

 [node name="InformationItem" type="MarginContainer"]
 script = ExtResource("1_0kyux")
@ -22,6 +22,7 @@ unique_name_in_owner = true
 layout_mode = 2
 size_flags_horizontal = 0
 size_flags_vertical = 4
+texture = ExtResource("2_irolo")

 [node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer"]
 layout_mode = 2
@ -33,8 +34,8 @@ alignment = 1
 unique_name_in_owner = true
 modulate = Color(0.164706, 0.137255, 0.247059, 1)
 layout_mode = 2
-theme_override_fonts/font = ExtResource("3_fka6y")
 theme_override_font_sizes/font_size = 32
+text = "雷达"
 horizontal_alignment = 1
 vertical_alignment = 1

@ -42,8 +43,7 @@ vertical_alignment = 1
 unique_name_in_owner = true
 modulate = Color(0.937255, 0.254902, 0.254902, 1)
 layout_mode = 2
-theme_override_fonts/font = ExtResource("3_fka6y")
-theme_override_font_sizes/font_size = 24
-text = "未连接"
+theme_override_font_sizes/font_size = 22
+text = "已连接"
 horizontal_alignment = 1
 vertical_alignment = 1
--- a/Robo-Bus-A31-HMI/Modules/language_tabs.tscn
+++ b/Robo-Bus-A31-HMI/Modules/language_tabs.tscn
@ -1,9 +1,8 @@
-[gd_scene load_steps=5 format=3 uid="uid://df31a6g0oklv"]
+[gd_scene load_steps=4 format=3 uid="uid://df31a6g0oklv"]

 [ext_resource type="Script" path="res://Modules/language_tabs.gd" id="1_05fei"]
 [ext_resource type="Texture2D" uid="uid://ddc0v6muv1x37" path="res://pad_hmi_ui/setting/language_btn.png" id="2_cruvh"]
 [ext_resource type="Script" path="res://common/base/base_control.gd" id="3_iu68l"]
-[ext_resource type="FontFile" uid="uid://crt0yhgcdxpfm" path="res://font/Noto_Sans_SC/static/NotoSansSC-Medium.ttf" id="4_jyv3e"]

 [node name="LanguageTabs" type="MarginContainer" node_paths=PackedStringArray("nodearr")]
 offset_right = 429.0
@ -38,8 +37,7 @@ script = ExtResource("3_iu68l")
 [node name="Label" type="Label" parent="HBoxContainer/Chinese"]
 layout_mode = 2
 theme_override_colors/font_color = Color(0.952941, 0.952941, 0.952941, 1)
-theme_override_fonts/font = ExtResource("4_jyv3e")
-theme_override_font_sizes/font_size = 24
+theme_override_font_sizes/font_size = 26
 text = "中文"
 horizontal_alignment = 1

@ -52,8 +50,7 @@ script = ExtResource("3_iu68l")
 [node name="Label" type="Label" parent="HBoxContainer/English"]
 layout_mode = 2
 theme_override_colors/font_color = Color(0.403922, 0.403922, 0.403922, 1)
-theme_override_fonts/font = ExtResource("4_jyv3e")
-theme_override_font_sizes/font_size = 24
+theme_override_font_sizes/font_size = 26
 text = "English"
 horizontal_alignment = 1

@ -66,7 +63,6 @@ script = ExtResource("3_iu68l")
 [node name="Label" type="Label" parent="HBoxContainer/Japanese"]
 layout_mode = 2
 theme_override_colors/font_color = Color(0.403922, 0.403922, 0.403922, 1)
-theme_override_fonts/font = ExtResource("4_jyv3e")
-theme_override_font_sizes/font_size = 24
+theme_override_font_sizes/font_size = 26
 text = "日本語"
 horizontal_alignment = 1
--- a/Robo-Bus-A31-HMI/Modules/main_3d_vehicle.tscn
+++ b/Robo-Bus-A31-HMI/Modules/main_3d_vehicle.tscn
@ -1,4 +1,4 @@
-[gd_scene load_steps=13 format=3 uid="uid://tqrf0pcv1bay"]
+[gd_scene load_steps=12 format=3 uid="uid://tqrf0pcv1bay"]

 [ext_resource type="Script" path="res://pad_hmi_ui/Main3DVehicle.gd" id="1_nyon1"]
 [ext_resource type="Texture2D" uid="uid://bhsjkyho6jr42" path="res://pad_hmi_ui/home/l2_1.png" id="2_pl52w"]
@ -9,7 +9,6 @@
 [ext_resource type="Texture2D" uid="uid://b4ddgruml02uj" path="res://pad_hmi_ui/home/information_bg.png" id="7_7in7q"]
 [ext_resource type="Texture2D" uid="uid://c1ncf47u6ssrd" path="res://pad_hmi_ui/home/arrow_icon_right.png" id="8_3ei63"]
 [ext_resource type="Texture2D" uid="uid://dsoc1dfktnbff" path="res://pad_hmi_ui/home/wheel_icon.png" id="9_m3c80"]
-[ext_resource type="FontFile" uid="uid://d1ithfx8aid4x" path="res://font/Kufam/static/Kufam-Medium.ttf" id="10_xrkcm"]

 [sub_resource type="ShaderMaterial" id="ShaderMaterial_8c5rn"]
 shader = ExtResource("3_pmm6i")
@ -31,6 +30,7 @@ content_margin_left = 34.0
 content_margin_top = 23.0

 [node name="Main3DVehicle" type="MarginContainer"]
+visible = false
 custom_minimum_size = Vector2(2320, 1520)
 script = ExtResource("1_nyon1")

@ -152,7 +152,6 @@ mouse_filter = 2
 layout_mode = 2
 size_flags_horizontal = 0
 size_flags_vertical = 0
-theme_override_colors/font_color = Color(0.403922, 0.403922, 0.403922, 1)
 theme_override_font_sizes/font_size = 22
 theme_override_styles/normal = SubResource("StyleBoxEmpty_j2i4v")
 text = "FPS:51"
@ -205,14 +204,12 @@ theme_override_constants/separation = -3
 [node name="Speed" type="Label" parent="MarginContainer/Main3DVehicleInformation/DrivingInformation/MarginContainer/VBoxContainer"]
 layout_mode = 2
 size_flags_horizontal = 4
-theme_override_fonts/font = ExtResource("10_xrkcm")
 theme_override_font_sizes/font_size = 49
 text = "20.0"

 [node name="SpeedUnit" type="Label" parent="MarginContainer/Main3DVehicleInformation/DrivingInformation/MarginContainer/VBoxContainer"]
 layout_mode = 2
 size_flags_horizontal = 4
-theme_override_colors/font_color = Color(0.403922, 0.403922, 0.403922, 1)
 theme_override_font_sizes/font_size = 23
 text = "Km/h"

--- a/Robo-Bus-A31-HMI/Modules/margin_container_2.tscn
+++ b/Robo-Bus-A31-HMI/Modules/margin_container_2.tscn
@ -1,4 +1,4 @@
-[gd_scene load_steps=21 format=3 uid="uid://ccp1epic52e7k"]
+[gd_scene load_steps=18 format=3 uid="uid://ccp1epic52e7k"]

 [ext_resource type="Script" path="res://Modules/SpeedGearAdjustment.gd" id="1_8ml6x"]
 [ext_resource type="Texture2D" uid="uid://pomyaut6jtnm" path="res://yuan.png" id="2_5b01c"]
@ -11,10 +11,7 @@
 [ext_resource type="Texture2D" uid="uid://py3v278ho7vt" path="res://pad_hmi_ui/home/plus_btn.png" id="8_kef14"]
 [ext_resource type="Script" path="res://code/path_follow_2d_por.gd" id="9_34b06"]
 [ext_resource type="Texture2D" uid="uid://bsbptxpt17lo5" path="res://pad_hmi_ui/home/6C56D304-B9D8-409E-B5A4-D15F18A0E87A.png" id="11_o3pr5"]
-[ext_resource type="FontFile" uid="uid://d1ithfx8aid4x" path="res://font/Kufam/static/Kufam-Medium.ttf" id="11_p6epk"]
 [ext_resource type="Texture2D" uid="uid://xbugddj2xpru" path="res://pad_hmi_ui/home/25A288F6-B440-4F4F-9E3C-F2BE6F3575E0.png" id="12_drn41"]
-[ext_resource type="FontFile" uid="uid://b4tmgitvmyhdo" path="res://font/Noto_Sans_SC/static/NotoSansSC-Regular.ttf" id="12_lyv3f"]
-[ext_resource type="FontFile" uid="uid://crt0yhgcdxpfm" path="res://font/Noto_Sans_SC/static/NotoSansSC-Medium.ttf" id="14_58u3t"]

 [sub_resource type="Shader" id="Shader_f57hx"]
 code = "shader_type canvas_item;
@ -160,10 +157,10 @@ texture = ExtResource("4_d48gs")

 [node name="GearTextureRect" type="TextureRect" parent="Speedometer"]
 layout_mode = 0
-offset_left = 84.0011
-offset_top = 352.996
-offset_right = 118.001
-offset_bottom = 386.996
+offset_left = 84.0023
+offset_top = 352.991
+offset_right = 118.002
+offset_bottom = 386.991
 pivot_offset = Vector2(17, 17)
 texture = ExtResource("5_qnams")
 script = ExtResource("7_smylr")
@ -234,7 +231,6 @@ theme_override_constants/separation = 18
 [node name="ThrottlePositionLabel" type="Label" parent="VBoxContainer2/VBoxContainer/HBoxContainer"]
 unique_name_in_owner = true
 layout_mode = 2
-theme_override_fonts/font = ExtResource("11_p6epk")
 theme_override_font_sizes/font_size = 65
 text = "14"
 script = ExtResource("7_smylr")
@ -242,15 +238,12 @@ script = ExtResource("7_smylr")
 [node name="Label2" type="Label" parent="VBoxContainer2/VBoxContainer/HBoxContainer"]
 modulate = Color(0.403922, 0.403922, 0.403922, 1)
 layout_mode = 2
-theme_override_colors/font_color = Color(0.403922, 0.403922, 0.403922, 1)
 theme_override_font_sizes/font_size = 34
 text = "/"

 [node name="Label3" type="Label" parent="VBoxContainer2/VBoxContainer/HBoxContainer"]
 modulate = Color(0.403922, 0.403922, 0.403922, 1)
 layout_mode = 2
-theme_override_colors/font_color = Color(0.403922, 0.403922, 0.403922, 1)
-theme_override_fonts/font = ExtResource("11_p6epk")
 theme_override_font_sizes/font_size = 34
 text = "50"

@ -258,9 +251,7 @@ text = "50"
 modulate = Color(0.403922, 0.403922, 0.403922, 1)
 layout_mode = 2
 size_flags_horizontal = 4
-theme_override_colors/font_color = Color(0.403922, 0.403922, 0.403922, 1)
-theme_override_fonts/font = ExtResource("12_lyv3f")
-theme_override_font_sizes/font_size = 32
+theme_override_font_sizes/font_size = 34
 text = "speed"

 [node name="MarginContainer" type="MarginContainer" parent="VBoxContainer2"]
@ -284,6 +275,5 @@ texture = ExtResource("12_drn41")

 [node name="Label" type="Label" parent="VBoxContainer2/MarginContainer/HBoxContainer"]
 layout_mode = 2
-theme_override_fonts/font = ExtResource("14_58u3t")
-theme_override_font_sizes/font_size = 24
+theme_override_font_sizes/font_size = 25
 text = "临时停车"
--- a/Robo-Bus-A31-HMI/Modules/setting.tscn
+++ b/Robo-Bus-A31-HMI/Modules/setting.tscn
@ -1,4 +1,4 @@
-[gd_scene load_steps=44 format=3 uid="uid://33cgqbhyfl47"]
+[gd_scene load_steps=42 format=3 uid="uid://33cgqbhyfl47"]

 [ext_resource type="Script" path="res://Modules/setting.gd" id="1_ehdr1"]
 [ext_resource type="Texture2D" uid="uid://dncdx223e1re4" path="res://pad_hmi_ui/setting/function_bg.png" id="2_o74j2"]
@ -30,11 +30,9 @@
 [ext_resource type="Texture2D" uid="uid://t2ku0xn32sqd" path="res://pad_hmi_ui/setting/progress_bar_normal.png" id="16_rrajj"]
 [ext_resource type="Texture2D" uid="uid://siw3iqyojrmb" path="res://pad_hmi_ui/setting/updatelog_bg.png" id="16_t8xnk"]
 [ext_resource type="Texture2D" uid="uid://c15ltf6sdq5m1" path="res://pad_hmi_ui/setting/cancel_btn.png" id="17_r1mfq"]
-[ext_resource type="FontFile" uid="uid://d1ithfx8aid4x" path="res://font/Kufam/static/Kufam-Medium.ttf" id="18_gng1i"]
 [ext_resource type="Texture2D" uid="uid://o418ai5uhori" path="res://pad_hmi_ui/setting/confirm_btn.png" id="18_i0avx"]
 [ext_resource type="PackedScene" uid="uid://ctjlpah7am5se" path="res://Modules/update_progress.tscn" id="19_ra4y1"]
 [ext_resource type="Texture2D" uid="uid://tiauoobg8vyr" path="res://pad_hmi_ui/setting/setting/l1-3.png" id="21_b1cxm"]
-[ext_resource type="FontFile" uid="uid://crt0yhgcdxpfm" path="res://font/Noto_Sans_SC/static/NotoSansSC-Medium.ttf" id="23_80f86"]
 [ext_resource type="Texture2D" uid="uid://c2wb86x10ngb7" path="res://pad_hmi_ui/setting/setting/l1-4.png" id="29_ou8fg"]

 [sub_resource type="StyleBoxTexture" id="StyleBoxTexture_mgevr"]
@ -63,8 +61,8 @@ anchor_right = 1.0
 anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
+theme_override_constants/margin_bottom = -2
 script = ExtResource("1_ehdr1")
-metadata/_edit_horizontal_guides_ = [467.0, 821.0, 265.0]

 [node name="HBoxContainer" type="HBoxContainer" parent="."]
 layout_mode = 2
@ -88,7 +86,6 @@ theme_override_constants/separation = 0
 [node name="Label" type="Label" parent="HBoxContainer/margin/VBoxContainer"]
 layout_mode = 2
 theme_override_constants/line_spacing = 0
-theme_override_fonts/font = ExtResource("23_80f86")
 theme_override_font_sizes/font_size = 48
 text = "系统设置"
 vertical_alignment = 1
@ -99,7 +96,6 @@ layout_mode = 2

 [node name="Label2" type="Label" parent="HBoxContainer/margin/VBoxContainer"]
 layout_mode = 2
-theme_override_fonts/font = ExtResource("23_80f86")
 theme_override_font_sizes/font_size = 32
 text = "地图设置"

@ -143,11 +139,10 @@ metadata/_edit_use_anchors_ = true
 layout_mode = 1
 anchors_preset = -1
 anchor_left = 0.236364
-anchor_top = 0.781818
+anchor_top = 0.7
 anchor_right = 0.777273
-anchor_bottom = 0.936364
+anchor_bottom = 0.854545
 theme_override_colors/font_color = Color(0.403922, 0.403922, 0.403922, 1)
-theme_override_fonts/font = ExtResource("23_80f86")
 theme_override_font_sizes/font_size = 24
 text = "录制数据"
 horizontal_alignment = 1
@ -184,11 +179,10 @@ metadata/_edit_use_anchors_ = true
 layout_mode = 1
 anchors_preset = -1
 anchor_left = 0.172727
-anchor_top = 0.777273
+anchor_top = 0.7
 anchor_right = 0.827272
-anchor_bottom = 0.931818
+anchor_bottom = 0.854545
 theme_override_colors/font_color = Color(0.403922, 0.403922, 0.403922, 1)
-theme_override_fonts/font = ExtResource("23_80f86")
 theme_override_font_sizes/font_size = 24
 text = "构建高清地图"
 horizontal_alignment = 1
@ -229,7 +223,6 @@ anchor_top = 0.777273
 anchor_right = 0.777273
 anchor_bottom = 0.945455
 theme_override_colors/font_color = Color(0.403922, 0.403922, 0.403922, 1)
-theme_override_fonts/font = ExtResource("23_80f86")
 theme_override_font_sizes/font_size = 24
 text = "导出"
 horizontal_alignment = 1
@ -280,11 +273,10 @@ metadata/_edit_use_anchors_ = true
 layout_mode = 1
 anchors_preset = -1
 anchor_left = 0.177273
-anchor_top = 0.736364
+anchor_top = 0.668182
 anchor_right = 0.831818
-anchor_bottom = 0.89091
+anchor_bottom = 0.822728
 theme_override_colors/font_color = Color(0.403922, 0.403922, 0.403922, 1)
-theme_override_fonts/font = ExtResource("23_80f86")
 theme_override_font_sizes/font_size = 24
 text = "下载更新地图"
 horizontal_alignment = 1
@ -325,7 +317,6 @@ anchor_top = 0.740909
 anchor_right = 0.759091
 anchor_bottom = 0.895454
 theme_override_colors/font_color = Color(0.403922, 0.403922, 0.403922, 1)
-theme_override_fonts/font = ExtResource("23_80f86")
 theme_override_font_sizes/font_size = 24
 text = "上传"
 horizontal_alignment = 1
@ -377,7 +368,6 @@ layout_mode = 2
 unique_name_in_owner = true
 layout_mode = 2
 theme_override_colors/font_color = Color(0.952941, 0.952941, 0.952941, 1)
-theme_override_fonts/font = ExtResource("23_80f86")
 theme_override_font_sizes/font_size = 33
 text = "进度 - "

@ -385,7 +375,6 @@ text = "进度 - "
 unique_name_in_owner = true
 layout_mode = 2
 theme_override_colors/font_color = Color(0.952941, 0.952941, 0.952941, 1)
-theme_override_fonts/font = ExtResource("18_gng1i")
 theme_override_font_sizes/font_size = 33
 text = "45%"

@ -466,7 +455,6 @@ unique_name_in_owner = true
 layout_mode = 2
 size_flags_horizontal = 10
 theme_override_colors/font_color = Color(0.952941, 0.952941, 0.952941, 1)
-theme_override_fonts/font = ExtResource("18_gng1i")
 theme_override_font_sizes/font_size = 34
 text = "25℃"

@ -478,7 +466,6 @@ layout_mode = 2
 unique_name_in_owner = true
 layout_mode = 2
 theme_override_colors/font_color = Color(0.952941, 0.952941, 0.952941, 1)
-theme_override_fonts/font = ExtResource("18_gng1i")
 theme_override_font_sizes/font_size = 34
 text = "2024-04-27"

@ -486,7 +473,6 @@ text = "2024-04-27"
 unique_name_in_owner = true
 layout_mode = 2
 theme_override_colors/font_color = Color(0.952941, 0.952941, 0.952941, 1)
-theme_override_fonts/font = ExtResource("18_gng1i")
 theme_override_font_sizes/font_size = 34
 text = "00:35:24"

@ -505,8 +491,7 @@ theme_override_constants/separation = 48
 [node name="Label" type="Label" parent="HBoxContainer/VBoxContainer/margin/VBoxContainer/HBoxContainer2/VBoxContainer"]
 layout_mode = 2
 theme_override_colors/font_color = Color(0.952941, 0.952941, 0.952941, 1)
-theme_override_fonts/font = ExtResource("23_80f86")
-theme_override_font_sizes/font_size = 32
+theme_override_font_sizes/font_size = 33
 text = "显示模式"

 [node name="ColorMode" type="TextureRect" parent="HBoxContainer/VBoxContainer/margin/VBoxContainer/HBoxContainer2/VBoxContainer"]
@ -522,8 +507,7 @@ theme_override_constants/separation = 48
 [node name="Label" type="Label" parent="HBoxContainer/VBoxContainer/margin/VBoxContainer/HBoxContainer2/VBoxContainer2"]
 layout_mode = 2
 theme_override_colors/font_color = Color(0.952941, 0.952941, 0.952941, 1)
-theme_override_fonts/font = ExtResource("23_80f86")
-theme_override_font_sizes/font_size = 32
+theme_override_font_sizes/font_size = 33
 text = "视图切换"

 [node name="ViewMode" type="TextureRect" parent="HBoxContainer/VBoxContainer/margin/VBoxContainer/HBoxContainer2/VBoxContainer2"]
@ -549,7 +533,6 @@ theme_override_constants/separation = 40
 [node name="Label" type="Label" parent="HBoxContainer/VBoxContainer/margin/VBoxContainer/HBoxContainer3/VBoxContainer"]
 layout_mode = 2
 theme_override_colors/font_color = Color(0.952941, 0.952941, 0.952941, 1)
-theme_override_fonts/font = ExtResource("23_80f86")
 theme_override_font_sizes/font_size = 32
 text = "系统语言"

@ -571,7 +554,6 @@ theme_override_constants/separation = 40
 [node name="Label" type="Label" parent="HBoxContainer/VBoxContainer/margin/VBoxContainer/HBoxContainer3/VBoxContainer2"]
 layout_mode = 2
 theme_override_colors/font_color = Color(0.952941, 0.952941, 0.952941, 1)
-theme_override_fonts/font = ExtResource("23_80f86")
 theme_override_font_sizes/font_size = 32
 text = "连接服务器"

@ -591,7 +573,6 @@ layout_mode = 2
 theme_override_colors/font_selected_color = Color(0.952941, 0.952941, 0.952941, 1)
 theme_override_colors/font_uneditable_color = Color(0.952941, 0.952941, 0.952941, 1)
 theme_override_colors/font_color = Color(0.952941, 0.952941, 0.952941, 1)
-theme_override_fonts/font = ExtResource("18_gng1i")
 theme_override_font_sizes/font_size = 30
 theme_override_styles/focus = SubResource("StyleBoxEmpty_emjfk")
 text = "ws://192.168.4.88:9091"
@ -647,7 +628,6 @@ theme_override_constants/separation = 0
 [node name="Label" type="Label" parent="HBoxContainer/VBoxContainer/RightBottonPanel/VBoxContainer/HBoxContainer"]
 layout_mode = 2
 theme_override_colors/font_color = Color(0.952941, 0.952941, 0.952941, 1)
-theme_override_fonts/font = ExtResource("23_80f86")
 theme_override_font_sizes/font_size = 32
 text = "VCU固件版本："
 vertical_alignment = 1
@ -656,8 +636,7 @@ vertical_alignment = 1
 unique_name_in_owner = true
 layout_mode = 2
 size_flags_horizontal = 3
-theme_override_colors/font_color = Color(0.403922, 0.403922, 0.403922, 1)
-theme_override_fonts/font = ExtResource("18_gng1i")
+theme_override_colors/font_color = Color(0.952941, 0.952941, 0.952941, 1)
 theme_override_font_sizes/font_size = 32
 text = "1.1.1"
 horizontal_alignment = 2
@ -670,8 +649,7 @@ layout_mode = 2
 [node name="Label3" type="Label" parent="HBoxContainer/VBoxContainer/RightBottonPanel/VBoxContainer/HBoxContainer"]
 layout_mode = 2
 theme_override_colors/font_color = Color(0.952941, 0.952941, 0.952941, 1)
-theme_override_fonts/font = ExtResource("23_80f86")
-theme_override_font_sizes/font_size = 32
+theme_override_font_sizes/font_size = 31
 text = "自动驾驶版本："
 horizontal_alignment = 1
 vertical_alignment = 1
@ -680,8 +658,7 @@ vertical_alignment = 1
 unique_name_in_owner = true
 layout_mode = 2
 size_flags_horizontal = 3
-theme_override_colors/font_color = Color(0.403922, 0.403922, 0.403922, 1)
-theme_override_fonts/font = ExtResource("18_gng1i")
+theme_override_colors/font_color = Color(0.952941, 0.952941, 0.952941, 1)
 theme_override_font_sizes/font_size = 32
 text = "1.1.1"
 horizontal_alignment = 2
@ -698,7 +675,6 @@ layout_mode = 2
 [node name="Label" type="Label" parent="HBoxContainer/VBoxContainer/RightBottonPanel/VBoxContainer/HBoxContainer2"]
 layout_mode = 2
 theme_override_colors/font_color = Color(0.952941, 0.952941, 0.952941, 1)
-theme_override_fonts/font = ExtResource("23_80f86")
 theme_override_font_sizes/font_size = 32
 text = "OTA升级"
 vertical_alignment = 1
@ -719,7 +695,6 @@ anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
 theme_override_colors/font_color = Color(0.952941, 0.952941, 0.952941, 1)
-theme_override_fonts/font = ExtResource("23_80f86")
 theme_override_font_sizes/font_size = 32
 text = "检查更新"
 horizontal_alignment = 1
--- a/Robo-Bus-A31-HMI/Modules/setting_tabs.tscn
+++ b/Robo-Bus-A31-HMI/Modules/setting_tabs.tscn
@ -36,7 +36,7 @@ script = ExtResource("3_krd6n")
 [node name="item_name" type="Label" parent="HBoxContainer/Item1"]
 layout_mode = 2
 theme_override_font_sizes/font_size = 24
-text = ".bag"
+text = "中文"
 horizontal_alignment = 1

 [node name="Item2" type="MarginContainer" parent="HBoxContainer"]
@ -47,5 +47,5 @@ script = ExtResource("3_krd6n")
 [node name="item_name" type="Label" parent="HBoxContainer/Item2"]
 layout_mode = 2
 theme_override_font_sizes/font_size = 24
-text = ".pcd"
+text = "English"
 horizontal_alignment = 1
--- a/Robo-Bus-A31-HMI/Modules/update_progress.tscn
+++ b/Robo-Bus-A31-HMI/Modules/update_progress.tscn
@ -1,4 +1,4 @@
-[gd_scene load_steps=14 format=3 uid="uid://ctjlpah7am5se"]
+[gd_scene load_steps=13 format=3 uid="uid://ctjlpah7am5se"]

 [ext_resource type="Script" path="res://Modules/update_progress.gd" id="1_hcogg"]
 [ext_resource type="Texture2D" uid="uid://bicyasmugq208" path="res://pad_hmi_ui/setting/ellipse_icon.png" id="2_2y3de"]
@ -6,7 +6,6 @@
 [ext_resource type="Texture2D" uid="uid://djdst6wnbvj2k" path="res://pad_hmi_ui/setting/ellipse_icon_dis.png" id="3_ynyyh"]
 [ext_resource type="Texture2D" uid="uid://d4m85u6yl6py8" path="res://pad_hmi_ui/setting/inprogress_icon_high.png" id="4_7bfrc"]
 [ext_resource type="Texture2D" uid="uid://dc88flrbrvoas" path="res://pad_hmi_ui/setting/line_icon_dis.png" id="5_swik2"]
-[ext_resource type="FontFile" uid="uid://b4tmgitvmyhdo" path="res://font/Noto_Sans_SC/static/NotoSansSC-Regular.ttf" id="7_opgm0"]

 [sub_resource type="Animation" id="Animation_qrca2"]
 length = 0.001
@ -165,7 +164,6 @@ texture = ExtResource("2_2y3de")
 [node name="progress_state_1" type="Label" parent="hbox/item_1"]
 unique_name_in_owner = true
 layout_mode = 2
-theme_override_fonts/font = ExtResource("7_opgm0")
 theme_override_font_sizes/font_size = 24
 text = "已完成"
 horizontal_alignment = 1
@ -173,7 +171,6 @@ horizontal_alignment = 1
 [node name="progress_name_1" type="Label" parent="hbox/item_1"]
 unique_name_in_owner = true
 layout_mode = 2
-theme_override_fonts/font = ExtResource("7_opgm0")
 theme_override_font_sizes/font_size = 32
 text = "查询"
 horizontal_alignment = 1
@ -210,7 +207,6 @@ texture = ExtResource("2_2y3de")
 [node name="progress_state_2" type="Label" parent="hbox/item_2"]
 unique_name_in_owner = true
 layout_mode = 2
-theme_override_fonts/font = ExtResource("7_opgm0")
 theme_override_font_sizes/font_size = 24
 text = "已完成"
 horizontal_alignment = 1
@ -218,7 +214,6 @@ horizontal_alignment = 1
 [node name="progress_name_2" type="Label" parent="hbox/item_2"]
 unique_name_in_owner = true
 layout_mode = 2
-theme_override_fonts/font = ExtResource("7_opgm0")
 theme_override_font_sizes/font_size = 32
 text = "下载"
 horizontal_alignment = 1
@ -255,7 +250,6 @@ texture = ExtResource("2_2y3de")
 [node name="progress_state_3" type="Label" parent="hbox/item_3"]
 unique_name_in_owner = true
 layout_mode = 2
-theme_override_fonts/font = ExtResource("7_opgm0")
 theme_override_font_sizes/font_size = 24
 text = "已完成"
 horizontal_alignment = 1
@ -263,7 +257,6 @@ horizontal_alignment = 1
 [node name="progress_name_3" type="Label" parent="hbox/item_3"]
 unique_name_in_owner = true
 layout_mode = 2
-theme_override_fonts/font = ExtResource("7_opgm0")
 theme_override_font_sizes/font_size = 32
 text = "校验"
 horizontal_alignment = 1
@ -300,7 +293,6 @@ texture = ExtResource("2_2y3de")
 [node name="progress_state_4" type="Label" parent="hbox/item_4"]
 unique_name_in_owner = true
 layout_mode = 2
-theme_override_fonts/font = ExtResource("7_opgm0")
 theme_override_font_sizes/font_size = 24
 text = "已完成"
 horizontal_alignment = 1
@ -308,7 +300,6 @@ horizontal_alignment = 1
 [node name="progress_name_4" type="Label" parent="hbox/item_4"]
 unique_name_in_owner = true
 layout_mode = 2
-theme_override_fonts/font = ExtResource("7_opgm0")
 theme_override_font_sizes/font_size = 32
 text = "安装"
 horizontal_alignment = 1
--- a/Robo-Bus-A31-HMI/Modules/volume_settings.gd
+++ b/Robo-Bus-A31-HMI/Modules/volume_settings.gd
@ -14,6 +14,7 @@ func _physics_process(delta: float) -> void:
 		texture_rect.texture = load("res://pad_hmi_ui/home/mute_icon.png")
 	else:
 		texture_rect.texture = load("res://pad_hmi_ui/home/sound_icon.png")
-
+	$HSlider/TextureProgressBar.value = h_slider.value
 func _on_h_slider_drag_ended(value_changed: bool) -> void:
+	
 	pass # Replace with function body.
--- a/Robo-Bus-A31-HMI/Modules/volume_settings.tscn
+++ b/Robo-Bus-A31-HMI/Modules/volume_settings.tscn
@ -16,6 +16,7 @@ texture_margin_left = 46.0
 texture_margin_right = 42.0
 expand_margin_top = 47.0
 expand_margin_bottom = 53.0
+modulate_color = Color(1, 1, 1, 0)

 [node name="VolumeSettings" type="MarginContainer"]
 offset_right = 594.0
@ -33,7 +34,22 @@ theme_override_icons/tick = ExtResource("1_q53pk")
 theme_override_styles/slider = SubResource("StyleBoxTexture_rir4m")
 theme_override_styles/grabber_area = SubResource("StyleBoxTexture_h6qwb")
 theme_override_styles/grabber_area_highlight = SubResource("StyleBoxTexture_h6qwb")
-value = 100.0
+value = 19.0
+
+[node name="TextureProgressBar" type="TextureProgressBar" parent="HSlider"]
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+offset_left = -3.0
+offset_top = 4.0
+offset_right = -3.0
+offset_bottom = 4.0
+grow_horizontal = 2
+grow_vertical = 2
+mouse_filter = 2
+value = 19.0
+texture_progress = ExtResource("2_q2e4s")

 [node name="TextureRect" type="TextureRect" parent="HSlider"]
 unique_name_in_owner = true
--- a/Robo-Bus-A31-HMI/control.tscn
+++ b/Robo-Bus-A31-HMI/control.tscn
@ -51,7 +51,7 @@ anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
 metadata/_edit_horizontal_guides_ = [1600.0, 42.0, 1561.0]
-metadata/_edit_vertical_guides_ = [2560.0, 30.0, 2494.0, 1443.0, 1758.0, 270.0]
+metadata/_edit_vertical_guides_ = [2560.0, 30.0, 2491.0, 1443.0, 1758.0, 270.0]
 metadata/_edit_use_anchors_ = true

 [node name="EgoVehicle" parent="." instance=ExtResource("13_tjeco")]
@ -177,22 +177,23 @@ size_flags_stretch_ratio = 21.0

 [node name="DataPanel" parent="MarginContainer/HBoxContainer/MarginContainer" instance=ExtResource("47_jqspi")]
 unique_name_in_owner = true
+custom_minimum_size = Vector2(2320, 1520)
 layout_mode = 2
-metadata/_edit_horizontal_guides_ = [352.0, 50.0]

 [node name="Main3DVehicle" parent="MarginContainer/HBoxContainer/MarginContainer" instance=ExtResource("48_p5kic")]
 unique_name_in_owner = true
-visible = false
 layout_mode = 2

 [node name="Information" parent="MarginContainer/HBoxContainer/MarginContainer" instance=ExtResource("49_s7rxh")]
 unique_name_in_owner = true
 visible = false
+custom_minimum_size = Vector2(2320, 1520)
 layout_mode = 2

 [node name="Setting" parent="MarginContainer/HBoxContainer/MarginContainer" instance=ExtResource("50_kqjcx")]
 unique_name_in_owner = true
 visible = false
+custom_minimum_size = Vector2(2320, 1520)
 layout_mode = 2

 [node name="TextureRect" type="TextureRect" parent="."]