Merge branch 'wxr4' into dev-tzy

wxr

2021-06-09 cb6e11c5067ecaba4d8f9907989154167c1e8943

 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();
@@ -40,6 +40,12 @@
            this.RefreshNowDeviceStatuMemory(this.device);
            //刷新界面状态
            this.RefreshFormStatu();
            //读取状态
            new System.Threading.Thread(() =>
            {
                DriverLayer.Control.Ins.SendReadCommand(device);
            })
            { IsBackground = true }.Start();
        }

        /// <summary>
@@ -73,6 +79,8 @@
        /// </summary>
        private void InitFrameWhiteContent2()
        {
            var paging = new ArmSensorHistroyPaging(device);
            paging.InitFrame(FrameWhiteCentet2);
        }

        #endregion
@@ -108,10 +116,10 @@
        private void RefreshFormStatu()
        {
            Application.RunOnMainThread(() => {
                var temp = device.status.Find((sta) => sta.key == FunctionAttributeKey.Status);
                var temp = device.attributes.Find((sta) => sta.key == FunctionAttributeKey.Status);
                if (temp != null)
                {
                    if (temp.value == "true")
                    if (temp.state == "alarm")
                    {
                        btnIcon.IsSelected = true;
                        btnSuctionView.TextID = StringId.InAlarm;
@@ -136,11 +144,24 @@
        /// </summary>
        private void RefreshNowDeviceStatuMemory(Function i_LocalDevice)
        {
            foreach (var data in i_LocalDevice.status)
            {
                //开关
                //if (data.key == "on_off") { this.weepRobotData.Cleaning = data.value.ToLower() == "on"; }
            }
            //foreach (var data in i_LocalDevice.status)
            //{
            //    if (data.key == "status")
            //    {
            //        if (data.value.ToLower() == "alarm")
            //        {
            //            this.btnIcon.IsSelected = true;
            //            this.btnSuctionView.IsSelected = true;
            //            this.btnSuctionView.TextID = StringId.InAlarm;
            //        }
            //        else
            //        {
            //            this.btnIcon.IsSelected = false;
            //            this.btnSuctionView.IsSelected = false;
            //            this.btnSuctionView.TextID = StringId.SensorNormalState;
            //        }
            //    }
            //}
        }

        #endregion