From 96e8ca6e5c4b9eb179eb21f04f5b696ae94a82c9 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 11 五月 2020 17:00:40 +0800
Subject: [PATCH] 2020-05-11-2
---
ZigbeeApp/Shared/Phone/Device/Logic/LogicView/TipView.cs | 12 +++---
ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs | 6 +-
ZigbeeApp/GateWay.Droid/Assets/Language.ini | 4 +-
ZigbeeApp/Home.Ios/Resources/Language.ini | 4 +-
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 28 +++++++-------
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs | 2
ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide | 0
ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs | 63 +++++++++++++++++++++----------
8 files changed, 71 insertions(+), 48 deletions(-)
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index d601123..548dc9b 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -1,17 +1,13 @@
锘�<Properties StartupConfiguration="{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}|Default">
<MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.5c86e4357d63" />
<MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" />
- <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/ZigBee/Device/ZbGateway.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/SoneLogicList.cs">
<Files>
- <File FileName="Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs" Line="772" Column="10" />
- <File FileName="Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs" Line="151" Column="49" />
- <File FileName="Shared/Phone/Device/Logic/SoneLogicList.cs" Line="31" Column="46" />
- <File FileName="Shared/Phone/ZigBee/Device/DoorLock.cs" Line="2757" Column="81" />
- <File FileName="Shared/Phone/Device/Logic/Method.cs" Line="876" Column="49" />
- <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="78" Column="45" />
- <File FileName="Shared/Phone/UserView/HomePage.cs" Line="44" Column="56" />
- <File FileName="Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs" Line="712" Column="50" />
- <File FileName="Shared/Phone/ZigBee/Device/ZbGateway.cs" Line="215" Column="7" />
+ <File FileName="Shared/Phone/Device/Logic/LogicView/TipView.cs" Line="416" Column="19" />
+ <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="706" Column="116" />
+ <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="102" Column="75" />
+ <File FileName="Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs" Line="1302" Column="15" />
+ <File FileName="Shared/Phone/Device/Logic/SoneLogicList.cs" Line="67" Column="16" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -20,12 +16,16 @@
<Node name="Shared" expanded="True">
<Node name="Phone" expanded="True">
<Node name="Device" expanded="True">
- <Node name="Logic" 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="DoorLock" expanded="True" />
</Node>
<Node name="ZigBee" expanded="True">
- <Node name="Device" expanded="True">
- <Node name="ZbGateway.cs" selected="True" />
- </Node>
+ <Node name="Device" expanded="True" />
</Node>
</Node>
</Node>
diff --git a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
index 976f4ab..6346bb3 100644
--- a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
+++ b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Language.ini b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
index bce1a44..57f6bb5 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Language.ini
+++ b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
@@ -547,8 +547,8 @@
5398=鍙敮鎸佹暟瀛楄緭鍏�
5399=鍏抽棴澶辫触
-5400=寮�鍚け璐�
-5401=娣诲姞澶辫触
+5400=寮�鍚父寮�妯″紡澶辫触
+5401=娣诲姞鏃舵晥鎬у父寮�璁剧疆澶辫触
5402=鏃舵晥鎬у父寮�璁剧疆
5403=鏃跺叧闂�
diff --git a/ZigbeeApp/Home.Ios/Resources/Language.ini b/ZigbeeApp/Home.Ios/Resources/Language.ini
index cf4cddf..1cf3c61 100755
--- a/ZigbeeApp/Home.Ios/Resources/Language.ini
+++ b/ZigbeeApp/Home.Ios/Resources/Language.ini
@@ -546,8 +546,8 @@
5397=鏃堕棿涓虹┖
5398=鍙敮鎸佹暟瀛楄緭鍏�
5399=鍏抽棴澶辫触
-5400=寮�鍚け璐�
-5401=娣诲姞澶辫触
+5400=寮�鍚父寮�妯″紡澶辫触
+5401=娣诲姞鏃舵晥鎬у父寮�璁剧疆澶辫触
5402=鏃舵晥鎬у父寮�璁剧疆
5403=鏃跺叧闂�
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/TipView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/TipView.cs
index a555e0c..90df6a1 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/TipView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/TipView.cs
@@ -81,7 +81,7 @@
TextAlignment = TextAlignment.Center,
TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
TextSize = 14,
- //Height =Application.GetRealHeight(127),
+ Height = bottomFrame.Height,
Width = Application.GetRealWidth(397),
BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
TextID = R.MyInternationalizationString.cancel,
@@ -95,7 +95,7 @@
TextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
TextSize = 14,
X = cancelBtn.Right,
- //Height =Application.GetRealHeight(127),
+ Height = bottomFrame.Height,
Width = bottomFrame.Width - cancelBtn.Width,
BackgroundColor = ZigbeeColor.Current.LogicBtnTypeColor,
TextID = R.MyInternationalizationString.confrim,
@@ -223,7 +223,7 @@
TextAlignment = TextAlignment.Center,
TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
TextSize = 14,
- // Height = Application.GetRealHeight(127),
+ Height = bottomFrame.Height,
Width = Application.GetRealWidth(397),
BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
TextID = R.MyInternationalizationString.cancel,
@@ -236,7 +236,7 @@
TextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
TextSize = 14,
X = cancelBtn.Right,
- //Height = Application.GetRealHeight(127),
+ Height = bottomFrame.Height,
Width = bottomFrame.Width - cancelBtn.Width,
BackgroundColor = ZigbeeColor.Current.LogicBtnTypeColor,
TextID = R.MyInternationalizationString.confrim,
@@ -363,7 +363,7 @@
TextAlignment = TextAlignment.Center,
TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
TextSize = 14,
- Height = Application.GetRealHeight(127),
+ Height = bottomFrame.Height,
Width = Application.GetRealWidth(397),
BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
TextID = R.MyInternationalizationString.cancel,
@@ -376,7 +376,7 @@
TextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
TextSize = 14,
X = cancelBtn.Right,
- Height = Application.GetRealHeight(127),
+ Height = bottomFrame.Height,
Width = bottomFrame.Width - cancelBtn.Width,
BackgroundColor = ZigbeeColor.Current.LogicBtnTypeColor,
TextID = R.MyInternationalizationString.confrim,
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
index 4a4eb39..48dcae3 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
@@ -703,7 +703,7 @@
/// <param name="timeVlaue">鏃堕棿鍊�</param>
/// <param name="common">璁惧</param>
/// <returns></returns>
- public static async System.Threading.Tasks.Task<bool> LockAddModifyLogic(int timeVlaue, CommonDevice common)
+ public static async System.Threading.Tasks.Task<int> LockAddModifyLogic(int timeVlaue, CommonDevice common)
{
//璇诲彇绯荤粺褰撳墠鏃堕棿锛氭椂-鍒�
var h = DateTime.Now.ToString("HH");
@@ -736,9 +736,9 @@
{
//娣诲姞闂ㄩ攣澶辨晥鏃堕棿鐨勫巻鍙茶褰�
UserCenter.HdlDeviceDoorLockLogic.Current.AddDoorHistoryLog((DoorLock)common, 9003, timeVlaue.ToString());
- return true;//琛ㄧず娣诲姞鎴愬姛;
+ return logicIfon.LogicId;//琛ㄧず娣诲姞鎴愬姛;
}
- return false;//琛ㄧず娣诲姞澶辫触;
+ return 0;//琛ㄧず娣诲姞澶辫触;
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
index 54c93b3..68303af 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
@@ -14,6 +14,7 @@
{
Tag = "SoneLogic";
soneLogicList = this;
+
}
/// 缁欏緪姊呭埛鏂扮晫闈㈢敤鐨�
public Action<bool> action;
@@ -29,8 +30,17 @@
FrameLayout listLogicFl = new FrameLayout();
///甯稿紑鑷姩鍖栧垪琛ㄤ笂涓嬫粦鍔ㄧ殑鎺т欢
VerticalRefreshLayout verticalRefresh = new VerticalRefreshLayout();
+ /// <summary>
+ /// 璁板綍閫昏緫id
+ /// </summary>
+ public int logicId = 0;
+ /// <summary>
+ /// 璁板綍閫変腑鏃堕棿
+ /// </summary>
+ public int timeValue = 0;
public async void Show()
{
+
#region 鐣岄潰鐨勫竷灞�浠ｇ爜
UserView.HomePage.Instance.ScrollEnabled = false;//閿佷綇宸︽粦
TopView view = new TopView();
@@ -56,6 +66,23 @@
};
this.AddChidren(middle);
#endregion
+ //鏄父寮�妯″紡鍐嶅幓璇诲彇
+ if (Send.CurrentDoorLock.IsDoorLockNormallyMode)
+ {
+ //杩涙潵鏇存柊涓�娆�
+ //鏌ユ壘鏄惁瀛樺湪鏃舵晥鎬ц嚜鍔ㄥ寲锛涙湁鐨勮瘽灏辫繑鍥炶嚜鍔ㄥ寲瀵硅薄;
+ var logic = await SkipView.GetLogicIfon();
+ if (logic != null)
+ {
+ try
+ {
+ //杩涙潵鏇存柊涓�娆″��
+ logicId = logic.LogicId;
+ timeValue = int.Parse(logic.Conditions[0]["DoorLockOpenDelayTime"]);
+ }
+ catch { }
+ }
+ }
#region 甯稿紑妯″紡鍥炬爣 鏃舵晥鎬у父寮�璁剧疆
///绗簩鍧楃涓�绾х埗鎺т欢
@@ -92,7 +119,6 @@
modeFl.AddChidren(button2);
ModeView();
#endregion
-
#region 甯稿紑鑷姩鍖�
///绗笁鍧楃涓�绾х埗鎺т欢
listLogicFl = new FrameLayout
@@ -225,9 +251,6 @@
if (Send.CurrentDoorLock.IsDoorLockNormallyMode)
{
- /// 鏌ユ壘鏄惁瀛樺湪鏃舵晥鎬ц嚜鍔ㄥ寲锛涙湁鐨勮瘽灏辫繑鍥炶嚜鍔ㄥ寲瀵硅薄;
- var logic = await SkipView.GetLogicIfon();
-
fLayout.Height = Application.GetRealHeight(780);//鏀瑰彉楂樺害
modeIconBtn.UnSelectedImagePath = "ZigeeLogic/openMode.png";//鏀瑰彉鍥炬爣鐘舵��
modeFl.Y = modeIconBtn.Bottom + Application.GetRealHeight(64);
@@ -257,11 +280,10 @@
var result = await UserCenter.DoorLock.DoorLockCommonInfo.DelNormallyOpenMode(Send.CurrentDoorLock);
if (result)
{
- if (logic != null)
+ if (logicId != 0)
{
///鏈夊彲鑳藉彧鏈夊父寮�妯″紡锛屾病鏈夋椂鏁堟�ц嚜鍔ㄥ寲
- ///娌℃湁鍒ゆ柇鐨勮瘽锛岄�昏緫浼氫负绌猴紝鎶涘嚭寮傚父;
- Send.DelLogic(logic.LogicId);
+ Send.DelLogic(logicId);
}
Send.CurrentDoorLock.IsDoorLockNormallyMode = false;
ModeView();
@@ -281,7 +303,7 @@
});
}
};
- if (logic != null)
+ if (logicId != 0)
{
///鏄剧ず澶辨晥璁剧疆鏃堕棿鏂囨湰鎺т欢
button2.Y = Application.GetRealHeight(127 + 69);
@@ -296,9 +318,8 @@
var m = DateTime.Now.Month.ToString();//閭ｄ竴鏈�
var d = DateTime.Now.ToString("dd");//閭ｄ竴澶�
var h = int.Parse(DateTime.Now.ToString("HH"));//褰撳墠绯荤粺鏃堕棿
- var timeInt = int.Parse(logic.Conditions[0]["DoorLockOpenDelayTime"]);
- int dayInt = (h + timeInt) / 24;//绠楀嚭鍑犲ぉ鍚庢墽琛�
- int hour = (h + timeInt) % 24;//绠楀嚭鍑犲ぉ鍚庨偅涓椂闂存墽琛�
+ int dayInt = (h + timeValue) / 24;//绠楀嚭鍑犲ぉ鍚庢墽琛�
+ int hour = (h + timeValue) % 24;//绠楀嚭鍑犲ぉ鍚庨偅涓椂闂存墽琛�
int days = int.Parse(d) + dayInt;
string text1 = Language.StringByID(MyInternationalizationString.timeSensitive);
string text2 = Language.StringByID(MyInternationalizationString.yearSone);
@@ -307,7 +328,8 @@
string text5 = Language.StringByID(MyInternationalizationString.executeSone);
button2.Text = text1 + y + text2 + m + text3 + days.ToString() + text4 + hour.ToString() + text5;
}
- else {
+ else
+ {
button2.Y = Application.GetRealHeight(0);
button2.X = Application.GetRealWidth(0);
button2.Width = Application.GetRealWidth(0);
@@ -362,7 +384,6 @@
try
{
///xm
-
var result = await UserCenter.DoorLock.DoorLockCommonInfo.SetNormallyOpenModeFuncAsync(Send.CurrentDoorLock);
if (!result)
{
@@ -374,7 +395,7 @@
///鍥犱负鏈夊父寮�妯″紡涓嬫墠鍙互鍒涘缓澶辨晥閫昏緫锛�
SkipView.GetLogicAll();//鍒犻櫎涔嬪墠鎵�鏈夊け鏁堥�昏緫
var addResult = await SkipView.LockAddModifyLogic(int.Parse(str), Send.CurrentDoorLock);//娣诲姞涓�鏉″け鏁堥�昏緫
- if (!addResult)
+ if (addResult == 0)
{
///鍙璇村鏋滃父寮�妯″紡寮�锛屽垱寤鸿嚜鍔ㄥ寲澶辫触锛岄偅涔堝皢瑕佸彂涓�鏉″父寮�妯″紡鍏抽棴鍛戒护;
UserCenter.DoorLock.DoorLockCommonInfo.DelNormallyOpenMode(Send.CurrentDoorLock);
@@ -382,8 +403,13 @@
LogicView.TipView.ShowFlashTip(Language.StringByID(MyInternationalizationString.addFailed));
return;
}
- Send.CurrentDoorLock.IsDoorLockNormallyMode = true;
- ModeView();
+ else
+ {
+ logicId = addResult;
+ timeValue = int.Parse(str);
+ Send.CurrentDoorLock.IsDoorLockNormallyMode = true;
+ ModeView();
+ }
}
@@ -556,10 +582,7 @@
TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
};
logicRow.AddRightView(edit);
- if (logic.LogicType == 2)
- {
- edit.TextID = MyInternationalizationString.look;
- }
+
///鍒犻櫎
var del = new Button
{
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
index d0818b5..041574e 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
@@ -1320,7 +1320,7 @@
DoorLockCommonInfo.NormallyOpenModeInvalidTime = temp;
//榛樿鍒涘缓甯稿紑妯″紡鐨勭壒娈婇�昏緫
var res = await Shared.Phone.Device.Logic.SkipView.LockAddModifyLogic(DoorLockCommonInfo.NormallyOpenModeInvalidTime, doorLock);
- if (!res)
+ if (res==0)
{
//榛樿鍒涘缓甯稿紑妯″紡澶辫触
string msg0 = Language.StringByID(R.MyInternationalizationString.AddLogicNormallyModeFailed);
--
Gitblit v1.8.0