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

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApDirection2Form.cs

@@ -97,7 +97,7 @@
            };

            bodyFrameLayout.AddChidren(btnSettion);

            //底线

            int lineWidth = btnSettion.GetRealWidthByText(12);

            int lineWidth = btnSettion.GetRealWidthByText();

            var btnLine1 = new NormalViewControl(lineWidth, ControlCommonResourse.BottomLineHeight, false);

            btnLine1.BackgroundColor = 0xff0075ff;

            btnLine1.Gravity = Gravity.CenterHorizontal;