新云端Ver1.3

黄学彪

2020-12-17 9f326f4000847e6167d8166fa2f6a66f53cb3734

 ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs

@@ -60,15 +60,11 @@


            //加一个白色背景

            var frameBack1 = new FrameLayout();

            frameBack1.Height = Application.GetRealHeight(450);

            frameBack1.Height = Application.GetRealHeight(750);

            frameBack1.Y = Application.GetRealHeight(196);

            frameBack1.BackgroundColor = UserCenterColor.Current.White;

            frameBack1.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);

            listBackControl.frameTable.AddChidren(frameBack1);



            //初始化信息桌布

            var tableContr = new InformationEditorControl();

            this.listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uInfoEditor), 1175);



            //房间图片底部阴影

            var btnShadow = new PicViewControl(853, 593);

@@ -100,12 +96,13 @@
                this.RoomPictrueSelect(btnPic);

            };



            //变更一下那个白色背景的Y轴,它到图片的中间位置

            frameBack1.Y = btnPic.Y + btnPic.Height / 2;



            this.newRoom = new Common.Room();

            newRoom.FloorId = this.floorKeys;

            newRoom.BackgroundImage = btnPic.ImagePath;



            //初始化信息桌布

            var tableContr = new InformationEditorControl();

            this.listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uInfoEditor), bodyFrameLayout.Height - btnShadow.Bottom, false);



            //添加全部菜单

            this.AddAllMenuRow(tableContr, btnPic);

@@ -123,6 +120,7 @@
            //【房间名称】

            var txtRoomName = new FrameCaptionInputControl(Language.StringByID(R.MyInternationalizationString.uRoomName), string.Empty, this.listview.rowSpace / 2);

            txtRoomName.txtInput.PlaceholderText = Language.StringByID(R.MyInternationalizationString.uPleaseInputRoomName);

            txtRoomName.txtInput.MaxByte = 48;//限制只能输入48个字节

            listview.AddChidren(txtRoomName);

            txtRoomName.InitControl();

            //底线

@@ -199,7 +197,7 @@
                    Shared.IO.FileUtils.WriteFileByBytes(picFullName, btnPic.ImageBytes);

                    newRoom.BackgroundImage = picName;

                    //备份

                    Phone.UserCenter.HdlAutoBackupLogic.AddOrEditorFile(picName);

                    HdlBackupLogic.Current.AddOrEditorAutoBackFileStatu(picName);

                }



                newRoom.FloorId = this.floorKeys;

@@ -261,7 +259,7 @@
        private void ShowTemperatrueDevice(NormalViewControl btnTemper)

        {

            var listDevice = new List<ZigBee.Device.CommonDevice>();

            foreach (var device in Common.LocalDevice.Current.listAllDevice)

            foreach (var device in HdlDeviceCommonLogic.Current.listAllDevice)

            {

                //获取温度传感器

                if (device is ZigBee.Device.TemperatureSensor && ((ZigBee.Device.TemperatureSensor)device).SensorDiv == 1)

@@ -285,7 +283,7 @@
                    btnTemper.Text = Language.StringByID(R.MyInternationalizationString.uNothing);

                    return;

                }

                newRoom.TemperatrueDevice = Common.LocalDevice.Current.GetDeviceMainKeys(list[0]);

                newRoom.TemperatrueDevice = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(list[0]);

                //获取温度值

                this.GetTemperatrueValue(btnTemper, newRoom.TemperatrueDevice);

            };

@@ -298,7 +296,7 @@
        /// <param name="deviceKey"></param>

        private void GetTemperatrueValue(NormalViewControl btnTemper, string deviceKey)

        {

            var device = Common.LocalDevice.Current.GetDevice(deviceKey);

            var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKey);

            if (device == null)

            {

                return;

@@ -310,7 +308,7 @@
            HdlGatewayReceiveLogic.Current.RemoveEvent("TemperatrueDevice");

            HdlGatewayReceiveLogic.Current.AddAttributeEvent("TemperatrueDevice", ReceiveComandDiv.A设备属性上报, ((report) =>

            {

                string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(report);

                string mainKeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(report);

                if (newRoom.TemperatrueDevice != mainKeys || btnTemper == null

                || report.DeviceStatusReport.CluterID != 1026)

                {

@@ -341,7 +339,7 @@
            {

                //去获取设备列表的信息

                System.Threading.Thread.Sleep(1500);

                var result = Common.LocalDevice.Current.ReadDeviceEpointDeviceInfo(device);

                var result = HdlDeviceCommonLogic.Current.ReadDeviceEpointDeviceInfo(device);

                if (result != null)

                {

                    device.AttributeStatus.Clear();

@@ -423,7 +421,7 @@
        private void ShowHumidityDevice(NormalViewControl btnHumi)

        {

            var listDevice = new List<ZigBee.Device.CommonDevice>();

            foreach (var device in Common.LocalDevice.Current.listAllDevice)

            foreach (var device in HdlDeviceCommonLogic.Current.listAllDevice)

            {

                //获取湿度传感器

                if (device is ZigBee.Device.TemperatureSensor && ((ZigBee.Device.TemperatureSensor)device).SensorDiv == 2)

@@ -452,7 +450,7 @@
                    btnHumi.Text = Language.StringByID(R.MyInternationalizationString.uNothing);

                    return;

                }

                newRoom.HumidityDevice = Common.LocalDevice.Current.GetDeviceMainKeys(list[0]);

                newRoom.HumidityDevice = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(list[0]);

                //获取湿度值

                this.GetHumidityValue(btnHumi, newRoom.HumidityDevice);

            };

@@ -465,7 +463,7 @@
        /// <param name="deviceKey"></param>

        private void GetHumidityValue(NormalViewControl btnHumi, string deviceKey)

        {

            var device = Common.LocalDevice.Current.GetDevice(deviceKey);

            var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKey);

            if (device == null)

            {

                return;

@@ -477,7 +475,7 @@
            HdlGatewayReceiveLogic.Current.RemoveEvent("HumidityDevice");

            HdlGatewayReceiveLogic.Current.AddAttributeEvent("HumidityDevice", ReceiveComandDiv.A设备属性上报, (report) =>

            {

                string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(report);

                string mainKeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(report);

                if (newRoom.HumidityDevice != mainKeys || btnHumi == null

                || report.DeviceStatusReport.CluterID != 1029)

                {

@@ -506,7 +504,7 @@
            {

                //去获取设备列表的信息

                System.Threading.Thread.Sleep(1500);

                var result = Common.LocalDevice.Current.ReadDeviceEpointDeviceInfo(device);

                var result = HdlDeviceCommonLogic.Current.ReadDeviceEpointDeviceInfo(device);

                if (result != null)

                {

                    device.AttributeStatus.Clear();