Merge branch 'tzy2' into MergeFL

wxr

2021-07-05 5a64fc39289d4121b2950c07a4b6e43cf76dd4a5

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

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

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