合并代码

黄学彪

2020-01-09 fa6bcb2e9907772480f99205f36ec2a1ce735a22

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

@@ -210,10 +210,12 @@
            };
            midTopFrameLayout.AddChidren(btnNext);

            btnNext.MouseUpEventHandler += (sender, e) =>
            EventHandler<MouseEventArgs> handerSideLip = (sender, e) =>
            {
                SideslipFramelayout();
            };
            btnNext.MouseUpEventHandler += handerSideLip;
            btnAllMethod.MouseUpEventHandler += handerSideLip;
            var btnLine = new Button
            {
                Y = midTopFrameLayout.Bottom,
@@ -298,7 +300,7 @@
            {
                var curDoorLockUser = doorLock.localDoorLockUserList[curUserId];

                if (curDoorLockUser.ConnectedAccount == "" || curDoorLockUser.ConnectedAccount != curAccountObj.SubAccountDistributedMark)
                if (string.IsNullOrEmpty(curDoorLockUser.ConnectedAccount) || curDoorLockUser.ConnectedAccount != curAccountObj.SubAccountDistributedMark)
                {
                    continue;
                }
@@ -360,8 +362,7 @@
                            break;
                    }

                    #region UI

                    #region UI 
                    var rowFrameLayout = new RowLayoutControl(bodyView.rowSpace / 2);
                    rowFrameLayout.BackgroundColor = ZigbeeColor.Current.XMWhite;
                    bodyView.AddChidren(rowFrameLayout);
@@ -370,7 +371,7 @@
                    btnicon.UnSelectedImagePath = "DoorLock/DoorLockUserPic.png";
                    //上面门锁用户名称一行 
                    var memberText = "";
                    if (curAccountObj.UserName == "" || curAccountObj.UserName == null)
                    if (string.IsNullOrEmpty(curAccountObj.UserName))
                    {
                        memberText = curAccountObj.Account;
                    }
@@ -532,7 +533,7 @@
                    switch (curDoorLockUser.UnlockType)
                    {
                        case 0:
                            if (curDoorLockUser.UserName != "" && curDoorLockUser.UserName != null)
                            if (!string.IsNullOrEmpty(curDoorLockUser.UserName))
                            {
                                btnDoorlockUser.Text = curDoorLockUser.UserName;
                            }
@@ -542,7 +543,7 @@
                            }
                            break;
                        case 3:
                            if (curDoorLockUser.UserName != "" && curDoorLockUser.UserName != null)
                            if (!string.IsNullOrEmpty(curDoorLockUser.UserName))
                            {
                                btnDoorlockUser.Text = curDoorLockUser.UserName;
                            }
@@ -552,7 +553,7 @@
                            }
                            break;
                        case 15:
                            if (curDoorLockUser.UserName != "" && curDoorLockUser.UserName != null)
                            if (!string.IsNullOrEmpty(curDoorLockUser.UserName))
                            {
                                btnDoorlockUser.Text = curDoorLockUser.UserName;
                            }
@@ -729,7 +730,7 @@
                        break;
                }

                if (doorLock.currentUserDisplayMethod == "" && i == 0)
                if (string.IsNullOrEmpty(doorLock.currentUserDisplayMethod) && i == 0)
                {
                    btnAllMethod.IsSelected = true;
                    btnMethodText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;