合并新代码，提供逻辑需要的门锁接口

xm

2020-04-28 dfd3bdc07c49fab66b38382e0bbe7c91bdf4f15b

 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);

@@ -513,6 +522,11 @@
                    else if (device.Type == DeviceType.Thermostat)

                    {

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

                    }

                    // 新风

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

                    {
                        cardContr = new Controls.DeviceFreshAirRowControl(listView.rowSpace / 2);
                    }

                    //彩灯(调光器)

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

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

@@ -744,6 +780,11 @@
                            //空调是特殊的,它的开关是属性上报来着.已经接收到网关的反馈

                            this.dicDeviceRowControl[mainKeys].SetHadGetResponeResultStatu();

                        }

                        if (report.DeviceStatusReport.CluterID == 514 && report.DeviceStatusReport.AttriBute[0].AttributeId == 0)

                        {

                            //新风是特殊的,它的开关是属性上报来着.已经接收到网关的反馈

                            this.dicDeviceRowControl[mainKeys].SetHadGetResponeResultStatu();

                        }

                        this.dicDeviceRowControl[mainKeys].RefreshControlInfo(locadevice);

                    }

                }, ShowErrorMode.NO);

@@ -850,6 +891,11 @@
                    LocalDevice.Current.GetDeviceObjectIcon(typeInfo.ConcreteType, ref path1, ref path2);

                    dic[typeInfo.BeloneTextId].IconPath = path1;

                    dic[typeInfo.BeloneTextId].IconPathSelected = path2;

                    if (device.Type == DeviceType.FreshAir)
                    {
                        dic[typeInfo.BeloneTextId].IconPath = "Device/FreshAirEpoint.png";
                        dic[typeInfo.BeloneTextId].IconPathSelected = "Device/FreshAirEpointSelected.png";
                    }

                    dic[typeInfo.BeloneTextId].TextId = typeInfo.BeloneTextId;

                }

                dic[typeInfo.BeloneTextId].listDeviceKeys.Add(LocalDevice.Current.GetDeviceMainKeys(device));