nigel wei
2024-08-31 a1b0a0e9ac707571a436272f41e3ee5aeef5aee2
金茂定制备份
6个文件已修改
10444 ■■■■ 已修改文件
HDL-ON_Android/Resources/Resource.designer.cs 10391 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/HDL-ON_iOS.csproj 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Acst/InverterJinmaoPage.cs 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SiriIntents/SiriIntents.csproj 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SiriIntentsUI/SiriIntentsUI.csproj 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Resources/Resource.designer.cs
Diff too large
HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -27,7 +27,7 @@
        <MtouchDebug>true</MtouchDebug>
        <CodesignKey>iPhone Developer</CodesignKey>
        <MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
        <CodesignProvision>OnPro2307291-Dev</CodesignProvision>
        <CodesignProvision>0002-OnPro-240830-1-Dev</CodesignProvision>
        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
        <MtouchI18n>cjk</MtouchI18n>
        <MtouchSdkVersion>17.5</MtouchSdkVersion>
@@ -61,7 +61,7 @@
        <MtouchEnableSGenConc>false</MtouchEnableSGenConc>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<CodesignProvision>0002-OnPro-240704-1-Dev</CodesignProvision>
<CodesignProvision>0002-OnPro-240830-1-Dev</CodesignProvision>
<MtouchSdkVersion>17.5</MtouchSdkVersion>
    </PropertyGroup>
    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
@@ -83,6 +83,7 @@
            //不是A网关或者是成员 只允许添加场景隐藏自动化
            var HideAutoPage = DB_ResidenceData.Instance.CurrentRegion.isOtherShare;
            bool hideSecurity = true;
            //判断是否需要隐藏自动化
            if (HideAutoPage)
            {
@@ -159,7 +160,6 @@
                    var otherWidth = (Application.GetRealWidth(375) - btnAutomationTitle.Width) / 2;
                    btnAutomationTitle.X = otherWidth;
                    btnSceneTilte = new Button()
                    {
                        Y = Application.GetRealHeight(40),
@@ -174,7 +174,6 @@
                    };
                    topView.AddChidren(btnSceneTilte);
                    btnSecurityTitle = new Button()
                    {
                        X = btnAutomationTitle.Right,
@@ -188,6 +187,7 @@
                        TextID = StringId.anfang,
                    };
                    topView.AddChidren(btnSecurityTitle);
                    hideSecurity = false;
                }
                else
                {
@@ -253,7 +253,10 @@
            {
                LoadAutomationPageView();
            }
            LoadSecurityPageView();
            if (!hideSecurity)
            {
                LoadSecurityPageView();
            }
            LoadEventList();
        }
HDL_ON/UI/UI2/FuntionControlView/Acst/InverterJinmaoPage.cs
@@ -152,9 +152,9 @@
#endif
            pvGenerate_todayUintButton = new Button()
            {
                Y = Application.GetRealWidth(41),
                Y = Application.GetRealWidth(45),
                Height = Application.GetRealWidth(17),
                Text = "kwh",
                Text = "kw",
                TextColor = CSS_Color.MainBackgroundColor,
                TextSize = 12,
                TextAlignment = TextAlignment.CenterLeft,
@@ -215,9 +215,9 @@
            var loadEle_TodayUintButton = new Button()
            {
                Y = Application.GetRealWidth(41),
                Y = Application.GetRealWidth(45),
                Height = Application.GetRealWidth(17),
                Text = "kwh",
                Text = "kw",
                TextColor = CSS_Color.MainBackgroundColor,
                TextSize = 12,
                TextAlignment = TextAlignment.CenterRight,
@@ -395,7 +395,7 @@
                Y = Application.GetRealWidth(220),
                Width = Application.GetRealWidth(100),
                Height = Application.GetRealWidth(17),
                Text = "今日发电量 (kwh)",
                Text = "今日发电量 (kw)",
                TextAlignment = TextAlignment.Center,
                TextColor = CSS_Color.TextualColor,
                TextSize = 12,
@@ -424,7 +424,7 @@
                Y = Application.GetRealWidth(220),
                Width = Application.GetRealWidth(100),
                Height = Application.GetRealWidth(17),
                Text = "本月发电量 (kwh)",
                Text = "本月发电量 (kw)",
                TextAlignment = TextAlignment.Center,
                TextColor = CSS_Color.TextualColor,
                TextSize = 12,
@@ -453,7 +453,7 @@
                Y = Application.GetRealWidth(220),
                Width = Application.GetRealWidth(100),
                Height = Application.GetRealWidth(17),
                Text = "累计发电量 (kwh)",
                Text = "累计发电量 (kw)",
                TextAlignment = TextAlignment.Center,
                TextColor = CSS_Color.TextualColor,
                TextSize = 12,
@@ -538,7 +538,7 @@
                Y = Application.GetRealWidth(220),
                Width = Application.GetRealWidth(100),
                Height = Application.GetRealWidth(17),
                Text = "今日用电量 (kwh)",
                Text = "今日用电量 (kw)",
                TextAlignment = TextAlignment.Center,
                TextColor = CSS_Color.TextualColor,
                TextSize = 12,
@@ -566,7 +566,7 @@
                Y = Application.GetRealWidth(220),
                Width = Application.GetRealWidth(100),
                Height = Application.GetRealWidth(17),
                Text = "本月用电量 (kwh)",
                Text = "本月用电量 (kw)",
                TextAlignment = TextAlignment.Center,
                TextColor = CSS_Color.TextualColor,
                TextSize = 12,
@@ -594,7 +594,7 @@
                Y = Application.GetRealWidth(220),
                Width = Application.GetRealWidth(100),
                Height = Application.GetRealWidth(17),
                Text = "累计用电量 (kwh)",
                Text = "本年用电量 (kw)",
                TextAlignment = TextAlignment.Center,
                TextColor = CSS_Color.TextualColor,
                TextSize = 12,
@@ -698,8 +698,8 @@
            var esRunStatus_ValuesInfoView = new FrameLayout()
            {
                Width = Application.GetRealWidth(263),
                Height = Application.GetRealWidth(134),
                Width = Application.GetRealWidth(282),
                Height = Application.GetRealWidth(153),
                Gravity = Gravity.CenterHorizontal,
                Y = Application.GetRealWidth(40),
                BackgroundImagePath = "FunctionIcon/Acst/Inverter/EnergyStorageStatusBg.png",
@@ -709,7 +709,7 @@
            #region 实时充电功率
            var esRunStatus_ChargeValuesView = new FrameLayout()
            {
                X = Application.GetRealWidth(2),
                X = Application.GetRealWidth(17),
                Width = Application.GetRealWidth(128),
                Height = Application.GetRealWidth(128),
            };
@@ -743,7 +743,7 @@
            #region 实时放电功率
            var esRunStatus_DischargeValuesView = new FrameLayout()
            {
                X = Application.GetRealWidth(132),
                X = Application.GetRealWidth(132+15),
                Width = Application.GetRealWidth(128),
                Height = Application.GetRealWidth(128),
            };
SiriIntents/SiriIntents.csproj
@@ -28,7 +28,7 @@
    <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
    <DeviceSpecificBuild>false</DeviceSpecificBuild>
    <MtouchVerbosity></MtouchVerbosity>
    <CodesignProvision>0002-OnProSiri-240704-1-Dev</CodesignProvision>
    <CodesignProvision>0002-OnProSiri-240830-1-Dev</CodesignProvision>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
    <DebugType>pdbonly</DebugType>
@@ -37,7 +37,7 @@
    <DefineConstants></DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <CodesignKey>Apple Distribution: HDL Automation Co., Ltd (BVTA78PRYA)</CodesignKey>
    <CodesignKey>Apple Development: xuebiao huang (4P32GXQWWK)</CodesignKey>
    <MtouchUseLlvm>true</MtouchUseLlvm>
    <MtouchFloat32>true</MtouchFloat32>
    <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
@@ -45,7 +45,7 @@
    <MtouchArch>ARM64</MtouchArch>
    <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
    <MtouchVerbosity></MtouchVerbosity>
    <CodesignProvision>0002-OnProSiri-240703-1-Hoc</CodesignProvision>
    <CodesignProvision>0002-OnProSiri-240830-1-Dev</CodesignProvision>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
    <DebugType>pdbonly</DebugType>
@@ -81,7 +81,7 @@
    <MtouchArch>ARM64</MtouchArch>
    <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
    <MtouchVerbosity></MtouchVerbosity>
    <CodesignProvision>0002-OnProSiri-240704-1-Dev</CodesignProvision>
    <CodesignProvision>0002-OnProSiri-240830-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-240704-1-Dev</CodesignProvision>
    <CodesignProvision>0002-OnProSiriUI-240830-1-Dev</CodesignProvision>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
    <DebugType>pdbonly</DebugType>
@@ -85,7 +85,7 @@
    <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
    <MtouchVerbosity></MtouchVerbosity>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <CodesignProvision>0002-OnProSiriUI-240704-1-Dev</CodesignProvision>
    <CodesignProvision></CodesignProvision>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="System" />