新代码

xm

2020-07-20 b02e8275a21dc06bf54b66273485d44e007a2616

 ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs

@@ -13,7 +13,8 @@
    /// </summary>

    public class DeviceMacInfoEditorForm : EditorCommonForm

    {

        #region ■ 变量声明___________________________ 
        #region ■ 变量声明___________________________



        /// <summary>

        /// 设备对象

        /// </summary>

@@ -101,10 +102,13 @@
            {

                //简约面板随便一个回路来获取设备信息

                var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 62);

                var key = new ZigBee.Device.Panel();

                key.DeviceAddr = deviceMac;

                key.CurrentGateWayId = dev.CurrentGateWayId;

                InitBindInfo(key);

                if (dev != null)

                {

                    var key = new ZigBee.Device.Panel();

                    key.DeviceAddr = deviceMac;

                    key.CurrentGateWayId = dev.CurrentGateWayId;

                    InitBindInfo(key);

                }

            }

        }



@@ -709,7 +713,8 @@
        private void AddPirSensorWorkModeRow()

        {

            if (this.deviceEnumInfo.ConcreteType != DeviceConcreteType.Sensor_Pir

                || deviceEnumInfo.IsHdlDevice == false)

                || deviceEnumInfo.IsHdlDevice == false

                || this.listNewDevice.Count != 2)

            {

                return;

            }

@@ -738,7 +743,8 @@
        /// </summary>

        private void AddPirSensorBindRow()

        {

            if (this.deviceEnumInfo.ConcreteType != DeviceConcreteType.Sensor_Pir)

            if (this.deviceEnumInfo.ConcreteType != DeviceConcreteType.Sensor_Pir

                || this.listNewDevice.Count != 2)

            {

                return;

            }

@@ -1158,7 +1164,7 @@
                    {

                        Application.RunOnMainThread(() =>

                        {

                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);

                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5007_2" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);

                        });

                        return;

                    }

@@ -1170,7 +1176,7 @@
                    {

                        Application.RunOnMainThread(() =>

                        {

                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);

                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5007_3" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);

                        });

                        return;

                    }

@@ -1206,6 +1212,10 @@
                foreach (var bDev in bindList)

                {

                    var device = Common.LocalDevice.Current.GetDevice(bDev.BindMacAddr, bDev.BindEpoint);

                    if (device == null)

                    {

                        continue;

                    }

                    if (device.Type == DeviceType.TemperatureSensor)

                    {

                        var bD = device as TemperatureSensor;

@@ -1399,7 +1409,7 @@
        /// <param name="oTADevice">ota设备</param>

        private void SetDeviceVersionInfo(PicViewControl btnNewVersion, OTADevice oTADevice)

        {

            HdlThreadLogic.Current.RunThread(async () =>

            HdlThreadLogic.Current.RunThread(() =>

            {

                bool receiveImageInfo = false;

                //设置设备全部的镜像信息

@@ -1411,7 +1421,7 @@
                while (receiveImageInfo == false && count > 0)

                {

                    //等待设备镜像的反馈

                    await Task.Delay(300);

                    System.Threading.Thread.Sleep(300);

                    count--;

                }

                //移除事件

@@ -1419,7 +1429,7 @@


                oTADevice = Common.LocalDevice.Current.GetOTADevice(listNewDevice[0].DeviceAddr);

                //添加升级固件信息(成不成功都无所谓)

                var result = await HdlFirmwareUpdateLogic.AddFirmwareVersionInfo(FirmwareLevelType.ZigbeeDevice, oTADevice.HwVersion.ToString(), oTADevice.ImgTypeId.ToString());

                var result = HdlFirmwareUpdateLogic.AddFirmwareVersionInfo(FirmwareLevelType.ZigbeeDevice, oTADevice.HwVersion.ToString(), oTADevice.ImgTypeId.ToString());



                //获取设备最新版本

                var deviceFirmware = HdlFirmwareUpdateLogic.GetFirmwareMostVersionInfo(FirmwareLevelType.ZigbeeDevice,

@@ -1498,16 +1508,16 @@
            //检测此回路是否拥有定位功能(拿端点最小的那个回路去定位)

            bool canTest = Common.LocalDevice.Current.DeviceIsCanFixedPosition(listNewDevice[0]);



            TopRightMenuControl frame = null;

            if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
            {
                frame = new TopRightMenuControl(3, 1);
            }
            else
            {
                frame = new TopRightMenuControl(canTest == true ? 2 : 1, 1);
            }
            TopRightMenuControl frame = null;



            if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)

            {

                frame = new TopRightMenuControl(3, 1);

            }

            else

            {

                frame = new TopRightMenuControl(canTest == true ? 2 : 1, 1);

            }



            string deviceMenu = string.Empty;

            if (canTest == true)

@@ -1537,23 +1547,23 @@
                    //删除指定设备

                    this.DoDeleteDevice();

                });

            });

            //同步
            });



            //同步

            deviceMenu = Language.StringByID(R.MyInternationalizationString.Synchronization);

            if (Common.LocalDevice.Current.DeviceIsCanFixedPosition(listNewDevice[0]))
            {
                frame.AddRowMenu(deviceMenu, "", "Item/SynchronizationSelected.png", () =>
                {
                    //如果当前住宅是虚拟住宅,此功能无效
                    if (Common.Config.Instance.Home.IsVirtually == true)
                    {
                        return;
                    }

                    //同步指定设备
                    this.SynchronizationDevice();
                });
            if (Common.LocalDevice.Current.DeviceIsCanFixedPosition(listNewDevice[0]))

            {

                frame.AddRowMenu(deviceMenu, "", "Item/SynchronizationSelected.png", () =>

                {

                    //如果当前住宅是虚拟住宅,此功能无效

                    if (Common.Config.Instance.Home.IsVirtually == true)

                    {

                        return;

                    }



                    //同步指定设备

                    this.SynchronizationDevice();

                });

            }



        }

@@ -1582,8 +1592,8 @@
                    this.CloseForm();

                });

            });

        }

        }



        /// <summary>

        /// 同步指定设备

        /// </summary>

@@ -1602,11 +1612,6 @@
                {

                    return;

                }

                HdlThreadLogic.Current.RunMain(() =>

                {

                    //关闭界面

                    this.CloseForm();

                });

            });

        }

        #endregion