From 3d8b0bbac92459aea0cf325bb48505fe09bfe016 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 26 三月 2021 14:01:26 +0800
Subject: [PATCH] 2021-03-26 1.更新
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Light/UserDeviceToLight.cs | 3 ++-
Crabtree/.vs/SmartHome/xs/UserPrefs.xml | 22 ++++++++++++++++------
2 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
index 404890d..f96c20d 100644
--- a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
+++ b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
@@ -1,21 +1,31 @@
锘�<Properties StartupConfiguration="{1D83BF28-BA88-4152-BA41-D7EFE90A5437}|Default">
<MonoDevelop.Ide.ItemProperties.ON.Droid PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
- <MonoDevelop.Ide.Workbench>
+ <MonoDevelop.Ide.Workbench ActiveDocument="SmartHome/UI/SimpleControl/Phone/Scene/UserAddSceneDevice.cs">
<Files>
- <File FileName="SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs" Line="756" Column="40" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/Scene/UserDeviceToScene.cs" Line="22" Column="19" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs" Line="52" Column="33" />
+ <File FileName="SmartHome/HDL/Operation/ResponseEntity/Timer.cs" Line="45" Column="23" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/Scene/SceneMethod.cs" Line="1" Column="1" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/Scene/UserAddSceneDevice.cs" Line="58" Column="33" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="SmartHome" expanded="True">
<Node name="Shared" expanded="True">
+ <Node name="HDL" expanded="True">
+ <Node name="Operation" expanded="True">
+ <Node name="ResponseEntity" expanded="True" />
+ </Node>
+ </Node>
<Node name="UI" expanded="True">
<Node name="SimpleControl" expanded="True">
<Node name="Phone" expanded="True">
- <Node name="Curtain" expanded="True" />
- <Node name="Schedule" expanded="True">
- <Node name="AddSchedule.cs" selected="True" />
+ <Node name="Light" expanded="True" />
+ <Node name="Scene" expanded="True">
+ <Node name="UserAddSceneDevice.cs" selected="True" />
</Node>
+ <Node name="Schedule" expanded="True" />
</Node>
</Node>
</Node>
@@ -33,7 +43,7 @@
<String>IosService/IosService.csproj</String>
<String>DroidService/DroidService.csproj</String>
</DisabledProjects>
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Release|iPhone" />
+ <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
<MonoDevelop.Ide.ItemProperties.ON.Ios automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore>
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Light/UserDeviceToLight.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Light/UserDeviceToLight.cs
index ad804e0..08d9ebe 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Light/UserDeviceToLight.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Light/UserDeviceToLight.cs
@@ -484,7 +484,7 @@
bodyScrolView.AddChidren (btnRoomNull);
Button btnPoint = new Button () {
Width = Application.GetRealWidth (10),
- Height = Application.GetRealHeight (10),
+ Height = Application.GetRealWidth (10),
X = Application.GetRealWidth (30),
Gravity = Gravity.CenterVertical,
UnSelectedImagePath = "Item/Point.png",
@@ -494,6 +494,7 @@
Button btnRoomName = new Button () {
Text = room.Name,
X = btnPoint.Right + Application.GetRealWidth (20),
+ Width = Application.GetRealWidth(400),
TextAlignment = TextAlignment.CenterLeft,
TextColor = SkinStyle.Current.TextColor1,
SelectedTextColor = SkinStyle.Current.TextColor1,
--
Gitblit v1.8.0