From 70fe48768ea3695780f4b2ae32e940d50bb580c7 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期四, 07 五月 2020 17:50:42 +0800
Subject: [PATCH] 2020-05-07-3
---
ZigbeeApp/Shared/Phone/Device/Logic/LogicView/TipView.cs | 2
ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs | 25 ++++++++
ZigbeeApp/GateWay.Droid/Assets/Language.ini | 6 ++
ZigbeeApp/Home.Ios/Resources/Language.ini | 7 ++
ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs | 2
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 47 +++++++++------
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs | 24 +++----
ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide | 0
.DS_Store | 0
ZigbeeApp/Shared/R.cs | 7 ++
ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs | 59 +++++++++++--------
11 files changed, 120 insertions(+), 59 deletions(-)
diff --git a/.DS_Store b/.DS_Store
index 7dd0f9d..54726f6 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 e8ba07c..ee6fd98 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -1,45 +1,54 @@
锘�<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/UserCenter/CommonBase/Logic/UserCenterLogic.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="Shared/R.cs">
<Files>
- <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="789" Column="9" />
- <File FileName="Shared/Phone/ZigBee/Common/Config.cs" Line="4" Column="11" />
- <File FileName="Shared/Common/House.cs" Line="29" Column="23" />
- <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="251" Column="54" />
- <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="12" Column="2" />
- <File FileName="Shared/Phone/Device/Logic/Method.cs" Line="114" Column="31" />
- <File FileName="Shared/Phone/Device/Logic/CurrentDeviceState.cs" Line="343" Column="61" />
- <File FileName="Shared/Phone/Device/Logic/LogicIfon.cs" Line="7" Column="2" />
- <File FileName="Shared/Phone/Device/Logic/AddLogicPage.cs" Line="96" Column="71" />
- <File FileName="Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs" Line="221" Column="19" />
- <File FileName="Shared/Phone/Device/Logic/RoomAndDeviceView.cs" Line="22" Column="17" />
- <File FileName="Shared/Common/Logic.cs" Line="8" Column="6" />
- <File FileName="Shared/Phone/UserCenter/CommonBase/Common/AccountOption.cs" Line="1" Column="1" />
- <File FileName="Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs" Line="118" Column="46" />
+ <File FileName="Shared/Phone/Category/SelectFloorForm.cs" Line="168" Column="1" IsPinned="True" />
+ <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="21" Column="24" />
+ <File FileName="Shared/Phone/Device/Logic/LogicView/TipView.cs" Line="271" Column="15" />
+ <File FileName="Shared/Phone/Device/Logic/SoneLogicList.cs" Line="148" Column="118" />
+ <File FileName="Shared/Phone/Device/Logic/AddLogicPage.cs" Line="22" Column="12" />
+ <File FileName="Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs" Line="1055" Column="70" />
+ <File FileName="Shared/Phone/ZigBee/Device/DoorLock.cs" Line="1" Column="1" />
+ <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="41" Column="36" />
+ <File FileName="Shared/Phone/UserCenter/CommonBase/Controls/MessageControls/ShowMsgControl.cs" Line="100" Column="22" />
+ <File FileName="GateWay.Droid/Assets/Language.ini" Line="549" Column="1" />
+ <File FileName="Shared/R.cs" Line="127" Column="64" />
</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="Category" expanded="True" />
<Node name="Device" expanded="True">
- <Node name="Logic" expanded="True" />
+ <Node name="Logic" expanded="True">
+ <Node name="LogicView" expanded="True" />
+ </Node>
</Node>
<Node name="UserCenter" expanded="True">
<Node name="CommonBase" expanded="True">
<Node name="Common" expanded="True" />
- <Node name="Logic" expanded="True">
- <Node name="UserCenterLogic.cs" selected="True" />
+ <Node name="Controls" expanded="True">
+ <Node name="MessageControls" expanded="True" />
</Node>
</Node>
+ <Node name="DoorLock" expanded="True" />
+ <Node name="Residence" expanded="True" />
</Node>
<Node name="ZigBee" expanded="True">
- <Node name="Common" expanded="True" />
+ <Node name="Device" expanded="True" />
</Node>
</Node>
+ <Node name="R.cs" selected="True" />
</Node>
</Node>
</State>
diff --git a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
index f0aa087..7a10306 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 82442c6..ba78659 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Language.ini
+++ b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
@@ -546,6 +546,12 @@
5397=鏃堕棿涓虹┖
5398=鍙敮鎸佹暟瀛楄緭鍏�
+5399=鍏抽棴澶辫触
+5400=寮�鍚け璐�
+5401=娣诲姞澶辫触
+5402=鏃舵晥鎬у父寮�璁剧疆
+5403=鏃舵墽琛�
+
10000=HDL Home
10001=甯哥敤
diff --git a/ZigbeeApp/Home.Ios/Resources/Language.ini b/ZigbeeApp/Home.Ios/Resources/Language.ini
index 82442c6..d44edd2 100755
--- a/ZigbeeApp/Home.Ios/Resources/Language.ini
+++ b/ZigbeeApp/Home.Ios/Resources/Language.ini
@@ -545,6 +545,13 @@
5396=鎴�
5397=鏃堕棿涓虹┖
5398=鍙敮鎸佹暟瀛楄緭鍏�
+5399=鍏抽棴澶辫触
+5400=寮�鍚け璐�
+5401=娣诲姞澶辫触
+5402=鏃舵晥鎬у父寮�璁剧疆
+5403=鏃舵墽琛�
+
+
10000=HDL Home
10001=甯哥敤
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
index d6c89bd..5b02be1 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
@@ -18,6 +18,8 @@
}
public void Show()
{
+
+
#region 鐣岄潰鐨勫竷灞�浠ｇ爜
TopView view = new TopView();
this.AddChidren(view.TopRowView());
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/TipView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/TipView.cs
index ec84597..7e4fd7d 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/TipView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/TipView.cs
@@ -281,8 +281,8 @@
}
- dialog.Close();
action(editTime.Text);
+ dialog.Close();
};
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
index ef19807..6d11569 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
@@ -20,6 +20,31 @@
{
case 0:
{
+ // if (doorLock == null)
+ // {
+ // ///闃叉鎶涘紓甯�
+ // Send.CurrentDoorLock = new DoorLock();
+ // }
+ // ///澶囨敞锛歐JC鐨�
+ //// Shared.Phone.Device.Logic.Send.CurrentDoorLock = doorLock;
+ // ///杩涙潵鍒锋柊涓�娆¤澶囧垪琛紱
+ // Common.Logic.LogicDviceList.Clear();
+ // 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;
+ // /////鐣欑粰寰愭鐢ㄧ殑
+ // //UpdateNomallyOpenStatus();
+ // };
+
+
//new涓�涓柊閫昏緫瀵硅薄锛�
//鏂板姝ｅ父鑷姩鍖栧叆鍙�
Common.Logic.CurrentLogic = new Common.Logic();
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
index d6bcbf8..300871c 100644
--- 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("鍏抽棴澶辫触");
+ LogicView.TipView.ShowFlashTip(Language.StringByID(MyInternationalizationString.closeFailed));
}
};
@@ -129,12 +122,11 @@
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,
- Text = "鏃舵晥鎬у父寮�璁剧疆12:20",
};
if (logic != null)
{
@@ -144,15 +136,21 @@
///鏃舵晥鎬у父寮�鍙湁涓�涓潯浠�;
try
{
- var y = DateTime.Now.ToString("yy");//閭ｄ竴骞�
- var m = DateTime.Now.ToString("mm");//閭ｄ竴鏈�
+
+ 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 me = DateTime.Now.ToLongDateString();
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;
+ 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;
}
catch { }
@@ -160,7 +158,7 @@
else
{
fLayout.Height = Application.GetRealHeight(645);//鏀瑰彉楂樺害
- modeIconBtn.IsSelected = false;//鏀瑰彉鍥炬爣鐘舵��
+ modeIconBtn.UnSelectedImagePath = "ZigeeLogic/noMode.png";//鏀瑰彉鍥炬爣鐘舵��
///绗簩绾х埗鎺т欢
var modeFl = new FrameLayout
{
@@ -215,7 +213,7 @@
var result = await UserCenter.DoorLock.DoorLockCommonInfo.SetNormallyOpenModeFuncAsync(Send.CurrentDoorLock);
if (!result)
{
- LogicView.TipView.ShowFlashTip("寮�鍚け璐�");
+ LogicView.TipView.ShowFlashTip(Language.StringByID(MyInternationalizationString.openFailed));
return;
}
else
@@ -225,8 +223,10 @@
var addResult = await SkipView.LockAddModifyLogic(int.Parse(str), Send.CurrentDoorLock);//娣诲姞涓�鏉″け鏁堥�昏緫
if (!addResult)
{
+ ///鍙璇村鏋滃父寮�妯″紡寮�锛屽垱寤鸿嚜鍔ㄥ寲澶辫触锛岄偅涔堝皢瑕佸彂涓�鏉″父寮�妯″紡鍏抽棴鍛戒护;
+ UserCenter.DoorLock.DoorLockCommonInfo.DelNormallyOpenMode(Send.CurrentDoorLock);
///鎻愮ず澶辫触
- LogicView.TipView.ShowFlashTip("娣诲姞澶辫触");
+ LogicView.TipView.ShowFlashTip(Language.StringByID(MyInternationalizationString.addFailed));
return;
}
Send.CurrentDoorLock.IsDoorLockNormallyMode = true;
@@ -235,6 +235,13 @@
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);
+ // }
+ //};
}
}
@@ -398,7 +405,7 @@
/// </summary>
/// <param name="verticalRefresh"></param>
RowLayout selectedRow = new RowLayout() { Tag = "0" };//璁板綍宸︽粦鐘舵��
- int i = 1;
+ int a = 1;
private void RefreshView(VerticalRefreshLayout verticalRefresh)
{
verticalRefresh.RemoveAll();
@@ -418,7 +425,7 @@
LineColor = ZigbeeColor.Current.LogicBackgroundColor,
BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
SubViewWidth = Application.GetRealWidth(184),//鏀瑰彉缂栬緫鎺т欢瀹藉害澶氬皯锛�
- Tag = i.ToString(),
+ Tag = a.ToString(),
};
fLayout.AddChidren(logicRow);
//宸︽粦鑿滃崟浜嬩欢
@@ -430,7 +437,7 @@
}
selectedRow = logicRow;
};
- i++;
+ a++;
///鏄剧ず閫昏緫鍚嶇О鐨勬帶浠�
var nameBtn = new Button
{
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
old mode 100755
new mode 100644
index 37601a4..6830a1d
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
@@ -1024,18 +1024,17 @@
/// </summary>
private async void NomallyOpenDialog()
{
- #region 鍚庣画鐗堟湰
- //if (UserCenterResourse.UserInfo.AuthorityNo != 1)
- //{
- // this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.OnlyMasterOperate));
- // return;
- //}
+ if (UserCenterResourse.UserInfo.AuthorityNo != 1)
+ {
+ this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.OnlyMasterOperate));
+ return;
+ }
- //if (!UserCenterResourse.AccountOption.DoorUnLockByRemote)
- //{
- // SystemSecondAuthentication();
- // return;
- //}
+ if (!UserCenterResourse.AccountOption.DoorUnLockByRemote)
+ {
+ SystemSecondAuthentication();
+ return;
+ }
action = () =>
{
@@ -1064,8 +1063,7 @@
UpdateNomallyOpenStatus();
};
};
- //HdlCheckLogic.Current.CheckSecondarySecurity(action);
- #endregion
+ HdlCheckLogic.Current.CheckSecondarySecurity(action);
}
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
old mode 100755
new mode 100644
index 11d8f17..3c38e89
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -835,6 +835,13 @@
public readonly static int or = 5396;
public readonly static int timeNull = 5397;
public readonly static int numberInput = 5398;
+ public readonly static int closeFailed = 5399;
+ public readonly static int openFailed = 5400;
+ public readonly static int addFailed = 5401;
+ public readonly static int timeSensitive = 5402;
+ public readonly static int executeSone = 5403;
+
+
#region 鐧诲綍娉ㄥ唽
/// <summary>
--
Gitblit v1.8.0