ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
@@ -36,19 +36,19 @@
        /// </summary>
        private NormalViewControl btnAirConditionerVersion = null;
        /// <summary>
        /// 简约面板绑定的温度目标名字
        /// 简约多功能面板绑定的温度目标名字
        /// </summary>
        private string bindTemperatureName = string.Empty;
        /// <summary>
        /// 简约面板绑定的湿度目标名字
        /// 简约多功能面板绑定的湿度目标名字
        /// </summary>
        private string bindHumidityName = string.Empty;
        /// <summary>
        /// 简约面板绑定被绑目标是温度
        /// 简约多功能面板绑定被绑目标是温度
        /// </summary>
        private CommonDevice bindTemperatureDev;
        /// <summary>
        /// 简约面板绑定被绑目标是湿度
        /// 简约多功能面板绑定被绑目标是湿度
        /// </summary>
        private CommonDevice bindHumidityDev;
        /// <summary>
@@ -56,13 +56,16 @@
        /// </summary>
        private string deviceMacTemp = string.Empty;
        // <summary>
        /// 简约面板中被绑定的温湿度目标列表
        /// 简约多功能面板中被绑定的温湿度目标列表
        /// </summary>
        private List<BindObj.BindListResponseObj> bindList = new List<BindObj.BindListResponseObj>();
        /// <summary>
        /// 简约多功能面板的接近感应数据
        private Panel.PanelProximitySensorInfo proximitySensorsInfo = new Panel.PanelProximitySensorInfo();
        #endregion
        #region ■ 初始化_____________________________
        /// <summary>
        /// 画面显示(底层会固定调用此方法,借以完成画面创建)
        /// </summary>
@@ -74,7 +77,7 @@
            {
                //针对单纯只有一个200端点的设备
                listNewDevice.Add(Common.LocalDevice.Current.GetOTADevice(deviceMac));
            }
            }
            this.listDeviceType.Clear();
            deviceMacTemp = deviceMac;
            foreach (var device in listNewDevice)
@@ -107,7 +110,7 @@
                    var key = new ZigBee.Device.Panel();
                    key.DeviceAddr = deviceMac;
                    key.CurrentGateWayId = dev.CurrentGateWayId;
                    InitBindInfo(key);
                    InitBindInfo(key);
                }
            }
        }
@@ -139,6 +142,7 @@
            string caption = Language.StringByID(R.MyInternationalizationString.uDeviceNote);
            string deviceName = Common.LocalDevice.Current.GetDeviceMacName(listNewDevice[0]);
            var btnNote = new FrameCaptionInputControl(caption, deviceName, listview.rowSpace / 2);
            btnNote.txtInput.MaxByte = 48;//限制只能输入48个字节
            listview.AddChidren(btnNote);
            btnNote.InitControl();
            //划线
@@ -152,6 +156,11 @@
                }
                if (oldName != btnNote.Text)
                {
                    //查看模板时,不允许编辑
                    if (Common.Config.Instance.Home.IsShowTemplate == true)
                    {
                        return;
                    }
                    //修改名字
                    this.DeviceReName(btnNote.Text, false);
                }
@@ -173,6 +182,11 @@
            rowBeloneArea.InitControl(Language.StringByID(R.MyInternationalizationString.uInstallationLocation), this.listNewDevice);
            //底线
            rowBeloneArea.AddBottomLine();
            //查看模板时,不允许编辑
            if (Common.Config.Instance.Home.IsShowTemplate == true)
            {
                rowBeloneArea.CanClick = false;
            }
            var listCheck = new List<string>();
            rowBeloneArea.SelectRoomEvent += (roomKeys) =>
@@ -245,8 +259,8 @@
                    this.CloseForm();
                }
            };
            //如果当前住宅是虚拟住宅的话,让所有菜单都不能点击
            if (Common.Config.Instance.Home.IsVirtually == true)
            //查看模板时,不允许编辑
            if (Common.Config.Instance.Home.IsShowTemplate == true)
            {
                for (int i = 0; i < listview.ChildrenCount; i++)
                {
@@ -289,9 +303,10 @@
            }
            else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
            {
                //简约多功能面板
                //简约多功能面板
                this.AddIBindRow(deviceMacTemp);
                this.AddFunctionSettionRow();
                this.AddProximitySensorsRow(deviceMacTemp);
                this.AddFunctionSettionRow();
                this.AddHumiditySourceRow(deviceMacTemp);
                this.AddTemperatureSensorRow(deviceMacTemp);
                this.DataCorrectionRow(deviceMacTemp);
@@ -816,14 +831,18 @@
                    var form = new DevicePanel.PanelFangyueFunctionSettionForm();
                    form.AddForm(listNewDevice[0], deviceEnumInfo);
                }
                //简约环境面板的按键配置
                //简约多功能面板
                else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
                {
                    var form = new DeviceFunctionSettionForm();
                    if (listNewDevice.Count > 62)
                    {
                        form.AddForm(listNewDevice[62], true);
                    }
                    foreach (var dev in listNewDevice)
                    {
                        if (dev.Type == DeviceType.OnOffOutput && dev.DeviceEpoint == 62)
                        {
                            form.AddForm(dev, true);
                        }
                    }
                }
                //河东的面板设备
                else if (deviceEnumInfo.BeloneType == DeviceBeloneType.A按键面板 && deviceEnumInfo.IsHdlDevice == true)
@@ -944,10 +963,17 @@
                    btnSwitch.IsSelected = statu;
                }
            };
            //查看模板时,不允许编辑
            if (Common.Config.Instance.Home.IsShowTemplate == true)
            {
                btnSwitch.CanClick = false;
                btnSwitch.IsSelected = TemplateData.TemplateDeviceDataLogic.Current.GetCurtainHandPullControl(deviceCurtain);
                return;
            }
            //如果是虚拟住宅
            if (Common.Config.Instance.Home.IsVirtually == true)
            {
                btnSwitch.IsSelected = ModelData.DeviceModelDataLogic.Current.GetCurtainHandPullControl(deviceCurtain);
                btnSwitch.IsSelected = TemplateData.TemplateDeviceDataLogic.Current.GetCurtainHandPullControl(deviceCurtain);
                return;
            }
@@ -1011,7 +1037,7 @@
        }
        #endregion
        #region ■  简约多功能面板用___________________
        #region ■ 简约多功能面板用___________________
        /// <summary>
        /// 添加【绑定目标】行
        /// </summary>
@@ -1026,19 +1052,60 @@
            //底线
            btnBindTargets.AddBottomLine();
            btnBindTargets.ButtonClickEvent += (sender, e) =>
            {
                var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 32);//简约面板随便一个按键来获取设备
                if (dev != null)
                {
                    var curControlDev = dev as Panel;
                    var simpleMutilfunctionTargetsPage = new Shared.Phone.UserCenter.DeviceBind.PanelSimpleMutilfunctionTargetsForm(curControlDev);
                    Shared.Phone.UserView.HomePage.Instance.AddChidren(simpleMutilfunctionTargetsPage);
                    Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
                    simpleMutilfunctionTargetsPage.Show();
            {
                var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 32);//简约面板随便一个按键来获取设备
                if (dev != null)
                {
                    var curControlDev = dev as Panel;
                    var simpleMutilfunctionTargetsPage = new Shared.Phone.UserCenter.DeviceBind.PanelSimpleMutilfunctionTargetsForm(curControlDev);
                    Shared.Phone.UserView.HomePage.Instance.AddChidren(simpleMutilfunctionTargetsPage);
                    Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
                    simpleMutilfunctionTargetsPage.Show();
                }
            };
        }
        }
        #region ■ 接近感应___________________________
        /// <summary>
        /// 接近感应行
        /// </summary>
        private void AddProximitySensorsRow(string deviceMac)
        {
            string proximity = Language.StringByID(R.MyInternationalizationString.ProximitySensors);
            var proximitySensors = new FrameRowControl(listview.rowSpace / 2);
            listview.AddChidren(proximitySensors);
            proximitySensors.AddLeftCaption(proximity, 400);
            //接近感应
            proximitySensors.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.ProximitySensors), 400);
            //开关控件
            var btnSwitch = proximitySensors.AddMostRightSwitchIcon();
            //底线
            proximitySensors.AddBottomLine();
            btnSwitch.ButtonClickEvent += async (sender, e) =>
             {
                 btnSwitch.IsSelected = !btnSwitch.IsSelected;
                 proximitySensorsInfo.enable = btnSwitch.IsSelected;
                 //简约面板随便一个回路来获取设备信息
                 var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 62);
                 if (dev != null)
                 {
                     var key = new ZigBee.Device.Panel();
                     key.DeviceAddr = deviceMac;
                     key.CurrentGateWayId = dev.CurrentGateWayId;
                     SetProximitySensor(key);
                 }
             };
            if (proximitySensorsInfo.enable == true)
            {
                btnSwitch.IsSelected = true;
            }
        }
        #endregion
        #region ■ 数据矫正_________________________ 
        /// <summary>
        ///  数据矫正行
@@ -1099,7 +1166,7 @@
                }
                device.Type = DeviceType.OnOffSwitch;
                device.DeviceAddr = deviceMac;
                device.DeviceEpoint = 65;//能绑定湿度的回路
                device.DeviceEpoint = 1;//能绑定湿度的回路
                var paneTargetsBaseFormp = new PaneTargetsBaseForm(device, bindHumidityDev, BindInfo.BindType.Humidity);
                Shared.Phone.UserView.HomePage.Instance.AddChidren(paneTargetsBaseFormp);
                Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
@@ -1150,7 +1217,7 @@
                }
                device.Type = DeviceType.OnOffSwitch;
                device.DeviceAddr = deviceMac;
                device.DeviceEpoint = 64;//能绑定温度的回路
                device.DeviceEpoint = 1;//能绑定温度的回路
                var paneTargetsBaseFormp = new PaneTargetsBaseForm(device, bindTemperatureDev, BindInfo.BindType.Temperature);
                Shared.Phone.UserView.HomePage.Instance.AddChidren(paneTargetsBaseFormp);
                Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
@@ -1173,7 +1240,7 @@
        }
        /// <summary>
        ///读温湿度数据
        ///初始化数据
        /// </summary>
        void InitBindInfo(CommonDevice curControlDev)
        {
@@ -1185,8 +1252,8 @@
                    {
                        CommonPage.Loading.Start("");
                    });
                    //1、获去绑定的温度传感器
                    curControlDev.DeviceEpoint = 64;
                    //读温湿度数据
                    curControlDev.DeviceEpoint = 1;
                    var result = await GetBindName(curControlDev);
                    if (!result)
                    {
@@ -1195,17 +1262,16 @@
                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5007_2" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
                        });
                        return;
                    }
                    //2、获去绑定的湿度度传感器
                    curControlDev.DeviceEpoint = 65;
                    var result2 = await GetBindName(curControlDev);
                    if (!result2)
                    }
                    //2、获设备接近感应初始数据
                    //接近感应(他们说随便拿一路回路就行了)
                    proximitySensorsInfo = await HdlDevicePanelLogic.Current.GetDeviceProximitySensorsSettion(curControlDev);
                    if (proximitySensorsInfo == null)
                    {
                        Application.RunOnMainThread(() =>
                        {
                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5007_3" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
                        });
                        proximitySensorsInfo = new Panel.PanelProximitySensorInfo();
                        //关闭进度条
                        this.CloseProgressBar(ShowReLoadMode.YES);
                        return;
                    }
                }
@@ -1217,6 +1283,8 @@
                {
                    Application.RunOnMainThread(() =>
                    {
                        //初始化右上角菜单
                        this.InitTopRightMenu();
                        //初始化中部控件
                        this.InitMiddleFrame();
                        CommonPage.Loading.Hide();
@@ -1290,11 +1358,49 @@
                result = true;
            }
            return result;
        }
        }
        #region ■ 设置数据___________________________
        /// <summary>
        /// 设置面板接近感应数据
        /// </summary>
        private void SetProximitySensor(CommonDevice curControlDev)
        {
            System.Threading.Tasks.Task.Run(async () =>
            {
                try
                {
                    Application.RunOnMainThread(() =>
                    {
                        CommonPage.Loading.Start("");
                    });
                    //接近感应(提供设备的同事说随便一个回路就行)
                    var result = await HdlDevicePanelLogic.Current.SetProximitySensorStatus(curControlDev, proximitySensorsInfo.enable);
                    if (result == false)
                    {
                        return;
                    }
                }
                catch (Exception ex)
                {
                    var mess = ex.Message;
                }
                finally
                {
                    Application.RunOnMainThread(() =>
                    {
                        CommonPage.Loading.Hide();
                    });
                }
            });
        }
        #endregion
        #endregion
        #region ■ 功能类型(空气开关专用)_____________
        /// <summary>
        /// 添加【功能类型】行(空气开关专用)
        /// </summary>
@@ -1317,6 +1423,11 @@
            rowFunction.InitControl();
            //底线
            rowFunction.AddBottomLine();
            //查看模板时,不允许编辑
            if (Common.Config.Instance.Home.IsShowTemplate == true)
            {
                rowFunction.CanClick = false;
            }
        }
        #endregion
@@ -1363,7 +1474,11 @@
            listview.AddChidren(rowVersion);
            rowVersion.AddLeftCaption(caption, 600);
            //版本
            this.btnAirConditionerVersion = rowVersion.AddMostRightView("", 800);
            this.btnAirConditionerVersion = rowVersion.AddMostRightView(string.Empty, 900);
            if (this.listNewDevice[0] is AC)
            {
                this.btnAirConditionerVersion.Text = ((AC)this.listNewDevice[0]).AcModelVersion;
            }
            //底线
            rowVersion.AddBottomLine();
@@ -1423,7 +1538,8 @@
            };
            //如果当前住宅不是虚拟住宅
            if (Common.Config.Instance.Home.IsVirtually == false)
            if (Config.Instance.Home.IsVirtually == false
                && Config.Instance.Home.IsShowTemplate == false)
            {
                //设置设备的版本信息
                this.SetDeviceVersionInfo(btnNewVersion, oTADevice);
@@ -1441,10 +1557,22 @@
            {
                bool receiveImageInfo = false;
                //设置设备全部的镜像信息
                HdlDeviceImageInfoLogic.Current.SetAllImageInfoToOtaDevice(oTADevice, (device, reportData) =>
                string checkKey = LocalDevice.Current.GetDeviceMainKeys(oTADevice.DeviceAddr, oTADevice.DeviceEpoint);
                HdlGatewayReceiveLogic.Current.AddAttributeEvent("SetDeviceVersionInfo", ReceiveComandDiv.A设备属性上报, (report) =>
                {
                    receiveImageInfo = true;
                    if (report.DeviceStatusReport.CluterID == (int)Cluster_ID.Ota)
                    {
                        string mainKey = LocalDevice.Current.GetDeviceMainKeys(report.DeviceAddr, report.DeviceEpoint);
                        if (checkKey == mainKey)
                        {
                            //已经接收得到
                            receiveImageInfo = true;
                        }
                    }
                });
                //发送命令
                HdlDeviceImageInfoLogic.Current.SetFirmwareVersionComand(oTADevice);
                int count = 5;
                while (receiveImageInfo == false && count > 0)
                {
@@ -1453,14 +1581,14 @@
                    count--;
                }
                //移除事件
                HdlDeviceImageInfoLogic.Current.RemoveDeviceFirmwareVersionThread(oTADevice);
                HdlGatewayReceiveLogic.Current.RemoveEvent("SetDeviceVersionInfo");
                oTADevice = Common.LocalDevice.Current.GetOTADevice(listNewDevice[0].DeviceAddr);
                //添加升级固件信息(成不成功都无所谓)
                var result = HdlFirmwareUpdateLogic.AddFirmwareVersionInfo(FirmwareLevelType.ZigbeeDevice, oTADevice.HwVersion.ToString(), oTADevice.ImgTypeId.ToString());
                var result = HdlFirmwareUpdateLogic.AddFirmwareVersionInfo(FirmwareLevelType.A设备, oTADevice.HwVersion.ToString(), oTADevice.ImgTypeId.ToString());
                //获取设备最新版本
                var deviceFirmware = HdlFirmwareUpdateLogic.GetFirmwareMostVersionInfo(FirmwareLevelType.ZigbeeDevice,
                var deviceFirmware = HdlFirmwareUpdateLogic.GetFirmwareMostVersionInfo(FirmwareLevelType.A设备,
                    oTADevice.HwVersion.ToString(),
                    oTADevice.ImgTypeId.ToString(),
                    oTADevice.ImgVersion);
@@ -1517,6 +1645,11 @@
        /// </summary>
        private void InitTopRightMenu()
        {
            //查看模板时,不允许编辑
            if (Common.Config.Instance.Home.IsShowTemplate == true)
            {
                return;
            }
            var btnIcon = new MostRightIconControl(69, 69);
            btnIcon.UnSelectedImagePath = "Item/More.png";
            topFrameLayout.AddChidren(btnIcon);
@@ -1652,8 +1785,7 @@
        public override void CloseFormBefore()
        {
            HdlGatewayReceiveLogic.Current.RemoveEvent("HandPullControl");
            //移除获取设备硬件信息的监听线程
            HdlDeviceHardInfoLogic.Current.RemoveDeviceHardInfoThread(listNewDevice[0]);
            HdlGatewayReceiveLogic.Current.RemoveEvent("SetDeviceVersionInfo");
            //设备新入网
            if (UserCenterResourse.DicActionForm.ContainsKey("AddDeviceTypeListForm") == true)
@@ -1673,21 +1805,13 @@
        /// </summary>
        private void RefreshHardFirmwareInfo()
        {
            if (listNewDevice[0].DriveCode > 0)
            if (listNewDevice[0].DriveCode > 0 || Common.Config.Instance.Home.IsShowTemplate == true)
            {
                //虚拟设备没有这种操作
                return;
            }
            //重新获取硬件信息
            HdlDeviceHardInfoLogic.Current.SetAllHardFirmwareInfoToDevice(listNewDevice[0], (device, reportData) =>
            {
                for (int i = 1; i < listNewDevice.Count; i++)
                {
                    //全部回路的信息都是一致的
                    HdlDeviceHardInfoLogic.Current.SetHardFirmwareInfo(device.DeviceStatusReport, listNewDevice[i]);
                    listNewDevice[i].ReSave();
                }
            });
            HdlDeviceHardInfoLogic.Current.SetAllHardFirmwareInfoToDevice(listNewDevice[0]);
        }
        #endregion
@@ -1718,27 +1842,48 @@
            {
                return;
            }
            //获取中....
            this.btnAirConditionerVersion.TextID = R.MyInternationalizationString.uGetting;
            //如果是虚拟住宅或者展示模板的话
            if (Config.Instance.Home.IsShowTemplate == true || Config.Instance.Home.IsVirtually == true)
            {
                return;
            }
            bool notVersion = true;
            if (this.listNewDevice[0] is AC)
            {
                notVersion = ((AC)this.listNewDevice[0]).AcModelVersion == string.Empty;
            }
            if (notVersion == true)
            {
                //获取中
                btnAirConditionerVersion.Text = Language.StringByID(R.MyInternationalizationString.uGetting);
            }
            HdlThreadLogic.Current.RunThread(async () =>
            {
                //读取空调模块版本
                var result = await HdlDeviceAirConditionerLogic.Current.ReadACFirewareVersionAsync(listNewDevice[0]);
                if (result == null || result.readACFirewareVersionResponData == null || result.readACFirewareVersionResponData.Status != 0)
                {
                    HdlThreadLogic.Current.RunMain(() =>
                    if (notVersion == true)
                    {
                        //获取失败
                        btnAirConditionerVersion.TextID = R.MyInternationalizationString.uGettingFail;
                    });
                        HdlThreadLogic.Current.RunMain(() =>
                        {
                            btnAirConditionerVersion.Text = Language.StringByID(R.MyInternationalizationString.uGettingFail);
                        });
                    }
                    return;
                }
                else
                HdlThreadLogic.Current.RunMain(() =>
                {
                    HdlThreadLogic.Current.RunMain(() =>
                    string strVersion = result.readACFirewareVersionResponData.FirewareVersion.Replace("-", string.Empty);
                    if (this.listNewDevice[0] is AC)
                    {
                        btnAirConditionerVersion.Text = result.readACFirewareVersionResponData.FirewareVersion.Replace("-", string.Empty);
                    });
                }
                        ((AC)this.listNewDevice[0]).AcModelVersion = strVersion;
                        this.listNewDevice[0].ReSave();
                    }
                    btnAirConditionerVersion.Text = strVersion;
                });
            });
        }