Merge branch 'Dev-Branch' into wjc

mac

2023-10-20 e7290281eabcb88d2e430dea9782565474837ce1

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

@@ -129,7 +129,7 @@
                    else
                    {
                        btnIcon.IsSelected = false;
                        btnSuctionView.TextID = StringId.SensorNormalState;
                        btnSuctionView.TextID = StringId.wuren;
                        btnSuctionView.IsSelected = false;
                    }
                }
@@ -147,7 +147,7 @@
                    else
                    {
                        btnIcon.IsSelected = false;
                        btnSuctionView.TextID = StringId.SensorNormalState;
                        btnSuctionView.TextID = StringId.wuren;
                        btnSuctionView.IsSelected = false;
                    }
                }