Merge branch 'dev-tzy' into dev-2020xm

xm

2020-07-14 d87400af518ebc9274f4447f06476959c3aa5102

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

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

    public class DeviceMacInfoEditorForm : EditorCommonForm

    {

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

        /// <summary>

        /// 设备对象

        /// </summary>

@@ -296,7 +296,7 @@
            }

            else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleEnvironment)

            {

                //添加【绑定目标】行(简约环境面板用) 
                //添加【绑定目标】行(简约环境面板用)

                this.AddSimplePanelSettionRow();

            }

            else

@@ -712,7 +712,8 @@
        private void AddPirSensorWorkModeRow()

        {

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

                || deviceEnumInfo.IsHdlDevice == false)

                || deviceEnumInfo.IsHdlDevice == false

                || this.listNewDevice.Count != 2)

            {

                return;

            }

@@ -741,7 +742,8 @@
        /// </summary>

        private void AddPirSensorBindRow()

        {

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

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

                || this.listNewDevice.Count != 2)

            {

                return;

            }

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

        private void SetDeviceVersionInfo(PicViewControl btnNewVersion, OTADevice oTADevice)

        {

            HdlThreadLogic.Current.RunThread(async () =>

            HdlThreadLogic.Current.RunThread(() =>

            {

                bool receiveImageInfo = false;

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

@@ -1418,7 +1420,7 @@
                while (receiveImageInfo == false && count > 0)

                {

                    //等待设备镜像的反馈

                    await Task.Delay(300);

                    System.Threading.Thread.Sleep(300);

                    count--;

                }

                //移除事件

@@ -1426,7 +1428,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,

@@ -1505,16 +1507,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)

@@ -1561,6 +1563,23 @@
                    //同步指定设备
                    this.SynchronizationDevice();
                });
            }



            //同步

            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();

                });

            }



        }

@@ -1616,6 +1635,27 @@
                });

            });

        }



        /// <summary>

        /// 同步指定设备

        /// </summary>

        private void SynchronizationDevice()

        {

            HdlThreadLogic.Current.RunThread(async () =>

            {

                //打开进度条

                this.ShowProgressBar();



                //同步设备

                bool result = await Common.LocalDevice.Current.SynchronizationDevice(listNewDevice);

                //关闭进度条

                this.CloseProgressBar();

                if (result == false)

                {

                    return;

                }

            });

        }

        #endregion



        #region ■ 关闭界面___________________________