先上传一个非最新的版本

黄学彪

2020-04-26 18a7f9f40e5fab3bee5d4ac3d8fd0273dea052d6

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

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

        /// 列表控件

        /// </summary>

        private VerticalListControl listview = null;

        private FrameListControl listview = null;

        /// <summary>

        /// 设备的设备类型

        /// </summary>

@@ -81,15 +81,19 @@
            //清空bodyFrame

            this.ClearBodyFrame();



            var listBackControl = new VerticalFrameControl();

            listBackControl.Height = bodyFrameLayout.Height;

            bodyFrameLayout.AddChidren(listBackControl);



            //初始化桌布

            var tableContr = new InformationEditorControl();

            this.listview = tableContr.InitControl(bodyFrameLayout, Language.StringByID(R.MyInternationalizationString.uInfoEditor), 369, 1368);

            this.listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uInfoEditor), 1368);



            //图片

            var btnPic = new DeviceInfoIconControl();

            btnPic.Y = Application.GetRealHeight(92);

            btnPic.Gravity = Gravity.CenterHorizontal;

            bodyFrameLayout.AddChidren(btnPic);

            listBackControl.frameTable.AddChidren(btnPic);

            btnPic.InitControl(listNewDevice[0]);



            //设备备注

@@ -171,7 +175,7 @@
            this.AddAllMenuRow();



            //初始化桌布完成

            tableContr.FinishInitControl(bodyFrameLayout, this.listview);

            tableContr.FinishInitControl();

            tableContr = null;



            //保存

@@ -303,7 +307,7 @@
                         };

                         actionNone = () =>

                         {

                             Shared.Phone.UserCenter.DoorLock.DoorLockCommonLayout.SecurityRequest(doorLock, action);

                             Shared.Phone.UserCenter.DoorLock.DoorLockCommonLayout.SecurityRequest(doorLock);

                         };

                         HdlCheckLogic.Current.CheckSecondarySecurity(action, actionNone);

                     }

@@ -324,7 +328,7 @@
                             };

                             actionNone = () =>

                             {

                                 Shared.Phone.UserCenter.DoorLock.DoorLockCommonLayout.SecurityRequest(doorLock, action);

                                 Shared.Phone.UserCenter.DoorLock.DoorLockCommonLayout.SecurityRequest(doorLock);

                             };

                             HdlCheckLogic.Current.CheckSecondarySecurity(action, actionNone);



@@ -928,10 +932,19 @@
                var title = Language.StringByID(R.MyInternationalizationString.uSelectFunctionType);



                var form = new BottomItemSelectForm();

                form.CancelCallEvent = true;//允许取消

                form.AddForm(title, listText, nowSelectNo);

                form.FinishSelectEvent += (selectNo) =>

                {

                    btnFunction.Text = listText[selectNo];

                    if (selectNo == -1)

                    {

                        //选择取消

                        btnFunction.Text = string.Empty;

                    }

                    else

                    {

                        btnFunction.Text = listText[selectNo];

                    }

                    nowSelectNo = selectNo;

                    //记录起当前选择的功能类型

                    if (selectNo == 0)

@@ -952,7 +965,7 @@
                            this.listNewDevice[0].IconPath = "Device/Light.png";

                        }

                    }

                    else

                    else if (selectNo == 2)

                    {

                        this.listNewDevice[0].DfunctionType = DeviceFunctionType.A插座;

                        if (this.listNewDevice[0].IsCustomizeImage == false)

@@ -961,6 +974,15 @@
                            this.listNewDevice[0].IconPath = "Device/Socket1.png";

                        }

                    }

                    else

                    {

                        this.listNewDevice[0].DfunctionType = DeviceFunctionType.A未定义;

                        if (this.listNewDevice[0].IsCustomizeImage == false)

                        {

                            //重新设置图片

                            this.listNewDevice[0].IconPath = "Device/Switch.png";

                        }

                    }

                    this.listNewDevice[0].ReSave();

                };

            };