代码合并

黄学彪

2019-12-20 23fb45dd846ed8b62304c408c6bbe64265d4ac8b

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

@@ -51,6 +51,7 @@
                    {
                        TypeRefresh();
                        CommonPage.Loading.Hide();
                        bodyView.EndHeaderRefreshing();
                    });
                }
            });
@@ -158,7 +159,6 @@
            {
                bodyView.BeginHeaderRefreshing();
                ReadDoorLockUserInfo();
                bodyView.EndHeaderRefreshing();
            };
        }

@@ -250,7 +250,7 @@
                {
                    Y = rowFrameLayout.Height - 1,
                    X = Application.GetRealWidth(176),
                    Width = Application.GetRealWidth(965),
                    Width = Application.GetRealWidth(847),
                    Height = 1,
                    BackgroundColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
                };
@@ -468,8 +468,10 @@
                {
                    if (doorLock.IsFreezeAccount[currentAccount.SubAccountDistributedMark] == true)
                    {

                        new Tip() { MaxWidth = 150, Text = btnUserName.Text + Language.StringByID(R.MyInternationalizationString.AccountIsFreezed), Direction = AMPopTipDirection.Down, CloseTime = 1 }.Show(Common.CommonPage.Instance);
                        Application.RunOnMainThread(() =>
                        {
                            new Tip() { MaxWidth = 150, Text = btnUserName.Text + Language.StringByID(R.MyInternationalizationString.AccountIsFreezed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
                        });
                        return;
                    }

@@ -506,12 +508,24 @@
                bottomFrameLayout.RemoveAll();
            };

            btnFinish.MouseUpEventHandler += async (sender, e) =>
            btnFinish.MouseUpEventHandler += (sender, e) =>
            {
               System.Threading.Tasks.Task.Run(async () =>
               {
                   try
                   {
                       Application.RunOnMainThread(() =>
                       {
                           CommonPage.Loading.Start("");
                       });
                if (curAccountId == "")
                       {  
                           Application.RunOnMainThread(() =>
                {
                    flMain.RemoveFromParent();
                    bottomFrameLayout.RemoveAll();
                               CommonPage.Loading.Hide ();
                           });
                }
                else
                {
@@ -528,7 +542,6 @@
                    }
                    addLockInfo.OpenLockMode = curDoorLockUser.UnlockType;
                    addLockInfo.DoorLockLocalUserId = curDoorLockUser.UserID.ToString();

                    switch (curDoorLockUser.UnlockType)
                    {
                        case 0:
@@ -562,7 +575,6 @@
                            }
                            break;
                    }

                    addLockInfo.EntryTime = curDoorLockUser.EntryTime;
                    var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/AddDoorLock", addLockInfo);
                    if (result != null)
@@ -582,29 +594,46 @@
                            var d = uList.Find((value) => { return value == curDoorLockUser.UserID; });
                            if (d != null)
                            {
                                       Application.RunOnMainThread(() =>
                                       {
                                TypeRefresh();
                                           CommonPage.Loading.Hide();
                                flMain.RemoveFromParent();
                                bottomFrameLayout.RemoveAll();
                                       }); 
                            }
                            else
                            {
                                new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Down, CloseTime = 1 }.Show(Common.CommonPage.Instance);
                            }
                        }
                        else
                                       Application.RunOnMainThread(() =>
                        {
                                           CommonPage.Loading.Hide();
                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.Down, CloseTime = 1 }.Show(Common.CommonPage.Instance);
                            flMain.RemoveFromParent();
                            bottomFrameLayout.RemoveAll();
                                       });
                        }
                    }
                    else
                    {
                        new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinish);
                        flMain.RemoveFromParent();
                        bottomFrameLayout.RemoveAll();
                                   Application.RunOnMainThread(() =>
                                   {
                                       CommonPage.Loading.Hide();
                                       new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.Down, CloseTime = 1 }.Show(Common.CommonPage.Instance);
                                   });
                                   return;
                    }
                }
                           else
                           {
                               Application.RunOnMainThread(() =>
                               {
                                   CommonPage.Loading.Hide();
                                   new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(btnFinish);
                               });
                               return;
                           }
                       }
                   }
                   catch { }
               });
            };
        }