mac
2023-09-01 0a11352dffeb8d5f31dd40b9728fe1abf4537f04
2023年09月01日18:06:42
4个文件已添加
8个文件已修改
113 ■■■■■ 已修改文件
HDL-ON_Android/Assets/Language.ini 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Assets/Phone/FunctionIcon/EnvirSensor/IlluminationBg.png 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Assets/Phone/FunctionIcon/EnvirSensor/IlluminationIcon.png 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/HDL-ON_Android.csproj 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/HDL-ON_iOS.csproj 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/Language.ini 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/Phone/FunctionIcon/EnvirSensor/IlluminationBg.png 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/Phone/FunctionIcon/EnvirSensor/IlluminationIcon.png 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/Common/R.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/HisenseTV /HisenseTvPage.cs 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/HisenseTV /Send.cs 83 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Assets/Language.ini
@@ -1228,6 +1228,7 @@
7173=Illuminance
7174=Exceed
7175=Under
7176=HV
8501=Video door lock
8502=Electric quantity
@@ -2626,6 +2627,7 @@
7173=照明度
7174=照明度高于
7175=照明度低于
7176=光照
  
@@ -4015,6 +4017,7 @@
7173=Illuminance
7174=Exceed
7175=Under
7176=HV
8501=Video door lock
8502=Electric quantity
@@ -5394,6 +5397,7 @@
7173=Illuminance
7174=Exceed
7175=Under
7176=HV
8501=Video door lock
8502=Electric quantity
@@ -6779,6 +6783,7 @@
7173=Illuminance
7174=Exceed
7175=Under
7176=HV
8501=Video door lock
8502=Electric quantity
HDL-ON_Android/Assets/Phone/FunctionIcon/EnvirSensor/IlluminationBg.png
HDL-ON_Android/Assets/Phone/FunctionIcon/EnvirSensor/IlluminationIcon.png
HDL-ON_Android/HDL-ON_Android.csproj
@@ -596,6 +596,8 @@
    <AndroidAsset Include="Assets\Phone\HisenseTv\shouyeSelected.png" />
    <AndroidAsset Include="Assets\Phone\HisenseTv\yingliangjianSelected.png" />
    <AndroidAsset Include="Assets\Phone\HisenseTv\yingliangjiaSelected.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\IlluminationBg.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\IlluminationIcon.png" />
  </ItemGroup>
  <ItemGroup>
    <AndroidResource Include="Resources\values\colors.xml" />
HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -1750,6 +1750,8 @@
      <BundleResource Include="Resources\Phone\HisenseTv\shouyeSelected.png" />
      <BundleResource Include="Resources\Phone\HisenseTv\yingliangjianSelected.png" />
      <BundleResource Include="Resources\Phone\HisenseTv\yingliangjiaSelected.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\IlluminationBg.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\IlluminationIcon.png" />
    </ItemGroup>
    <ItemGroup>
      <ITunesArtwork Include="iTunesArtwork" />
HDL-ON_iOS/Resources/Language.ini
@@ -1228,6 +1228,7 @@
7173=Illuminance
7174=Exceed
7175=Under
7176=HV
8501=Video door lock
8502=Electric quantity
@@ -2626,6 +2627,7 @@
7173=照明度
7174=照明度高于
7175=照明度低于
7176=光照
@@ -4012,6 +4014,7 @@
7173=Illuminance
7174=Exceed
7175=Under
7176=HV
8501=Video door lock
8502=Electric quantity
@@ -5391,6 +5394,7 @@
7173=Illuminance
7174=Exceed
7175=Under
7176=HV
8501=Video door lock
8502=Electric quantity
@@ -6776,6 +6780,7 @@
7173=Illuminance
7174=Exceed
7175=Under
7176=HV
8501=Video door lock
8502=Electric quantity
HDL-ON_iOS/Resources/Phone/FunctionIcon/EnvirSensor/IlluminationBg.png
HDL-ON_iOS/Resources/Phone/FunctionIcon/EnvirSensor/IlluminationIcon.png
HDL_ON/Common/R.cs
@@ -3539,6 +3539,10 @@
        /// 照明度低于
        /// </summary>
        public const int zhaomingdudiyu = 7175;
        /// <summary>
        /// 光照
        /// </summary>
        public const int guangzhao = 7176;
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs
@@ -351,6 +351,10 @@
        /// </summary>
        void LoadSensorDiv(Function sensor,int index)
        {
            if (sensor.spk==SPK.SensorLight) {
                //先过滤掉光照传感器
                return;
            }
            var levelColorList = sensorTemp.GetLevelColorList(sensor.spk);
            var levelTextList = sensorTemp.GetLevelTextList(sensor.spk);
            {
@@ -392,6 +396,10 @@
                        imagePath = "FunctionIcon/EnvirSensor/HchoBg.png";
                        iconPath = "FunctionIcon/EnvirSensor/HchoIcon.png";
                        break;
                    case SPK.SensorLight:
                        imagePath = "FunctionIcon/EnvirSensor/IlluminationBg.png";
                        iconPath = "FunctionIcon/EnvirSensor/IlluminationIcon.png";
                        break;
                }
                sensorView.BackgroundImagePath = imagePath;
HDL_ON/UI/UI2/FuntionControlView/HisenseTV /HisenseTvPage.cs
@@ -93,7 +93,7 @@
            this.btnRoomName = btnRoomName;
            this.btnCollectionIcon = btnCollectionIcon;
            this.comerom = comerom;
            this.action = action;
            this.action = action;
        }
@@ -168,7 +168,9 @@
            //开机
            kaijiFL.SetClickListener((fl, btnImage, btnText) =>
            {
                //Send.Current.Open("b7686438");
                ControlCommand(HisenseTVFunctionalAttributeConstant.on_off, "on");
            });
            //关机
            guanFL.SetClickListener((fl, btnImage, btnText) =>
HDL_ON/UI/UI2/FuntionControlView/HisenseTV /Send.cs
@@ -1,5 +1,8 @@
using System;
using System.Collections.Generic;
using System.Net;
using System.Net.Sockets;
using System.Text;
using HDL_ON.DAL.Server;
using HDL_ON.Entity;
using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
@@ -26,6 +29,46 @@
                return sendMethod;
            }
        }
        /// <summary>
        /// 打开海信电视
        /// </summary>
        /// <param name="deviceMac">电视mac</param>
        public void Open(string deviceMac)
        {
            CommonMethod.Current.SunThread(() =>
            {
                // 创建UdpClient实例
                UdpClient udpClient = new UdpClient();
                try
                {
                    // 设置发送和接收数据的IP和端口
                    IPEndPoint iPEndPoint = new IPEndPoint(IPAddress.Parse("255.255.255.255"), 9);
                    // 发送数据
                    //byte[] data = System.Text.Encoding.ASCII.GetBytes("Hello, UDP Server!");
                    byte[] data = StrToToHexByte(deviceMac);
                    for (int i = 0; i < 16; i++)
                    {
                        udpClient.Send(data, data.Length, iPEndPoint);
                        //Console.WriteLine("数据已发送");
                    }
                    //// 接收数据
                    //IPEndPoint remoteEP = new IPEndPoint(IPAddress.Any, 0);
                    //byte[] receivedData = udpClient.Receive(ref remoteEP);
                    //string receivedMessage = System.Text.Encoding.ASCII.GetString(receivedData);
                    //Console.WriteLine("接收到的数据:" + receivedMessage);
                }
                catch (Exception e)
                {
                    Console.WriteLine("发生错误:" + e.Message);
                }
                finally
                {
                    // 关闭UdpClient连接
                    udpClient.Close();
                }
            }, TipType.none);
        }
@@ -65,6 +108,46 @@
            { IsBackground = true }.Start();
        }
        /// <summary>
        /// 将16进制的字符串转为byte[]
        /// </summary>
        /// <param name="hexDeviceMacString"></param>
        /// <returns></returns>
        private byte[] StrToToHexByte(string hexDeviceMacString)
        {
            if (string.IsNullOrEmpty(hexDeviceMacString))
            {
                return new byte[] { };
            }
            hexDeviceMacString = hexDeviceMacString.Replace(" ", "").Replace("_","");
            if ((hexDeviceMacString.Length % 2) != 0) {
                return new byte[] { };
            }
            byte[] returnBytes = new byte[hexDeviceMacString.Length / 2];
            for (int i = 0; i < returnBytes.Length; i++)
                returnBytes[i] = Convert.ToByte(hexDeviceMacString.Substring(i * 2, 2), 16);
            return returnBytes;
        }
        /// <summary>
        /// 二进制数组转十六进制字符串
        /// </summary>
        /// <param name="btyes"></param>
        /// <returns></returns>
        private string Byte2hex(byte[] btyes)
        {
            StringBuilder sb = new StringBuilder(btyes.Length * 2);
            for (int i = 0; i < btyes.Length; i++)
            {
                int hight = ((btyes[i] >> 4) & 0x0f);
                int low = btyes[i] & 0x0f;
                sb.Append(hight > 9 ? (char)((hight - 10) + 'a') : (char)(hight + '0'));
                sb.Append(low > 9 ? (char)((low - 10) + 'a') : (char)(low + '0'));
            }
            return sb.ToString();
        }
        /// <summary>
        ///请求服务器(与住宅有关:例如;homeId)