2020.06.24.01

陈嘉乐

2020-06-24 adb12dcdbb2ddaeac687c3aa9e57bb7ed459ab7e

 ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/Base/DeviceCardCommon.cs

@@ -93,7 +93,7 @@
            btnBackGroud.UnSelectedImagePath = "Item/FunctionCardView.png";

            btnBackGroud.SelectedImagePath = "Item/FunctionCardViewSelected.png";

            btnBackGroud.Gravity = Gravity.CenterHorizontal;

            this.AddChidren(btnBackGroud, ChidrenBindMode.BindEventOnly);

            this.AddChidren(btnBackGroud, ChidrenBindMode.BindEvent);



            //设备名称控件

            this.btnDeviceName = new NormalViewControl(320, 63, true);

@@ -103,7 +103,7 @@
            btnDeviceName.TextColor = UserCenterColor.Current.TextGrayColor1;

            btnDeviceName.SelectedTextColor = UserCenterColor.Current.White;

            btnDeviceName.Text = Common.LocalDevice.Current.GetDeviceEpointName(i_device);

            this.AddChidren(btnDeviceName, ChidrenBindMode.BindEventOnly);

            this.AddChidren(btnDeviceName, ChidrenBindMode.BindEvent);



            //收集控件

            this.btnCollect = new IconViewControl(107);

@@ -142,13 +142,13 @@
            fraDeviceRound.X = HdlControlLogic.Current.GetPictrueRealSize(44);

            fraDeviceRound.Y = HdlControlLogic.Current.GetPictrueRealSize(101);

            fraDeviceRound.BackgroundColor = Common.ZigbeeColor.Current.GXCForFunctionUnSelectedBackgroundColor;

            this.AddChidren(fraDeviceRound, ChidrenBindMode.BindEventOnly);

            this.AddChidren(fraDeviceRound, ChidrenBindMode.BindEvent);



            //设备图标控件

            this.btnDeviceIcon = new IconViewControl(86);

            btnDeviceIcon.Gravity = Gravity.Center;

            fraDeviceRound.AddChidren(btnDeviceIcon);

            this.ChangedChidrenBindMode(fraDeviceRound, ChidrenBindMode.BindEventOnly);

            this.ChangedChidrenBindMode(fraDeviceRound, ChidrenBindMode.BindEvent);



            //状态文本控件

            this.btnStatu = new NormalViewControl(HdlControlLogic.Current.GetPictrueRealSize(300), HdlControlLogic.Current.GetPictrueRealSize(63), false);

@@ -157,7 +157,7 @@
            btnStatu.TextColor = UserCenterColor.Current.TextColor1;

            btnStatu.SelectedTextColor = Common.ZigbeeColor.Current.GXCTextSelectedColor;

            btnStatu.IsBold = true;

            this.AddChidren(btnStatu, ChidrenBindMode.BindEventOnly);

            this.AddChidren(btnStatu, ChidrenBindMode.BindEvent);



            //开关控件(不加入父控件中)

            this.btnSwitch = new PicViewControl(109, 104);

@@ -361,7 +361,7 @@


            HdlThreadLogic.Current.RunThread(() =>

            {

                int waitime = 30;

                int waitime = 40;

                while (waitime > 0)

                {

                    System.Threading.Thread.Sleep(100);

@@ -371,8 +371,15 @@
                        break;

                    }

                    waitime--;

                    //2秒的时候,还是接受不到的话,强制再次刷新设备状态

                    if (waitime == 20)

                    {

                        //从新发送获取设备的状态(强制)

                        this.device.HadReadDeviceStatu = false;

                        this.SendStatuComand();

                    }

                }

                if (waitime <= 0)

                if (waitime <= 0 && this.Parent != null)

                {

                    //没有获取得到结果

                    HdlThreadLogic.Current.RunMain(() =>