2023年11月06日11:23:46

mac

2023-11-06 54c202bd4867092fca2bc6f96bec0cfd1056a46a

 HDL_ON/Entity/Function/Scene.cs

@@ -151,6 +151,7 @@
        /// 配合豆豆修改云端数据
        /// 调试宝、on pro和平台对应
        /// </summary>
        [Newtonsoft.Json.JsonIgnore]
        public List<SceneImageInfo> OssSceneImages = new List<SceneImageInfo>()
        {
            new SceneImageInfo
@@ -591,6 +592,11 @@
            var modeState = status.Find((obj) => obj.key == FunctionAttributeKey.Mode);
            var tempState = status.Find((obj) => obj.key == FunctionAttributeKey.SetTemp);
            var fanState = status.Find((obj) => obj.key == FunctionAttributeKey.FanSpeed);
            ////海信电视状态
            //var hisenseTvState = status.Find((obj) => obj.key == "wol");
            //if(hisenseTvState != null)
            //{
            //}
            if (modeState != null)
            {
                sceneFunctionInfo += modeState.GetValueText() + " ";
@@ -630,6 +636,32 @@
            if (perAngle != null)
            {
                sceneFunctionInfo += " " + perAngle.value + "°";
            }

            var perSetVolume = status.Find((obj) => obj.key == FunctionAttributeKey.SetVolume);
            if (perSetVolume != null)
            {
                sceneFunctionInfo += " " + perSetVolume.value;
            }

            var perSignal = status.Find((obj) => obj.key == FunctionAttributeKey.Signal);
            if (perSignal != null)
            {
                var p = new HDL_ON.UI.UI2.Intelligence.Automation.PublicInterface();
                string key = p.GetKey(p.GetHisenseSignalSourceDic(), perSignal.value);
                sceneFunctionInfo += " " + key;
            }

            var perVolume =status.Find((obj) => obj.key == FunctionAttributeKey.Volume);
            if (perVolume != null)
            {
                sceneFunctionInfo += " " + perVolume.value;
            }

            var perSongName =status.Find((obj) => obj.key == FunctionAttributeKey.SongName);
            if (perSongName != null)
            {
                sceneFunctionInfo += " " + perSongName.value;
            }
            return sceneFunctionInfo;
        }
@@ -705,6 +737,18 @@
                case "security":
                    text = Language.StringByID(StringId.DeploymentStatus);
                    break;
                case FunctionAttributeKey.SetVolume:
                    text = Language.StringByID(StringId.yinliang);
                    break;
                case FunctionAttributeKey.Signal:
                    text = Language.StringByID(StringId.xinhaoyuan);
                    break;
                case FunctionAttributeKey.Volume:
                    text = Language.StringByID(StringId.yinliang);
                    break;
                case FunctionAttributeKey.SongName:
                    text = Language.StringByID(StringId.tishiyin);
                    break;
            }
            return text;
        }
@@ -716,7 +760,7 @@
        /// </summary>
        public string GetUintString()
        {
            if (!string.IsNullOrEmpty(UintString) && UintString!= "{}")
            if (!string.IsNullOrEmpty(UintString) && UintString != "{}")
            {
                return UintString;
            }
@@ -850,6 +894,20 @@
                case "auto":
                    text = Language.StringByID(StringId.Auto);
                    break;
                case FunctionAttributeKey.Signal:
                    var p = new UI.UI2.Intelligence.Automation.PublicInterface();
                    var dic = p.GetHisenseSignalSourceDic();
                    text = p.GetKey(dic, value);
                    break;
                case FunctionAttributeKey.SetVolume:
                    text = value;
                    break;
                case FunctionAttributeKey.Volume:
                    text = value;
                    break;
                case FunctionAttributeKey.SongName:
                    text = value;
                    break;
            }
            return text;
        }