Merge branch 'WJC' into wxr6

wxr

2021-06-09 ac2aeba22ed55fd81bd87a373017933ecb49508c

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

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

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