新版本

黄学彪

2020-09-18 c7df85937f73fb347ee0b19e9c052d2d00a6df6c

 ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs

@@ -321,7 +321,7 @@
            this.listBodyContr.frameTable.AddChidren(bg);



            var tip = new NormalViewControl(this.GetPictrueRealSize(717), this.GetPictrueRealSize(58), false);

            tip.Y = Application.GetRealHeight(815);

            tip.Y = bg.Bottom + Application.GetRealHeight(35);

            tip.Gravity = Gravity.CenterHorizontal;

            tip.TextID = R.MyInternationalizationString.NewAccountNeedBingGW;

            tip.TextColor = ZigbeeColor.Current.GXCTextGrayColor;

@@ -329,13 +329,13 @@
            this.listBodyContr.frameTable.AddChidren(tip);



            var addBG = new PicViewControl(971, 366);

            addBG.Y = Application.GetRealHeight(1048);

            addBG.Y = tip.Bottom + Application.GetRealHeight(176);

            addBG.UnSelectedImagePath = "Item/VirtualFrame.png";

            addBG.Gravity = Gravity.CenterHorizontal;

            this.listBodyContr.frameTable.AddChidren(addBG);



            var addGatewayBtn = new IconViewControl(89);

            addGatewayBtn.Y = Application.GetRealHeight(1143);

            addGatewayBtn.Y = tip.Bottom + Application.GetRealHeight(271);

            addGatewayBtn.UnSelectedImagePath = "Item/Add_GW.png";

            addGatewayBtn.Gravity = Gravity.CenterHorizontal;

            this.listBodyContr.frameTable.AddChidren(addGatewayBtn);

@@ -346,7 +346,7 @@
            };



            var addTip = new PicViewControl(717, 58);

            addTip.Y = Application.GetRealHeight(1256);

            addTip.Y = addGatewayBtn.Bottom + Application.GetRealHeight(23);

            addTip.Gravity = Gravity.CenterHorizontal;

            addTip.TextID = R.MyInternationalizationString.AddSmartGW;

            addTip.TextColor = ZigbeeColor.Current.GXCTextBlackColor;

@@ -697,17 +697,31 @@
                        }

                        HdlThreadLogic.Current.RunThread(() =>

                        {

                            for (int i = 0; i < listContr.Count; i++)

                            while (listDeviceBackContr.Parent != null)

                            {

                                if (listDeviceBackContr.Parent == null)

                                bool hadSend = false;

                                for (int i = 0; i < listContr.Count; i++)

                                {

                                    return;

                                    if (listDeviceBackContr.Parent == null)

                                    {

                                        return;

                                    }

                                    //如果还没有接收到数据,则再次发送

                                    if (listContr[i].ReceiveResponeResultStatu() == false)

                                    {

                                        //发送获取状态的命令

                                        listContr[i].SendStatuComand();

                                        hadSend = true;

                                        System.Threading.Thread.Sleep(200);

                                    }

                                }

                                System.Threading.Thread.Sleep(200);

                                //发送获取状态的命令

                                listContr[i].SendStatuComand();

                                if (hadSend == false)

                                {

                                    //如果已经全部回路都接收了网关回复,则不再二次发送

                                    break;

                                }

                                System.Threading.Thread.Sleep(2000);

                            }



                        }, ShowErrorMode.NO);

                    }

                });

@@ -1192,6 +1206,8 @@
                                    //设备状态必须刷新

                                    string statuText = HdlDeviceOtherLogic.Current.GetDeviceStatu(contr.device);

                                    contr.SetDeviceStatuText(statuText);

                                    //传感器切换为灰色状态

                                    contr.SwitchCardStatuAppeal(false);



                                }, ShowErrorMode.NO);

                            }