备份

xm

2020-07-10 acb2b278663952ce555b06a2e821f359225f15e0

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

File was renamed from Home0630/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
@@ -14,7 +14,6 @@
    public class DeviceMacInfoEditorForm : EditorCommonForm

    {

        #region ■ 变量声明___________________________



        /// <summary>

        /// 设备对象

        /// </summary>

@@ -605,6 +604,7 @@
        }

        #endregion



        #endregion


        #region ■ 按键设置(方悦)_____________________

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

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



            var 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)

            {

@@ -1529,6 +1539,23 @@
                });

            });



            //同步
            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();
                });
            }



        }



        /// <summary>

@@ -1556,6 +1583,32 @@
                });

            });

        }


        /// <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;

                }

                HdlThreadLogic.Current.RunMain(() =>

                {

                    //关闭界面

                    this.CloseForm();

                });

            });

        }

        #endregion



        #region ■ 关闭界面___________________________