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

wxr

2022-09-27 0ee75b88cfe03e46289de0de96e8ed4580c797d3

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

@@ -83,6 +83,12 @@
            FrameWhiteCentet1.AddChidren(btnSuctionView);


            //int i = 0;
            //btnIcon.MouseUpEventHandler = (sender, e) => {
            //    device.GetAttribute(FunctionAttributeKey.TargetStatus).state = i.ToString();
            //    i++;
            //    RefreshFormStatu();
            //};


            
@@ -172,7 +178,7 @@
                })
                { IsBackground = true }.Start();
            };

            //回到置顶刷新
            base.SettionFinishEvent += () => {
                exitLabView.Visible = device.extSet.labModel;
            };
@@ -286,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":
@@ -298,6 +304,14 @@
                                        btnSuctionView.TextID = StringId.SomeoneRunning;
                                        btnSuctionView.IsSelected = true;
                                    }
                                    else
                                    {
                                        btnIcon.UnSelectedImagePath = "FunctionIcon/ArmSensor/SomeoneInBgIcon.png";
                                        btnIcon.IsSelected = true;
                                        btnIcon.IsSelected = false;
                                        btnSuctionView.TextID = StringId.Someone;
                                        btnSuctionView.IsSelected = true;
                                    }
                                    break;
                                case "3":
                                    if (device.extSet.labModel)
@@ -306,6 +320,14 @@
                                        btnIcon.IsSelected = true;
                                        btnIcon.IsSelected = false;
                                        btnSuctionView.TextID = StringId.SomeoneSitting;
                                        btnSuctionView.IsSelected = true;
                                    }
                                    else
                                    {
                                        btnIcon.UnSelectedImagePath = "FunctionIcon/ArmSensor/SomeoneInBgIcon.png";
                                        btnIcon.IsSelected = true;
                                        btnIcon.IsSelected = false;
                                        btnSuctionView.TextID = StringId.Someone;
                                        btnSuctionView.IsSelected = true;
                                    }
                                    break;
@@ -325,7 +347,14 @@
                                        btnSuctionView.TextID = StringId.SomeoneStanding;
                                        btnSuctionView.IsSelected = true;
                                    }
                                    Console.WriteLine(btnSuctionView.Text);
                                    else
                                    {
                                        btnIcon.UnSelectedImagePath = "FunctionIcon/ArmSensor/SomeoneInBgIcon.png";
                                        btnIcon.IsSelected = true;
                                        btnIcon.IsSelected = false;
                                        btnSuctionView.TextID = StringId.Someone;
                                        btnSuctionView.IsSelected = true;
                                    }
                                    break;
                                default: