合并代码

xm

2020-04-22 dfa6733793434bdcfd394f978ae72f1628b2260f

 ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs

old mode 100755
new mode 100644
@@ -476,7 +476,16 @@
            var listDevice = new List<CommonDevice>();

            for (int i = 0; i < rowInfo.listDeviceKeys.Count; i++)

            {

                var device = LocalDevice.Current.GetDevice(rowInfo.listDeviceKeys[i]);

                var device = LocalDevice.Current.GetDevice(rowInfo.listDeviceKeys[i]);

                //获取设备类型的
                var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
                //新风面板下的回路不显示，（如新风、温/湿度传感器则不显示）
                if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_FangyueFreshAir)
                {
                    continue;
                }



                if (device != null)

                {

                    listDevice.Add(device);

@@ -511,6 +520,11 @@
                    }

                    //空调

                    else if (device.Type == DeviceType.Thermostat)

                    {

                        cardContr = new Controls.DeviceAcRowControl(listView.rowSpace / 2);

                    }

                    // 新风

                    else if (device.Type == DeviceType.FreshAir)

                    {

                        cardContr = new Controls.DeviceAcRowControl(listView.rowSpace / 2);

                    }

@@ -611,21 +625,43 @@
            }



            var dicSceneContr = new Dictionary<int, SceneCategoryView>();

            var listview = new VerticalListControl();

            functionSceneBodyView.AddChidren(listview);

            //主人，管理员专用刷新控件

            VerticalListRefreshControl listview1 = null;

            //成员专用不能刷新的控件

            VerticalListControl listview2 = null;

            //if (UserCenterResourse.UserInfo.AuthorityNo == 1 || UserCenterResourse.UserInfo.AuthorityNo == 2)

            //{

            //    listview1 = new VerticalListRefreshControl();

            //    functionSceneBodyView.AddChidren(listview1);

            //}

            //else

            {

                listview2 = new VerticalListControl();

                functionSceneBodyView.AddChidren(listview2);

            }

            foreach (var scene in listScene)

            {

                //场景卡片控件

                var sceneView = new SceneCategoryView();

                listview.AddChidren(sceneView);

                listview1?.AddChidren(sceneView);

                listview2?.AddChidren(sceneView);

                sceneView.InitControl(scene, room);



                dicSceneContr[scene.Id] = sceneView;

            }

            HdlThreadLogic.Current.RunThread(() =>

            {

                //获取全部场景的延时时间

                this.GetAllDelayScene(dicSceneContr, listview);

                if (listview1 != null)

                {

                    //获取全部场景的延时时间

                    this.GetAllDelayScene(dicSceneContr, listview1);

                }

                else

                {

                    //获取全部场景的延时时间

                    this.GetAllDelayScene(dicSceneContr, listview2);

                }

            }, ShowErrorMode.NO);

        }



@@ -633,7 +669,7 @@
        /// 获取全部场景的延时时间

        /// </summary>

        /// <param name="dicSceneContr"></param>

        private async void GetAllDelayScene(Dictionary<int, SceneCategoryView> dicSceneContr, VerticalListControl listview)

        private async void GetAllDelayScene(Dictionary<int, SceneCategoryView> dicSceneContr, ViewGroup listview)

        {

            //读取全部的延时时间

            var result = await Scene.CatDelaySceneAsync();