上传一个合并的版本

黄学彪

2020-06-01 0bf9e65bc3ba98391e7835c922b15baab3c77876

 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayProductInfoForm.cs

@@ -56,11 +56,32 @@
            framePic.Gravity = Gravity.CenterHorizontal;

            framePic.Y = Application.GetRealHeight(58);

            listBackControl.frameTable.AddChidren(framePic);



            var imageFile = "Gateway/RealGateway" + this.zbGateway.getGwInfo.LinuxImageType + ".png";

            string fullName = IO.FileUtils.GetImageFilePath(imageFile);

            if (fullName == string.Empty)

            {

                //如果没有指定的网关的真实图片的话,则用共通图片

                imageFile = "Gateway/RealGateway.png";



            }

#if Android

            //设备图片

            var bim = Android.Graphics.BitmapFactory.DecodeFile(fullName);

            var btnpictrue = new PicViewControl(bim.Width, bim.Height);

#endif

#if iOS

            //设备图片

            var bim = UIKit.UIImage.FromFile(fullName);

            var btnpictrue = new PicViewControl((int)bim.Size.Width, (int)bim.Size.Height);

#endif

            bim.Dispose();

            bim = null;



            //图片

            var btnImage = new PicViewControl(380, 328, true);

            btnImage.Gravity = Gravity.Center;

            btnImage.UnSelectedImagePath = "Gateway/RealGateway.png";

            framePic.AddChidren(btnImage);

            btnpictrue.Gravity = Gravity.Center;

            btnpictrue.UnSelectedImagePath = imageFile;

            framePic.AddChidren(btnpictrue);



            //初始化桌布

            var tableContr = new InformationEditorControl();

@@ -101,15 +122,14 @@
                btnNote.AddBottomLine();

            }



            //设备类型

            //设备类型 (固定智能网关)

            caption = Language.StringByID(R.MyInternationalizationString.uDeviceType);

            var btnType = new FrameCaptionViewControl(caption, string.Empty, listview.rowSpace / 2);

            var btnType = new FrameCaptionViewControl(caption, Language.StringByID(60004), listview.rowSpace / 2);

            btnType.UseClickStatu = false;

            listview.AddChidren(btnType);

            btnType.InitControl();

            //划线

            btnType.AddBottomLine();

            HdlGatewayLogic.Current.SetGatewayImageText(btnType.txtView, zbGateway);



            //安装位置

            var rowBeloneArea = new BelongAreaControl(listview.rowSpace / 2);