Merge branch 'WJC' into wxr6

wxr

2021-11-05 f6c4e9886b924d8f5271e8b58378d7a07269dcb8

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

@@ -114,6 +114,10 @@
        {
            Application.RunOnMainThread(()=>{
                var temp = device.attributes.Find((sta) => sta.key == FunctionAttributeKey.Status);
                if(temp== null)
                {
                    temp = device.attributes.Find((sta) => sta.key == FunctionAttributeKey.PeopleStatus);
                }
                if (temp != null)
                {
                    if (temp.state == "true")