From 1f9243b9560762db104362297b1fca28d77c3cd8 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 25 九月 2023 17:23:55 +0800
Subject: [PATCH] 组控图片输入
---
HDL-ON_Android/Assets/Phone/FunctionIcon/GroupControl/gp_all_off.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/GroupControl/gp_all_off_home.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/GroupControl/gp_all_off_home_click.png | 0
HDL-ON_iOS/HDL-ON_iOS.csproj | 7 +++++++
HDL-ON_iOS/Resources/Phone/FunctionIcon/GroupControl/gp_all_off_home_click.png | 0
HDL_ON/Entity/Enumerative/Command.cs | 2 +-
HDL-ON_iOS/Resources/Phone/FunctionIcon/GroupControl/gp_all_on_home_click.png | 0
HDL-ON_Android/HDL-ON_Android.csproj | 7 +++++++
HDL-ON_iOS/Resources/Phone/FunctionIcon/GroupControl/gp_all_off_home.png | 0
HDL_ON/DAL/Server/HttpUtil.cs | 4 ++--
HDL_ON/Common/Utlis.cs | 2 +-
HDL-ON_Android/Assets/Phone/FunctionIcon/GroupControl/gp_all_on.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/GroupControl/gp_all_on_home.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/GroupControl/gp_all_on.png | 0
HDL_ON/UI/UI1-Login/LoginPage.cs | 1 +
HDL-ON_Android/Assets/Phone/FunctionIcon/GroupControl/gp_all_on_home_click.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/GroupControl/gp_all_off.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/GroupControl/gp_all_on_home.png | 0
SiriIntents/Server/HttpUtil.cs | 4 ++--
19 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/GroupControl/gp_all_off.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/GroupControl/gp_all_off.png
new file mode 100644
index 0000000..4dd5fff
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/GroupControl/gp_all_off.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/GroupControl/gp_all_off_home.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/GroupControl/gp_all_off_home.png
new file mode 100644
index 0000000..4496b78
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/GroupControl/gp_all_off_home.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/GroupControl/gp_all_off_home_click.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/GroupControl/gp_all_off_home_click.png
new file mode 100644
index 0000000..15aa556
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/GroupControl/gp_all_off_home_click.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/GroupControl/gp_all_on.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/GroupControl/gp_all_on.png
new file mode 100644
index 0000000..55fe174
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/GroupControl/gp_all_on.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/GroupControl/gp_all_on_home.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/GroupControl/gp_all_on_home.png
new file mode 100644
index 0000000..96a1303
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/GroupControl/gp_all_on_home.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/GroupControl/gp_all_on_home_click.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/GroupControl/gp_all_on_home_click.png
new file mode 100644
index 0000000..0b2d8e7
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/GroupControl/gp_all_on_home_click.png
Binary files differ
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index c0f79ce..37a619a 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -599,6 +599,12 @@
<AndroidAsset Include="Assets\h5\static\js\index.3517131b.js" />
<AndroidAsset Include="Assets\h5\static\js\chunk-vendors.56c88730.js" />
<AndroidAsset Include="Assets\h5\static\js\pages-inverter-index.e5e9499f.js" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\GroupControl\gp_all_off_home_click.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\GroupControl\gp_all_off_home.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\GroupControl\gp_all_off.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\GroupControl\gp_all_on_home_click.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\GroupControl\gp_all_on_home.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\GroupControl\gp_all_on.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\values\colors.xml" />
@@ -1816,6 +1822,7 @@
<Folder Include="Assets\Phone\FunctionIcon\Electrical\MechanicalArm\" />
<Folder Include="Assets\Phone\AksIcon\" />
<Folder Include="Assets\Phone\HisenseTv\" />
+ <Folder Include="Assets\Phone\FunctionIcon\GroupControl\" />
</ItemGroup>
<Import Project="..\HDL_ON\HDL_ON.projitems" Label="Shared" Condition="Exists('..\HDL_ON\HDL_ON.projitems')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index a212a7d..e2747a9 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -504,6 +504,7 @@
<Folder Include="Resources\Phone\FunctionIcon\Panel\" />
<Folder Include="Resources\Phone\FunctionIcon\Inverter\" />
<Folder Include="Resources\Phone\FunctionIcon\Electrical\MechanicalArm\" />
+ <Folder Include="Resources\Phone\FunctionIcon\GroupControl\" />
</ItemGroup>
<ItemGroup>
<InterfaceDefinition Include="LaunchScreen.storyboard" />
@@ -1753,6 +1754,12 @@
<BundleResource Include="Resources\h5\static\img\equal-plant-ic.7ef6befa.png" />
<BundleResource Include="Resources\h5\static\img\coal-save-ic.6c5fd125.png" />
<BundleResource Include="Resources\h5\static\font\SourceHanSansCN-Normal.otf" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\GroupControl\gp_all_off_home_click.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\GroupControl\gp_all_off_home.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\GroupControl\gp_all_off.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\GroupControl\gp_all_on_home_click.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\GroupControl\gp_all_on_home.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\GroupControl\gp_all_on.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/GroupControl/gp_all_off.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/GroupControl/gp_all_off.png
new file mode 100644
index 0000000..4dd5fff
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/GroupControl/gp_all_off.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/GroupControl/gp_all_off_home.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/GroupControl/gp_all_off_home.png
new file mode 100644
index 0000000..4496b78
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/GroupControl/gp_all_off_home.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/GroupControl/gp_all_off_home_click.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/GroupControl/gp_all_off_home_click.png
new file mode 100644
index 0000000..15aa556
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/GroupControl/gp_all_off_home_click.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/GroupControl/gp_all_on.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/GroupControl/gp_all_on.png
new file mode 100644
index 0000000..55fe174
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/GroupControl/gp_all_on.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/GroupControl/gp_all_on_home.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/GroupControl/gp_all_on_home.png
new file mode 100644
index 0000000..96a1303
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/GroupControl/gp_all_on_home.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/GroupControl/gp_all_on_home_click.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/GroupControl/gp_all_on_home_click.png
new file mode 100644
index 0000000..0b2d8e7
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/GroupControl/gp_all_on_home_click.png
Binary files differ
diff --git a/HDL_ON/Common/Utlis.cs b/HDL_ON/Common/Utlis.cs
index 7778dc5..ae49f82 100644
--- a/HDL_ON/Common/Utlis.cs
+++ b/HDL_ON/Common/Utlis.cs
@@ -42,7 +42,7 @@
}
}
string text = tag + "======" + url + "\r\n" + content;
- Console.WriteLine(text);
+ //Console.WriteLine(text);
#endif
}
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index 5235064..b659327 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/HDL_ON/DAL/Server/HttpUtil.cs
@@ -18,8 +18,8 @@
/// 鍥哄畾鍩熷悕,姝ｅ紡鐜
/// 鍏叡鍩熷悕灏辫繎瑙ｆ瀽
/// </summary>
- public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
- //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
+ //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
+ public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
const string APP_KEY = "HDL-HOME-APP-TEST";
const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss";
diff --git a/HDL_ON/Entity/Enumerative/Command.cs b/HDL_ON/Entity/Enumerative/Command.cs
index a95726f..4b73b4d 100644
--- a/HDL_ON/Entity/Enumerative/Command.cs
+++ b/HDL_ON/Entity/Enumerative/Command.cs
@@ -1688,7 +1688,7 @@
SetGateway = 0xE54C,
SetGatewayACK = 0xE54C,
/// <summary>
- /// 绗竴娆℃悳绱㈡寚浠�
+ /// 鎼滅储妯″潡鎸囦护
/// 鎿嶄綔鐮�: 0xE548
/// </summary>
ReadDeviceModul = 0xE548,
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index 5662f9d..71255d4 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -326,6 +326,7 @@
//etAccount.Text = "12345678904";//2.0 娴嬭瘯 钀ょ煶
etAccount.Text = "18316672920";
etAccount.Text = "18244942707";
+ etAccount.Text = "18402017839";//wjc
}
else
{
diff --git a/SiriIntents/Server/HttpUtil.cs b/SiriIntents/Server/HttpUtil.cs
index 8d4483c..dc7aca0 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";
+ //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
+ public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
const string APP_KEY = "HDL-HOME-APP-TEST";
const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss";
//public const string GlobalRequestHttpsHost = "http://59.41.255.150:7777";//mmmm
--
Gitblit v1.8.0