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

WJC

2019-10-29 45e4e387f3ef259b9e225fdd543e20be285a5112

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

@@ -132,7 +132,7 @@
                Tag = Tag
            };
            AddChidren(line);
            

            ClickBtn = new Button();
            if (click)
            {