From a4d29f9f72452ccae2f607e6ad31cad493822da4 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 06 五月 2020 11:36:47 +0800
Subject: [PATCH] 2020-05-06-1
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs | 24 ++++
ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs | 21 ----
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 69 ++-----------
ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide | 0
ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs | 134 ++++++++++----------------
5 files changed, 88 insertions(+), 160 deletions(-)
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index 0cb68fd..c33eaef 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -1,63 +1,22 @@
锘�<Properties StartupConfiguration="{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}|Default">
- <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.5c86e4357d63" />
+ <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
<MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" />
<MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/SoneLogicList.cs">
<Files>
- <File FileName="Shared/Phone/Device/Logic/SoneLogicList.cs" Line="19" Column="22" />
- <File FileName="Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs" Line="8" Column="43" />
- <File FileName="Shared/Phone/UserCenter/DoorLock/ShowDoorLockMsgControl.cs" Line="442" Column="18" />
- <File FileName="Shared/Phone/UserCenter/CommonBase/Common/UserCenterEnumCommon.cs" Line="483" Column="19" />
- <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="28" Column="26" />
- <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="214" Column="45" />
- <File FileName="Shared/Phone/UserCenter/CommonBase/Controls/MessageControls/ShowMsgControl.cs" Line="161" Column="45" />
- <File FileName="Shared/Phone/Device/Logic/Method.cs" Line="834" Column="50" />
- <File FileName="Shared/R.cs" Line="559" Column="23" />
- <File FileName="Shared/Phone/Device/Logic/LogicView/TipView.cs" Line="119" Column="23" />
- <File FileName="Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs" Line="608" Column="22" />
- <File FileName="Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs" Line="138" Column="60" />
- <File FileName="Shared/Phone/ZigBee/Device/DoorLock.cs" Line="42" Column="41" />
+ <File FileName="Shared/Phone/Device/Logic/SoneLogicList.cs" Line="22" Column="51" />
+ <File FileName="Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs" />
+ <File FileName="Shared/Phone/UserCenter/DoorLock/ShowDoorLockMsgControl.cs" />
+ <File FileName="Shared/Phone/UserCenter/CommonBase/Common/UserCenterEnumCommon.cs" />
+ <File FileName="Shared/Phone/Device/Logic/SkipView.cs" />
+ <File FileName="Shared/Phone/Device/Logic/Send.cs" />
+ <File FileName="Shared/Phone/UserCenter/CommonBase/Controls/MessageControls/ShowMsgControl.cs" />
+ <File FileName="Shared/Phone/Device/Logic/Method.cs" />
+ <File FileName="Shared/R.cs" />
+ <File FileName="Shared/Phone/Device/Logic/LogicView/TipView.cs" />
+ <File FileName="Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs" />
+ <File FileName="Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs" />
+ <File FileName="Shared/Phone/ZigBee/Device/DoorLock.cs" />
</Files>
- <Pads>
- <Pad Id="ProjectPad">
- <State name="__root__">
- <Node name="GateWay" expanded="True">
- <Node name="GateWay.Droid" expanded="True">
- <Node name="Assets" expanded="True" />
- </Node>
- <Node name="Home.IOS" expanded="True">
- <Node name="Resources" expanded="True" />
- </Node>
- <Node name="Shared" expanded="True">
- <Node name="Common" expanded="True" />
- <Node name="Phone" expanded="True">
- <Node name="Device" expanded="True">
- <Node name="Logic" expanded="True">
- <Node name="LogicView" expanded="True" />
- <Node name="SoneLogicList.cs" selected="True" />
- </Node>
- </Node>
- <Node name="UserCenter" expanded="True">
- <Node name="CommonBase" expanded="True">
- <Node name="Common" expanded="True" />
- <Node name="Controls" expanded="True">
- <Node name="BaseCommonControl" expanded="True">
- <Node name="Base" expanded="True" />
- </Node>
- <Node name="MessageControls" expanded="True" />
- <Node name="NormalControls" expanded="True" />
- </Node>
- </Node>
- <Node name="DoorLock" expanded="True" />
- </Node>
- <Node name="ZigBee" expanded="True">
- <Node name="Device" expanded="True" />
- </Node>
- </Node>
- </Node>
- </Node>
- </State>
- </Pad>
- </Pads>
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.ItemProperties.Home.IOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-001674E61438002E" />
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
diff --git a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
index 6eb247a..e3e6f72 100644
--- a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
+++ b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
Binary files differ
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
index efdbc61..ed6a13b 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
@@ -796,26 +796,7 @@
}
return _if;
}
-
- /// <summary>
- /// 甯稿紑妯″紡寮�鍏�
- /// </summary>
- /// <returns></returns>
- public static async System.Threading.Tasks.Task<bool> OpenMode(bool _if, DoorLock doorLock)
- {
- var result = await doorLock.SetNormallyOpenModeFuncAsync(_if);
-
- if (result == null || result.defaultControlResponseData == null || result.defaultControlResponseData.status != 0)
- {
- return false;
- }
- if (result.defaultControlResponseData.status == 0)
- {
- //app纭鍙栨秷鈥滃父寮�妯″紡鈥濇垚鍔�
- return true;
- }
- return false;
- }
+
}
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
index ae7f8e6..4501171 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
@@ -108,48 +108,28 @@
TextSize = 16,
};
openModeFl.AddChidren(closeBtn);
- closeBtn.MouseUpEventHandler += (sender, e) =>
+ closeBtn.MouseUpEventHandler += async (sender, e) =>
{
-
- var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Confirm,
- Language.StringByID(MyInternationalizationString.doyouwanttodelete),
- Language.StringByID(MyInternationalizationString.confrim));
- alert.Show();
- alert.ConfirmClickEvent += async () =>
+ var result = await UserCenter.DoorLock.DoorLockCommonInfo.DelNormallyOpenMode(Send.CurrentDoorLock);
+ if (result)
{
+ if (logic != null)
+ {
+ ///鏈夊彲鑳藉彧鏈夊父寮�妯″紡锛屾病鏈夋椂鏁堟�ц嚜鍔ㄥ寲
+ ///娌℃湁鍒ゆ柇鐨勮瘽锛岄�昏緫浼氫负绌猴紝鎶涘嚭寮傚父;
+ Send.DelLogic(logic.LogicId);
+ }
+ this.RemoveFromParent();
+ var soneLogicList = new SoneLogicList();
+ UserView.HomePage.Instance.AddChidren(soneLogicList);
+ UserView.HomePage.Instance.PageIndex += 1;
+ soneLogicList.Show(() => { }, false);
+ }
+ else
+ {
+ ///鎻愮ず澶辫触
+ }
- Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.DelNormallyOpenMode(Send.CurrentDoorLock, action);
-
- Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.LogicAction += (d) => {
- this.RemoveFromParent();
- var soneLogicList = new SoneLogicList();
- UserView.HomePage.Instance.AddChidren(soneLogicList);
- UserView.HomePage.Instance.PageIndex += 1;
- soneLogicList.Show(() => { }, false);
-
- };
-
- /////xm
- //var result = await SkipView.OpenMode(false, Send.CurrentDoorLock);
- //if (result)
- //{
- // if (logic != null)
- // {
- // ///鏈夊彲鑳藉彧鏈夊父寮�妯″紡锛屾病鏈夋椂鏁堟�ц嚜鍔ㄥ寲
- // ///娌℃湁鍒ゆ柇鐨勮瘽锛岄�昏緫浼氫负绌猴紝鎶涘嚭寮傚父;
- // Send.DelLogic(logic.LogicId);
- // }
- // this.RemoveFromParent();
- // var soneLogicList = new SoneLogicList();
- // UserView.HomePage.Instance.AddChidren(soneLogicList);
- // UserView.HomePage.Instance.PageIndex += 1;
- // soneLogicList.Show(()=>{ },false);
- //}
- //else {
- // ///鎻愮ず澶辫触
- //}
-
- };
};
///鏄剧ず澶辨晥璁剧疆鏃堕棿鏂囨湰鎺т欢
@@ -226,67 +206,53 @@
};
modeFl.AddChidren(nextIconBtn);
-
- nextIconBtn.MouseUpEventHandler += (sender, e) =>
- {
- Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.NomallyOpenModeInvalidTimeDialog(Send.CurrentDoorLock, action);
- Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.LogicAction += (d) => {
- this.RemoveFromParent();
- var soneLogicList = new SoneLogicList();
- UserView.HomePage.Instance.AddChidren(soneLogicList);
- UserView.HomePage.Instance.PageIndex += 1;
- soneLogicList.Show(() => { }, true);
-
- };
- #region
- /*
- LogicView.TipView.ShowConfrimTip(() =>
- {///鍐嶆纭
+ nextIconBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ LogicView.TipView.ShowConfrimTip(() =>
+ {///鍐嶆纭
LogicView.TipView.ShowInputTip(true, async (str) =>
- {///纭鍙戦�佸懡浠�
+ {///纭鍙戦�佸懡浠�
try
- {
+ {
///xm
- var result = await SkipView.OpenMode(true,Send.CurrentDoorLock);
- if (!result)
- {
- Application.RunOnMainThread(() =>
- {
- ///鎻愮ず澶辫触
+ var result = await UserCenter.DoorLock.DoorLockCommonInfo.SetNormallyOpenModeFuncAsync(Send.CurrentDoorLock);
+ if (!result)
+ {
+ Application.RunOnMainThread(() =>
+ {
+ ///鎻愮ず澶辫触
});
- return;
- }
- else
- {
+ return;
+ }
+ else
+ {
///鍥犱负鏈夊父寮�妯″紡涓嬫墠鍙互鍒涘缓澶辨晥閫昏緫锛�
SkipView.GetLogicAll();//鍒犻櫎涔嬪墠鎵�鏈夊け鏁堥�昏緫
var addResult = await SkipView.LockAddModifyLogic(int.Parse(str), Send.CurrentDoorLock);//娣诲姞涓�鏉″け鏁堥�昏緫
if (!addResult)
- {
+ {
///鎻愮ず澶辫触
return;
- }
- this.RemoveFromParent();
- var soneLogicList = new SoneLogicList();
- UserView.HomePage.Instance.AddChidren(soneLogicList);
- UserView.HomePage.Instance.PageIndex += 1;
- soneLogicList.Show(() => { }, true);
+ }
+ this.RemoveFromParent();
+ var soneLogicList = new SoneLogicList();
+ UserView.HomePage.Instance.AddChidren(soneLogicList);
+ UserView.HomePage.Instance.PageIndex += 1;
+ soneLogicList.Show(() => { }, true);
- }
- }
- catch
- {
+ }
+ }
+ catch
+ {
- }
- });
+ }
+ });
- });
- */
+ });
- #endregion
- };
+ };
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
index f88ba42..6ac755d 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
@@ -388,8 +388,30 @@
}
return false;
}
-
+ /// <summary>
+ /// 璁剧疆甯稿紑妯″紡
+ /// </summary>
+ /// <param name="doorLock">褰撳墠闂ㄩ攣</param>
+ /// <param name="action">鍥炶皟澶勭悊鏇存柊鍐呭</param>
+ /// <returns></returns>
+ public static async System.Threading.Tasks.Task<bool> SetNormallyOpenModeFuncAsync(ZigBee.Device.DoorLock doorLock)
+ {
+ //app璁剧疆鈥滃父寮�妯″紡鈥濆け璐�
+ var result = await doorLock.SetNormallyOpenModeFuncAsync(false);
+ if (result == null || result.defaultControlResponseData == null || result.defaultControlResponseData.status != 0)
+ {
+ return false;
+ }
+
+ if (result.defaultControlResponseData.status == 0)
+ {
+ //app璁剧疆鈥滃父寮�妯″紡鈥濇垚鍔�
+ NormallyOpenModeValue(doorLock, false);
+ return true;
+ }
+ return false;
+ }
/// <summary>
/// 鍚姩甯稿紑妯″紡銆愬脊绐椼��
--
Gitblit v1.8.0