From 48ba446936b51fffafa7c3600c0dadc6ac0e8c20 Mon Sep 17 00:00:00 2001 From: 陈嘉乐 <cjl@hdlchina.com.cn> Date: 星期五, 10 七月 2020 10:52:13 +0800 Subject: [PATCH] 2020-07-10-01 --- ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs | 514 ++++++++++++++++++++++++++------------------------------ 1 files changed, 237 insertions(+), 277 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs index 74cbb04..d259aeb 100755 --- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs @@ -25,11 +25,6 @@ var doorLock = tempDevice as ZigBee.Device.DoorLock; if (doorLock.doorLockProgrammingEventNotificationCommand != null) { - - Application.RunOnMainThread(() => - { - - }); } } } @@ -45,18 +40,48 @@ BackgroundColor = Shared.Common.ZigbeeColor.Current.GXCTopViewBackgroundColor; } - #region 鈼� 鍙橀噺鐢虫槑__________________________ + #region 鍙橀噺鐢虫槑 + /// <summary> + /// 褰撳墠闂ㄩ攣 + /// </summary> ZigBee.Device.DoorLock doorLock; - VerticalRefreshLayout bodyView; - Button currentMethod;// 褰撳墠閫夋嫨鐨勬柟寮� + /// <summary> + /// 鍒锋柊View + /// </summary> + VerticalListRefreshControl bodyView; + /// <summary> + /// 褰撳墠閫夋嫨鐨勬柟寮� + /// </summary> + Button currentMethod; + /// <summary> + /// 褰撳墠璐︽埛 + /// </summary> Shared.Phone.UserCenter.MemberInfoRes curAccountObj; + /// <summary> + /// 鏁版嵁涓虹┖锛孶I鏄剧ず鐨勭┖鍥剧墖 + /// </summary> Button entryStatusPic; + /// <summary> + /// 鏁版嵁涓虹┖锛孶I鏄剧ず鐨勬枃鏈彁绀� + /// </summary> Button btnPicTip; + /// <summary> + /// 鏁版嵁涓虹┖锛孶I鏄剧ず鐨勬枃鏈彁绀� + /// </summary> Button btnPicTip1; + /// <summary> + /// //鏄惁浜屾鍒犻櫎 + /// </summary> bool isSecondDel; + /// <summary> + /// 绌烘暟鎹樉绀哄竷灞� + /// </summary> FrameLayout blankFrameLayout; #endregion + /// <summary> + /// 璇诲彇闂ㄩ攣瀛樺偍鐨勬渶鏂版暟鎹� + /// </summary> void ReadDoorLockUserInfo() { System.Threading.Tasks.Task.Run(async () => @@ -81,6 +106,7 @@ // 绫诲瀷鍖哄垎 TypeRefresh(); CommonPage.Loading.Hide(); + bodyView.EndHeaderRefreshing(); }); } }); @@ -91,6 +117,7 @@ /// </summary> public void Show() { + UserView.HomePage.Instance.ScrollEnabled = false; doorLock.currentUserDisplayMethod = ""; this.TopFrameLayout(this, Language.StringByID(R.MyInternationalizationString.LockMethod)); this.btnTitleLine.Visible = false; @@ -155,7 +182,10 @@ RefreshList(); } } - //涓儴甯冨眬 + + /// <summary> + /// 涓儴甯冨眬 + /// </summary> void MidFrameLayoutContent() { #region 寮�閿佹柟寮廢I @@ -173,8 +203,9 @@ Y = Application.GetRealHeight(35), X = Application.GetRealWidth(812 - 100), TextAlignment = TextAlignment.CenterRight, - TextColor = Shared.Common.ZigbeeColor.Current.XMTopTitleText, + TextColor = Shared.Common.ZigbeeColor.Current.XMBlack, TextSize = 12, + IsBold = true, }; midTopFrameLayout.AddChidren(btnAllMethod); // 绫诲瀷鍖哄垎 @@ -210,10 +241,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, @@ -223,7 +256,7 @@ this.midFrameLayout.AddChidren(btnLine); #endregion - bodyView = new VerticalRefreshLayout() + bodyView = new VerticalListRefreshControl(29) { Y = btnLine.Bottom, Height = Application.GetRealHeight(1921 - 184 - 116), @@ -233,11 +266,13 @@ { bodyView.BeginHeaderRefreshing(); ReadDoorLockUserInfo(); - bodyView.EndHeaderRefreshing(); }; BlankPicUI(); } + /// <summary> + /// 绌烘暟鎹甎I鏄剧ず + /// </summary> void BlankPicUI() { blankFrameLayout = new FrameLayout @@ -253,6 +288,7 @@ Width = Application.GetRealHeight(757), Visible = false, UnSelectedImagePath = "DoorLock/UnLockBlankPic.png", + Gravity = Gravity.CenterHorizontal, }; blankFrameLayout.AddChidren(entryStatusPic); @@ -264,20 +300,25 @@ Gravity = Gravity.CenterHorizontal, Visible = false, Y = Application.GetRealHeight(844), + TextSize = 12, }; blankFrameLayout.AddChidren(btnPicTip); btnPicTip1 = new Button { X = Application.GetRealWidth(397), - Y = btnPicTip.Bottom, + Y = Application.GetRealHeight(844 + 49), Text = Language.StringByID(R.MyInternationalizationString.NoPasswordInformation1), TextColor = Shared.Common.ZigbeeColor.Current.XMGray3, Gravity = Gravity.CenterHorizontal, - Visible = false, - BackgroundColor = 0xff00ff00, + Visible = true, + TextSize = 12, }; blankFrameLayout.AddChidren(btnPicTip1); + if (UserCenterResourse.UserInfo.AuthorityNo != 1) + { + btnPicTip1.Width = 0; + } } /// <summary> @@ -295,7 +336,7 @@ { var curDoorLockUser = doorLock.localDoorLockUserList[curUserId]; - if (curDoorLockUser.ConnectedAccount == "" || curDoorLockUser.ConnectedAccount != curAccountObj.SubAccountDistributedMark) + if (string.IsNullOrEmpty(curDoorLockUser.ConnectedAccount) || curDoorLockUser.ConnectedAccount != curAccountObj.SubAccountDistributedMark) { continue; } @@ -328,12 +369,7 @@ btnPicTip.Height = Application.GetRealHeight(0); btnPicTip1.Height = Application.GetRealHeight(0); blankFrameLayout.Height = Application.GetRealHeight(0); - var frameLayoutRow = new FrameLayout() - { - Height = Application.GetMinRealAverage(0), - BackgroundColor = Shared.Common.ZigbeeColor.Current.XMWhite, - }; - bodyView.AddChidren(frameLayoutRow); + int i = 0; foreach (var curUserId in curAccountDoorLockUserList.Keys) { @@ -362,70 +398,165 @@ break; } - #region UI - var rowFrameLayout = new RowLayout() + #region UI + var rowFrameLayout = new RowLayoutControl(bodyView.rowSpace / 2); + rowFrameLayout.BackgroundColor = ZigbeeColor.Current.XMWhite; + bodyView.AddChidren(rowFrameLayout); + rowFrameLayout.frameTable.UseClickStatu = false; + var btnicon = rowFrameLayout.frameTable.AddLeftIcon(); + btnicon.UnSelectedImagePath = "DoorLock/DoorLockUserPic.png"; + //涓婇潰闂ㄩ攣鐢ㄦ埛鍚嶇О涓�琛� + var memberText = ""; + if (string.IsNullOrEmpty(curAccountObj.UserName)) { - Height = Application.GetRealHeight(127 + 23), - X = Application.GetRealWidth(58), - Y = i * Application.GetRealHeight(150), - Width = Application.GetRealWidth(965), - LineColor = Shared.Common.ZigbeeColor.Current.XMRowLine, - BackgroundColor = Shared.Common.ZigbeeColor.Current.XMWhite, - }; - frameLayoutRow.AddChidren(rowFrameLayout); - - var btnPicFrameLayout = new FrameLayout() + memberText = curAccountObj.Account; + } + else { - Width = Application.GetRealWidth(81), - Height = Application.GetRealHeight(81), - X = Application.GetRealWidth(40), - Y = Application.GetRealHeight(49), - }; - rowFrameLayout.AddChidren(btnPicFrameLayout); - - var btnPic = new Button() - { - Width = Application.GetRealWidth(84), - Height = Application.GetRealHeight(84), - UnSelectedImagePath = "DoorLock/DoorLockUserPic.png", - }; - btnPicFrameLayout.AddChidren(btnPic); - + memberText = curAccountObj.UserName; + } + //鎴愬憳涓�琛� + var btnaa = rowFrameLayout.frameTable.AddBottomView(memberText, 800); var btnDoorlockUser = new EditText() { - Width = Application.GetRealWidth(1080 - 173), + Width = Application.GetRealWidth(800), Height = Application.GetRealHeight(60), - X = Application.GetRealWidth(173), - Y = Application.GetRealHeight(35), + X = btnaa.X, + Y = rowFrameLayout.chidrenYaxis + Application.GetRealHeight(12), TextSize = 14, PlaceholderTextColor = Shared.Common.ZigbeeColor.Current.XMGray3, TextColor = Shared.Common.ZigbeeColor.Current.XMBlack, TextAlignment = TextAlignment.CenterLeft, }; - rowFrameLayout.AddChidren(btnDoorlockUser); - - var btnMember = new Button() + rowFrameLayout.frameTable.AddChidren(btnDoorlockUser, ChidrenBindMode.NotBind); + rowFrameLayout.frameTable.AddBottomLine(); + var btndelete = rowFrameLayout.AddDeleteControl(); + btndelete.ButtonClickEvent += (sender, e) => { - Width = Application.GetRealWidth(1080 - 173), - Height = Application.GetRealHeight(49), - X = Application.GetRealWidth(173), - Y = Application.GetRealHeight(95), - TextColor = Shared.Common.ZigbeeColor.Current.XMGray3, - TextSize = 14, - TextAlignment = TextAlignment.CenterLeft, + 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 + { + 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(CommonPage.Instance); + } + } + catch { } + finally + { + CommonPage.Loading.Hide(); + } + }; }; - rowFrameLayout.AddChidren(btnMember); - - var btnDel = new Button() - { - Width = Application.GetRealWidth(184), - Text = Language.StringByID(R.MyInternationalizationString.DelBindDevice), - TextColor = Shared.Common.ZigbeeColor.Current.XMWhite, - TextSize = 12, - TextAlignment = TextAlignment.Center, - BackgroundColor = Shared.Common.ZigbeeColor.Current.XMDel, - }; - rowFrameLayout.AddRightView(btnDel); #endregion #region 鏁版嵁澶勭悊 @@ -438,7 +569,7 @@ switch (curDoorLockUser.UnlockType) { case 0: - if (curDoorLockUser.UserName != "" && curDoorLockUser.UserName != null) + if (!string.IsNullOrEmpty(curDoorLockUser.UserName)) { btnDoorlockUser.Text = curDoorLockUser.UserName; } @@ -448,7 +579,7 @@ } break; case 3: - if (curDoorLockUser.UserName != "" && curDoorLockUser.UserName != null) + if (!string.IsNullOrEmpty(curDoorLockUser.UserName)) { btnDoorlockUser.Text = curDoorLockUser.UserName; } @@ -458,7 +589,7 @@ } break; case 15: - if (curDoorLockUser.UserName != "" && curDoorLockUser.UserName != null) + if (!string.IsNullOrEmpty(curDoorLockUser.UserName)) { btnDoorlockUser.Text = curDoorLockUser.UserName; } @@ -469,14 +600,6 @@ break; } - if (curAccountObj.UserName == "" || curAccountObj.UserName == null) - { - btnMember.Text = curAccountObj.Account; - } - else - { - btnMember.Text = curAccountObj.UserName; - } Action<Shared.View> action = async (obj) => { @@ -505,6 +628,7 @@ var localDoorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { }; localDoorLockObj.UserID = curDoorLockUser.UserID; localDoorLockObj.UnlockType = curDoorLockUser.UnlockType; + localDoorLockObj.PrimaryId = curDoorLockUser.PrimaryId; localDoorLockObj.EntryTime = curDoorLockUser.EntryTime; localDoorLockObj.UserName = refreshDoorLockData.UserIdRemarks; localDoorLockObj.ConnectedAccount = curAccountObj.SubAccountDistributedMark; @@ -523,145 +647,18 @@ } }; btnDoorlockUser.EditorEnterAction += action; - - btnDel.MouseUpEventHandler += (sender, e) => - { - var alert = new Alert(Language.StringByID(R.MyInternationalizationString.Tip), Language.StringByID(R.MyInternationalizationString.SureToDelUnlockMethod), - Language.StringByID(R.MyInternationalizationString.Cancel), Language.StringByID(R.MyInternationalizationString.Confrim)); - alert.Show(); - alert.ResultEventHandler += async (sender1, e1) => - { - if (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); - } - } - catch { } - finally - { - CommonPage.Loading.Hide(); - } - } - }; - }; #endregion i++; } - frameLayoutRow.Height = i * Application.GetRealHeight(150); } } - // 渚ц竟瀵艰埅鏍� + /// <summary> + /// 渚ц竟瀵艰埅鏍� + /// </summary> void SideslipFramelayout() { + #region sidelipFrameLayout UI var dialog = new Dialog { }; @@ -690,13 +687,18 @@ Y = Application.GetRealHeight(28), }; sidelipFrameLayout.AddChidren(sidelipVerticalScrolViewLayout); + #endregion + Button oldbutton = null; Button oldbuttonText = null; for (var i = 0; i < 4; i++) { + #region rowFrameLayout UI var rowFrameLayout = new RowLayout() { Height = Application.GetRealHeight(150), + LineColor = Shared.Common.ZigbeeColor.Current.XMRowLine, + X = Application.GetRealWidth(81), }; sidelipVerticalScrolViewLayout.AddChidren(rowFrameLayout); @@ -704,8 +706,7 @@ { Width = Application.GetRealWidth(81), Height = Application.GetRealHeight(81), - X = Application.GetRealWidth(81), - Y = Application.GetRealHeight(55), + Y = Application.GetRealHeight(35), }; rowFrameLayout.AddChidren(btnAllMethod); @@ -713,14 +714,16 @@ { Width = Application.GetRealWidth(311), Height = Application.GetRealHeight(58), - X = Application.GetRealWidth(173), - Y = Application.GetRealHeight(69), + X = Application.GetRealWidth(92), + Y = Application.GetRealHeight(49), TextColor = Shared.Common.ZigbeeColor.Current.XMGray3, TextSize = 14, TextAlignment = TextAlignment.CenterLeft, }; rowFrameLayout.AddChidren(btnMethodText); + #endregion + #region 鏁版嵁澶勭悊 EventHandler<MouseEventArgs> hander = (sender, e) => { if (!btnAllMethod.IsSelected) @@ -739,6 +742,7 @@ doorLock.ReSave(); btnAllMethod.IsSelected = true; oldbuttonText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack; + oldbuttonText.IsBold = true; TypeRefresh(); } dialog.Close(); @@ -747,69 +751,35 @@ btnAllMethod.MouseUpEventHandler += hander; btnMethodText.MouseUpEventHandler += hander; - switch (i) - { - case 0: - btnAllMethod.UnSelectedImagePath = "DoorLock/AllMethod.png"; - btnAllMethod.SelectedImagePath = "DoorLock/AllMethodOn.png"; - btnMethodText.Text = Language.StringByID(R.MyInternationalizationString.AllMethod); - break; - case 1: - btnAllMethod.UnSelectedImagePath = "DoorLock/Password.png"; - btnAllMethod.SelectedImagePath = "DoorLock/PasswordOn.png"; - btnMethodText.Text = Language.StringByID(R.MyInternationalizationString.PasswordUnlock); - break; - case 2: - btnAllMethod.UnSelectedImagePath = "DoorLock/Fingerprint.png"; - btnAllMethod.SelectedImagePath = "DoorLock/FingerprintOn.png"; - btnMethodText.Text = Language.StringByID(R.MyInternationalizationString.FingerprintUnlock); - break; - case 3: - btnAllMethod.UnSelectedImagePath = "DoorLock/proximityCard.png"; - btnAllMethod.SelectedImagePath = "DoorLock/proximityCardOn.png"; - btnMethodText.Text = Language.StringByID(R.MyInternationalizationString.ProximithCardUnlock); - break; - } + DisplayAllUnlockMethod(i, btnAllMethod, btnMethodText); - if (doorLock.currentUserDisplayMethod == "" && i == 0) + if (string.IsNullOrEmpty(doorLock.currentUserDisplayMethod) && i == 0) { - btnAllMethod.IsSelected = true; - btnMethodText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack; - oldbutton = btnAllMethod; - oldbuttonText = btnMethodText; + CurrentSelectUnlockMethod(btnAllMethod, btnMethodText, oldbutton, oldbuttonText); } if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.AllMethod) && i == 0) { - btnAllMethod.IsSelected = true; - btnMethodText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack; - oldbutton = btnAllMethod; - oldbuttonText = btnMethodText; + CurrentSelectUnlockMethod(btnAllMethod, btnMethodText, oldbutton, oldbuttonText); } if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.PasswordUnlock) && i == 1) { - btnAllMethod.IsSelected = true; - btnMethodText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack; - oldbutton = btnAllMethod; - oldbuttonText = btnMethodText; + CurrentSelectUnlockMethod(btnAllMethod, btnMethodText, oldbutton, oldbuttonText); } if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.FingerprintUnlock) && i == 2) { - btnAllMethod.IsSelected = true; - btnMethodText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack; - oldbutton = btnAllMethod; - oldbuttonText = btnMethodText; + CurrentSelectUnlockMethod(btnAllMethod, btnMethodText, oldbutton, oldbuttonText); } if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.ProximithCardUnlock) && i == 3) { - btnAllMethod.IsSelected = true; - btnMethodText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack; - oldbutton = btnAllMethod; - oldbuttonText = btnMethodText; + CurrentSelectUnlockMethod(btnAllMethod, btnMethodText, oldbutton, oldbuttonText); } + #endregion } } - //绫诲瀷鍖哄垎 + /// <summary> + /// 绫诲瀷鍖哄垎 + /// </summary> void TypeRefresh() { if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.PasswordUnlock)) @@ -835,19 +805,9 @@ /// </summary> public override void RemoveFromParent() { + UserView.HomePage.Instance.ScrollEnabled = true; ZbGateway.StatusList.Remove(this); base.RemoveFromParent(); - } - - public void Changed(CommonDevice common) - { - } - public void ChangedILogicStatus(ZigBee.Device.Logic logic) - { - } - - public void ChangedISceneStatus(Scene scene) - { } } } -- Gitblit v1.8.0