From 8060dedbec31cc9dbc33adae91b94b8a977c7163 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 30 十一月 2020 21:22:55 +0800
Subject: [PATCH] 2020-11-30 1.增加极光推送。2.住宅相关接口增加签名校验。 3.增加消息中心页面。4.UI优化。5.裁剪选取图片优化。
---
HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs | 106 +++++++++++++++++++++++++++++++++++++---------------
1 files changed, 75 insertions(+), 31 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
index 1693fc8..5a248d2 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
@@ -504,29 +504,29 @@
string GetFunctionScnenInfo(Function sceneFunction)
{
string sceneFunctionInfo = Language.StringByID(StringId.Close);
- if (sceneFunction.trait_on_off.value.ToString() == "off")
+ if (sceneFunction.trait_on_off.curValue.ToString() == "off")
return sceneFunctionInfo;
sceneFunctionInfo = "";
- Trait perTrait;
+ FunctionAttributes perTrait;
switch (sceneFunction.functionType)
{
case FunctionType.AC:
- sceneFunctionInfo += sceneFunction.function.Find((obj) => obj.name == "mode").GetCurValueText();
- sceneFunctionInfo += " " + sceneFunction.function.Find((obj) => obj.name == "set_temperature").value.ToString() +
- sceneFunction.function.Find((obj) => obj.name == "set_temperature").uintString;
- sceneFunctionInfo += sceneFunction.function.Find((obj) => obj.name == "fan").GetCurValueText();
+ sceneFunctionInfo += sceneFunction.function.Find((obj) => obj.key == "mode").GetCurValueText();
+ sceneFunctionInfo += " " + sceneFunction.function.Find((obj) => obj.key == "set_temperature").curValue.ToString() +
+ sceneFunction.function.Find((obj) => obj.key == "set_temperature").uintString;
+ sceneFunctionInfo += sceneFunction.function.Find((obj) => obj.key == "fan").GetCurValueText();
break;
case FunctionType.FloorHeating:
- sceneFunctionInfo += sceneFunction.function.Find((obj) => obj.name == "mode").GetCurValueText();
- sceneFunctionInfo += " " + sceneFunction.function.Find((obj) => obj.name == "set_temperature").value.ToString() +
- sceneFunction.function.Find((obj) => obj.name == "set_temperature").uintString;
+ sceneFunctionInfo += sceneFunction.function.Find((obj) => obj.key == "mode").GetCurValueText();
+ sceneFunctionInfo += " " + sceneFunction.function.Find((obj) => obj.key == "set_temperature").curValue.ToString() +
+ sceneFunction.function.Find((obj) => obj.key == "set_temperature").uintString;
break;
case FunctionType.Dimmer:
- perTrait = sceneFunction.function.Find((obj) => obj.name == "brightness");
+ perTrait = sceneFunction.function.Find((obj) => obj.key == "brightness");
if (perTrait != null)
{
- sceneFunctionInfo += Language.StringByID(StringId.Open) + " " + sceneFunction.function.Find((obj) => obj.name == "brightness").value.ToString() + "%";
+ sceneFunctionInfo += Language.StringByID(StringId.Open) + " " + sceneFunction.function.Find((obj) => obj.key == "brightness").curValue.ToString() + "%";
}
else
{
@@ -537,10 +537,10 @@
sceneFunctionInfo += Language.StringByID(StringId.Open);
break;
case FunctionType.RGB:
- perTrait = sceneFunction.function.Find((obj) => obj.name == "percent");
+ perTrait = sceneFunction.function.Find((obj) => obj.key == "percent");
if (perTrait != null)
{
- sceneFunctionInfo += Language.StringByID(StringId.Open) + " " + sceneFunction.function.Find((obj) => obj.name == "brightness").value.ToString() + "%";
+ sceneFunctionInfo += Language.StringByID(StringId.Open) + " " + sceneFunction.function.Find((obj) => obj.key == "brightness").curValue.ToString() + "%";
}
else
{
@@ -551,10 +551,10 @@
sceneFunctionInfo += Language.StringByID(StringId.Open);
break;
case FunctionType.MotorCurtain:
- perTrait = sceneFunction.function.Find((obj) => obj.name == "percent");
+ perTrait = sceneFunction.function.Find((obj) => obj.key == "percent");
if (perTrait != null)
{
- sceneFunctionInfo += Language.StringByID(StringId.Open) + " " + sceneFunction.function.Find((obj) => obj.name == "percent").value.ToString() + "%";
+ sceneFunctionInfo += Language.StringByID(StringId.Open) + " " + sceneFunction.function.Find((obj) => obj.key == "percent").curValue.ToString() + "%";
}
else
{
@@ -735,16 +735,24 @@
{
btnTakePicture.IsSelected = false;
- var pid = Guid.NewGuid();
+ //var pid = Guid.NewGuid();
+ //CropImage.TakePicture((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() + ".png";
CropImage.TakePicture((imagePath) =>
{
- if (imagePath != null)
- {
- addSceneImageView.ImagePath = imagePath.ToString();
- scene.ImagePath = addSceneImageView.ImagePath;
- MainPage.Log("SelectPicture 瑁佸壀鍥剧墖杩斿洖璺緞: " + imagePath);
- }
- }, pid.ToString(), 4, 3);
+ CropImageCallBack(imagePath, imageName);
+ }, imageName, 4, 3);
+
if (pageTitleId == StringId.EditScene)
{
scene.SaveFunctionData();
@@ -758,16 +766,25 @@
btnAlbum.MouseUpEventHandler = (sender, e) =>
{
btnAlbum.IsSelected = false;
- var pid = Guid.NewGuid();
+ //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() + ".png";
CropImage.SelectPicture((imagePath) =>
{
- if (imagePath != null)
- {
- addSceneImageView.ImagePath = imagePath.ToString();
- scene.ImagePath = addSceneImageView.ImagePath;
- MainPage.Log("SelectPicture 瑁佸壀鍥剧墖杩斿洖璺緞: " + imagePath);
- }
- }, pid.ToString(), 4, 3);
+ CropImageCallBack(imagePath, imageName);
+ }, imageName, 4, 3);
+
+
if (pageTitleId == StringId.EditScene)
{
scene.SaveFunctionData();
@@ -792,6 +809,32 @@
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="imagePath"></param>
+ /// <param name="imageName"></param>
+ void CropImageCallBack(string imagePath, string imageName)
+ {
+ if (string.IsNullOrEmpty(imagePath) == true)
+ {
+ return;
+ }
+ //濡傛灉鏄嚜瀹氫箟鍥剧墖鍒犻櫎涔嬪墠鐨�
+ if (!addSceneImageView.ImagePath.Contains("Gallery/scenebg"))
+ {
+ Utlis.WriteLine("鍒犻櫎: " + addSceneImageView.ImagePath);
+ System.IO.File.Delete(addSceneImageView.ImagePath);
+ }
+
+ MainPage.Log("SelectPicture 瑁佸壀鍥剧墖杩斿洖璺緞: " + imagePath);
+ FileUtils.FileCopyToRootPath(imagePath, imageName);
+ System.IO.File.Delete(imagePath);
+
+ scene.ImagePath = imageName;
+ addSceneImageView.ImagePath = imageName;
}
/// <summary>
@@ -879,5 +922,6 @@
btnEditSceneNameIcon.MouseUpEventHandler = eventHandler;
}
+
}
}
--
Gitblit v1.8.0