From 2be70a32d2a8c517bd9868fb60913fcc843e66fe Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期三, 13 五月 2020 11:21:32 +0800 Subject: [PATCH] 上传代码 --- ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs | 225 +++++++++++++++++++++++++++---------------------------- 1 files changed, 111 insertions(+), 114 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs index 54e00a4..4c51329 100755 --- a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs +++ b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs @@ -19,12 +19,6 @@ public Action<bool> action; ///绗簩鍧楃涓�绾х埗鎺т欢 FrameLayout fLayout = new FrameLayout(); - ///甯稿紑妯″紡鍥炬爣 - Button modeIconBtn = new Button(); - ///绗簩鍧楃浜岀骇鐖舵帶浠� - FrameLayout modeFl = new FrameLayout(); - Button button1 = new Button(); - Button button2= new Button(); ///绗笁鍧楃涓�绾х埗鎺т欢 FrameLayout listLogicFl = new FrameLayout(); ///甯稿紑鑷姩鍖栧垪琛ㄤ笂涓嬫粦鍔ㄧ殑鎺т欢 @@ -92,30 +86,6 @@ BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor, }; middle.AddChidren(fLayout); - ///甯稿紑妯″紡鍥炬爣 - modeIconBtn = new Button - { - X = Application.GetRealWidth(395), - Y = Application.GetRealHeight(92), - Width = Application.GetMinRealAverage(294), - Height = Application.GetMinRealAverage(294), - }; - fLayout.AddChidren(modeIconBtn); - ///绗簩鍧楃浜岀骇鐖舵帶浠� - modeFl = new FrameLayout - { - }; - fLayout.AddChidren(modeFl); - - button1 = new Button - { - }; - modeFl.AddChidren(button1); - - button2 = new Button - { - }; - modeFl.AddChidren(button2); ModeView(); #endregion #region 甯稿紑鑷姩鍖� @@ -162,7 +132,7 @@ UnSelectedImagePath = "ZigeeLogic/add.png", }; addLogicfL.AddChidren(addIconBtn); - + ///鍔犲ぇ鐐瑰嚮鐑敭 var addIconclickBtn = new Button { Width = Application.GetRealWidth(90 + 69 + 63), @@ -245,33 +215,46 @@ /// <summary> /// 甯稿紑妯″紡寮�鍏冲垏鎹㈠浘鏍囩晫闈� /// </summary> - public async void ModeView() + public void ModeView() { - + + fLayout.RemoveAll(); + ///甯稿紑妯″紡鍥炬爣 + Button modeIconBtn = new Button + { + X = Application.GetRealWidth(395), + Y = Application.GetRealHeight(92), + Width = Application.GetMinRealAverage(294), + Height = Application.GetMinRealAverage(294), + }; + fLayout.AddChidren(modeIconBtn); if (Send.CurrentDoorLock.IsDoorLockNormallyMode) { - fLayout.Height = Application.GetRealHeight(780);//鏀瑰彉楂樺害 + + fLayout.Height = Application.GetRealHeight(780);//鏀瑰彉楂樺害 modeIconBtn.UnSelectedImagePath = "ZigeeLogic/openMode.png";//鏀瑰彉鍥炬爣鐘舵�� - modeFl.Y = modeIconBtn.Bottom + Application.GetRealHeight(64); - modeFl.X = Application.GetRealWidth(0); - modeFl.Height = Application.GetRealHeight(127 + 199); - modeFl.Width = Application.GetRealHeight(1080); - modeFl.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor; - modeFl.SetCornerWithSameRadius(Application.GetRealHeight(0), HDLUtils.RectCornerBottomLeft); - + ///绗簩绾х埗鎺т欢 + var openModeFl = new FrameLayout + { + Y = Application.GetRealHeight(455), + Height = Application.GetRealHeight(127 + 199), + Width = Application.GetRealWidth(1080), + }; + fLayout.AddChidren(openModeFl); ///鍏抽棴鏃舵晥鎬ц嚜鍔ㄥ寲 - button1.Y = Application.GetRealHeight(0); - button1.X = Application.GetRealWidth(86); - button1.Width = Application.GetRealWidth(907); - button1.Height = Application.GetRealHeight(127); - button1.Radius = (uint)Application.GetRealHeight(58); - button1.BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor; - button1.TextAlignment = TextAlignment.Center; - button1.TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor; - button1.TextID = MyInternationalizationString.closeUp; - button1.TextSize = 16; - - button1.MouseUpEventHandler = async (sender, e) => + Button closeBtn = new Button + { + X = Application.GetRealWidth(86), + Height = Application.GetRealHeight(127), + Width = Application.GetRealWidth(907), + Radius = (uint)Application.GetRealHeight(58), + BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor, + TextID = MyInternationalizationString.closeUp, + TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor, + TextSize = 16, + }; + openModeFl.AddChidren(closeBtn); + closeBtn.MouseUpEventHandler += async (sender, e) => { CommonPage.Loading.Start(); try @@ -302,16 +285,20 @@ }); } }; + + ///鏄剧ず澶辨晥璁剧疆鏃堕棿鏂囨湰鎺т欢 + var timeTextBtn = new Button + { + Y = Application.GetRealHeight(127 + 69), + X = Application.GetRealWidth(125), + Width = Application.GetRealWidth(634 + 200), + Height = Application.GetRealHeight(60), + TextSize = 15, + TextColor = ZigbeeColor.Current.LogicTextBlackColor, + }; if (logicId != 0) { - ///鏄剧ず澶辨晥璁剧疆鏃堕棿鏂囨湰鎺т欢 - button2.Y = Application.GetRealHeight(127 + 69); - button2.X = Application.GetRealWidth(125); - button2.Width = Application.GetRealWidth(634 + 200); - button2.Height = Application.GetRealHeight(60); - button2.UnSelectedImagePath = "ZigeeLogic/1234.png"; - button2.TextSize = 15; - button2.TextColor = ZigbeeColor.Current.LogicTextBlackColor; + openModeFl.AddChidren(timeTextBtn); ///鏈夋椂鏁堟�у父寮�鎵嶆樉绀烘椂闂存潯浠舵枃鏈� var y = DateTime.Now.Year.ToString();//閭d竴骞� var m = DateTime.Now.Month.ToString();//閭d竴鏈� @@ -325,72 +312,80 @@ string text3 = Language.StringByID(MyInternationalizationString.monthSone); string text4 = Language.StringByID(MyInternationalizationString.numberSone); string text5 = Language.StringByID(MyInternationalizationString.executeSone); - button2.Text = text1 + y + text2 + m + text3 + days.ToString() + text4 + hour.ToString() + text5; + timeTextBtn.Text = text1 + y + text2 + m + text3 + days.ToString() + text4 + hour.ToString() + text5; } - else - { - button2.Y = Application.GetRealHeight(0); - button2.X = Application.GetRealWidth(0); - button2.Width = Application.GetRealWidth(0); - button2.Height = Application.GetRealHeight(0); - } - + } else { fLayout.Height = Application.GetRealHeight(645);//鏀瑰彉楂樺害 modeIconBtn.UnSelectedImagePath = "ZigeeLogic/noMode.png";//鏀瑰彉鍥炬爣鐘舵�� - modeFl.Y = modeIconBtn.Bottom + Application.GetRealHeight(92); - modeFl.X = Application.GetRealWidth(58); - modeFl.Height = Application.GetRealHeight(138); - modeFl.Width = Application.GetRealHeight(1022); - modeFl.BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor; + ///绗簩绾х埗鎺т欢 + var modeFl = new FrameLayout + { + Y = Application.GetRealHeight(478), + X = Application.GetRealWidth(58), + Height = Application.GetRealHeight(138), + Width = Application.GetRealWidth(1022), + BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor, + }; + fLayout.AddChidren(modeFl); modeFl.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerBottomLeft); - ///鏃舵晥鎬у父寮�璁剧疆鏄剧ず鏂囨湰鎺т欢 - button1.Y = Application.GetRealHeight(40); - button1.X = Application.GetRealWidth(58); - button1.Width = Application.GetRealWidth(600); - button1.Height = Application.GetRealHeight(60); - button1.Radius = (uint)Application.GetRealHeight(0); - button1.BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor; - button1.TextAlignment = TextAlignment.CenterLeft; - button1.TextColor = ZigbeeColor.Current.LogicTextBlackColor; - // Text = "鏃舵晥鎬у父寮�璁剧疆", - button1.TextID = MyInternationalizationString.timeSetSone; - button1.TextSize = 15; - - - ///涓嬩竴绾ц彍鍗曞浘鏍囨帶浠� - button2.Width = Application.GetMinRealAverage(104); - button2.Height = Application.GetMinRealAverage(104); - button2.X = Application.GetRealWidth(861); - button2.Y = Application.GetRealHeight(17); - button2.UnSelectedImagePath = "ZigeeLogic/nextIconSone.png"; - button2.TextSize = 15; - button2.TextColor = ZigbeeColor.Current.LogicTextBlackColor; - button2.Text =""; - button2.MouseUpEventHandler = (sender, e) => + var modeTextBtn = new Button { - LogicView.TipView.ShowConfrimTip(() => + Y = Application.GetRealHeight(40), + X = Application.GetRealWidth(58), + Width = Application.GetRealWidth(600), + Height = Application.GetRealHeight(60), + TextSize = 15, + TextColor = ZigbeeColor.Current.LogicTextBlackColor, + TextAlignment = TextAlignment.CenterLeft, + // Text = "鏃舵晥鎬у父寮�璁剧疆", + TextID = MyInternationalizationString.timeSetSone, + }; + modeFl.AddChidren(modeTextBtn); + ///涓嬩竴绾ц彍鍗曞浘鏍囨帶浠� + var nextIconBtn = new Button + { + Width = Application.GetMinRealAverage(104), + Height = Application.GetMinRealAverage(104), + X = Application.GetRealWidth(861), + Y = Application.GetRealHeight(17), + UnSelectedImagePath = "ZigeeLogic/nextIconSone.png", + }; + modeFl.AddChidren(nextIconBtn); - {///鍐嶆纭 + ///鍔犲ぇ鐐瑰嚮鐑敭 + var clickBtn = new Button + { + Width = Application.GetRealWidth(104 + 161 + 30), + Height = Application.GetRealHeight(138), + X = Application.GetRealWidth(700), + }; + modeFl.AddChidren(clickBtn); + clickBtn.MouseUpEventHandler += (sender, e) => + { + + LogicView.TipView.ShowConfrimTip(() => + + {///鍐嶆纭 LogicView.TipView.ShowInputTip(true, async (str) => - {///纭鍙戦�佸懡浠� + {///纭鍙戦�佸懡浠� CommonPage.Loading.Start(); - try - { + try + { ///xm var result = await UserCenter.DoorLock.DoorLockCommonInfo.SetNormallyOpenModeFuncAsync(Send.CurrentDoorLock); - if (!result) - { - LogicView.TipView.ShowFlashTip(Language.StringByID(MyInternationalizationString.openFailed)); - return; - } - else - { + if (!result) + { + LogicView.TipView.ShowFlashTip(Language.StringByID(MyInternationalizationString.openFailed)); + return; + } + else + { ///鍥犱负鏈夊父寮�妯″紡涓嬫墠鍙互鍒涘缓澶辨晥閫昏緫锛� SkipView.GetLogicAll();//鍒犻櫎涔嬪墠鎵�鏈夊け鏁堥�昏緫 var addResult = await SkipView.LockAddModifyLogic(int.Parse(str), Send.CurrentDoorLock);//娣诲姞涓�鏉″け鏁堥�昏緫 @@ -477,8 +472,10 @@ } } - - RowLayout selectedRow = new RowLayout() { Tag = "0" };//璁板綍宸︽粦鐘舵�� + /// <summary> + /// 璁板綍宸︽粦鐘舵�� + /// </summary> + RowLayout selectedRow = new RowLayout() { Tag = "0" }; int a = 1; /// <summary> /// 鍔犺浇鑷姩鍖栧垪琛� @@ -644,6 +641,6 @@ }; } } - + } } -- Gitblit v1.8.0