From eea1503b2de29723200e8593f62232b86d2b25df Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期二, 03 十二月 2019 10:25:45 +0800
Subject: [PATCH] 2019-12-03-1
---
ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs | 1 -
ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs | 2 +-
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 23 +++++++++++++----------
ZigbeeApp/Shared/DLL/IOS/Shared.IOS.dll | 0
ZigbeeApp/Shared/DLL/Android/Shared.Droid.Smartrefresh.dll | 0
ZigbeeApp/.DS_Store | 0
ZigbeeApp/Shared/Phone/Device/Category/Category.cs | 4 ++--
ZigbeeApp/Shared/DLL/Android/Shared.Droid.dll | 0
ZigbeeApp/GateWay.Ios/GateWay.Ios.csproj | 12 ++++++------
ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs | 3 ++-
ZigbeeApp/GateWay.Ios/.DS_Store | 0
ZigbeeApp/Shared/Phone/.DS_Store | 0
ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dll | 0
ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs | 3 ++-
ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide | 0
ZigbeeApp/Shared/Phone/Device/.DS_Store | 0
16 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/ZigbeeApp/.DS_Store b/ZigbeeApp/.DS_Store
index 40ba119..f2ce1d2 100644
--- a/ZigbeeApp/.DS_Store
+++ b/ZigbeeApp/.DS_Store
Binary files differ
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index a0aa02f..a948d58 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -2,29 +2,32 @@
<MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.SelectDevice" />
<MonoDevelop.Ide.ItemProperties.GateWay.Ios automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.913cb77b0eef11c9119c61a02bc00fec01bf67d6" />
<MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" />
- <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/DelayTime.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/LogicCommunalPage.cs">
<Files>
- <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="1962" Column="79" />
- <File FileName="Shared/Phone/Device/Logic/LogicDevicePage.cs" Line="1941" Column="64" />
- <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs" Line="2105" Column="46" />
- <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs" Line="23" Column="1" />
- <File FileName="Shared/Phone/Device/Logic/DelayTime.cs" Line="1" Column="1" />
+ <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="991" Column="23" />
+ <File FileName="Shared/Phone/Device/Logic/LogicDevicePage.cs" />
+ <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs" />
+ <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs" />
+ <File FileName="Shared/Phone/Device/Logic/Send.cs" />
+ <File FileName="Shared/Phone/Device/Logic/DeviceStateCondition.cs" />
+ <File FileName="Shared/Phone/ZigBee/Device/DoorLock.cs" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="GateWay" expanded="True">
- <Node name="GateWay.Droid" expanded="True">
- <Node name="References" expanded="True" />
- </Node>
+ <Node name="GateWay.Ios" selected="True" />
<Node name="Shared" expanded="True">
<Node name="Phone" expanded="True">
<Node name="Device" expanded="True">
+ <Node name="Category" expanded="True" />
<Node name="Logic" expanded="True">
<Node name="DoorLockLogic" expanded="True" />
- <Node name="DelayTime.cs" selected="True" />
</Node>
</Node>
+ <Node name="ZigBee" expanded="True">
+ <Node name="Device" expanded="True" />
+ </Node>
</Node>
</Node>
</Node>
diff --git a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
index 2c82b65..64dcf53 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.Ios/.DS_Store b/ZigbeeApp/GateWay.Ios/.DS_Store
index aea61d7..1982f0f 100644
--- a/ZigbeeApp/GateWay.Ios/.DS_Store
+++ b/ZigbeeApp/GateWay.Ios/.DS_Store
Binary files differ
diff --git a/ZigbeeApp/GateWay.Ios/GateWay.Ios.csproj b/ZigbeeApp/GateWay.Ios/GateWay.Ios.csproj
index a5def40..885eb1b 100644
--- a/ZigbeeApp/GateWay.Ios/GateWay.Ios.csproj
+++ b/ZigbeeApp/GateWay.Ios/GateWay.Ios.csproj
@@ -137,18 +137,18 @@
<Reference Include="ZXingNetMobile">
<HintPath>..\packages\ZXing.Net.Mobile.2.4.1\lib\Xamarin.iOS10\ZXingNetMobile.dll</HintPath>
</Reference>
- <Reference Include="Shared.IOS">
- <HintPath>..\Shared\DLL\IOS\Shared.IOS.dll</HintPath>
- </Reference>
- <Reference Include="Shared.IOS.TBL">
- <HintPath>..\Shared\DLL\IOS\Shared.IOS.TBL.dll</HintPath>
- </Reference>
<Reference Include="Xamarin.Essentials">
<HintPath>..\Shared\DLL\IOS\Xamarin.Essentials.dll</HintPath>
</Reference>
<Reference Include="MJRefresh_Xamarin">
<HintPath>..\Shared\DLL\IOS\MJRefresh_Xamarin.dll</HintPath>
</Reference>
+ <Reference Include="Shared.IOS">
+ <HintPath>..\Shared\DLL\IOS\Shared.IOS.dll</HintPath>
+ </Reference>
+ <Reference Include="Shared.IOS.TBL">
+ <HintPath>..\Shared\DLL\IOS\Shared.IOS.TBL.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json">
diff --git a/ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dll b/ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dll
index 4b5485f..354eaa7 100644
--- a/ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dll
+++ b/ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dll
Binary files differ
diff --git a/ZigbeeApp/Shared/DLL/Android/Shared.Droid.Smartrefresh.dll b/ZigbeeApp/Shared/DLL/Android/Shared.Droid.Smartrefresh.dll
index bd4bb83..41cbd1b 100644
--- a/ZigbeeApp/Shared/DLL/Android/Shared.Droid.Smartrefresh.dll
+++ b/ZigbeeApp/Shared/DLL/Android/Shared.Droid.Smartrefresh.dll
Binary files differ
diff --git a/ZigbeeApp/Shared/DLL/Android/Shared.Droid.dll b/ZigbeeApp/Shared/DLL/Android/Shared.Droid.dll
index ef19174..86fac20 100644
--- a/ZigbeeApp/Shared/DLL/Android/Shared.Droid.dll
+++ b/ZigbeeApp/Shared/DLL/Android/Shared.Droid.dll
Binary files differ
diff --git a/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.dll b/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.dll
index 7e9dbfe..6dac8e4 100644
--- a/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.dll
+++ b/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.dll
Binary files differ
diff --git a/ZigbeeApp/Shared/Phone/.DS_Store b/ZigbeeApp/Shared/Phone/.DS_Store
index c3afe79..3c34015 100644
--- a/ZigbeeApp/Shared/Phone/.DS_Store
+++ b/ZigbeeApp/Shared/Phone/.DS_Store
Binary files differ
diff --git a/ZigbeeApp/Shared/Phone/Device/.DS_Store b/ZigbeeApp/Shared/Phone/Device/.DS_Store
index 51ead7a..b101087 100644
--- a/ZigbeeApp/Shared/Phone/Device/.DS_Store
+++ b/ZigbeeApp/Shared/Phone/Device/.DS_Store
Binary files differ
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
index 58aa20c..f08747f 100644
--- a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
@@ -2010,7 +2010,7 @@
//鑷姩鍖�
Automationview(logicScrolView);
CommonPage.Loading.Hide();
-
+
}
/// <summary>
/// 鑷姩鍖栧垪琛ㄧ晫闈�
@@ -2163,7 +2163,7 @@
TextColor = ZigbeeColor.Current.LogicListWeekTextColor,
};
logicRowlayout.AddChidren(logictimeBtn);
-
+
///鏄剧ず鎵ц鍛ㄦ湡
switch (logic.TimeAttribute.Repeat)
{
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs b/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs
index 1dcbdfe..a8a3b9d 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs
@@ -70,7 +70,7 @@
};
this.AddChidren(middle);
- var textBox = new EditText
+ var textBox = new EditTextView//EditText
{
Width = Application.GetRealWidth(1080),
Height = Application.GetRealHeight(600),
@@ -81,6 +81,7 @@
TextSize = 14,
};
middle.AddChidren(textBox);
+ textBox.HideSoftInput();
var btnsave = new Button
{
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs
index 061560a..5f79282 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs
@@ -19,7 +19,6 @@
public void Show(int isInt=0, bool edit=false)
{
-
#region 鏈�涓婇潰鐨勫竷灞�浠ｇ爜
var topRowLayout = new RowLayout
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs
index 092dc54..ddf7555 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs
@@ -24,9 +24,10 @@
Button clickbutton = new Button();
Button clicktextcolcrbutton = new Button();
- public void Show()
+ public void Show()
{
+
UserView.HomePage.Instance.ScrollEnabled = false;
this.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
#region 鏈�涓婇潰鐨勫竷灞�浠ｇ爜
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs
index 78c77e8..01df463 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs
@@ -13,7 +13,7 @@
/// </summary>
/// <param name="common">Common.</param>
/// <param name="objecttype">Objecttype.</param>
- public static void AddDeviceconditions(CommonDevice common, Dictionary<string, string> objecttype)
+ public static void AddDeviceconditions(CommonDevice common, Dictionary<string, string> objecttype)
{
for (int i = 0; i < Common.Logic.CurrentLogic.Conditions.Count; i++)
{
--
Gitblit v1.8.0