2019-11-11-1

WJC

2019-11-11 18d4b849131c1d44b0a8dc1abee4a57207d1c497

 ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs

old mode 100755
new mode 100644
@@ -513,13 +513,7 @@
            }



            //编辑

            var btnEditor = new NormalViewControl(Application.GetRealWidth(184), frameRow.Height, false);

            btnEditor.BackgroundColor = 0xff4a4a4a;

            btnEditor.TextSize = 12;

            btnEditor.TextColor = UserCenterColor.Current.White;

            btnEditor.TextAlignment = TextAlignment.Center;

            btnEditor.TextID = R.MyInternationalizationString.uEditor;

            frameRow.AddRightView(btnEditor);

            var btnEditor = frameRow.AddEditorControl();

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

            {

                var form = new EditorRoomInforForm();

@@ -531,13 +525,7 @@
            };



            //删除

            var btnDelete = new NormalViewControl(Application.GetRealWidth(184), frameRow.Height, false);

            btnDelete.BackgroundColor = 0xfff75858;

            btnDelete.TextSize = 12;

            btnDelete.TextColor = UserCenterColor.Current.White;

            btnDelete.TextAlignment = TextAlignment.Center;

            btnDelete.TextID = R.MyInternationalizationString.uDelete;

            frameRow.AddRightView(btnDelete);

            var btnDelete = frameRow.AddDeleteControl();

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

            {

                //确认删除房间?

@@ -569,10 +557,10 @@


        #endregion



        #region ■ 删除楼层___________________________

        #region ■ 删除住宅___________________________



        /// <summary>

        /// 删除楼层

        /// 删除住宅

        /// </summary>

        public async void DeleteResidence()

        {

@@ -635,7 +623,7 @@


        #endregion



        #region ■ 右上角菜单_________________________

        #region ■ 一般方法___________________________



        /// <summary>

        /// 检测App的住宅模式 0:还没有设置有模式 1:楼层模式 2:没有楼层模式

@@ -683,31 +671,12 @@
                    return false;

                }

            }

            return true;

        }



            HdlThreadLogic.Current.RunThread(async () =>

            {

                //因为删除的是当前的住宅,所以需要先切换到别的住宅

                string deleteId = Common.Config.Instance.Home.Id;

                string deleteFile = Common.Config.Instance.Home.FileName;

                int index = 0;

                for (; index < Common.Config.Instance.HomeFilePathList.Count; index++)

                {

                    if (Common.Config.Instance.HomeFilePathList[index] == deleteFile)

                    {

                        //当前住宅所处的位置(住宅数肯定大于1,不然不会出现删除按钮)

                        if (index == 0)

                        {

                            //取下一位

                            index++;

                        }

                        else

                        {

                            //取前一位

                            index--;

                        }

                        break;

                    }

                }

        #endregion



        #region ■ 结构体_____________________________



        /// <summary>

        ///  删除住宅的启动参数