2019.12.30

gxc

2019-12-30 0e4ad9a4de5b95f58daf1a6c5072c6a57cf223f9

 ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs

@@ -162,8 +162,6 @@
            {
                RemoveFromParent();
            };

           
        }

        /// <summary>
@@ -359,7 +357,6 @@
        /// <param name="mouseEventArgs">The ${ParameterType} instance containing the event data.</param>
        private void ShowSameTypeFunction(object typeSender, MouseEventArgs mouseEventArgs)
        {
            //选择功能--直接从房间的devicelist中获取
            tempFunctionTypeBtn.IsSelected = false;
            tempFunctionTypeBtn = (typeSender as Button).Parent as FunctionButton;
            ((typeSender as Button).Parent as FunctionButton).IsSelected = true;
@@ -432,6 +429,7 @@
                     if ((sender as Button).IsSelected)
                     {
                         (sender as Button).TextID = R.MyInternationalizationString.Cancel;
                         selectedList.Clear();
                         selectedList.AddRange(sameTypeList);
                     }
                     else
@@ -479,7 +477,17 @@
                        r.AddDevice(d.CommonDevice, true);
                        deviceListScrolView.RemoveViewByTag(d);
                    }
                    RefreshData();
                    
                    if (sameTypeList.Count == selectedList.Count)
                    {
                        RefreshData();
                        RefreshBodyView();
                    }
                    else
                    {
                        RefreshData();
                        sameTypeList = typeDeviceDic[int.Parse((typeSender as Button).Tag.ToString())];
                    }
                };
            };
        }