From 691dbe24f5724f153e07947c7b75bdfea5f0b6d5 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期二, 24 九月 2024 16:15:15 +0800
Subject: [PATCH] 离线控制模式
---
HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
index ae70c7a..75f6c69 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
@@ -595,13 +595,23 @@
};
row.AddChidren(btnFunctionDelayInfo);
- if (!string.IsNullOrEmpty(scenefunction.delay) && Convert.ToInt32(scenefunction.delay) > 0)
+ try
{
- btnFunctionDelayInfo.Text = Language.StringByID(StringId.Delay) + " " + new Scene() { delay = scenefunction.delay }.GetDelayText();
+ int delayTime = 0;
+ int.TryParse(scenefunction.delay, out delayTime);
+
+ if (!string.IsNullOrEmpty(scenefunction.delay) && delayTime > 0)
+ {
+ btnFunctionDelayInfo.Text = Language.StringByID(StringId.Delay) + " " + new Scene() { delay = scenefunction.delay }.GetDelayText();
+ }
+ else
+ {
+ btnFunctionDelayInfo.Text = Language.StringByID(StringId.NoDelay);
+ }
}
- else
+ catch (Exception ex)
{
- btnFunctionDelayInfo.Text = Language.StringByID(StringId.NoDelay);
+ MainPage.Log("Error", $"鍦烘櫙缂栬緫锛岃浆璇戞暟鎹紓甯革細{ex.StackTrace}");
}
@@ -1030,7 +1040,7 @@
CropImage.TakePicture((imagePath) =>
{
CropImageCallBack(imagePath);
- }, imageName, 4, 3);
+ }, imageName, 4, 3,0);
pictureOptionView.Parent.RemoveFromParent();
};
@@ -1041,16 +1051,6 @@
btnAlbum.MouseUpEventHandler = (sender, e) =>
{
btnAlbum.IsSelected = false;
- //var pid = Guid.NewGuid();
- //CropImage.SelectPicture((imagePath) =>
- //{
- // if (imagePath != null)
- // {
- // addSceneImageView.ImagePath = imagePath.ToString();
- // scene.ImagePath = addSceneImageView.ImagePath;
- // MainPage.Log("SelectPicture 瑁佸壀鍥剧墖杩斿洖璺緞: " + imagePath);
- // }
- //}, pid.ToString(), 4, 3);
//浠庣浉鍐岄�夋嫨鍥剧墖瑁佸壀
var imageName = Guid.NewGuid().ToString();
@@ -1058,7 +1058,7 @@
CropImage.SelectPicture((imagePath) =>
{
CropImageCallBack(imagePath);
- }, imageName, 4, 3);
+ }, imageName, 4, 3,0);
pictureOptionView.Parent.RemoveFromParent();
--
Gitblit v1.8.0