合并代码

黄学彪

2020-01-09 fa6bcb2e9907772480f99205f36ec2a1ce735a22

 ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs

@@ -266,31 +266,36 @@
                    }

                    //这里主要只是获取在线状态

                    var zbway = HdlGatewayLogic.Current.GetLocalGateway(listGwId[i]);

                    var result = Common.LocalDevice.Current.GetDeviceListFromGateway(zbway, false, (device) =>

                     {

                         string mainkeys = Common.LocalDevice.Current.GetDeviceMainKeys(device);

                         if (listView.Parent == null || dicData.ContainsKey(mainkeys) == false || listCheck.Contains(mainkeys) == true)

                         {

                             return;

                         }

                         listCheck.Add(mainkeys);

                    int statu = 0;

                    var list = Common.LocalDevice.Current.GetDeviceListFromGateway(zbway, ref statu, false, ShowErrorMode.NO);

                    if (statu != -1)

                    {

                        HdlThreadLogic.Current.RunMain(() =>

                        {

                            for (int j = 0; j < list.Count; j++)

                            {

                                string mainkeys = Common.LocalDevice.Current.GetDeviceMainKeys(list[i]);

                                if (listView.Parent == null || dicData.ContainsKey(mainkeys) == false || listCheck.Contains(mainkeys) == true)

                                {

                                    return;

                                }

                                listCheck.Add(mainkeys);



                         var localDevice = Common.LocalDevice.Current.GetDevice(mainkeys);

                         if (localDevice != null && localDevice.IsOnline != device.IsOnline)

                         {

                             //在线状态一样的话，不需要刷新

                             localDevice.IsOnline = device.IsOnline;

                             localDevice.ReSave();

                         }

                         if (device.IsOnline == 1)

                         {

                             HdlThreadLogic.Current.RunMain(() =>

                             {

                                 dicData[mainkeys].OnlineCount += 1;

                                 dicData[mainkeys].btnOnline.Text = dicData[mainkeys].OnlineCount + "/" + dicData[mainkeys].listDeviceKeys.Count;

                             });

                         }

                     }, ShowErrorMode.NO);

                                var localDevice = Common.LocalDevice.Current.GetDevice(mainkeys);

                                if (localDevice != null && localDevice.IsOnline != list[i].IsOnline)

                                {

                                    //在线状态一样的话，不需要刷新

                                    localDevice.IsOnline = list[i].IsOnline;

                                    localDevice.ReSave();

                                }

                                if (list[i].IsOnline == 1)

                                {

                                    dicData[mainkeys].OnlineCount += 1;

                                    dicData[mainkeys].btnOnline.Text = dicData[mainkeys].OnlineCount + "/" + dicData[mainkeys].listDeviceKeys.Count;

                                }

                            }

                        });

                    }

                }

            });

        }