Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

 ZigbeeApp/Shared/Phone/Device/CommonForm/CategoryFunctionRow.cs

@@ -42,7 +42,7 @@
                v_Selected = value;
                try
                {
                    SetOnLineStatu(v_Selected);
                    SetStatu(v_Selected);
                }
                catch
                {
@@ -141,7 +141,7 @@

            var line = new Button()
            {
                X = Application.GetRealWidth(200),
                X = Application.GetRealWidth(181),
                Y = Height - 1,
                Width = Application.GetRealWidth(821),
                Height = 1,
@@ -211,4 +211,4 @@
            SwitchBtn.Visible = !statu;
        }
    }
}
}