合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

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

@@ -54,16 +54,28 @@
            //清空bodyFrame

            this.ClearBodyFrame();



            //网关如果正常连接路由器{0}系统指示灯会1秒闪烁

            string[] ArryMsg = Language.StringByID(R.MyInternationalizationString.uAddApWirelessGatewayMsg4).Split(new string[] { "{0}" }, StringSplitOptions.RemoveEmptyEntries);

            int yy = Application.GetRealHeight(1066);

            //手机连接网关

            var btnTitle = new NormalViewControl(400, 60, true);

            btnTitle.TextID = R.MyInternationalizationString.uMobileConnectionGateway;

            btnTitle.X = Application.GetRealWidth(75);

            btnTitle.Y = Application.GetRealHeight(939);

            btnTitle.IsBold = true;

            btnTitle.TextSize = 14;

            bodyFrameLayout.AddChidren(btnTitle);



            //1.app若显示连接的网关设备，表明连接成功

            //2.请前往添加其他设备

            //3.若长时间无法连接成功，请前往“查看帮助”

            string[] ArryMsg = Language.StringByID(R.MyInternationalizationString.uAddMiniGatewayMsg4).Split(new string[] { "{0}" }, StringSplitOptions.RemoveEmptyEntries);

            int yy = btnTitle.Bottom + Application.GetRealHeight(23);

            foreach (var msg in ArryMsg)

            {

                var btnMsg = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(60), false);

                btnMsg.Text = msg;

                btnMsg.Y = yy;

                btnMsg.TextAlignment = TextAlignment.Center;

                btnMsg.X = btnTitle.X;

                btnMsg.TextColor = UserCenterColor.Current.TextGrayColor1;

                btnMsg.TextSize = 12;

                bodyFrameLayout.AddChidren(btnMsg);

                yy = btnMsg.Bottom;

            }

@@ -72,6 +84,14 @@
            this.InitConcetionAnimete();

            //开启网关检测的线程

            this.StartCheckGatewayThread();



            //查看帮助

            var btnHelp = this.AddHelpControl();

            btnHelp.ButtonClickEvent += (sender, e) =>

            {

                var form = new AddGatewayHelpForm();

                form.AddForm("Ap");

            };

        }



        /// <summary>

@@ -84,9 +104,9 @@


            //图标

            var picGwImage = new FrameLayout();

            picGwImage.Width = this.GetPictrueRealSize(861);

            picGwImage.Height = this.GetPictrueRealSize(245);

            picGwImage.Y = Application.GetRealWidth(223);

            picGwImage.Width = this.GetPictrueRealSize(860);

            picGwImage.Height = this.GetPictrueRealSize(239);

            picGwImage.Y = Application.GetRealWidth(308);

            picGwImage.Gravity = Gravity.CenterHorizontal;

            picGwImage.BackgroundImagePath = "Gateway/WirelessApGatewaySearching.png";

            bodyFrameLayout.AddChidren(picGwImage);

@@ -198,9 +218,9 @@
        {

            //图标

            var btnGwImage = new FrameLayout();

            btnGwImage.Width = this.GetPictrueRealSize(861);

            btnGwImage.Height = this.GetPictrueRealSize(245);

            btnGwImage.Y = Application.GetRealHeight(360);

            btnGwImage.Width = this.GetPictrueRealSize(860);

            btnGwImage.Height = this.GetPictrueRealSize(239);

            btnGwImage.Y = Application.GetRealHeight(308);

            btnGwImage.Gravity = Gravity.CenterHorizontal;

            btnGwImage.BackgroundImagePath = "Gateway/WirelessApGatewaySearching.png";

            bodyFrameLayout.AddChidren(btnGwImage);

@@ -231,7 +251,7 @@
            var btnRound = new PicViewControl(width, width, false);

            btnRound.Radius = (uint)width / 2;

            btnRound.BackgroundColor = UserCenterColor.Current.ConcetionRoundColor;

            btnRound.Y = this.GetPictrueRealSize(135);

            btnRound.Y = this.GetPictrueRealSize(132);

            btnRound.X = listPoint[0];

            btnGwImage.AddChidren(btnRound);



@@ -312,6 +332,8 @@
        private void StartCheckGatewayThread()

        {

            this.isGatewaySearching = true;

            this.dicZbGatewayDiv = new Dictionary<string, int>();



            HdlThreadLogic.Current.RunThread(() =>

            {

                int count = 0;

@@ -352,6 +374,13 @@
                    //已经处理了

                    continue;

                }

                //2020.09.18 本地连接没有连接上,则不处理

                if (way.localIsConnected == false)

                {

                    string strMsg = "搜索到了网关,但是本地链接不上  ID:" + way.GwId + " IP:" + way.GwIP + " 名称:" + way.GwName;

                    HdlLogLogic.Current.WriteLog(-1, strMsg);

                    continue;

                }



                //网关绑定模式

                var mode = GatewayBindMode.BindAgain;

@@ -379,7 +408,7 @@
                if (mode == GatewayBindMode.First || mode == GatewayBindMode.Binded)

                {

                    //添加搜索到的网关到缓存(执行网关保存操作)

                    var result = HdlGatewayLogic.Current.AddNewGateway(way, ShowErrorMode.NO);

                    var result = HdlGatewayLogic.Current.AddNewGateway(way, ShowErrorMode.NO, WriteLogMode.YES);

                    if (result == false)

                    {

                        continue;

@@ -412,7 +441,7 @@
                if (mode == GatewayBindMode.First || mode == GatewayBindMode.Binded)

                {

                    //我觉得这里需要获取一下新网关的设备列表

                    Common.LocalDevice.Current.SetDeviceToMemmoryByGateway(way, true);

                    Common.LocalDevice.Current.SetDeviceToMemmoryByGateway(way.GwId, true);

                    if (way.IsMainGateWay == true)

                    {

                        //如果它是主网关,则刷新场景列表