From ab2e9523bfaff199584fbae3797b38e81fd591de Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 30 八月 2022 17:41:37 +0800
Subject: [PATCH] 场景编辑操作修改
---
Crabtree/SmartHome/UI/SimpleControl/Phone/User/MigrateBean.cs | 4 +++-
Crabtree/SmartHome/UI/SimpleControl/EquipmentPublicClass.cs | 2 +-
Crabtree/SmartHome/HDL/Common/HttpUtil/HttpUtil.cs | 5 ++++-
Crabtree/SmartHome/UI/SimpleControl/Phone/Scene/UserDeviceToScene.cs | 15 +++++++++++++--
Crabtree/SmartHome/UI/SimpleControl/Phone/Scene/UserScenePage.cs | 19 ++++++++++++++++---
5 files changed, 37 insertions(+), 8 deletions(-)
diff --git a/Crabtree/SmartHome/HDL/Common/HttpUtil/HttpUtil.cs b/Crabtree/SmartHome/HDL/Common/HttpUtil/HttpUtil.cs
index a7eb48b..489525a 100644
--- a/Crabtree/SmartHome/HDL/Common/HttpUtil/HttpUtil.cs
+++ b/Crabtree/SmartHome/HDL/Common/HttpUtil/HttpUtil.cs
@@ -56,8 +56,11 @@
/// 鍥哄畾鍩熷悕,姝ｅ紡鐜
/// 鍏叡鍩熷悕灏辫繎瑙ｆ瀽
/// </summary>
+#if DEBUG
+ public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
+#else
public const string GlobalRequestHttpsHost = "https://bahrain-gateway.hdlcontrol.com";
- //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
+#endif
/// <summary>
///
/// </summary>
diff --git a/Crabtree/SmartHome/UI/SimpleControl/EquipmentPublicClass.cs b/Crabtree/SmartHome/UI/SimpleControl/EquipmentPublicClass.cs
index 4f4fc7e..d32f70e 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/EquipmentPublicClass.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/EquipmentPublicClass.cs
@@ -203,7 +203,7 @@
Application.RunOnMainThread (() => {
MainPage.Loading.Hide ();
#if DEBUG
- upLoadLink = true;
+ //upLoadLink = true;
#endif
//骞冲彴杩佺Щ鏁版嵁澶勭悊 wxr 2022-06-14 13:37:49
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Scene/UserDeviceToScene.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Scene/UserDeviceToScene.cs
index a9ccc52..4975ee1 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Scene/UserDeviceToScene.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Scene/UserDeviceToScene.cs
@@ -198,7 +198,6 @@
};
sceneView.AddChidren (btnSceneName);
var btnBGC = new Button () {
- //UnSelectedImagePath = "Item/sss.png",
UnSelectedImagePath = "Item/Transparent.png",
SelectedImagePath = "Item/SceneSettingBackground.png",
TextAlignment = TextAlignment.BottomCenter,
@@ -208,15 +207,27 @@
};
sceneView.AddChidren (btnBGC);
- btnBGC.MouseLongEventHandler += (sender, e) => {
+ var btnSetSceneIcon = new Button () {
+ UnSelectedImagePath = "Item/More2.png",
+ SelectedImagePath = "Item/Transparent.png",
+ Height = Application.GetRealHeight (50),
+ Width = Application.GetRealWidth (60),
+ X = Application.GetRealWidth (240),
+ Y = Application.GetRealHeight (10),
+ };
+ sceneView.AddChidren (btnSetSceneIcon);
+
+ btnSetSceneIcon.MouseUpEventHandler += (sender, e) => {//MouseLongEventHandler
//if (string.IsNullOrEmpty (scene.Name))
// return;
+ btnSetSceneIcon.IsSelected = true;
LongPressFrameLayout = new FrameLayout () {
BackgroundColor = SkinStyle.Current.SceneTransparentBackColor,
};
sceneView.AddChidren (LongPressFrameLayout);
LongPressFrameLayout.MouseUpEventHandler += (sender2, e2) => {
LongPressFrameLayout.RemoveFromParent ();
+ btnSetSceneIcon.IsSelected = false;
};
var btnEditor = new Button () {
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Scene/UserScenePage.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Scene/UserScenePage.cs
index edebe33..b39fb1e 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Scene/UserScenePage.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Scene/UserScenePage.cs
@@ -135,9 +135,8 @@
BackgroundColor = SkinStyle.Current.Black50Transparent,
};
sceneView.AddChidren (btnSceneName);
-
+
var btnBGC = new Button () {
- //UnSelectedImagePath = "Item/sss.png",
UnSelectedImagePath = "Item/Transparent.png",
SelectedImagePath = "Item/SceneSettingBackground.png",
TextAlignment = TextAlignment.BottomCenter,
@@ -147,14 +146,28 @@
};
sceneView.AddChidren (btnBGC);
- btnBGC.MouseLongEventHandler += (sender, e) => {
+ var btnSetSceneIcon = new Button () {
+ UnSelectedImagePath = "Item/More2.png",
+ SelectedImagePath = "Item/Transparent.png",
+ Height = Application.GetRealHeight (50),
+ Width = Application.GetRealWidth (60),
+ X = Application.GetRealWidth(240),
+ Y = Application.GetRealHeight(10),
+ };
+
+
+ sceneView.AddChidren (btnSetSceneIcon);
+ //btnBGC.MouseLongEventHandler += (sender, e) => {
+ btnSetSceneIcon.MouseUpEventHandler += (sender, e) => {
if (string.IsNullOrEmpty (scene.Name))
return;
+ btnSetSceneIcon.IsSelected = true;
LongPressFrameLayout = new FrameLayout () {
BackgroundColor = SkinStyle.Current.SceneTransparentBackColor,
};
LongPressFrameLayout.MouseUpEventHandler += (sender2, e2) => {
LongPressFrameLayout.RemoveFromParent ();
+ btnSetSceneIcon.IsSelected = false;
};
sceneView.AddChidren (LongPressFrameLayout);
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/MigrateBean.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/MigrateBean.cs
index ce8865d..94098d9 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/MigrateBean.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/MigrateBean.cs
@@ -223,7 +223,9 @@
if (!getTimerList () || sss) {
var dd = GetTimerBackupBean ();
- TimerBakeupFileDetailedInformation (dd.id);
+ if (dd != null) {
+ TimerBakeupFileDetailedInformation (dd.id);
+ }
}
//6.鏍囪杩佺Щ鏁版嵁瀹屾垚
--
Gitblit v1.8.0