Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm

xm

2020-05-07 c1de48884fa145a16a0f8bcee93274dcfaa0ff82

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

@@ -65,7 +65,7 @@
            };

            bodyFrameLayout.AddChidren(btnHelp);

            //底线

            int lineWidth = btnHelp.GetRealWidthByText(12);

            int lineWidth = btnHelp.GetRealWidthByText();

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

            btnLine.BackgroundColor = UserCenterColor.Current.TextOrangeColor;

            btnLine.Gravity = Gravity.CenterHorizontal;