2020.2.28

gxc

2020-02-28 66a9965c44ecc32a6696abca876ab9d1cd091584

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

@@ -117,11 +117,20 @@
                    listResidenceSort.Add(pageData.PageData[i].Id);

                }

            }

            for (int i = 0; i < listResidenceSort.Count; i++)

            {

                //移除掉不存在了的顺序

                if (dicData.ContainsKey(listResidenceSort[i]) == false)

                {

                    listResidenceSort.RemoveAt(i);

                    i--;

                }

            }

            //保存顺序

            string fullName = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.ResidenceSortFile);

            UserCenterLogic.SaveFileContent(fullName, listResidenceSort);



            Application.RunOnMainThread(() =>

            HdlThreadLogic.Current.RunMain(() =>

            {

                if (this.Parent == null)

                {

@@ -132,6 +141,10 @@
                this.dicResidenceData = new Dictionary<string, Common.ResponseEntity.ResidenceObj>();

                for (int i = 0; i < listResidenceSort.Count; i++)

                {

                    if (dicData.ContainsKey(listResidenceSort[i]) == false)

                    {

                        continue;

                    }

                    var info = dicData[listResidenceSort[i]];

                    if (info.IsOthreShare == false)

                    {

@@ -206,16 +219,19 @@
                    {

                        HdlThreadLogic.Current.RunThread(async () =>

                        {

                            ProgressBar.Show();

                            this.ShowProgressBar();



                            Config.Instance.HomeId = info.Id;

                            Global.CreateHomeDirectory(info.Id);

                            //重新初始化住宅对象

                            Config.Instance.Home = House.GetHouseByHouseId(info.Id);

                            Config.Instance.Save();

                            //刷新个人中心的内存及线程

                            await UserCenterLogic.InitUserCenterMenmoryAndThread();

                            await UserCenterLogic.InitUserCenterMenmoryAndThread(false);



                            Room.InitAllRoom();



                            Application.RunOnMainThread(() =>

                            HdlThreadLogic.Current.RunMain(() =>

                            {

                                //重新刷新列表

                                this.listView.RemoveAll();

@@ -233,9 +249,9 @@
                }

            };



            if (info.IsOthreShare == true && info.AccountType != 1)

            if (info.IsOthreShare == true)

            {

                //分享的，又不拥有管理员权限的,不能更改

                //分享的,不能更改

                return;

            }

            //更改

@@ -264,7 +280,7 @@
        private void ShowEditorNameForm(Common.ResponseEntity.ResidenceObj info, NormalViewControl btnHome)

        {

            //生成一个弹窗画面

            var dialogForm = new DialogInputFrameControl(this, DialogFrameMode.OnlyInput);

            var dialogForm = new DialogInputControl();

            //编辑住宅

            dialogForm.SetTitleText(Language.StringByID(R.MyInternationalizationString.uChangedName));

            //请输入住宅名称

@@ -340,7 +356,7 @@
        private void ShowAddNameForm()

        {

            //生成一个弹窗画面

            var dialogForm = new DialogInputFrameControl(this, DialogFrameMode.OnlyInput);

            var dialogForm = new DialogInputControl();

            //创建住宅

            dialogForm.SetTitleText(Language.StringByID(R.MyInternationalizationString.uCreatResidence));

            //请输入住宅名称

@@ -513,7 +529,7 @@
            public PageSettingInfo PageSetting = new PageSettingInfo()

            {

                Page = 1,

                PageSize = 500

                PageSize = 5000

            };

        }



@@ -545,29 +561,6 @@
            /// ZigbeeHomeGuid

            /// </summary>

            public string Id = string.Empty;

        }



        /// <summary>

        ///  编辑住宅的启动参数

        /// </summary>

        public class EditorResidencePra : IfacePraCommon

        {

            /// <summary>

            /// RequestVersion

            /// </summary>

            public string RequestVersion = Common.CommonPage.RequestVersion;

            /// <summary>

            /// LoginAccessToken

            /// </summary>

            public string LoginAccessToken = Common.Config.Instance.Token;

            /// <summary>

            /// ZigbeeHomeId

            /// </summary>

            public string HomeId = "";

            /// <summary>

            /// Name

            /// </summary>

            public string Name = string.Empty;

        }



        #endregion