合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

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

@@ -58,27 +58,42 @@
            //清空bodyFrame

            this.ClearBodyFrame();



            //图标

            var picGwImage = new FrameLayout();

            picGwImage.Width = this.GetPictrueRealSize(861);

            picGwImage.Height = this.GetPictrueRealSize(478);

            picGwImage.Y = Application.GetRealHeight(251);

            picGwImage.Gravity = Gravity.CenterHorizontal;

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

            bodyFrameLayout.AddChidren(picGwImage);

            //手机连接网关

            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);



            //正在搜索网关…

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

            btnMsg.TextID = R.MyInternationalizationString.uGatewaySearching;

            btnMsg.Y = Application.GetRealHeight(1008);

            btnMsg.TextColor = UserCenterColor.Current.TextGrayColor3;

            btnMsg.TextAlignment = TextAlignment.Center;

            bodyFrameLayout.AddChidren(btnMsg);

            //1.app若显示连接的网关设备，表明连接成功{0}2.请前往添加其他设备{0}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.X = btnTitle.X;

                btnMsg.TextColor = UserCenterColor.Current.TextGrayColor1;

                btnMsg.TextSize = 12;

                bodyFrameLayout.AddChidren(btnMsg);

                yy = btnMsg.Bottom;

            }



            //初始化连接的假想动画效果

            this.InitConcetionAnimete(picGwImage, btnMsg);

            this.InitConcetionAnimete();

            //开启网关检测的线程

            this.StartCheckGatewayThread();



            //查看帮助

            var btnHelp = this.AddHelpControl();

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

            {

                var form = new AddGatewayHelpForm();

                form.AddForm("Wired");

            };

        }



        /// <summary>

@@ -201,8 +216,25 @@
        /// <summary>

        /// 初始化连接的假想动画效果

        /// </summary>

        private void InitConcetionAnimete(FrameLayout picGwImage, NormalViewControl btnMsg)

        private void InitConcetionAnimete()

        {

            //图标

            var picGwImage = new FrameLayout();

            picGwImage.Width = this.GetPictrueRealSize(861);

            picGwImage.Height = this.GetPictrueRealSize(478);

            picGwImage.Y = Application.GetRealHeight(251);

            picGwImage.Gravity = Gravity.CenterHorizontal;

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

            bodyFrameLayout.AddChidren(picGwImage);



            //正在搜索网关…

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

            btnMsg.TextID = R.MyInternationalizationString.uGatewaySearching;

            btnMsg.Y = picGwImage.Bottom + Application.GetRealHeight(150);

            btnMsg.TextColor = UserCenterColor.Current.TextGrayColor3;

            btnMsg.TextAlignment = TextAlignment.Center;

            bodyFrameLayout.AddChidren(btnMsg);



            //首格的X轴

            int firstPoint = this.GetPictrueRealSize(288);

            //一格的宽度

@@ -292,6 +324,8 @@
        private void StartCheckGatewayThread()

        {

            this.isGatewaySearching = true;

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



            HdlThreadLogic.Current.RunThread(() =>

            {

                //清空全部列表

@@ -358,9 +392,15 @@
            for (int i = 0; i < listId.Count; i++)

            {

                ZbGateway way = ZbGateway.GateWayList.Find((obj) => obj.GwId == listId[i]);

                if (way == null || way.localIsConnected == false)

                if (way == null)

                {

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

                    continue;

                }

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

                if (way.localIsConnected == false)

                {

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

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

                    continue;

                }



@@ -390,7 +430,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;