合并了代码

黄学彪

2019-12-31 737c036a39176fd2085ce82b7c60391da8cb508c

 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs

@@ -373,7 +373,6 @@
                    var btnicon = rowFrameLayout.frameTable.AddLeftIcon();
                    btnicon.UnSelectedImagePath = "DoorLock/DoorLockUserPic.png";
                    //上面门锁用户名称一行
                    //rowFrameLayout.frameTable.AddTopView("", 800);
                    var memberText = "";
                    if (curAccountObj.UserName == "" || curAccountObj.UserName == null)
                    {
@@ -401,21 +400,11 @@
                    var btndelete = rowFrameLayout.AddDeleteControl();
                    btndelete.ButtonClickEvent += (sender, e) =>
                    {
                        var dialog = new Dialog { };
                        var doorDialog = new Shared.Phone.UserCenter.DoorLock.DoorlockDialog(dialog, Language.StringByID(R.MyInternationalizationString.Tip));
                        doorDialog.Show();
                        doorDialog.dialogMidFraFrameLayout.Height = Application.GetRealHeight(58);
                        doorDialog.dialogMidFraFrameLayout.X = Application.GetRealWidth(0);
                        doorDialog.dialogMidFraFrameLayout.Y = Application.GetRealHeight(202);
                        doorDialog.dialogMidFraFrameLayout.AddChidren(doorDialog.dialogMidText);
                        doorDialog.dialogMidText.Text = Language.StringByID(R.MyInternationalizationString.SureToDelUnlockMethod);
                        doorDialog.dialogMidFraFrameLayout.AddChidren(doorDialog.dialogMidText);
                        doorDialog.dialogBtnConfirm.Text = Language.StringByID(R.MyInternationalizationString.DoorlockConfirm);
                        doorDialog.dialogBtnCancel.MouseUpEventHandler += (sender1, e1) =>
                        {
                            dialog.Close();
                        };
                        doorDialog.dialogBtnConfirm.MouseUpEventHandler += async (sender1, e1) =>
                        string msg = Language.StringByID(R.MyInternationalizationString.SureToDelUnlockMethod);
                        var alert = new Shared.Phone.UserCenter.ShowMsgControl(ShowMsgType.Confirm, msg, Language.StringByID(R.MyInternationalizationString.DoorlockConfirm));
                        alert.Show();
                        //使用确认型弹框时,的回调函数
                        alert.ConfirmClickEvent += async () =>
                        {
                            try
                            {
@@ -527,7 +516,6 @@
                                {
                                    new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(CommonPage.Instance);
                                }
                                dialog.Close();
                            }
                            catch { }
                            finally
@@ -625,148 +613,9 @@
                         }
                     };
                    btnDoorlockUser.EditorEnterAction += action;

                    //btnDel.MouseUpEventHandler += (sender, e) =>
                    //{
                    //var dialog = new Dialog { };
                    //var doorDialog = new Shared.Phone.UserCenter.DoorLock.DoorlockDialog(dialog, Language.StringByID(R.MyInternationalizationString.Tip));
                    //doorDialog.Show();
                    //doorDialog.dialogMidFraFrameLayout.Height = Application.GetRealHeight(58);
                    //doorDialog.dialogMidFraFrameLayout.X = Application.GetRealWidth(0);
                    //doorDialog.dialogMidFraFrameLayout.Y = Application.GetRealHeight(202);
                    //doorDialog.dialogMidFraFrameLayout.AddChidren(doorDialog.dialogMidText);
                    //doorDialog.dialogMidText.Text = Language.StringByID(R.MyInternationalizationString.SureToDelUnlockMethod);
                    //doorDialog.dialogMidFraFrameLayout.AddChidren(doorDialog.dialogMidText);
                    //doorDialog.dialogBtnConfirm.Text = Language.StringByID(R.MyInternationalizationString.DoorlockConfirm);
                    //doorDialog.dialogBtnCancel.MouseUpEventHandler += (sender1, e1) =>
                    //{
                    //    dialog.Close();
                    //};
                    //doorDialog.dialogBtnConfirm.MouseUpEventHandler += async (sender1, e1) =>
                    //{
                    //    try
                    //    {
                    //        CommonPage.Loading.Start("");
                    //        var passData = doorLock.SetUserAccessData(curDoorLockUser.UserID, ZigBee.Device.DoorLock.AccessType.DelCurrentUser);
                    //        var resultData = await doorLock.DefaultControlAsync(passData);
                    //        if (resultData != null && resultData.defaultControlResponseData != null)
                    //        {
                    //            if (resultData.defaultControlResponseData.status == 0 || resultData.defaultControlResponseData.status == 2)
                    //            {
                    //                var deleteDoorLockData = new ZigBee.Device.DoorLock.DeleteDoorLockData();
                    //                if (UserCenterResourse.UserInfo.AuthorityNo != 1)
                    //                {
                    //                    deleteDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
                    //                    deleteDoorLockData.IsOtherAccountCtrl = true;
                    //                }
                    //                if (doorLock.DeviceAddr != null)
                    //                {
                    //                    deleteDoorLockData.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
                    //                }
                    //                deleteDoorLockData.DoorLockLocalUserId = curDoorLockUser.UserID.ToString();
                    //                deleteDoorLockData.PrimaryId = curDoorLockUser.PrimaryId;
                    //                deleteDoorLockData.DelDoorLockDelType = 2;
                    //                var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/DelDoorLock", deleteDoorLockData);
                    //                if (result != null)
                    //                {
                    //                    if (result.StateCode == "Success")
                    //                    {
                    //                        isSecondDel = false;
                    //                        if (doorLock.localDoorLockUserList.ContainsKey(curDoorLockUser.UserID))
                    //                        {
                    //                            doorLock.localDoorLockAccountList.Remove(curDoorLockUser.ConnectedAccount);
                    //                            var localDoorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
                    //                            localDoorLockObj.UserID = curDoorLockUser.UserID;
                    //                            doorLock.localDoorLockUserList.Remove(curUserId);
                    //                            doorLock.ReSave();
                    //                            TypeRefresh();
                    //                        }
                    //                    }
                    //                    else
                    //                    {
                    //                        //开关图标
                    //                        new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
                    //                    }
                    //                }
                    //                else
                    //                {
                    //                    isSecondDel = true;
                    //                    new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
                    //                }
                    //            }
                    //            else
                    //            {
                    //                if (isSecondDel)
                    //                {
                    //                    var deleteDoorLockData = new ZigBee.Device.DoorLock.DeleteDoorLockData();
                    //                    if (UserCenterResourse.UserInfo.AuthorityNo != 1)
                    //                    {
                    //                        deleteDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
                    //                        deleteDoorLockData.IsOtherAccountCtrl = true;
                    //                    }
                    //                    if (doorLock.DeviceAddr != null)
                    //                    {
                    //                        deleteDoorLockData.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
                    //                    }
                    //                    deleteDoorLockData.DoorLockLocalUserId = curDoorLockUser.UserID.ToString();
                    //                    deleteDoorLockData.PrimaryId = curDoorLockUser.PrimaryId;
                    //                    deleteDoorLockData.DelDoorLockDelType = 2;
                    //                    var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/DelDoorLock", deleteDoorLockData);
                    //                    if (result != null)
                    //                    {
                    //                        if (result.StateCode == "Success")
                    //                        {
                    //                            isSecondDel = false;
                    //                            if (doorLock.localDoorLockUserList.ContainsKey(curDoorLockUser.UserID))
                    //                            {
                    //                                doorLock.localDoorLockUserList.Remove(curDoorLockUser.UserID);
                    //                                var localDoorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
                    //                                localDoorLockObj.UserID = curDoorLockUser.UserID;
                    //                                doorLock.localDoorLockUserList.Remove(curUserId);
                    //                                TypeRefresh();
                    //                            }
                    //                        }
                    //                        else
                    //                        {
                    //                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
                    //                        }
                    //                    }
                    //                    else
                    //                    {
                    //                        isSecondDel = true;
                    //                        new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
                    //                    }
                    //                }
                    //                else
                    //                {
                    //                    if (curDoorLockUser.UserID < 10)
                    //                    {
                    //                        new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.OnlyBeDeletedOnTheDevice), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
                    //                    }
                    //                    else
                    //                    {
                    //                        new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
                    //                    }
                    //                }
                    //            }
                    //        }
                    //        else
                    //        {
                    //            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDel);
                    //        }
                    //        dialog.Close();
                    //    }
                    //    catch { }
                    //    finally
                    //    {
                    //        CommonPage.Loading.Hide();
                    //    }
                    //}; 
                    //};
                    #endregion
                    i++;
                }
                //bodyView.AdjustRealHeight(Application.GetRealHeight(23));
            }
        }