From 6bca8fcd37a48808a0b9c9342fc1be0adddfece6 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 08 五月 2020 17:46:44 +0800
Subject: [PATCH] 请合并最新代码，优化绑定信息
---
ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs | 134 +++++++++++++++++++++++---------------------
1 files changed, 69 insertions(+), 65 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
old mode 100755
new mode 100644
index c083b5c..9f042fa
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
@@ -16,11 +16,7 @@
{
Tag = "SoneLogic";
}
- /// <summary>
- ///
- /// </summary>
- /// <param name="action">缁欏緪姊呭埛鏂扮晫闈㈢敤鐨�</param>
- /// <param name="bool_If"></param>
+ /// 缁欏緪姊呭埛鏂扮晫闈㈢敤鐨�
public Action<bool> action;
public async void Show()
{
@@ -33,13 +29,11 @@
view.clickBtn.MouseDownEventHandler += (sender, e) =>
{
UserView.HomePage.Instance.ScrollEnabled = true;
+ RemoveFromParent();
if (action != null)
{
action(Send.CurrentDoorLock.IsDoorLockNormallyMode);
}
-
- RemoveFromParent();
-
};
var middle = new FrameLayout
@@ -67,8 +61,6 @@
Y = Application.GetRealHeight(92),
Width = Application.GetMinRealAverage(294),
Height = Application.GetMinRealAverage(294),
- UnSelectedImagePath = "ZigeeLogic/noMode.png",
- SelectedImagePath = "ZigeeLogic/openMode.png",
};
fLayout.AddChidren(modeIconBtn);
@@ -78,7 +70,7 @@
var logic = await SkipView.GetLogicIfon();
fLayout.Height = Application.GetRealHeight(780);//鏀瑰彉楂樺害
- modeIconBtn.IsSelected = true;//鏀瑰彉鍥炬爣鐘舵��
+ modeIconBtn.UnSelectedImagePath = "ZigeeLogic/openMode.png";//鏀瑰彉鍥炬爣鐘舵��
///绗簩绾х埗鎺т欢
var openModeFl = new FrameLayout
{
@@ -116,11 +108,12 @@
var soneLogicList = new SoneLogicList();
UserView.HomePage.Instance.AddChidren(soneLogicList);
UserView.HomePage.Instance.PageIndex += 1;
- soneLogicList.Show();
+ soneLogicList.Show();
+ soneLogicList.action = action;
}
else
{
- ///鎻愮ず澶辫触
+ LogicView.TipView.ShowFlashTip("鍏抽棴澶辫触");
}
};
@@ -129,8 +122,8 @@
var timeTextBtn = new Button
{
Y = Application.GetRealHeight(127 + 69),
- X = Application.GetRealWidth(225),
- Width = Application.GetRealWidth(634),
+ X = Application.GetRealWidth(125),
+ Width = Application.GetRealWidth(634 + 200),
Height = Application.GetRealHeight(60),
TextSize = 15,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
@@ -152,7 +145,8 @@
var timeInt = int.Parse(logic.Conditions[0]["DoorLockOpenDelayTime"]);
int dayInt = (h + timeInt) / 24;//绠楀嚭鍑犲ぉ鍚庢墽琛�
int hour = (h + timeInt) % 24;//绠楀嚭鍑犲ぉ鍚庨偅涓椂闂存墽琛�
- timeTextBtn.Text = "鏃舵晥鎬у父寮�璁剧疆" + y + "骞�" + m + "鏈�" + d + dayInt + "鍙�" + timeInt + "鏃�" + "鎵ц";
+ int days = int.Parse(d) + dayInt;
+ timeTextBtn.Text = "鏃舵晥鎬у父寮�璁剧疆" + y + "骞�" + m + "鏈�" + days.ToString() + "鍙�" + hour.ToString() + "鏃�" + "鎵ц";
}
catch { }
@@ -160,7 +154,7 @@
else
{
fLayout.Height = Application.GetRealHeight(645);//鏀瑰彉楂樺害
- modeIconBtn.IsSelected = false;//鏀瑰彉鍥炬爣鐘舵��
+ modeIconBtn.UnSelectedImagePath = "ZigeeLogic/noMode.png";//鏀瑰彉鍥炬爣鐘舵��
///绗簩绾х埗鎺т欢
var modeFl = new FrameLayout
{
@@ -195,58 +189,65 @@
Height = Application.GetMinRealAverage(104),
X = Application.GetRealWidth(861),
Y = Application.GetRealHeight(17),
- UnSelectedImagePath = "ZigeeLogic/next.png",
+ UnSelectedImagePath = "ZigeeLogic/nextIconSone.png",
};
modeFl.AddChidren(nextIconBtn);
nextIconBtn.MouseUpEventHandler += (sender, e) =>
- {
- LogicView.TipView.ShowConfrimTip(() =>
- {///鍐嶆纭
- LogicView.TipView.ShowInputTip(true, async (str) =>
- {///纭鍙戦�佸懡浠�
- try
- {
- ///xm
- var result = await UserCenter.DoorLock.DoorLockCommonInfo.SetNormallyOpenModeFuncAsync(Send.CurrentDoorLock);
- if (!result)
- {
- Application.RunOnMainThread(() =>
- {
- ///鎻愮ず澶辫触
- });
- return;
- }
- else
- {
- ///鍥犱负鏈夊父寮�妯″紡涓嬫墠鍙互鍒涘缓澶辨晥閫昏緫锛�
- SkipView.GetLogicAll();//鍒犻櫎涔嬪墠鎵�鏈夊け鏁堥�昏緫
- var addResult = await SkipView.LockAddModifyLogic(int.Parse(str), Send.CurrentDoorLock);//娣诲姞涓�鏉″け鏁堥�昏緫
- if (!addResult)
- {
- ///鎻愮ず澶辫触
- return;
- }
- Send.CurrentDoorLock.IsDoorLockNormallyMode = true;
- this.RemoveFromParent();
- var soneLogicList = new SoneLogicList();
- UserView.HomePage.Instance.AddChidren(soneLogicList);
- UserView.HomePage.Instance.PageIndex += 1;
- soneLogicList.Show();
+ {
- }
- }
- catch
- {
+ LogicView.TipView.ShowConfrimTip(() =>
- }
- });
+ {///鍐嶆纭
+ LogicView.TipView.ShowInputTip(true, async (str) =>
+ {///纭鍙戦�佸懡浠�
+ try
+ {
+ ///xm
+ var result = await UserCenter.DoorLock.DoorLockCommonInfo.SetNormallyOpenModeFuncAsync(Send.CurrentDoorLock);
+ if (!result)
+ {
+ LogicView.TipView.ShowFlashTip("寮�鍚け璐�");
+ return;
+ }
+ else
+ {
+ ///鍥犱负鏈夊父寮�妯″紡涓嬫墠鍙互鍒涘缓澶辨晥閫昏緫锛�
+ SkipView.GetLogicAll();//鍒犻櫎涔嬪墠鎵�鏈夊け鏁堥�昏緫
+ var addResult = await SkipView.LockAddModifyLogic(int.Parse(str), Send.CurrentDoorLock);//娣诲姞涓�鏉″け鏁堥�昏緫
+ if (!addResult)
+ {
+ ///鎻愮ず澶辫触
+ LogicView.TipView.ShowFlashTip("娣诲姞澶辫触");
+ return;
+ }
+ Send.CurrentDoorLock.IsDoorLockNormallyMode = true;
+ this.RemoveFromParent();
+ var soneLogicList = new SoneLogicList();
+ UserView.HomePage.Instance.AddChidren(soneLogicList);
+ UserView.HomePage.Instance.PageIndex += 1;
+ soneLogicList.Show();
+ soneLogicList.action = action;
+ //soneLogicList.action += (c) => {
+ // if (action != null)
+ // {
+ // action(Send.CurrentDoorLock.IsDoorLockNormallyMode);
+ // }
+ //};
- });
+ }
+ }
+ catch
+ {
- };
+ }
+ });
+
+ });
+
+ };
}
#endregion
@@ -397,10 +398,11 @@
/// 鍔犺浇鑷姩鍖栧垪琛�
/// </summary>
/// <param name="verticalRefresh"></param>
+ RowLayout selectedRow = new RowLayout() { Tag = "0" };//璁板綍宸︽粦鐘舵��
+ int a = 1;
private void RefreshView(VerticalRefreshLayout verticalRefresh)
{
verticalRefresh.RemoveAll();
-
foreach (var logic in Common.Logic.SoneLogicList)
{
#region 鑷姩鍖栧竷灞�View
@@ -417,17 +419,19 @@
LineColor = ZigbeeColor.Current.LogicBackgroundColor,
BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
SubViewWidth = Application.GetRealWidth(184),//鏀瑰彉缂栬緫鎺т欢瀹藉害澶氬皯锛�
+ Tag = a.ToString(),
};
fLayout.AddChidren(logicRow);
//宸︽粦鑿滃崟浜嬩欢
logicRow.OpenMenuAction += () =>
{
- //if (selectedRow.Tag.ToString() != logicRowlayout.Tag.ToString())
- //{ //淇濈暀宸︽粦鍙湁涓�涓�;
- // selectedRow.HideMenu();//
- //}
- //selectedRow = logicRowlayout;
+ if (selectedRow.Tag.ToString() != logicRow.Tag.ToString())
+ { //淇濈暀宸︽粦鍙湁涓�涓�;
+ selectedRow.HideMenu();//
+ }
+ selectedRow = logicRow;
};
+ a++;
///鏄剧ず閫昏緫鍚嶇О鐨勬帶浠�
var nameBtn = new Button
{
--
Gitblit v1.8.0