From f573c74a1b431a6d016d766628f2e6320fa42ff9 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 03 六月 2020 14:50:20 +0800
Subject: [PATCH] 2020-06-03-1
---
ZigbeeApp/Shared/Phone/Device/Logic/LogicView/TipView.cs | 308 +++++++++++++++++++++++++-------------------------
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 4
ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide | 0
.DS_Store | 0
ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs | 9
5 files changed, 160 insertions(+), 161 deletions(-)
diff --git a/.DS_Store b/.DS_Store
index 923826e..8e9340b 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 24b7df4..dc2210b 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -3,9 +3,7 @@
<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="244" Column="31" />
- <File FileName="Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs" Line="656" Column="36" />
- <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="155" Column="18" />
+ <File FileName="Shared/Phone/Device/Logic/SoneLogicList.cs" Line="230" Column="24" />
</Files>
<Pads>
<Pad Id="ProjectPad">
diff --git a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
index 11906c7..4ebe8b2 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/LogicView/TipView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/TipView.cs
old mode 100755
new mode 100644
index 88bf472..0bd9c85
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/TipView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/TipView.cs
@@ -115,167 +115,167 @@
action();
};
}
- /// <summary>
- /// 杈撳叆妗�
- /// </summary>
- /// <param name="_if">鏄惁闇�瑕佸彇娑堟寜閽�</param>
- /// <param name="action"></param>
- public static void ShowInputTip(bool _if, Action<string> action)
- {
+ /// <summary>
+ /// 杈撳叆妗�
+ /// </summary>
+ /// <param name="_if">鏄惁闇�瑕佸彇娑堟寜閽�</param>
+ /// <param name="action"></param>
+ public static void ShowInputTip(bool _if, Action<string> action)
+ {
- ///涓绘帶浠�
- Dialog dialog = new Dialog();
- dialog.Show();
- ///鑳屾櫙鐨勭埗鎺т欢
- FrameLayout fLayout = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicTranslucentColor };
- dialog.AddChidren(fLayout);
- fLayout.MouseUpEventHandler += (sender, e) =>
- {
- dialog.Close();
- };
- ///寮规鐖舵帶浠�
- FrameLayout tipFLayout = new FrameLayout
- {
- X = Application.GetRealWidth(144),
- Y = Application.GetRealHeight(706),
- Width = Application.GetRealWidth(792),
- Height = Application.GetRealHeight(351 + 127),
- BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
- Radius = (uint)Application.GetRealHeight(17)
- };
- fLayout.AddChidren(tipFLayout);
- ///涓婇潰蹇殑鐖舵帶浠�
- FrameLayout topFrame = new FrameLayout
- {
- Width = Application.GetRealWidth(792),
- Height = Application.GetRealHeight(351),
- };
- tipFLayout.AddChidren(topFrame);
- ///鎻愮ず鎺т欢
- Button tipBtn = new Button
- {
- Y = Application.GetRealHeight(69),
- X = Application.GetRealWidth(150),
- Height = Application.GetRealHeight(63),
- Width = Application.GetRealWidth(492),
- TextID = R.MyInternationalizationString.invalidSetting,
- TextAlignment = TextAlignment.Center,
- TextColor = ZigbeeColor.Current.LogicTipColor,
- TextSize = 16,
+ ///涓绘帶浠�
+ Dialog dialog = new Dialog();
+ dialog.Show();
+ ///鑳屾櫙鐨勭埗鎺т欢
+ FrameLayout fLayout = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicTranslucentColor };
+ dialog.AddChidren(fLayout);
+ fLayout.MouseUpEventHandler += (sender, e) =>
+ {
+ dialog.Close();
+ };
+ ///寮规鐖舵帶浠�
+ FrameLayout tipFLayout = new FrameLayout
+ {
+ X = Application.GetRealWidth(144),
+ Y = Application.GetRealHeight(706),
+ Width = Application.GetRealWidth(792),
+ Height = Application.GetRealHeight(351 + 127),
+ BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+ Radius = (uint)Application.GetRealHeight(17)
+ };
+ fLayout.AddChidren(tipFLayout);
+ ///涓婇潰蹇殑鐖舵帶浠�
+ FrameLayout topFrame = new FrameLayout
+ {
+ Width = Application.GetRealWidth(792),
+ Height = Application.GetRealHeight(351),
+ };
+ tipFLayout.AddChidren(topFrame);
+ ///鎻愮ず鎺т欢
+ Button tipBtn = new Button
+ {
+ Y = Application.GetRealHeight(69),
+ X = Application.GetRealWidth(150),
+ Height = Application.GetRealHeight(63),
+ Width = Application.GetRealWidth(492),
+ TextID = R.MyInternationalizationString.invalidSetting,
+ TextAlignment = TextAlignment.Center,
+ TextColor = ZigbeeColor.Current.LogicTipColor,
+ TextSize = 16,
- };
- topFrame.AddChidren(tipBtn);
- ///鏂囨湰1鎺т欢
- Button Text1Btn = new Button
- {
- Y = Application.GetRealHeight(187),
- X = Application.GetRealWidth(50),
- Height = Application.GetRealHeight(58),
- Width = Application.GetRealWidth(242 + 94),
- TextID = R.MyInternationalizationString.lockOpen,
- TextAlignment = TextAlignment.CenterRight,
- TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
- TextSize = 14,
+ };
+ topFrame.AddChidren(tipBtn);
+ ///鏂囨湰1鎺т欢
+ Button Text1Btn = new Button
+ {
+ Y = Application.GetRealHeight(187),
+ X = Application.GetRealWidth(50),
+ Height = Application.GetRealHeight(58),
+ Width = Application.GetRealWidth(242 + 94),
+ TextID = R.MyInternationalizationString.lockOpen,
+ TextAlignment = TextAlignment.CenterRight,
+ TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+ TextSize = 14,
- };
- topFrame.AddChidren(Text1Btn);
- ///杈撳叆鏂囨湰妗�
- EditText editTime = new EditText()
- {
- X = Application.GetRealWidth(409),
- Y = Application.GetRealHeight(173),
- Height = Application.GetRealHeight(81),
- Width = Application.GetRealWidth(132),
- Radius = (uint)Application.GetMinRealAverage(17),
- BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
- TextColor = ZigbeeColor.Current.LogicTextBlackColor,
- TextAlignment = TextAlignment.Center,
- TextSize = 14,
- Text = "12",
- IsNumberKeyboardType=true,//鍙緭鍏ユ暟瀛楃殑灞炴��
- };
- topFrame.AddChidren(editTime);
- ///鏂囨湰2鎺т欢
- Button Text2Btn = new Button
- {
- Y = Application.GetRealHeight(187),
- X = Application.GetRealWidth(564),
- Height = Application.GetRealHeight(58),
- Width = Application.GetRealWidth(51 + 100),
- TextID = R.MyInternationalizationString.hour,
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
- TextSize = 14,
+ };
+ topFrame.AddChidren(Text1Btn);
+ ///杈撳叆鏂囨湰妗�
+ EditText editTime = new EditText()
+ {
+ X = Application.GetRealWidth(409),
+ Y = Application.GetRealHeight(173),
+ Height = Application.GetRealHeight(81),
+ Width = Application.GetRealWidth(132),
+ Radius = (uint)Application.GetMinRealAverage(17),
+ BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
+ TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ TextAlignment = TextAlignment.Center,
+ TextSize = 14,
+ Text = "12",
+ IsNumberKeyboardType = true,//鍙緭鍏ユ暟瀛楃殑灞炴��
+ };
+ topFrame.AddChidren(editTime);
+ ///鏂囨湰2鎺т欢
+ Button Text2Btn = new Button
+ {
+ Y = Application.GetRealHeight(187),
+ X = Application.GetRealWidth(564),
+ Height = Application.GetRealHeight(58),
+ Width = Application.GetRealWidth(51 + 100),
+ TextID = R.MyInternationalizationString.hour,
+ TextAlignment = TextAlignment.CenterLeft,
+ TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+ TextSize = 14,
- };
- topFrame.AddChidren(Text2Btn);
+ };
+ topFrame.AddChidren(Text2Btn);
- ///涓嬮潰蹇殑鐖舵帶浠�
- FrameLayout bottomFrame = new FrameLayout
- {
- Y = topFrame.Bottom,
- Width = Application.GetRealWidth(792),
- Height = Application.GetRealHeight(127),
- Gravity=Gravity.BottomCenter,
- };
- tipFLayout.AddChidren(bottomFrame);
- ///鍙栨秷鎺т欢
- Button cancelBtn = new Button
- {
- TextAlignment = TextAlignment.Center,
- TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
- TextSize = 14,
- Height = bottomFrame.Height,
- Width = Application.GetRealWidth(397),
- BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
- TextID = R.MyInternationalizationString.cancel,
- };
- bottomFrame.AddChidren(cancelBtn);
- ///纭鎺т欢
- Button okBtn = new Button
- {
- TextAlignment = TextAlignment.Center,
- TextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
- TextSize = 14,
- X = cancelBtn.Right,
- Height = bottomFrame.Height,
- Width = bottomFrame.Width - cancelBtn.Width,
- BackgroundColor = ZigbeeColor.Current.LogicBtnTypeColor,
- TextID = R.MyInternationalizationString.confrim,
- };
- bottomFrame.AddChidren(okBtn);
+ ///涓嬮潰蹇殑鐖舵帶浠�
+ FrameLayout bottomFrame = new FrameLayout
+ {
+ Y = topFrame.Bottom,
+ Width = Application.GetRealWidth(792),
+ Height = Application.GetRealHeight(127),
+ Gravity = Gravity.BottomCenter,
+ };
+ tipFLayout.AddChidren(bottomFrame);
+ ///鍙栨秷鎺т欢
+ Button cancelBtn = new Button
+ {
+ TextAlignment = TextAlignment.Center,
+ TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+ TextSize = 14,
+ Height = bottomFrame.Height,
+ Width = Application.GetRealWidth(397),
+ BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
+ TextID = R.MyInternationalizationString.cancel,
+ };
+ bottomFrame.AddChidren(cancelBtn);
+ ///纭鎺т欢
+ Button okBtn = new Button
+ {
+ TextAlignment = TextAlignment.Center,
+ TextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+ TextSize = 14,
+ X = cancelBtn.Right,
+ Height = bottomFrame.Height,
+ Width = bottomFrame.Width - cancelBtn.Width,
+ BackgroundColor = ZigbeeColor.Current.LogicBtnTypeColor,
+ TextID = R.MyInternationalizationString.confrim,
+ };
+ bottomFrame.AddChidren(okBtn);
- if (_if) {
- cancelBtn.X = Application.GetRealWidth(0);
- cancelBtn.Width = Application.GetRealWidth(0);
- okBtn.X = Application.GetRealWidth(0);
- okBtn.Width = Application.GetRealWidth(792);
- okBtn.SetCornerWithSameRadius(Application.GetRealHeight(17), HDLUtils.RectCornerBottomLeft | HDLUtils.RectCornerBottomRight);
- }
- else
- {
- cancelBtn.X = Application.GetRealWidth(0);
- cancelBtn.Width = Application.GetRealWidth(397);
- okBtn.X = Application.GetRealWidth(397);
- okBtn.Width = bottomFrame.Width - cancelBtn.Width;
- cancelBtn.SetCornerWithSameRadius(Application.GetRealHeight(17), HDLUtils.RectCornerBottomLeft);
- okBtn.SetCornerWithSameRadius(Application.GetRealHeight(17), HDLUtils.RectCornerBottomRight);
+ if (_if) {
+ cancelBtn.X = Application.GetRealWidth(0);
+ cancelBtn.Width = Application.GetRealWidth(0);
+ okBtn.X = Application.GetRealWidth(0);
+ okBtn.Width = Application.GetRealWidth(792);
+ okBtn.SetCornerWithSameRadius(Application.GetRealHeight(17), HDLUtils.RectCornerBottomLeft | HDLUtils.RectCornerBottomRight);
+ }
+ else
+ {
+ cancelBtn.X = Application.GetRealWidth(0);
+ cancelBtn.Width = Application.GetRealWidth(397);
+ okBtn.X = Application.GetRealWidth(397);
+ okBtn.Width = bottomFrame.Width - cancelBtn.Width;
+ cancelBtn.SetCornerWithSameRadius(Application.GetRealHeight(17), HDLUtils.RectCornerBottomLeft);
+ okBtn.SetCornerWithSameRadius(Application.GetRealHeight(17), HDLUtils.RectCornerBottomRight);
- }
- ///鍙栨秷鐐瑰嚮浜嬩欢
- cancelBtn.MouseUpEventHandler += (sender, e) =>
- {
- dialog.Close();
- };
- ///纭鐐瑰嚮浜嬩欢
- okBtn.MouseUpEventHandler += (sender, e) =>
- {
- if (string.IsNullOrEmpty(editTime.Text))
- {
- ShowErrorTip(Language.StringByID(R.MyInternationalizationString.timeNull),true);
- return;
- }
- if (int.Parse(editTime.Text) < 1 || int.Parse(editTime.Text) > 12)
+ }
+ ///鍙栨秷鐐瑰嚮浜嬩欢
+ cancelBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ dialog.Close();
+ };
+ ///纭鐐瑰嚮浜嬩欢
+ okBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ if (string.IsNullOrEmpty(editTime.Text))
+ {
+ ShowErrorTip(Language.StringByID(R.MyInternationalizationString.timeNull), true);
+ return;
+ }
+ if (int.Parse(editTime.Text) < 1 || int.Parse(editTime.Text) > 12|| int.Parse(editTime.Text)>(int.MaxValue-1))
{ ///闄愬埗杈撳叆鏁板瓧鑼冨洿;
string str = Language.StringByID(R.MyInternationalizationString.less) + Language.StringByID(R.MyInternationalizationString.or) + Language.StringByID(R.MyInternationalizationString.more);
ShowErrorTip(str, true);
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
index 5bb8a14..7447489 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
@@ -223,6 +223,7 @@
//UserCenter.DoorLock.DoorLockCommonInfo.UpdateCurrentDoorlockAction += (DoorlockKey, _bool) =>
//{
+ // Logic.SkipView.DelAllLogic(DoorlockKey);
// var key = Send.CurrentDoorLock.DeviceAddr + Send.CurrentDoorLock.DeviceEpoint;
// if (DoorlockKey == key)
// {
@@ -238,10 +239,10 @@
// }
//};
}
- /// <summary>
- /// 甯稿紑妯″紡寮�鍏冲垏鎹㈠浘鏍囩晫闈�
- /// </summary>
- public void ModeView()
+ /// <summary>
+ /// 甯稿紑妯″紡寮�鍏冲垏鎹㈠浘鏍囩晫闈�
+ /// </summary>
+ public void ModeView()
{
fLayout.RemoveAll();
--
Gitblit v1.8.0