From 790d1cadf03164aecd0fccd2874f7da7997e34d4 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 18 五月 2020 13:48:35 +0800
Subject: [PATCH] 2020-05-18-2
---
ZigbeeApp/GateWay.Droid/Assets/Language.ini | 4 +-
ZigbeeApp/Shared/Phone/Device/Logic/Send.cs | 7 +++
ZigbeeApp/Home.Ios/Resources/Language.ini | 4 +-
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 22 ++++++++--
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs | 23 ++++++-----
ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide | 0
ZigbeeApp/Shared/R.cs | 1
ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs | 13 ++++--
8 files changed, 49 insertions(+), 25 deletions(-)
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index 775f0d7..c869181 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -1,21 +1,31 @@
锘�<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/Device/Logic/SkipView.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs">
<Files>
- <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="489" Column="36" />
- <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="10" Column="2" />
+ <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="39" Column="69" />
+ <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="810" Column="32" />
+ <File FileName="Shared/Phone/Device/Logic/SoneLogicList.cs" Line="11" Column="36" />
+ <File FileName="GateWay.Droid/Assets/Language.ini" Line="547" Column="13" />
+ <File FileName="Shared/R.cs" Line="842" Column="55" />
+ <File FileName="Home.Ios/Resources/Language.ini" Line="554" Column="1" />
+ <File FileName="Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs" Line="1061" Column="29" />
</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="Phone" expanded="True">
<Node name="Device" expanded="True">
<Node name="Logic" expanded="True">
<Node name="DoorLockLogic" expanded="True" />
- <Node name="SkipView.cs" selected="True" />
</Node>
</Node>
<Node name="UserCenter" expanded="True">
@@ -24,7 +34,9 @@
<Node name="MessageControls" expanded="True" />
</Node>
</Node>
- <Node name="DoorLock" expanded="True" />
+ <Node name="DoorLock" expanded="True">
+ <Node name="UserDoorLockPage.cs" selected="True" />
+ </Node>
</Node>
</Node>
</Node>
diff --git a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
index 9270564..68fa844 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 57f6bb5..ab072b5 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Language.ini
+++ b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
@@ -545,12 +545,12 @@
5396=鎴�
5397=鏃堕棿涓虹┖
5398=鍙敮鎸佹暟瀛楄緭鍏�
-
5399=鍏抽棴澶辫触
5400=寮�鍚父寮�妯″紡澶辫触
5401=娣诲姞鏃舵晥鎬у父寮�璁剧疆澶辫触
5402=鏃舵晥鎬у父寮�璁剧疆
-5403=鏃跺叧闂�
+5403=鍒嗗叧闂�
+5404=鏃�
10000=HDL Home
10001=甯哥敤
diff --git a/ZigbeeApp/Home.Ios/Resources/Language.ini b/ZigbeeApp/Home.Ios/Resources/Language.ini
index 1cf3c61..1e664ac 100755
--- a/ZigbeeApp/Home.Ios/Resources/Language.ini
+++ b/ZigbeeApp/Home.Ios/Resources/Language.ini
@@ -549,8 +549,8 @@
5400=寮�鍚父寮�妯″紡澶辫触
5401=娣诲姞鏃舵晥鎬у父寮�璁剧疆澶辫触
5402=鏃舵晥鎬у父寮�璁剧疆
-5403=鏃跺叧闂�
-
+5403=鍒嗗叧闂�
+5404=鏃�
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
index e9b5aeb..3996c24 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
@@ -22,6 +22,7 @@
return await System.Threading.Tasks.Task.Run(async () =>
{
List<int> logicIdList = new List<int>();
+
Action<string, string> action = (topic, data) =>
{
var gatewayID = topic.Split('/')[0];
@@ -30,20 +31,24 @@
{
return;
}
-
+
if (topic == $"{gatewayID}/Logic/GetLogicList_Respon")
{
+ Console.WriteLine("鎵撳嵃閫昏緫杩斿洖鏁版嵁1====");
var list = jObjectdata["Data"]["LogicList"];
if (list == null)
{
return;
}
+ Console.WriteLine("鎵撳嵃閫昏緫杩斿洖鏁版嵁2====");
foreach (var listIfon in list)
{
var logicId = int.Parse(listIfon["LogicId"].ToString());
logicIdList.Add(logicId);
+
}
+ Console.WriteLine("鎵撳嵃閫昏緫杩斿洖鏁版嵁3===="+logicIdList.Count.ToString());
}
};
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
index d8a77a6..2ccd171 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
@@ -60,6 +60,7 @@
this.AddChidren(middle);
#endregion
//鏄父寮�妯″紡鍐嶅幓璇诲彇
+
if (Send.CurrentDoorLock.IsDoorLockNormallyMode)
{
//杩涙潵鏇存柊涓�娆�
@@ -309,16 +310,19 @@
var y = DateTime.Now.Year.ToString();//閭ｄ竴骞�
var m = DateTime.Now.Month.ToString();//閭ｄ竴鏈�
var d = DateTime.Now.ToString("dd");//閭ｄ竴澶�
- var h = int.Parse(DateTime.Now.ToString("HH"));//褰撳墠绯荤粺鏃堕棿
+ var h = int.Parse(DateTime.Now.ToString("HH"));//灏忔椂
int dayInt = (h + timeValue) / 24;//绠楀嚭鍑犲ぉ鍚庢墽琛�
int hour = (h + timeValue) % 24;//绠楀嚭鍑犲ぉ鍚庨偅涓椂闂存墽琛�
int days = int.Parse(d) + dayInt;
+ int minute = DateTime.Now.Minute;//鍒嗛挓
string text1 = Language.StringByID(MyInternationalizationString.timeSensitive);
string text2 = Language.StringByID(MyInternationalizationString.yearSone);
string text3 = Language.StringByID(MyInternationalizationString.monthSone);
string text4 = Language.StringByID(MyInternationalizationString.numberSone);
- string text5 = Language.StringByID(MyInternationalizationString.executeSone);
- timeTextBtn.Text = text1 + y + text2 + m + text3 + days.ToString() + text4 + hour.ToString() + text5;
+ string text5 = Language.StringByID(MyInternationalizationString.hour1);
+ string text6 = Language.StringByID(MyInternationalizationString.executeSone);
+ // timeTextBtn.Text = text1 + y + text2 + m + text3 + days.ToString() + text4 + hour.ToString() + text5 + minute.ToString() + text6;
+ timeTextBtn.Text = text1 + m + text3 + days.ToString() + text4 + hour.ToString() + text5 + minute.ToString() + text6;
}
@@ -469,7 +473,7 @@
Common.Logic.SoneLogicList.Add(logic);
}
}
- }
+ }
}
}
catch (Exception e)
@@ -620,6 +624,7 @@
else
{
//閫昏緫鍏�
+ logic.IsEnable = 0;
typeIconBtn.UnSelectedImagePath = "ZigeeLogic/nofunction.png";
typeBjBtn.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
index 2c9af49..e4b1243 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
@@ -1052,18 +1052,19 @@
if (Common.Logic.LogicDviceList.Count == 0)
{
Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
- }
- var addLogicPage = new Shared.Phone.Device.Logic.SoneLogicList();
- UserView.HomePage.Instance.AddChidren(addLogicPage);
- UserView.HomePage.Instance.PageIndex += 1;
- addLogicPage.Show();
-
- addLogicPage.action += (w) =>
- {
- doorLock.IsDoorLockNormallyMode = w;
+ }
+
+ var addLogicPage = new Shared.Phone.Device.Logic.SoneLogicList();
+ UserView.HomePage.Instance.AddChidren(addLogicPage);
+ UserView.HomePage.Instance.PageIndex += 1;
+ addLogicPage.Show();
+ addLogicPage.action += (w) =>
+ {
+ doorLock.IsDoorLockNormallyMode = w;
///鐣欑粰寰愭鐢ㄧ殑
- UpdateNomallyOpenStatus();
- };
+ UpdateNomallyOpenStatus();
+ };
+
};
HdlCheckLogic.Current.CheckSecondarySecurity(action);
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index 3c38e89..d7b2d33 100644
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -840,6 +840,7 @@
public readonly static int addFailed = 5401;
public readonly static int timeSensitive = 5402;
public readonly static int executeSone = 5403;
+ public readonly static int hour1 = 5404;
--
Gitblit v1.8.0