Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm

xm

2020-05-07 c1de48884fa145a16a0f8bcee93274dcfaa0ff82

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

@@ -234,13 +234,13 @@
                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 });

                list.Add(new AddDevicePra { DeviceType = VirtualDeviceEnum.A水浸传感器, RoomId = floorKey + "_ChuFang", DeviceCount = 1 });

                list.Add(new AddDevicePra { DeviceType = VirtualDeviceEnum.A烟雾传感器, RoomId = floorKey + "_ChuFang", DeviceCount = 1 });

                list.Add(new AddDevicePra { DeviceType = VirtualDeviceEnum.A燃气传感器, RoomId = floorKey + "_ChuFang", DeviceCount = 1 });

                list.Add(new AddDevicePra { DeviceType = VirtualDeviceEnum.A吸顶燃气传感器, RoomId = floorKey + "_ChuFang", DeviceCount = 1 });



                //走廊

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

@@ -255,6 +255,9 @@
        {

            //先刷新容器

            LocalDevice.Current.ReFreshByLocal();

            //顺便也整一下网关(有可能它是从实体账号转为虚拟时,没有清空)

            HdlGatewayLogic.Current.ReFreshByLocal();

            HdlGatewayLogic.Current.RefreshAppOldSelectGatewayId();



            Type thisType = m_Current.GetType();

            //获取需要创建的虚拟设备列表

@@ -580,6 +583,19 @@
                device.IasDeviceType = 43;

                //设置设备的基本信息

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



                this.DeviceNumber++;

            }

        }



        public void Zigbee吸顶燃气传感器(int i_DeviceCount, string i_RoomId)

        {

            for (int i = 0; i < i_DeviceCount; i++)

            {

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

                device.IasDeviceType = 43;

                //设置设备的基本信息

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



                this.DeviceNumber++;

            }

@@ -933,7 +949,8 @@
            A方悦双开四控面板 = 23,

            A方悦四开八控面板 = 24,

            A方悦新风面板 = 25,

            A方悦新风小模块 = 26

            A方悦新风小模块 = 26,

            A吸顶燃气传感器 = 27,

        }



        #endregion