派生自 ~xm/HomeApp
ZigbeeApp/.DS_StoreBinary files differ
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> ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ideBinary files differ
ZigbeeApp/GateWay.Ios/.DS_StoreBinary files differ
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"> ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dllBinary files differ
ZigbeeApp/Shared/DLL/Android/Shared.Droid.Smartrefresh.dllBinary files differ
ZigbeeApp/Shared/DLL/Android/Shared.Droid.dllBinary files differ
ZigbeeApp/Shared/DLL/IOS/Shared.IOS.dllBinary files differ
ZigbeeApp/Shared/Phone/.DS_StoreBinary files differ
ZigbeeApp/Shared/Phone/Device/.DS_StoreBinary files differ
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) { 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 { 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 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 最上面的布局代码 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++) {
