2020.2.28

gxc

2020-02-28 66a9965c44ecc32a6696abca876ab9d1cd091584

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

@@ -91,10 +91,10 @@
        /// </summary>
        public void Show()
        {
            RemoveAll();
            InitData();
            AddTop();
            AddBodyView();
            
        }

        /// <summary>
@@ -114,8 +114,7 @@
        private void RefreshData()
        {
            devList = Shared.Common.Room.CurrentRoom.GetUnalloctedDeviceUIs();
            //sceneList = Shared.Common.Room.CurrentRoom.GetUnalloctedScenes();
            sceneList = Shared.Common.Room.CurrentRoom.GetLoveRoom().SceneUIList;
            sceneList = Shared.Common.Room.CurrentRoom.GetUnalloctedScenes();
            typeDeviceDic.Clear();
            typeIdDic.Clear();
            if (devList == null)
@@ -124,7 +123,7 @@
            }
            foreach (var device in devList)
            {
                var info = Common.LocalDevice.Current.GetNotHdlMyDeviceEnumInfo(new List<CommonDevice> { device?.CommonDevice });
                var info = Common.LocalDevice.Current.GetDeviceBelongEnumInfo(device?.CommonDevice);
                if (typeDeviceDic.ContainsKey(info.BeloneTextId) == false)
                {
                    var sameDevList = new List<DeviceUI> { };
@@ -163,8 +162,6 @@
            {
                RemoveFromParent();
            };

           
        }

        /// <summary>
@@ -253,7 +250,7 @@
        public void RefreshBodyView()
        {
            functionSceneBodyView.RemoveAll();
            

            if (functionBtn.IsSelected)
            {
                ShowFunction();
@@ -308,7 +305,7 @@
                    Width = Application.GetRealWidth(1028)
                };
                functionSceneBodyView.AddChidren(functionTypeScrowView);
                

                deviceListScrolView = new VerticalScrolViewLayout
                {
                    X = Application.GetRealWidth(CommonFormResouce.X_Left),
@@ -337,7 +334,7 @@
                    };
                    string imgPath=string.Empty;
                    string imgSeletedPath=string.Empty;
                    Common.LocalDevice.Current.GetDeviceBeloneIcon(deviceType.Value, ref imgPath ,ref imgSeletedPath);
                    Common.LocalDevice.Current.GetDeviceObjectIcon(deviceType.Value, ref imgPath ,ref imgSeletedPath);
                    functionTypeIMG.Init(imgPath,imgSeletedPath);
                    functionTypeIMG.SetTitle(deviceType.Key);
                    typeRowLayout.AddChidren(functionTypeIMG);
@@ -360,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;
@@ -382,7 +378,7 @@

                var deviceRow = new SelectFunctionView(0, 35);
                deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
                deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
                deviceRow.SetTitle(Common.LocalDevice.Current.GetDeviceEpointName(deviceUI.CommonDevice));
                deviceTypeRowLayout.AddChidren(deviceRow);

                EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
@@ -433,6 +429,7 @@
                     if ((sender as Button).IsSelected)
                     {
                         (sender as Button).TextID = R.MyInternationalizationString.Cancel;
                         selectedList.Clear();
                         selectedList.AddRange(sameTypeList);
                     }
                     else
@@ -471,16 +468,26 @@
            add.MouseUpEventHandler += (sender, e) =>
            {
                var selectZone = new SelectZone();
                AddChidren(selectZone);
                selectZone.title = Language.StringByID(R.MyInternationalizationString.AddTo);
                selectZone.Init();
                selectZone.ZoneAction = (r) =>
                selectZone.ZoneAction += (r) =>
                {
                    foreach (var d in selectedList)
                    {
                        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())];
                    }
                };
            };
        }
@@ -529,7 +536,7 @@
                ShowNoSceneTip();
            }
            else
            {
            {

                var sceneScrolView = new VerticalScrolViewLayout
                {
                    Y = Application.GetRealHeight(22),
@@ -649,7 +656,7 @@
                            var frame = sceneScrolView.GetChildren(i) as FrameLayout;
                            (frame.GetChildren(1) as Button).IsSelected = (sender as Button).IsSelected;
                        }
                        

                        if ((sender as Button).IsSelected)
                        {
                            (sender as Button).TextID = R.MyInternationalizationString.Cancel;
@@ -692,9 +699,9 @@
                add.MouseUpEventHandler += (sender, e) =>
                {
                    var selectZone = new SelectZone();
                    CommonPage.Instance.AddChidren(selectZone);
                    selectZone.title = Language.StringByID(R.MyInternationalizationString.AddTo);
                    selectZone.Init();
                    selectZone.ZoneAction = (r) =>
                    selectZone.ZoneAction += (r) =>
                    {
                        foreach (var s in selectedList)
                        {