From c1d681f496f2e1c53f88472d803e3c95fab521af Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期四, 29 七月 2021 09:46:16 +0800
Subject: [PATCH] 萤石测试通过
---
HDL_ON/UI/UI2/3-Intelligence/Scene/CatchSceneAddPage.cs | 382 ++++++++++--------------------------------------------
1 files changed, 74 insertions(+), 308 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/CatchSceneAddPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/CatchSceneAddPage.cs
index 61abb45..8b7f266 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/CatchSceneAddPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/CatchSceneAddPage.cs
@@ -1,7 +1,5 @@
锘縰sing System;
using System.Collections.Generic;
-using System.Threading;
-using HDL_ON.DAL.Server;
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
using Shared;
@@ -21,36 +19,6 @@
private Button btnChooseZoneViewTitle;
private VerticalScrolViewLayout functionListView;
private Button btnComplete;
-
- #region 鍥炬爣閫夋嫨閮ㄥ垎鍥炬爣
- /// <summary>
- /// 鑳屾櫙鍥鹃�夐」鍖哄煙
- /// </summary>
- FrameLayout pictureOptionView;
- /// <summary>
- /// 鑳屾櫙鍥鹃�夐」閫夋嫨鍖哄煙
- /// </summary>
- VerticalScrolViewLayout optionView;
- /// <summary>
- /// 榛樿鍥惧簱鎸夐挳
- /// </summary>
- Button btnDefaultGallery;
- /// <summary>
- /// 鎷嶇収鎸夐挳
- /// </summary>
- Button btnTakePicture;
- /// <summary>
- /// 鐩稿唽鎸夐挳
- /// </summary>
- Button btnAlbum;
- /// <summary>
- /// 鍙栨秷鎸夐挳
- /// </summary>
- Button btnCancel;
- #endregion
-
-
-
/// <summary>
/// 鎹曟崏鐨勫尯鍩熷垪琛�
/// </summary>
@@ -69,6 +37,7 @@
RemoveFromParent();
};
}
+
public void LoadPage()
{
@@ -105,14 +74,6 @@
//2020-12-03 淇敼鍥剧墖鍔犺浇鏂规硶
ImageUtlis.Current.LoadLocalOrNetworkImages(scene.ImagePath, addSceneImageView);
-
- /// <summary>
- /// 淇敼鍦烘櫙鑳屾櫙浜嬩欢
- /// </summary>
- addSceneImageView.MouseUpEventHandler = (sender, e) =>
- {
- LoadPictureOptionView();
- };
#region 鍦烘櫙鍚嶇Оrow
sceneNameView = new FrameLayout()
@@ -213,6 +174,71 @@
BackgroundColor = CSS_Color.BackgroundColor,
});
#endregion
+ #region 鍦烘櫙寤舵椂row
+ /*
+ if (DB_ResidenceData.Instance.GatewayType == 1)
+ {
+ FrameLayout sceneDelayRow = new FrameLayout()
+ {
+ Y = sceneNameView.Bottom,
+ Height = Application.GetRealWidth(50),
+ };
+ contentView.AddChidren(sceneDelayRow);
+
+ Button btnSceneDelayRight = new Button()
+ {
+ X = Application.GetRealWidth(339),
+ Gravity = Gravity.CenterVertical,
+ Width = Application.GetMinRealAverage(16),
+ Height = Application.GetMinRealAverage(16),
+ UnSelectedImagePath = "Public/Right.png",
+ };
+ sceneDelayRow.AddChidren(btnSceneDelayRight);
+
+ var btnSceneDelayInfo = new Button()
+ {
+ Width = Application.GetRealWidth(327),
+ TextAlignment = TextAlignment.CenterRight,
+ TextColor = CSS_Color.PromptingColor1,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ Text = scene.GetDelayText()
+ };
+ sceneDelayRow.AddChidren(btnSceneDelayInfo);
+
+ Button btnSceneDelayTitle = new Button()
+ {
+ X = Application.GetRealWidth(16),
+ //Width = Application.GetRealWidth(90),
+ TextAlignment = TextAlignment.CenterLeft,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextSize = CSS_FontSize.TextFontSize,
+ TextID = StringId.SceneDelay,
+ };
+ sceneDelayRow.AddChidren(btnSceneDelayTitle);
+
+ btnSceneDelayTitle.MouseUpEventHandler = (sender, e) =>
+ {
+ Action<string> action = (obj) => {
+ scene.delay = obj;
+ btnSceneDelayInfo.Text = scene.GetDelayText();
+ };
+ Dictionary<string, string> items = new Dictionary<string, string>();
+ items.Add("30", "30s");
+ items.Add("60", "1min");
+ items.Add("120", "2min");
+ items.Add("300", "5min");
+ new PublicAssmebly().SetSceneDelayDialog(items, action, scene.delay);
+ };
+
+ contentView.AddChidren(new Button()
+ {
+ Y = sceneDelayRow.Bottom,
+ Height = Application.GetRealHeight(8),
+ BackgroundColor = CSS_Color.BackgroundColor,
+ });
+ }
+ */
+ #endregion
#region 閫夋嫨鍖哄煙
FrameLayout chooseZoneView = new FrameLayout()
@@ -247,6 +273,8 @@
BackgroundColor = CSS_Color.BackgroundColor,
};
contentView.AddChidren(btnLine1);
+
+
#endregion
@@ -302,7 +330,10 @@
{
if(temp.roomIds.Contains(catchRoom.roomId))
{
- catchFunctionList.Add(temp);
+ if (MainPage.SceneSupportFunctionList.Contains(temp.spk))
+ {
+ catchFunctionList.Add(temp);
+ }
}
}
}
@@ -314,6 +345,8 @@
}
};
}
+
+
/// <summary>
/// 鍔犺浇鍔熻兘鍒楄〃
@@ -402,273 +435,6 @@
}
}
- /// <summary>
- /// 鍔犺浇鍥炬爣閫夋嫨閫夐」
- /// </summary>
- void LoadPictureOptionView()
- {
- var pView = new FrameLayout()
- {
- BackgroundColor = CSS_Color.DialogTransparentColor1,
- };
- bodyView.AddChidren(pView);
-
- pictureOptionView = new FrameLayout()
- {
- Y = Application.GetRealHeight(445),
- Height = Application.GetRealHeight(250),
- AnimateSpeed = 0.3f,
- Animate = Animate.DownToUp,
- };
- pView.AddChidren(pictureOptionView);
-
- optionView = new VerticalScrolViewLayout()
- {
- Gravity = Gravity.CenterHorizontal,
- Width = Application.GetRealWidth(343),
- Height = Application.GetRealHeight(150),
- BackgroundColor = CSS_Color.MainBackgroundColor,
- Radius = (uint)Application.GetRealWidth(12),
- };
- pictureOptionView.AddChidren(optionView);
-
- btnDefaultGallery = new Button()
- {
- Height = Application.GetRealHeight(50),
- TextAlignment = TextAlignment.Center,
- TextColor = CSS_Color.TextualColor,
- SelectedTextColor = CSS_Color.MainColor,
- TextSize = CSS_FontSize.SubheadingFontSize,
- TextID = StringId.DefaultGallery,
- };
- optionView.AddChidren(btnDefaultGallery);
-
- optionView.AddChidren(new Button() { Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
-
- btnTakePicture = new Button()
- {
- Height = Application.GetRealHeight(50),
- TextAlignment = TextAlignment.Center,
- TextColor = CSS_Color.TextualColor,
- SelectedTextColor = CSS_Color.MainColor,
- TextSize = CSS_FontSize.SubheadingFontSize,
- TextID = StringId.TakePicture,
- };
- optionView.AddChidren(btnTakePicture);
-
- optionView.AddChidren(new Button() { Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
-
- btnAlbum = new Button()
- {
- Height = Application.GetRealHeight(50),
- TextAlignment = TextAlignment.Center,
- TextColor = CSS_Color.TextualColor,
- SelectedTextColor = CSS_Color.MainColor,
- TextSize = CSS_FontSize.SubheadingFontSize,
- TextID = StringId.Album,
- };
- optionView.AddChidren(btnAlbum);
-
- optionView.AddChidren(new Button() { Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
-
- btnCancel = new Button()
- {
- Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(8) + optionView.Bottom,
- Width = Application.GetRealWidth(343),
- Height = Application.GetRealHeight(50),
- BackgroundColor = CSS_Color.MainBackgroundColor,
- Radius = (uint)Application.GetRealWidth(12),
- TextID = StringId.Cancel,
- TextColor = CSS_Color.WarningColor,
- TextSize = CSS_FontSize.SubheadingFontSize,
- };
- pictureOptionView.AddChidren(btnCancel);
-
-
- LoadEvent_PictureOptionViewEventList(pView);
- }
-
- /// <summary>
- /// 鍔犺浇鑳屾櫙鍥鹃�夋嫨鍖哄煙浜嬩欢鍒楄〃
- /// </summary>
- void LoadEvent_PictureOptionViewEventList(FrameLayout pView)
- {
- pictureOptionView.MouseUpEventHandler = (sender, e) =>
- {
- pictureOptionView.Parent.RemoveFromParent();
- };
- pView.MouseUpEventHandler = (sender, e) =>
- {
- pictureOptionView.Parent.RemoveFromParent();
- };
-
- btnCancel.MouseUpEventHandler = (sender, e) =>
- {
- pictureOptionView.Parent.RemoveFromParent();
- };
- btnTakePicture.MouseDownEventHandler = (sender, e) => {
- btnTakePicture.IsSelected = true;
- };
- btnTakePicture.MouseUpEventHandler = (sender, e) =>
- {
- btnTakePicture.IsSelected = false;
-
- var imageName = Guid.NewGuid().ToString();
- CropImage.TakePicture((imagePath) =>
- {
- CropImageCallBack(imagePath);
-
- }, imageName, 4, 3);
-
- pictureOptionView.Parent.RemoveFromParent();
- };
- btnAlbum.MouseDownEventHandler = (sender, e) => {
- btnAlbum.IsSelected = true;
- };
-
- btnAlbum.MouseUpEventHandler = (sender, e) =>
- {
- btnAlbum.IsSelected = false;
-
- //浠庣浉鍐岄�夋嫨鍥剧墖瑁佸壀
- var imageName = Guid.NewGuid().ToString();
- //var imageName = scene.sid;
- CropImage.SelectPicture((imagePath) =>
- {
- CropImageCallBack(imagePath);
- }, imageName, 4, 3);
-
-
- //if (pageTitleId == StringId.EditScene)
- //{
- // scene.SaveFunctionData();
- //}
- pictureOptionView.Parent.RemoveFromParent();
- };
-
- btnDefaultGallery.MouseUpEventHandler = (sender, e) => {
- pictureOptionView.Parent.RemoveFromParent();
- Action<string> action = (obj) => {
- scene.ImagePath = obj;
- addSceneImageView.ImageBytes = null;//瑙ｅ喅鏈塈mageBytes涓嶅姞杞絀magePath
- addSceneImageView.ImagePath = scene.ImagePath;
- };
-
- var galleryPage = new GalleryPage(scene.ImagePath, action);
- MainPage.BasePageView.AddChidren(galleryPage);
- galleryPage.LoadPage(true);
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- };
-
- }
-
- /// <summary>
- /// 瑁佸壀瀹岀収鐗囧洖璋冿紝缁熶竴澶勭悊
- /// </summary>
- /// <param name="imagePath">瑁佸壀鍚庣殑鐪熷疄璺緞</param>
- /// <param name="imageName">鑷畾涔夌殑鍥剧墖鍚嶇О</param>
- void CropImageCallBack(string selectImagePath)
- {
- if (string.IsNullOrEmpty(selectImagePath) == true)
- {
- return;
- }
-
- //涓婁紶鎴愬姛鍒板洖璋�
- Action<string> uploadSuccessAction = (imageUrl) =>
- {
- //2020-12-03 闇�瑕佽鏈�鏂扮殑鍥剧墖璺緞鍚屾鍒颁簯绔�
- scene.ImagePath = imageUrl;
- };
- //涓婁紶鍥剧墖鍒颁簯绔�
- UploadImage(selectImagePath, addSceneImageView, scene, uploadSuccessAction);
- }
-
- /// <summary>
- /// 涓婁紶鍥剧墖鏂规硶
- /// </summary>
- /// <param name="selectImagePath">瑁佸壀鍚庣殑鍥剧墖璺緞</param>
- /// <param name="imageView"></param>
- /// <param name="uploadSuccessAction"></param>
- void UploadImage(string selectImagePath, ImageView imageView, Scene mScene, Action<string> uploadSuccessAction)
- {
- try
- {
- //MainPage.Log("SelectPicture 瑁佸壀鍥剧墖杩斿洖璺緞: " + selectImagePath);
- //1.璇诲彇瑁佸壀鍚庣殑鍥剧墖锛岀劧鍚庡垹闄�
- var imageBytes = Shared.IO.FileUtils.ReadFile(selectImagePath);
- System.IO.File.Delete(selectImagePath);
-
- var waitPage = new Loading();
- bodyView.AddChidren(waitPage);
- waitPage.Start(Language.StringByID(StringId.PleaseWait));
- //寮�濮嬩笂浼�
- new Thread(() =>
- {
- try
- {
- var newImageName = mScene.name.Trim() + ".png";
- var uploadImageObj = new UploadImageObj()
- {
- prefix = "Scene" + Utlis.GetTimestamp(),
- fileName = newImageName,
- uid = mScene.sid,
- content = imageBytes,
- };
-
- var imageUrl = ImageUtlis.Current.UploadImage(uploadImageObj);
- if (!string.IsNullOrEmpty(imageUrl) && imageUrl.Contains(newImageName))
- {
- //涓婁紶鎴愬姛
- Application.RunOnMainThread(() =>
- {
- //Utlis.WriteLine("涓婁紶鎴愬姛锛�" + imageUrl);
- //1.2濡傛灉鏄嚜瀹氫箟鍥剧墖鍒犻櫎涔嬪墠鐨�
- if (!string.IsNullOrEmpty(imageView.ImagePath) && !imageView.ImagePath.Contains("Classification/Room/Roombg"))
- {
- //Utlis.WriteLine("鍒犻櫎: " + imageView.ImagePath);
- System.IO.File.Delete(imageView.ImagePath);
- }
- //閲嶅懡鍚嶄繚瀛�
- ImageUtlis.Current.WriteFileByBytes(imageUrl, imageBytes);
- imageView.ImagePath = null;
- imageView.ImageBytes = imageBytes;
- //涓婁紶鎴愬姛
- Utlis.ShowTip(Language.StringByID(StringId.UploadSuccessfully));
- uploadSuccessAction?.Invoke(imageUrl);
- });
- }
- else
- {
- //涓婁紶澶辫触
- Application.RunOnMainThread(() =>
- {
- //涓婁紶澶辫触
- Utlis.ShowTip(Language.StringByID(StringId.UploadFailed));
- });
- }
-
- }
- catch (Exception ex)
- {
- }
- finally
- {
- Application.RunOnMainThread(() =>
- {
- if (waitPage != null)
- {
- waitPage.RemoveFromParent();
- waitPage = null;
- }
- });
- }
- })
- { IsBackground = true }.Start();
- }
- catch { }
- }
}
}
--
Gitblit v1.8.0