同步了全部的代码

黄学彪

2019-11-18 16604a593202f2f87adf71abd57d036fe7da3b52

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

@@ -158,12 +158,8 @@
            //根据MAC合并设备列表

            this.MargeAllDeviceByMac(listDevice);



            Application.RunOnMainThread(() =>

            HdlThreadLogic.Current.RunMain(() =>

            {

                if (this.Parent == null)

                {

                    return;

                }

                var listOta = new List<OTADevice>();

                foreach (var macAddress in this.dicRowInfo.Keys)

                {

@@ -176,6 +172,7 @@
                    //添加设备的菜单行

                    this.AddDeviceMenuRow(macAddress);

                }



                //添加底部间隙

                var frameTemp = new FrameLayout();

                frameTemp.Height = Application.GetRealHeight(23);

@@ -215,9 +212,9 @@
            rowInfo.MenuRow = rowMenu;

            //向右图标

            var btnRight = rowMenu.frameTable.AddMostRightEmptyIcon(58, 58);

            rowMenu.frameTable.ChangedChidrenBindMode(btnRight, ChidrenBindMode.NotBind);

            btnRight.UnSelectedImagePath = "Item/Next.png";

            btnRight.SelectedImagePath = "Item/Down.png";

            rowMenu.frameTable.ChangedChidrenBindMode(btnRight, ChidrenBindMode.NotBind);



            //提示新版本

            var btnNew = new InformationTipView(rowMenu.btnIcon);

@@ -247,9 +244,21 @@
            //展开,折叠

            btnRight.ButtonClickEvent += (sender, e) =>

            {

                btnRight.IsSelected = !btnRight.IsSelected;

                //展开或者折叠明细列表

                this.ShowDetailList(deviceMac, btnRight.IsSelected);

                //回路数大于1才展开

                if (Common.LocalDevice.Current.GetDevicesCountByMac(deviceMac) > 1)

                {

                    btnRight.IsSelected = !btnRight.IsSelected;

                    //展开或者折叠明细列表

                    this.ShowDetailList(deviceMac, btnRight.IsSelected);

                }

                else

                {

                    btnNew.Visible = false;

                    var form = new DeviceMacInfoEditorForm();

                    form.AddForm(deviceMac);

                    //界面跳转,记录当前的正在操作的设备的Mac地址

                    this.nowActionDeviceMac = deviceMac;

                }

            };



            rowMenu.frameTable.ButtonClickEvent += (sender, e) =>