wxr
2023-09-25 1f9243b9560762db104362297b1fca28d77c3cd8
组控图片输入
12个文件已添加
7个文件已修改
27 ■■■■ 已修改文件
HDL-ON_Android/Assets/Phone/FunctionIcon/GroupControl/gp_all_off.png 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Assets/Phone/FunctionIcon/GroupControl/gp_all_off_home.png 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Assets/Phone/FunctionIcon/GroupControl/gp_all_off_home_click.png 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Assets/Phone/FunctionIcon/GroupControl/gp_all_on.png 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Assets/Phone/FunctionIcon/GroupControl/gp_all_on_home.png 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Assets/Phone/FunctionIcon/GroupControl/gp_all_on_home_click.png 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/HDL-ON_Android.csproj 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/HDL-ON_iOS.csproj 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/Phone/FunctionIcon/GroupControl/gp_all_off.png 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/Phone/FunctionIcon/GroupControl/gp_all_off_home.png 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/Phone/FunctionIcon/GroupControl/gp_all_off_home_click.png 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/Phone/FunctionIcon/GroupControl/gp_all_on.png 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/Phone/FunctionIcon/GroupControl/gp_all_on_home.png 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/Phone/FunctionIcon/GroupControl/gp_all_on_home_click.png 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/Common/Utlis.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/DAL/Server/HttpUtil.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/Entity/Enumerative/Command.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI1-Login/LoginPage.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SiriIntents/Server/HttpUtil.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Assets/Phone/FunctionIcon/GroupControl/gp_all_off.png
HDL-ON_Android/Assets/Phone/FunctionIcon/GroupControl/gp_all_off_home.png
HDL-ON_Android/Assets/Phone/FunctionIcon/GroupControl/gp_all_off_home_click.png
HDL-ON_Android/Assets/Phone/FunctionIcon/GroupControl/gp_all_on.png
HDL-ON_Android/Assets/Phone/FunctionIcon/GroupControl/gp_all_on_home.png
HDL-ON_Android/Assets/Phone/FunctionIcon/GroupControl/gp_all_on_home_click.png
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" />
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" />
HDL-ON_iOS/Resources/Phone/FunctionIcon/GroupControl/gp_all_off.png
HDL-ON_iOS/Resources/Phone/FunctionIcon/GroupControl/gp_all_off_home.png
HDL-ON_iOS/Resources/Phone/FunctionIcon/GroupControl/gp_all_off_home_click.png
HDL-ON_iOS/Resources/Phone/FunctionIcon/GroupControl/gp_all_on.png
HDL-ON_iOS/Resources/Phone/FunctionIcon/GroupControl/gp_all_on_home.png
HDL-ON_iOS/Resources/Phone/FunctionIcon/GroupControl/gp_all_on_home_click.png
HDL_ON/Common/Utlis.cs
@@ -42,7 +42,7 @@
                }
            }
            string text = tag + "======" + url + "\r\n" + content;
            Console.WriteLine(text);
            //Console.WriteLine(text);
#endif
        }
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";
HDL_ON/Entity/Enumerative/Command.cs
@@ -1688,7 +1688,7 @@
        SetGateway = 0xE54C,
        SetGatewayACK = 0xE54C,
        /// <summary>
        /// 第一次搜索指令
        /// 搜索模块指令
        /// 操作码: 0xE548
        /// </summary>
        ReadDeviceModul = 0xE548,
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
                {
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