From 561052e04a4bde86e963c89e10f7614df38fd002 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期三, 04 九月 2024 10:58:21 +0800
Subject: [PATCH] 地暖面板，新增SPK
---
SiriIntents/SiriIntents.csproj | 4
HDL_ON/DAL/Server/HttpUtil.cs | 12 ++--
HDL_ON/UI/UI2/FuntionControlView/Acst/InverterJinmaoHistroyPage.cs | 6 +-
HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs | 2
HDL-ON_iOS/HDL-ON_iOS.csproj | 2
HDL_ON/UI/UI2/FuntionControlView/Acst/InverterJinmaoPage.cs | 6 ++
HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs | 70 ++++++-----------------
SiriIntentsUI/SiriIntentsUI.csproj | 2
HDL_ON/UI/UI1-Login/RegisterPage.cs | 11 +++
SiriIntents/Server/HttpUtil.cs | 12 ++--
10 files changed, 54 insertions(+), 73 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 407a0b3..433c415 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -61,7 +61,7 @@
<MtouchEnableSGenConc>false</MtouchEnableSGenConc>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-<CodesignProvision>0002-OnPro-240830-1-Dev</CodesignProvision>
+<CodesignProvision>0002-OnPro-240704-1-Dev</CodesignProvision>
<MtouchSdkVersion>17.5</MtouchSdkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index 8cadb5d..1ccfedf 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/HDL_ON/DAL/Server/HttpUtil.cs
@@ -18,14 +18,14 @@
/// 鍥哄畾鍩熷悕,姝ｅ紡鐜
/// 鍏叡鍩熷悕灏辫繎瑙ｆ瀽
/// </summary>
- public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
- public const string APP_KEY = "HDL-HOME-APP";
- public const string SECRET_KEY = "CPL345bn28gHnvi9G4tYbq3cTYkiHC";
+ //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
+ //public const string APP_KEY = "HDL-HOME-APP";
+ //public const string SECRET_KEY = "CPL345bn28gHnvi9G4tYbq3cTYkiHC";
- //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
- //public const string APP_KEY = "HDL-HOME-APP-TEST";
- //public const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss";
+ public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
+ public const string APP_KEY = "HDL-HOME-APP-TEST";
+ public const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss";
//public const string GlobalRequestHttpsHost = "http://59.41.255.150:7777";//mmmm
diff --git a/HDL_ON/UI/UI1-Login/RegisterPage.cs b/HDL_ON/UI/UI1-Login/RegisterPage.cs
index 132ee76..8bcf14a 100644
--- a/HDL_ON/UI/UI1-Login/RegisterPage.cs
+++ b/HDL_ON/UI/UI1-Login/RegisterPage.cs
@@ -239,7 +239,16 @@
};
pm = new HttpServerRequest();
- OnAppConfig.Instance.GlobalRegion.regionUrl = "";
+ try
+ {
+ if (OnAppConfig.Instance.GlobalRegion != null)
+ {
+ OnAppConfig.Instance.GlobalRegion.regionUrl = "";
+ }
+ }catch(Exception ex)
+ {
+ MainPage.Log("Error", "杩涘叆娉ㄥ唽鐣岄潰AppConfig寮傚父锛�" + ex.Message);
+ }
}
//public RegisterPage(Action action)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Acst/InverterJinmaoHistroyPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Acst/InverterJinmaoHistroyPage.cs
index 119e878..247176d 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Acst/InverterJinmaoHistroyPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Acst/InverterJinmaoHistroyPage.cs
@@ -179,7 +179,7 @@
};
infoView1_DateInfoView.AddChidren(infoView1_DateInfo_PreClickButton);
- var infoView1_DateInfo_DateTextButton = new Button()
+ infoView1_DateInfo_DateTextButton = new Button()
{
Gravity = Gravity.Center,
Width = Application.GetRealWidth(200),
@@ -192,7 +192,7 @@
infoView1_DateInfoView.AddChidren(infoView1_DateInfo_DateTextButton);
- var infoView1_DateInfo_NextIconButton = new Button()
+ infoView1_DateInfo_NextIconButton = new Button()
{
X = Application.GetRealWidth(343 - 18 - 6),
Gravity = Gravity.CenterVertical,
@@ -202,7 +202,7 @@
};
infoView1_DateInfoView.AddChidren(infoView1_DateInfo_NextIconButton);
- var infoView1_DateInfo_NextClickButton = new Button()
+ infoView1_DateInfo_NextClickButton = new Button()
{
X = Application.GetRealWidth(343 - 18 - 6 -32),
Width = Application.GetRealWidth(32 + 6),
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Acst/InverterJinmaoPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Acst/InverterJinmaoPage.cs
index e0665d3..382e769 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Acst/InverterJinmaoPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Acst/InverterJinmaoPage.cs
@@ -148,6 +148,7 @@
pvGenerate_TodayValuesButton.Width = pvGenerate_TodayValuesButton.GetTextWidth() + Application.GetRealWidth(4);
#else
pvGenerate_TodayValuesButton.TextAlignment = TextAlignment.BottomLeft;
+ pvGenerate_TodayValuesButton.Y = Application.GetRealWidth(37);
pvGenerate_TodayValuesButton.Width = pvGenerate_TodayValuesButton.GetTextWidth() + Application.GetRealWidth(4);
#endif
pvGenerate_todayUintButton = new Button()
@@ -242,6 +243,11 @@
TextAlignment = TextAlignment.TopRight,
IsBold = true,
};
+#if __IOS__
+#else
+ pvLoad_TodayValuesButton.Y = Application.GetRealWidth(37);
+ pvLoad_TodayValuesButton.X = Application.GetRealWidth(81 - 16) - loadEle_TodayUintButton.Width;
+#endif
loadEleView.AddChidren(pvLoad_TodayValuesButton);
pvLoad_TotalValuesButton = new Button()
diff --git a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs
index 4f8edc6..db81b46 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs
@@ -197,7 +197,7 @@
Gravity = Gravity.CenterHorizontal,
Y = Application.GetRealHeight(200),
Width = Application.GetRealWidth(80),
- Height = Application.GetRealWidth(60),
+ Height = Application.GetRealWidth(65),
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = 56,
IsBold = true,
diff --git a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs
index 15d5264..a3888ee 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs
@@ -87,16 +87,14 @@
bodyView.arcBar.IsClickable = false;
bodyView.arcBar.ThumbImagePath = "FunctionIcon/AC/DiyThumbIcon.png";
}
- ////鑷姩妯″紡涓嶅厑璁歌皟娓╁害 2021-10-27 09:41:35 wxr 闄堢惓鍙嶉
- //if (updateTemp.GetAttrState(FunctionAttributeKey.Mode) == "auto" || updateTemp.GetAttrState(FunctionAttributeKey.Mode) == "timer")
- //{
- // bodyView.btnPlus.Enable = false;
- // bodyView.btnMinus.Enable = false;
- // bodyView.arcBar.IsClickable = false;
- // bodyView.arcBar.IsOffline = true;
- //}
- //鏇存柊涓嶅悓鐣岄潰鐘舵�� 2022骞�06鏈�09鏃�19:22:55 wjc 淇敼
- bodyView.updateStatusPage();
+ //鑷姩妯″紡涓嶅厑璁歌皟娓╁害 2021-10-27 09:41:35 wxr 闄堢惓鍙嶉
+ if (updateTemp.GetAttrState(FunctionAttributeKey.Mode) == "auto" || updateTemp.GetAttrState(FunctionAttributeKey.Mode) == "timer")
+ {
+ bodyView.btnPlus.Enable = false;
+ bodyView.btnMinus.Enable = false;
+ bodyView.arcBar.IsClickable = false;
+ bodyView.arcBar.IsOffline = true;
+ }
});
}
catch (Exception ex)
@@ -118,16 +116,14 @@
//function.SaveFunctionData(true);
};
- ////鑷姩妯″紡涓嶅厑璁歌皟娓╁害 2021-10-27 09:41:35 wxr 闄堢惓鍙嶉
- //if (function.GetAttrState(FunctionAttributeKey.Mode) == "auto" || function.GetAttrState(FunctionAttributeKey.Mode) == "timer")
- //{
- // btnPlus.Enable = false;
- // btnMinus.Enable = false;
- // arcBar.IsClickable = false;
- // arcBar.IsOffline = true;
- //}
- //鍒濆鍖栦笉鍚岀晫闈㈢姸鎬� 2022骞�06鏈�09鏃�19:22:55 wjc 淇敼
- this.updateStatusPage();
+ //鑷姩妯″紡涓嶅厑璁歌皟娓╁害 2021-10-27 09:41:35 wxr 闄堢惓鍙嶉
+ if (function.GetAttrState(FunctionAttributeKey.Mode) == "auto" || function.GetAttrState(FunctionAttributeKey.Mode) == "timer")
+ {
+ btnPlus.Enable = false;
+ btnMinus.Enable = false;
+ arcBar.IsClickable = false;
+ arcBar.IsOffline = true;
+ }
}
/// <summary>
@@ -287,36 +283,6 @@
dialogView.MouseUpEventHandler = eventHandler;
}
- /// <summary>
- /// 鏇存柊涓嶅悓鐣岄潰鐘舵��
- /// </summary>
- private void updateStatusPage()
- {
- btnPlus.Enable = true;
- btnMinus.Enable = true;
- arcBar.IsClickable = true;
- arcBar.IsOffline = false;
- switch (getModeValue)
- {
- case "auto"://鑷姩
- case "timer"://
- btnPlus.Enable = false;
- btnMinus.Enable = false;
- arcBar.IsClickable = false;
- arcBar.IsOffline = true;
- break;
-
- }
- }
- /// <summary>
- /// 鑾峰彇妯″紡value鍊�
- /// </summary>
- private string getModeValue
- {
- get
- {
- return function.GetAttrState(FunctionAttributeKey.Mode);
- }
- }
+
}
-}
+}
\ No newline at end of file
diff --git a/SiriIntents/Server/HttpUtil.cs b/SiriIntents/Server/HttpUtil.cs
index 6abba29..8f04bde 100644
--- a/SiriIntents/Server/HttpUtil.cs
+++ b/SiriIntents/Server/HttpUtil.cs
@@ -16,14 +16,14 @@
/// 鍥哄畾鍩熷悕,姝ｅ紡鐜
/// 鍏叡鍩熷悕灏辫繎瑙ｆ瀽
/// </summary>
- public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
- const string APP_KEY = "HDL-HOME-APP";
- const string SECRET_KEY = "CPL345bn28gHnvi9G4tYbq3cTYkiHC";
+ //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
+ //const string APP_KEY = "HDL-HOME-APP";
+ //const string SECRET_KEY = "CPL345bn28gHnvi9G4tYbq3cTYkiHC";
- //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
- //public const string APP_KEY = "HDL-HOME-APP-TEST";
- //public const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss";
+ public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
+ public const string APP_KEY = "HDL-HOME-APP-TEST";
+ public const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss";
//public const string GlobalRequestHttpsHost = "http://59.41.255.150:7777";//mmmm
diff --git a/SiriIntents/SiriIntents.csproj b/SiriIntents/SiriIntents.csproj
index ad43bff..765db83 100644
--- a/SiriIntents/SiriIntents.csproj
+++ b/SiriIntents/SiriIntents.csproj
@@ -28,7 +28,7 @@
<MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
<DeviceSpecificBuild>false</DeviceSpecificBuild>
<MtouchVerbosity></MtouchVerbosity>
- <CodesignProvision>0002-OnProSiri-240830-1-Dev</CodesignProvision>
+ <CodesignProvision>0002-OnProSiri-240704-1-Dev</CodesignProvision>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>pdbonly</DebugType>
@@ -81,7 +81,7 @@
<MtouchArch>ARM64</MtouchArch>
<MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
<MtouchVerbosity></MtouchVerbosity>
- <CodesignProvision>0002-OnProSiri-240830-1-Dev</CodesignProvision>
+ <CodesignProvision>0002-OnProSiri-240704-1-Dev</CodesignProvision>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
diff --git a/SiriIntentsUI/SiriIntentsUI.csproj b/SiriIntentsUI/SiriIntentsUI.csproj
index 6f60aef..976a633 100644
--- a/SiriIntentsUI/SiriIntentsUI.csproj
+++ b/SiriIntentsUI/SiriIntentsUI.csproj
@@ -29,7 +29,7 @@
<DeviceSpecificBuild>false</DeviceSpecificBuild>
<MtouchVerbosity></MtouchVerbosity>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <CodesignProvision>0002-OnProSiriUI-240830-1-Dev</CodesignProvision>
+ <CodesignProvision>0002-OnProSiriUI-240704-1-Dev</CodesignProvision>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>pdbonly</DebugType>
--
Gitblit v1.8.0