From d42b4046d4d7900b74695cffac6340c160d857c9 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 19 十月 2022 15:46:17 +0800
Subject: [PATCH] 回复人居图片文件夹
---
HDL-ON_Android/HDL-ON_Android.csproj | 93 +++++++++++++++++++++++++++++++
HDL-ON_Android/SplashActivity.cs | 2
HDL-ON_Android/Assets/Language.ini | 2
HDL_ON/DAL/Server/HttpUtil.cs | 4
HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs | 25 --------
SiriIntents/Server/HttpUtil.cs | 4
6 files changed, 99 insertions(+), 31 deletions(-)
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index 53e41e4..7ad9e66 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -4819,7 +4819,7 @@
9=袙褏芯写 褋 泻芯写 蟹邪 锌芯褌胁褗褉卸写械薪懈械
10=袦芯谢褟, 懈蟹褔邪泻邪泄褌械...
11=袟邪褌胁芯褉懈
-12= 袙蟹械屑械褌械 泻芯写 蟹邪 锌芯褌胁褗褉卸写械薪懈械
+12=袙蟹械屑械褌械 泻芯写 蟹邪 锌芯褌胁褗褉卸写械薪懈械
13=袙谢懈蟹邪薪械 褋 锌邪褉芯谢邪
14=袪械谐懈褋褌褉懈褉邪泄褌械 褋械
15=袦芯谢褟, 胁褗胁械写械褌械 屑芯斜懈谢薪懈褟 褋懈 薪芯屑械褉
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index bca899f..d98ab2d 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -296,6 +296,99 @@
<AndroidAsset Include="Assets\h5\static\img\co2-reduction-ic.9c75228c.png" />
<AndroidAsset Include="Assets\h5\static\img\equal-plant-ic.7ef6befa.png" />
<AndroidAsset Include="Assets\h5\static\img\coal-save-ic.6c5fd125.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\BgChooseScene.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\LvJianLogo.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\BgChooseMode.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\ModeHumiIcon2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\PowerIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\ModeCoolIcon2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\ModeHeatHumiIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\ModeHeatIcon2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\ModeHeatIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\SceneAtHome2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\ModeFanIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\TempAndHumiBack.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\CollectionIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\TopViewBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\ModeHeatHumiIcon2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\ModeHumiIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\ModeCoolIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\SceneSleepIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\SceneSleepIcon2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\ModeFanIcon2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\ModeDeHumiIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\SceneAtHome.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\ModeDeHumiIcon2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\SceneAwayHomeIcon2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\MsgViewBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\SceneAwayHomeIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\ModeHumiIcon2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\ModeCoolIcon2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\ModeHeatHumiIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\ModeHeatIcon2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\ModeHeatIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\SceneAtHome2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\ModeFanIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\CollectionIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\ModeHeatHumiIcon2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\ModeHumiIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\ModeCoolIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\PowerOffIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\SceneSleepIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\SceneSleepIcon2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\BgSubControlView.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\ModeFanIcon2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\ModeDeHumiIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\SceneAtHome.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\ModeDeHumiIcon2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\SceneAwayHomeIcon2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\SceneAwayHomeIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\ModeHumiIcon2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\PowerIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\ModeCoolIcon2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\ModeHeatHumiIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\ModeHeatIcon2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\ModeHeatIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\SceneAtHome2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\ModeFanIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\TempAndHumiBack.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\CollectionIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\TopViewBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\ModeHeatHumiIcon2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\ModeHumiIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\ModeCoolIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\SceneSleepIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\SceneSleepIcon2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\ModeFanIcon2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\ModeDeHumiIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\SceneAtHome.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\ModeDeHumiIcon2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\SceneAwayHomeIcon2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\MsgViewBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\SceneAwayHomeIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\ModeHumiIcon2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\PowerIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\ModeCoolIcon2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\ModeHeatHumiIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\ModeHeatIcon2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\ModeHeatIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\SceneAtHome2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\ModeFanIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\TempAndHumiBack.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\CollectionIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\TopViewBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\ModeHeatHumiIcon2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\ModeHumiIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\ModeCoolIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\SceneSleepIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\SceneSleepIcon2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\ModeFanIcon2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\ModeDeHumiIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\SceneAtHome.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\ModeDeHumiIcon2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\SceneAwayHomeIcon2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\MsgViewBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\SceneAwayHomeIcon.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\values\colors.xml" />
diff --git a/HDL-ON_Android/SplashActivity.cs b/HDL-ON_Android/SplashActivity.cs
index 1d00018..07a8b17 100644
--- a/HDL-ON_Android/SplashActivity.cs
+++ b/HDL-ON_Android/SplashActivity.cs
@@ -166,7 +166,7 @@
Language.CurrentLanguage = "Chinese";
Locale locale1 = Locale.Default;
var localeList = Resources.Configuration.Locale;
- Console.WriteLine("999999999999999999999999999999999999999999999"+ localeList.Language);
+ Console.WriteLine("褰撳墠璇█缂栧彿"+ localeList.Language);
if (localeList.Language == "zh")
{
Language.CurrentLanguage = "Chinese";
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index 511a91e..bf39c96 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/HDL_ON/DAL/Server/HttpUtil.cs
@@ -17,8 +17,8 @@
/// 鍥哄畾鍩熷悕,姝ｅ紡鐜
/// 鍏叡鍩熷悕灏辫繎瑙ｆ瀽
/// </summary>
- public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
- //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
+ //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
+ public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
/// <summary>
/// RegionMark
/// </summary>
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs
index 6043907..5ae667f 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs
@@ -718,18 +718,6 @@
{
btnTakePicture.IsSelected = false;
- //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();
//var imageName = scene.sid;
CropImage.TakePicture((imagePath) =>
@@ -738,9 +726,6 @@
}, imageName, 4, 3);
- //if (pageTitleId == StringId.EditScene)
- //{
- // scene.SaveFunctionData();
//}
pictureOptionView.Parent.RemoveFromParent();
};
@@ -751,16 +736,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();
diff --git a/SiriIntents/Server/HttpUtil.cs b/SiriIntents/Server/HttpUtil.cs
index f61de04..56a78a0 100644
--- a/SiriIntents/Server/HttpUtil.cs
+++ b/SiriIntents/Server/HttpUtil.cs
@@ -16,8 +16,8 @@
/// 鍥哄畾鍩熷悕,姝ｅ紡鐜
/// 鍏叡鍩熷悕灏辫繎瑙ｆ瀽
/// </summary>
- public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
- //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
+ //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
+ public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
/// <summary>
/// RegionMark
/// </summary>
--
Gitblit v1.8.0