上传一个合并的版本

黄学彪

2020-06-01 0bf9e65bc3ba98391e7835c922b15baab3c77876

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

@@ -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(() =>