Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

 ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs

@@ -191,9 +191,9 @@
            this.AddShardContentRow(rowShard);



            //一旦移除该家庭成员，他/她将无法使用该网关下所绑定的设备

            var btnNote1 = new NormalViewControl(613, 98, true);

            btnNote1.X = Application.GetRealWidth(246);

            btnNote1.Y = Application.GetRealHeight(1328);

            var btnNote1 = new NormalViewControl(613, 100, true);

            btnNote1.X = Application.GetRealWidth(248);

            btnNote1.Y = Application.GetRealHeight(1327);

            btnNote1.TextSize = 12;

            btnNote1.TextID = R.MyInternationalizationString.RemoveMenberAndDonotUserBindGatewayDevice;

            btnNote1.IsMoreLines = true;

@@ -203,7 +203,7 @@


            var btnIcon = new IconViewControl(58);

            btnIcon.X = Application.GetRealWidth(167);

            btnIcon.Y = Application.GetRealHeight(1328);

            btnIcon.Y = btnNote1.Y;

            btnIcon.UnSelectedImagePath = "Item/Tips.png";

            bodyFrameLayout.AddChidren(btnIcon);



@@ -245,9 +245,38 @@


            //开关

            var btnSwitch = row.AddMostRightSwitchIcon();

            if (this.memberInfo.IsAllowRemoteCtrl == true)

            {

                btnSwitch.IsSelected = true;

            }

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

            {

                btnSwitch.IsSelected = !btnSwitch.IsSelected;

                HdlThreadLogic.Current.RunThread(async () =>

                {

                    var pra = new

                    {

                        HouseDistributedMark = Common.Config.Instance.Home.Id,

                        DistributedMark = this.memberInfo.DistributedMark,

                        IsAllowRemoteCtrl = !btnSwitch.IsSelected

                    };

                    //打开进度条

                    this.ShowProgressBar();

                    var result = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/ChangeSubAccountIsAllowRemoteCtrl", false, pra);

                    //关闭进度条

                    this.CloseProgressBar();



                    if (result == false)

                    {

                        return;

                    }

                    this.memberInfo.IsAllowRemoteCtrl = !btnSwitch.IsSelected;



                    Application.RunOnMainThread(() =>

                    {

                        btnSwitch.IsSelected = !btnSwitch.IsSelected;

                    });

                });

      
            };

            //底线

            row.AddBottomLine();