Merge branch 'wxr4' into temp-wxr

wxr

2021-06-06 d7e25d6a5960b3495cd4d8a67545410e03ca7962

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

@@ -28,7 +28,7 @@
        public override void InitFrameWhiteContent()
        {
            base.ShowColltionButton = false;
            base.SetTitleText(device.name);
            base.SetTitleText(Language.StringByID(StringId.Sensor));

            //添加第二索引页
            this.AddSecondPage();