Merge branch 'wxr4' into wxr6

wxr

2021-06-09 27141af3b38f65eb62e89872fc1fddc97ab08671

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

@@ -27,7 +27,7 @@
        /// </summary>
        public override void InitFrameWhiteContent()
        {
            base.SetTitleText(Language.StringByID(StringId.Sensor));
            base.SetTitleText(device.name);

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