| HDL_ON/Common/UserInfo.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
HDL_ON/Common/UserInfo.cs
@@ -181,7 +181,7 @@ /// 记录自动化筛选的功能的条件 /// </summary> [Newtonsoft.Json.JsonIgnore] public string logicselectedFunction; public string logicselectedFunction = Language.StringByID(StringId.allFun); #endregion
@@ -125,7 +125,7 @@ break; case SPK.MusicStandard: case SPK.AvMusic: //Music.A31MusicModel.Current.functionMusic =function;//当前播放器 //Music.A31MusicModel.Current= new Music.A31MusicModel { functionMusic = function };//当前播放器 //var a31PlayMusicPage = new Music.A31PlayMusicPage(); //MainPage.BasePageView.AddChidren(a31PlayMusicPage); //a31PlayMusicPage.Show(); HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs
@@ -42,8 +42,10 @@ sceneView.frameLayout.Y = timeView.frameLayout.Bottom; sceneView.btnText.TextID = StringId.Scenes; sceneView.btnIcon.UnSelectedImagePath = "LogicIcon/scene.png"; if (MainView.IsGatewayType) { viewLayout.AddChidren(sceneView.FLayoutView()); } //室外变化 LogicView.SelectTypeView shiwaiView = new LogicView.SelectTypeView(); shiwaiView.frameLayout.Y = sceneView.frameLayout.Bottom; @@ -60,14 +62,15 @@ likiadaodaView.frameLayout.Y = shiwaiView.frameLayout.Bottom; likiadaodaView.btnText.TextID = StringId.likiadaoda; likiadaodaView.btnIcon.UnSelectedImagePath = "LogicIcon/location.png"; int count = 0;//输入类型个数 if (MainView.IsGatewayType) { count = 4; viewLayout.AddChidren(likiadaodaView.FLayoutView()); } ////功能 ///产品经理君焕要求，设备功能移到这里。<2022-3-7> new FunTpye(LogicMethod.condition_if).FunTypeView(viewLayout, likiadaodaView.frameLayout.Bottom,4); new FunTpye(LogicMethod.condition_if).FunTypeView(viewLayout, likiadaodaView.frameLayout.Bottom, count); #endregion
@@ -12,15 +12,6 @@ if_type = str; } /// <summary> /// 默认选中是房间时：全部区域 /// </summary> //public static Entity.Room selectedRoom = new Entity.Room { roomId ="6688" }; /// <summary> /// 默认选中是设备类型时：全部功能 /// </summary> //public static Entity.Room selectedRoom = new Entity.Room { roomId = "6688" }; /// <summary> /// 表示是(条件/目标) /// </summary> private string if_type; @@ -43,7 +34,9 @@ viewLayout.AddChidren(vv); if (!MainView.IsGatewayType) { //如果是bus网关重置高度; funAllAreaView.frameLayout.Y = Application.GetRealHeight(0); vv.Y = funAllAreaView.frameLayout.Bottom; } //房间点击事件 EventHandler<MouseEventArgs> roomClick = (sender, e) => @@ -124,7 +117,8 @@ funAllAreaView.btnText2.Text = Language.StringByID(StringId.allFun); //selectedRoom = (areaView.btnClick.Tag as Entity.Room); UserInfo.Current.logicselectedRoom = (areaView.btnClick.Tag as Entity.Room); UserInfo.Current.logicselectedFunction = ""; ///切换房间默认:全部功能 UserInfo.Current.logicselectedFunction = Language.StringByID(StringId.allFun); ///获取显示设备列表 var list = LogicMethod.CurrLogicMethod.GetFunctionDeviceList(areaView.btnClick.Tag as Entity.Room, if_type); @@ -139,7 +133,7 @@ }; funAllAreaView.btnText1.MouseUpEventHandler += roomClick; funAllAreaView.btnIcon1.MouseUpEventHandler += roomClick; //功能点击事件 //功能类型点击事件 EventHandler<MouseEventArgs> funClick = (sender3, e3) => { @@ -226,9 +220,9 @@ fLayout.RemoveFromParent(); funAllAreaView.btnText2.Text = areaView.btnClick.Tag.ToString(); UserInfo.Current.logicselectedFunction = areaView.btnClick.Tag.ToString(); ///获取单个类型（例如：灯光类。。）设备FunctionType列表 ///获取单个类型（例如：灯光类。。）设备FunctionType列表<简称:spk列表> var typeFunctionList = LogicMethod.CurrLogicMethod.GetDeviceTypeFunctionList(UserInfo.Current.logicselectedFunction); ///获取单个灯光类型（例如：灯光1,灯光2。。）显示设备列表 ///获取单个灯光类型（例如：灯光1,灯光2。。）设备列表 var lists2 = LogicMethod.CurrLogicMethod.GetShowDeviceList(typeFunctionList, functionList); DeviceListView(vv, lists2); @@ -242,25 +236,17 @@ }; funAllAreaView.btnText2.MouseUpEventHandler += funClick; funAllAreaView.btnIcon2.MouseUpEventHandler += funClick; ///获取显示设备列表 ///获取房间支持的设备列表 var deviceList = LogicMethod.CurrLogicMethod.GetFunctionDeviceList(UserInfo.Current.logicselectedRoom, if_type); if (!string.IsNullOrEmpty(UserInfo.Current.logicselectedFunction)) { ///获取单个类型（例如：灯光类。。）设备FunctionType列表 ///获取单个类型（例如:灯光类。。）设备FunctionType列表<简称:spk列表> var typeFunctionList = LogicMethod.CurrLogicMethod.GetDeviceTypeFunctionList(UserInfo.Current.logicselectedFunction); ///获取单个灯光类型（例如：灯光1,灯光2。。）显示设备列表 ///获取单个灯光类型（例如：灯光1,灯光2。。）设备列表 var lists = LogicMethod.CurrLogicMethod.GetShowDeviceList(typeFunctionList, deviceList); ///房间名称 funAllAreaView.btnText1.Text = UserInfo.Current.logicselectedRoom.roomName; ///功能类型名称<灯光类。。。。。> funAllAreaView.btnText2.Text = UserInfo.Current.logicselectedFunction; DeviceListView(vv, lists); } else { DeviceListView(vv, deviceList); } funAllAreaView.btnText1.Text = UserInfo.Current.logicselectedRoom.roomName; }
@@ -72,6 +72,7 @@ #endregion #region ---界面点击事件--- playView.collectIconBtn.Visible = false;//先暂时隐藏收藏功能 //收藏图标事件 playView.collectIconBtn.MouseUpEventHandler += (sender, e) => { HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
@@ -192,7 +192,7 @@ musicView.singerBtn.Text = player.functionMusic.GetAttrState(KeyProperty.song_name); musicView.songNameBtn.Text = player.functionMusic.GetAttrState(KeyProperty.song_name); musicView.musicNameBtn.Text = player.functionMusic.name; musicView.collectIconBtn.Visible = false;//先暂时隐藏收藏功能 ///收藏事件 musicView.collectIconBtn.MouseUpEventHandler += (sender, e) => {
