Merge branch 'Dev-Branch' into dev--wxr

wxr

2022-09-27 0ee75b88cfe03e46289de0de96e8ed4580c797d3

 HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SenesorMegahealthPage.cs

@@ -292,7 +292,7 @@
                                    btnIcon.UnSelectedImagePath = "FunctionIcon/ArmSensor/SomeoneInBgIcon.png";
                                    btnIcon.IsSelected = true;
                                    btnIcon.IsSelected = false;
                                    btnSuctionView.TextID = StringId.SomeoneIn;
                                    btnSuctionView.TextID = StringId.Someone;
                                    btnSuctionView.IsSelected = true;
                                    break;
                                case "2":
@@ -309,7 +309,7 @@
                                        btnIcon.UnSelectedImagePath = "FunctionIcon/ArmSensor/SomeoneInBgIcon.png";
                                        btnIcon.IsSelected = true;
                                        btnIcon.IsSelected = false;
                                        btnSuctionView.TextID = StringId.SomeoneIn;
                                        btnSuctionView.TextID = StringId.Someone;
                                        btnSuctionView.IsSelected = true;
                                    }
                                    break;
@@ -327,7 +327,7 @@
                                        btnIcon.UnSelectedImagePath = "FunctionIcon/ArmSensor/SomeoneInBgIcon.png";
                                        btnIcon.IsSelected = true;
                                        btnIcon.IsSelected = false;
                                        btnSuctionView.TextID = StringId.SomeoneIn;
                                        btnSuctionView.TextID = StringId.Someone;
                                        btnSuctionView.IsSelected = true;
                                    }
                                    break;
@@ -352,7 +352,7 @@
                                        btnIcon.UnSelectedImagePath = "FunctionIcon/ArmSensor/SomeoneInBgIcon.png";
                                        btnIcon.IsSelected = true;
                                        btnIcon.IsSelected = false;
                                        btnSuctionView.TextID = StringId.SomeoneIn;
                                        btnSuctionView.TextID = StringId.Someone;
                                        btnSuctionView.IsSelected = true;
                                    }
                                    break;