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

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

 ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/IndoorUnitSettionForm.cs

@@ -180,7 +180,7 @@
        /// </summary>

        private void ShowTopRightMenu()

        {

            var frame = new TopRightMenuControl(1);

            var frame = new TopRightMenuControl(1, 1);

            //定位

            var deviceMenu = Language.StringByID(R.MyInternationalizationString.uFixedPosition);

            frame.AddRowMenu(deviceMenu, "Item/FixedPosition.png", "Item/FixedPositionSelected.png", () =>