Merge remote-tracking branch 'origin/newBranch1' into WJC

xm

2021-11-24 1802b849f0dadc81644fb0a706d6fb45efdf2a20

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

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