请合并，门锁和晾衣架第一版代码

xm

2020-12-10 3aa397ab145382935492b11c1f18c9634e69910b

 ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs

@@ -71,9 +71,9 @@


            this.AddNormalRowControl("当前身份", 400, UserCenterResourse.UserInfo.AuthorityText, 400);



            this.AddTopButtomRowControl("住宅ID", 400, Common.Config.Instance.Home.Id, 900);

            //this.AddTopButtomRowControl("住宅ID", 400, Common.Config.Instance.Home.Id, 900);



            this.AddTopButtomRowControl("账号GUID", 400, string.IsNullOrEmpty(Common.Config.Instance.Guid) == true ? Common.Config.Instance.Home.MainUserDistributedMark : Common.Config.Instance.Guid, 900);

            //this.AddTopButtomRowControl("账号GUID", 400, string.IsNullOrEmpty(Common.Config.Instance.Guid) == true ? Common.Config.Instance.Home.MainUserDistributedMark : Common.Config.Instance.Guid, 900);



            this.AddNormalRowControl("住宅分享", 400, Common.Config.Instance.Home.IsOthreShare == true ? "是" : "否", 400);



@@ -300,6 +300,18 @@


            row1 = new FrameRowControl(listView.rowSpace / 2);

            listView.AddChidren(row1);

            row1.AddLeftCaption("使用旧的设备获取方式", 600);

            row1.AddBottomLine();

            var btnSwitchDeviceMethord = row1.AddMostRightSwitchIcon();

            btnSwitchDeviceMethord.IsSelected = UserCenterResourse.HideOption.UseOldSearchDeviceMethord == 1;

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

            {

                btnSwitchDeviceMethord.IsSelected = !btnSwitchDeviceMethord.IsSelected;

                UserCenterResourse.HideOption.UseOldSearchDeviceMethord = btnSwitchDeviceMethord.IsSelected == true ? 1 : 0;

            };



            row1 = new FrameRowControl(listView.rowSpace / 2);

            listView.AddChidren(row1);

            row1.AddLeftCaption("重置导入标识", 500);

            row1.AddRightArrow();

            row1.AddBottomLine();