合并代码

黄学彪

2020-01-09 fa6bcb2e9907772480f99205f36ec2a1ce735a22

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

@@ -102,7 +102,7 @@
                TextAlignment = TextAlignment.CenterRight,
                TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
                TextSize = 12,
                IsBold =true,
                IsBold = true,
            };
            midTopFrameLayout.AddChidren(btnAllMethod);
            // 类型区分 
@@ -137,11 +137,12 @@
                SelectedImagePath = "DoorLock/UnLockSideslipIcon.png",
            };
            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,
@@ -173,7 +174,7 @@
            foreach (var curUserId in doorLock.localDoorLockUserList.Keys)
            {
                var curDoorLockUser = doorLock.localDoorLockUserList[curUserId];
                if (curDoorLockUser.ConnectedAccount != "")
                if (!string.IsNullOrEmpty(curDoorLockUser.ConnectedAccount))
                {
                    continue;
                }
@@ -244,7 +245,7 @@
                    TextAlignment = TextAlignment.CenterLeft,
                    TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
                    Gravity = Gravity.CenterVertical,
                    TextSize =15,
                    TextSize = 15,
                };
                rowFrameLayout.AddChidren(btnText);

@@ -267,7 +268,7 @@
                switch (curDoorLockUser.UnlockType)
                {
                    case 0:
                        if (curDoorLockUser.UserName != "" && curDoorLockUser.UserName != null)
                        if (!string.IsNullOrEmpty(curDoorLockUser.UserName))
                        {
                            btnText.Text = curDoorLockUser.UserName;
                        }
@@ -277,7 +278,7 @@
                        }
                        break;
                    case 3:
                        if (curDoorLockUser.UserName != "" && curDoorLockUser.UserName != null)
                        if (!string.IsNullOrEmpty(curDoorLockUser.UserName))
                        {
                            btnText.Text = curDoorLockUser.UserName;
                        }
@@ -287,7 +288,7 @@
                        }
                        break;
                    case 15:
                        if (curDoorLockUser.UserName != "" && curDoorLockUser.UserName != null)
                        if (!string.IsNullOrEmpty(curDoorLockUser.UserName))
                        {
                            btnText.Text = curDoorLockUser.UserName;
                        }
@@ -326,7 +327,7 @@
            {
                Height = Application.GetRealHeight(100),
                Y = Application.GetRealHeight(1253),
                Radius =(uint) Application.GetRealHeight(100/2),
                Radius = (uint)Application.GetRealHeight(100 / 2),
                BackgroundColor = ZigbeeColor.Current.XMWhite,
            };
            flMain.AddChidren(bottomFrameLayout);
@@ -334,7 +335,7 @@
            var bottomFrameLayout1 = new FrameLayout()
            {
                Height = Application.GetRealHeight(668 - 60),
                Y = Application.GetRealHeight(1253+58),
                Y = Application.GetRealHeight(1253 + 58),
                BackgroundColor = ZigbeeColor.Current.XMWhite,
            };
            flMain.AddChidren(bottomFrameLayout1);
@@ -457,7 +458,7 @@
                    btnLine.Visible = false;
                }

                if (currentAccount.UserName != "" && currentAccount.UserName != null)
                if (!string.IsNullOrEmpty(currentAccount.UserName))
                {
                    btnUserName.Text = currentAccount.UserName;
                }
@@ -547,7 +548,7 @@
                           switch (curDoorLockUser.UnlockType)
                           {
                               case 0:
                                   if (curDoorLockUser.UserName != "" && curDoorLockUser.UserName != null)
                                   if (!string.IsNullOrEmpty(curDoorLockUser.UserName))
                                   {
                                       addLockInfo.UserIdRemarks = curDoorLockUser.UserName;
                                   }
@@ -557,7 +558,7 @@
                                   }
                                   break;
                               case 3:
                                   if (curDoorLockUser.UserName != "" && curDoorLockUser.UserName != null)
                                   if (!string.IsNullOrEmpty(curDoorLockUser.UserName))
                                   {
                                       addLockInfo.UserIdRemarks = curDoorLockUser.UserName;
                                   }
@@ -567,7 +568,7 @@
                                   }
                                   break;
                               case 15:
                                   if (curDoorLockUser.UserName != "" && curDoorLockUser.UserName != null)
                                   if (!string.IsNullOrEmpty(curDoorLockUser.UserName))
                                   {
                                       addLockInfo.UserIdRemarks = curDoorLockUser.UserName;
                                   }
@@ -753,7 +754,7 @@
                        break;
                }

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