新版本

黄学彪

2020-07-13 f3e65daca7978b21b5888f49b1bf35e1a6e5d4fd

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs

@@ -58,6 +58,8 @@
            this.InitDeviceData();

            //初始化场景

            this.InitSceneData();

            //刷新左边刷新房间视图列表

            HdlRoomLogic.Current.RefreshRoomListView();

        }



        #endregion

@@ -104,7 +106,10 @@
            house.IsVirtually = true;

            house.Save(false);

            Config.Instance.HomeId = house.Id;

            Config.Instance.Home = House.GetHouseByHouseId(house.Id);

            Config.Instance.Home = HdlResidenceLogic.Current.GetHouseByHouseId(house.Id);



            //预创建个人中心全部的文件夹

            HdlFileLogic.Current.CreatAllUserCenterDirectory();

        }



        #endregion

@@ -163,8 +168,6 @@
            var listFloorKey = this.GetAllFloorKeys();

            var dicRoomName = this.GetRoomSampleList();



            //设置初始楼层

            Config.Instance.Home.CurrentFloorId = listFloorKey[0];

            foreach (string floorKey in listFloorKey)

            {

                foreach (string roomId in dicRoomName.Keys)

@@ -234,7 +237,6 @@
                list.Add(new AddDevicePra { DeviceType = VirtualDeviceEnum.A空气开关, RoomId = floorKey + "_XuanGuan", DeviceCount = 1 });

                list.Add(new AddDevicePra { DeviceType = VirtualDeviceEnum.A1路调光器, RoomId = floorKey + "_XuanGuan", DeviceCount = 1 });

                list.Add(new AddDevicePra { DeviceType = VirtualDeviceEnum.A门窗磁传感器, RoomId = floorKey + "_XuanGuan", DeviceCount = 1 });

                list.Add(new AddDevicePra { DeviceType = VirtualDeviceEnum.A智能门锁, RoomId = floorKey + "_XuanGuan", DeviceCount = 1 });



                //厨房

                list.Add(new AddDevicePra { DeviceType = VirtualDeviceEnum.A4按键面板, RoomId = floorKey + "_ChuFang", DeviceCount = 1 });

@@ -562,6 +564,7 @@
                //1个传感器

                var device = new IASZone() { DeviceAddr = "DeviceAddr" + this.DeviceNumber, DeviceEpoint = 1 };

                device.IasDeviceType = 13;

                device.DeviceID = 1026;

                //设置设备的基本信息

                this.SetBaseDataToDevice(device, 1200, 1200, "MSPIR01-ZB.10", i_RoomId);



@@ -582,6 +585,7 @@
            {

                var device = new IASZone() { DeviceAddr = "DeviceAddr" + this.DeviceNumber, DeviceEpoint = 1 };

                device.IasDeviceType = 43;

                device.DeviceID = 1026;

                //设置设备的基本信息

                this.SetBaseDataToDevice(device, 1300, 1300, "MSG01/M-ZB.10", i_RoomId);



@@ -595,6 +599,7 @@
            {

                var device = new IASZone() { DeviceAddr = "DeviceAddr" + this.DeviceNumber, DeviceEpoint = 1 };

                device.IasDeviceType = 43;

                device.DeviceID = 1026;

                //设置设备的基本信息

                this.SetBaseDataToDevice(device, 1300, 1300, "MGCD01/ZB.10", i_RoomId);



@@ -608,6 +613,7 @@
            {

                var device = new IASZone() { DeviceAddr = "DeviceAddr" + this.DeviceNumber, DeviceEpoint = 1 };

                device.IasDeviceType = 21;

                device.DeviceID = 1026;

                //设置设备的基本信息

                this.SetBaseDataToDevice(device, 1301, 1301, "MSDC01/M-ZB.10", i_RoomId);



@@ -621,6 +627,7 @@
            {

                var device = new IASZone() { DeviceAddr = "DeviceAddr" + this.DeviceNumber, DeviceEpoint = 1 };

                device.IasDeviceType = 40;

                device.DeviceID = 1026;

                //设置设备的基本信息

                this.SetBaseDataToDevice(device, 1301, 1301, "MSS01/M-ZB.10", i_RoomId);



@@ -634,6 +641,7 @@
            {

                var device = new IASZone() { DeviceAddr = "DeviceAddr" + this.DeviceNumber, DeviceEpoint = 1 };

                device.IasDeviceType = 13;

                device.DeviceID = 1026;

                //设置设备的基本信息

                this.SetBaseDataToDevice(device, 1303, 1303, "MSPIR01/M-ZB.10", i_RoomId);



@@ -647,6 +655,7 @@
            {

                var device = new IASZone() { DeviceAddr = "DeviceAddr" + this.DeviceNumber, DeviceEpoint = 1 };

                device.IasDeviceType = 42;

                device.DeviceID = 1026;

                //设置设备的基本信息

                this.SetBaseDataToDevice(device, 1304, 1304, "MSW01/M-ZB.10", i_RoomId);



@@ -660,6 +669,7 @@
            {

                var device = new IASZone() { DeviceAddr = "DeviceAddr" + this.DeviceNumber, DeviceEpoint = 1 };

                device.IasDeviceType = 44;

                device.DeviceID = 1026;

                //设置设备的基本信息

                this.SetBaseDataToDevice(device, 1305, 1305, "MBU01/M-ZB.10", i_RoomId);



@@ -704,8 +714,8 @@
                    this.SetBaseDataToDevice(device, 2300, 2300, "MPD0101-ZB.10", i_RoomId);

                }



                //1个继电器

                var device2 = new ToggleLight() { DeviceAddr = "DeviceAddr" + this.DeviceNumber, DeviceEpoint = 8 };

                //1个调光器

                var device2 = new DimmableLight() { DeviceAddr = "DeviceAddr" + this.DeviceNumber, DeviceEpoint = 8 };

                device2.DfunctionType = DeviceFunctionType.A灯光;

                //设置设备的基本信息

                this.SetBaseDataToDevice(device2, 2300, 2300, "MPD0101-ZB.10", i_RoomId);

@@ -902,10 +912,24 @@
            device.ModelIdentifier = ModelIdentifier;

            device.CurrentGateWayId = string.Empty;



            //默认每个设备都可以定位

            //默认每个设备都可以定位,拥有开关功能

            device.InClusterList.Add(new CommonDevice.InClusterObj { InCluster = 3 });

            device.OutClusterList.Add(new CommonDevice.OutClusterObj { OutCluster = 3 });



            if (device.Type == DeviceType.AirSwitch || device.Type == DeviceType.OnOffOutput

                || device.Type == DeviceType.DimmableLight || device.Type == DeviceType.ColorDimmableLight)

            {

                device.InClusterList.Add(new CommonDevice.InClusterObj { InCluster = 6 });

                device.OutClusterList.Add(new CommonDevice.OutClusterObj { OutCluster = 6 });

            }

            if (device.Type == DeviceType.OnOffOutput || device.Type == DeviceType.DimmableLight

                || device.Type == DeviceType.ColorDimmableLight)

            {

                device.InClusterList.Add(new CommonDevice.InClusterObj { InCluster = 8 });

            }

            if (device.Type == DeviceType.WindowCoveringDevice)

            {

                device.InClusterList.Add(new CommonDevice.InClusterObj { InCluster = 258 });

            }

            //添加虚拟设备

            LocalDevice.Current.AddVirtualDeviceToMemory(device);