From 679c2a4c459c7ad0e9f727ad4196c0754716c28f Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期三, 08 四月 2020 11:39:20 +0800
Subject: [PATCH] 2020-04-08-1
---
ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs | 9 +++-
ZigbeeApp/GateWay.Droid/Assets/Language.ini | 1
ZigbeeApp/Home.Ios/Resources/Language.ini | 2 +
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 15 ++-----
ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide | 0
.DS_Store | 0
ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs | 20 +++++++--
ZigbeeApp/Shared/R.cs | 1
ZigbeeApp/Shared/Phone/Device/Logic/OneLogic.cs | 17 ++++++--
9 files changed, 43 insertions(+), 22 deletions(-)
diff --git a/.DS_Store b/.DS_Store
index 2b6cef9..b7c7dea 100644
--- a/.DS_Store
+++ b/.DS_Store
Binary files differ
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index cdbb4d6..7282d8e 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -1,27 +1,22 @@
锘�<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/Device/Logic/TimePage.cs">
<Files>
- <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="272" Column="18" />
+ <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="186" Column="78" />
+ <File FileName="Shared/Phone/Device/Logic/OneLogic.cs" Line="158" Column="48" />
+ <File FileName="Shared/Phone/Device/Logic/TimePage.cs" Line="338" Column="1" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="GateWay" expanded="True">
<Node name="Shared" expanded="True">
- <Node name="Common" expanded="True" />
<Node name="Phone" expanded="True">
- <Node name="Category" expanded="True" />
- <Node name="CommonForm" expanded="True" />
<Node name="Device" expanded="True">
<Node name="Logic" expanded="True">
- <Node name="LogicView" expanded="True" />
- <Node name="SkipView.cs" selected="True" />
+ <Node name="TimePage.cs" selected="True" />
</Node>
- </Node>
- <Node name="UserCenter" expanded="True">
- <Node name="DoorLock" expanded="True" />
</Node>
</Node>
</Node>
diff --git a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
index d4aa5c8..fc64f06 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 3c29d50..4c5586e 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Language.ini
+++ b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
@@ -528,6 +528,7 @@
5379=鏆傛棤鑱斿姩浜嬩欢{\r\n} 璇风偣鍑诲彸涓婅娣诲姞
5380=甯稿紑妯″紡
5381=娣诲姞鏉′欢鎴栬�呮坊鍔犲姛鑳戒负绌�
+5382=鏌ョ湅
diff --git a/ZigbeeApp/Home.Ios/Resources/Language.ini b/ZigbeeApp/Home.Ios/Resources/Language.ini
index 3c29d50..4b930a3 100755
--- a/ZigbeeApp/Home.Ios/Resources/Language.ini
+++ b/ZigbeeApp/Home.Ios/Resources/Language.ini
@@ -528,6 +528,8 @@
5379=鏆傛棤鑱斿姩浜嬩欢{\r\n} 璇风偣鍑诲彸涓婅娣诲姞
5380=甯稿紑妯″紡
5381=娣诲姞鏉′欢鎴栬�呮坊鍔犲姛鑳戒负绌�
+5382=鏌ョ湅
+
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/OneLogic.cs b/ZigbeeApp/Shared/Phone/Device/Logic/OneLogic.cs
index 3d58db9..8ef4c90 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/OneLogic.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/OneLogic.cs
@@ -28,14 +28,23 @@
#region View甯冨眬浠ｇ爜
TopView view = new TopView();
this.AddChidren(view.TopRowView());
- if (Common.Logic.CurrentLogic.LogicId != 0)
+
+ if (Yes)
{
- view.toptitleNameBtn.Text = Language.StringByID(MyInternationalizationString.editautomation);
+ view.toptitleNameBtn.Text = Language.StringByID(MyInternationalizationString.look);
}
else
{
- view.toptitleNameBtn.Text = Language.StringByID(MyInternationalizationString.newautomation);
+ if (Common.Logic.CurrentLogic.LogicId != 0)
+ {
+ view.toptitleNameBtn.Text = Language.StringByID(MyInternationalizationString.editautomation);
+ }
+ else
+ {
+ view.toptitleNameBtn.Text = Language.StringByID(MyInternationalizationString.newautomation);
+ }
}
+
view.clickBtn.MouseDownEventHandler += (sender, e) =>
{
// UserView.HomePage.Instance.ScrollEnabled = true;//鎭㈠宸︽粦
@@ -151,7 +160,7 @@
UserView.HomePage.Instance.PageIndex += 1;
timePage.str1 = conditions["StartHour"] + ":" + conditions["StartMin"] + "-" + conditions["StopHour"] + ":" + conditions["StopMin"];
timePage.IsEditor = true;
- timePage.Show();
+ timePage.Show(true);
}
};
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
index 81ca490..e20c360 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
@@ -482,6 +482,9 @@
TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
};
logicRowlayout.AddRightView(edit);
+ if (logic.LogicType==2) {
+ edit.TextID=MyInternationalizationString.look;
+ }
edit.MouseUpEventHandler += (sender, e) =>
{
Common.Logic.CurrentLogic = logic;
@@ -733,7 +736,7 @@
}
///<summary>
- /// 鏄惁瀛樺湪S-one閫昏緫鏂规硶(true涓哄瓨鍦�)
+ /// s-one闂ㄩ攣鏄惁瀛樺湪鑷姩鍖栫殑鏂规硶(true涓哄瓨鍦�)
/// </summary>
public static async System.Threading.Tasks.Task<bool> Exist(int valueInt=2)
{
@@ -754,7 +757,7 @@
}
///<summary>
- /// s-one闂ㄩ攣纭鍙栨秷鍙戦�佺殑鏂规硶
+ /// s-one闂ㄩ攣纭鍙栨秷(浣挎弧瓒虫潯浠舵墍鏈夐�昏緫澶辫兘涓�娆�)鍙戦�佺殑鏂规硶
/// </summary>
public static async void LockCloseLogic(CommonDevice common)
{
@@ -763,7 +766,7 @@
int m= int.Parse(DateTime.Now.ToString("mm"));
//杞寲涓哄灏戝垎閽�;
int s = h * 60 + m;
- List<Common.Logic> logicList = new List<Common.Logic>();
+ var logicList = new List<Common.Logic>();
logicList.Clear();
var Idlist = await Send.GetLogicId(2);
if (Idlist.Count != 0)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs
index ae014e0..a16d97a 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs
@@ -19,7 +19,7 @@
public string str1;
Dictionary<string, string> timeBucketConditionsInfo = new Dictionary<string, string>();
- public void Show()
+ public void Show(bool _if=false)
{
#region 涓婇潰鐨勫竷灞�浠ｇ爜
@@ -335,11 +335,21 @@
}
//LogicIfon.logicIfon.Addconditions(timeBucketConditionsInfo,timeBucketConditionsInfo.Type);
+ if (_if) {
+ //璺冲埌S-one闂ㄩ攣
+ var oneLogic = new OneLogic { };
+ UserView.HomePage.Instance.AddChidren(oneLogic);
+ UserView.HomePage.Instance.PageIndex += 1;
+ oneLogic.Show(false);
- var logicCommunalPage = new LogicCommunalPage { };
- UserView.HomePage.Instance.AddChidren(logicCommunalPage);
- UserView.HomePage.Instance.PageIndex += 1;
- logicCommunalPage.Show(() => { });
+ }
+ else
+ {
+ var logicCommunalPage = new LogicCommunalPage { };
+ UserView.HomePage.Instance.AddChidren(logicCommunalPage);
+ UserView.HomePage.Instance.PageIndex += 1;
+ logicCommunalPage.Show(() => { });
+ }
};
}
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index 54e4865..a48a1c3 100644
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -718,6 +718,7 @@
public readonly static int tiplocktextnull = 5379;
public readonly static int openmode = 5380;
public readonly static int addnull = 5381;
+ public readonly static int look = 5382;
#region 鐧诲綍娉ㄥ唽
/// <summary>
--
Gitblit v1.8.0