From e41577d72b90fcd17999ffdd614072ecf313a733 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期三, 18 三月 2020 14:51:03 +0800
Subject: [PATCH] 2020-03-18-1
---
ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs | 11 +++++------
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 39 +++++++++++----------------------------
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs | 2 +-
ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide | 0
4 files changed, 17 insertions(+), 35 deletions(-)
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index 2f96e3d..1d1cece 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -1,45 +1,28 @@
锘�<Properties StartupConfiguration="{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}|Default">
<MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.M7BBB18B19152766" />
<MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.SelectDevice" />
- <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/DelayTime.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/AddLogicPage.cs">
<Files>
- <File FileName="Shared/Phone/Device/Category/Category.cs" Line="2323" Column="1" />
- <File FileName="Shared/Phone/UserCenter/Device/DeviceSearchForm.cs" />
- <File FileName="Shared/Phone/ZigBee/Device/ZbGateway.cs" />
- <File FileName="Shared/Phone/Device/Logic/Method.cs" />
- <File FileName="Shared/Phone/UserCenter/UserMain/UserMainForm.cs" />
- <File FileName="Shared/Phone/Device/Logic/RoomAndDeviceView.cs" Line="292" Column="59" />
- <File FileName="Shared/Phone/Device/Logic/CurrentDeviceState.cs" Line="1198" Column="75" />
- <File FileName="Shared/Phone/Device/Logic/LogicView/mFunView.cs" Line="7" Column="36" />
- <File FileName="Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs" Line="1094" Column="10" />
- <File FileName="Shared/Phone/Device/Logic/DelayTime.cs" Line="61" Column="18" />
- <File FileName="Shared/Phone/Device/Logic/DeviceTarget.cs" Line="78" Column="48" />
- <File FileName="Shared/Phone/Device/Logic/SecurityMode.cs" Line="50" Column="40" />
- <File FileName="Shared/Phone/Device/Logic/LogicView/SaveView.cs" Line="14" Column="30" />
+ <File FileName="Shared/Phone/Device/Category/Category.cs" Line="2285" Column="85" />
+ <File FileName="Shared/Phone/Device/Logic/Method.cs" Line="319" Column="18" />
+ <File FileName="Shared/Phone/Device/Logic/RoomAndDeviceView.cs" Line="87" Column="44" />
+ <File FileName="Shared/Phone/Device/Logic/CurrentDeviceState.cs" Line="1" Column="1" />
+ <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="112" Column="50" />
+ <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs" Line="584" Column="23" />
+ <File FileName="Shared/Phone/Device/Logic/DeviceTarget.cs" Line="49" Column="70" />
+ <File FileName="Shared/Phone/Device/Logic/LogicView/IfString.cs" Line="9" Column="22" />
+ <File FileName="Shared/Phone/Device/Logic/AddLogicPage.cs" Line="69" Column="34" />
</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 name="Phone" expanded="True">
- <Node name="ZigeeLogic" expanded="True">
- <Node name="delay.png" selected="True" />
- </Node>
- </Node>
- </Node>
- </Node>
<Node name="Shared" expanded="True">
<Node name="Phone" expanded="True">
<Node name="Device" expanded="True">
- <Node name="CommonForm" expanded="True" />
<Node name="Logic" expanded="True">
- <Node name="LogicView" expanded="True" />
+ <Node name="AddLogicPage.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 f93cb64..c325500 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/AddLogicPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
index d9053c6..73cfb83 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
@@ -63,12 +63,11 @@
middle.AddChidren(securityview.FunFrameView());
securityview.clickviewBtn.MouseUpEventHandler += (sender, e) =>
{
- CurtainPanel.ButtonSet buttonSet = new CurtainPanel.ButtonSet();
- UserView.HomePage.Instance.AddChidren(buttonSet);
- UserView.HomePage.Instance.PageIndex += 1;
- buttonSet.Show();
- return;
-
+ //CurtainPanel.ButtonSet buttonSet = new CurtainPanel.ButtonSet();
+ //UserView.HomePage.Instance.AddChidren(buttonSet);
+ //UserView.HomePage.Instance.PageIndex += 1;
+ //buttonSet.Show();
+ //return;
var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
this.AddChidren(flMain);
SecurityView(flMain, false);
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs
old mode 100755
new mode 100644
index 03a8f3f..8e7b68a
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs
@@ -218,7 +218,7 @@
{
LogicView.AddDeviceView addflview = new LogicView.AddDeviceView();
- addflview.titleBtn.TextID = MyInternationalizationString.selectunlockingmode;
+ addflview.titleBtn.TextID = MyInternationalizationString.addaction;
middle.AddChidren(addflview.AddFl());
addflview.clickBtn.MouseUpEventHandler += (sender, e) =>
{
--
Gitblit v1.8.0