wxr
2024-09-24 691dbe24f5724f153e07947c7b75bdfea5f0b6d5
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();