Merge branch 'wxr6' into newBranch1

wxr

2021-07-05 4f8fc4fe0a7d6f73c3a06e6f924a4a2615b090d7

 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();