| HDL-ON_iOS/HDL-ON_iOS.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/DAL/Server/HttpUtil.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI1-Login/RegisterPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/FuntionControlView/Acst/InverterJinmaoHistroyPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/FuntionControlView/Acst/InverterJinmaoPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| SiriIntents/Server/HttpUtil.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| SiriIntents/SiriIntents.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| SiriIntentsUI/SiriIntentsUI.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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' "> 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 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) 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), 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() 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, 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); } } } } } 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 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" /> 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>
