From 4a9844ac95e2ff67b2a2b1082c30f15c561866c6 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 11 三月 2022 16:35:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wjc' into wxr0114
---
HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs | 11 +++--
HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs | 46 ++++++++---------------
HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs | 4 +-
HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs | 1
HDL_ON/Common/UserInfo.cs | 2
HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs | 2
6 files changed, 28 insertions(+), 38 deletions(-)
diff --git a/HDL_ON/Common/UserInfo.cs b/HDL_ON/Common/UserInfo.cs
index b7a8838..5ba0686 100644
--- a/HDL_ON/Common/UserInfo.cs
+++ b/HDL_ON/Common/UserInfo.cs
@@ -181,7 +181,7 @@
/// 璁板綍鑷姩鍖栫瓫閫夌殑鍔熻兘鐨勬潯浠�
/// </summary>
[Newtonsoft.Json.JsonIgnore]
- public string logicselectedFunction;
+ public string logicselectedFunction = Language.StringByID(StringId.allFun);
#endregion
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
index 6438837..3cbd914 100644
--- a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
@@ -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();
@@ -205,4 +205,4 @@
return eventHandler;
}
}
-}
\ No newline at end of file
+}
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs
index deee2f7..49990a0 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs
+++ b/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";
- viewLayout.AddChidren(sceneView.FLayoutView());
-
+ 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
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs
index f7b44a0..4dccee2 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs
@@ -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)
{
+ //濡傛灉鏄痓us缃戝叧閲嶇疆楂樺害;
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鍒楄〃
- var typeFunctionList = LogicMethod.CurrLogicMethod.GetDeviceTypeFunctionList(UserInfo.Current.logicselectedFunction);
- ///鑾峰彇鍗曚釜鐏厜绫诲瀷锛堜緥濡傦細鐏厜1,鐏厜2銆傘�傦級鏄剧ず璁惧鍒楄〃
- var lists = LogicMethod.CurrLogicMethod.GetShowDeviceList(typeFunctionList, deviceList);
-
- funAllAreaView.btnText2.Text = UserInfo.Current.logicselectedFunction;
- DeviceListView(vv, lists);
- }
- else
- {
- DeviceListView(vv, deviceList);
- }
+ ///鑾峰彇鍗曚釜绫诲瀷锛堜緥濡�:鐏厜绫汇�傘�傦級璁惧FunctionType鍒楄〃<绠�绉�:spk鍒楄〃>
+ var typeFunctionList = LogicMethod.CurrLogicMethod.GetDeviceTypeFunctionList(UserInfo.Current.logicselectedFunction);
+ ///鑾峰彇鍗曚釜鐏厜绫诲瀷锛堜緥濡傦細鐏厜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);
}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
index 87c272a..244082b 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
@@ -72,6 +72,7 @@
#endregion
#region ---鐣岄潰鐐瑰嚮浜嬩欢---
+ playView.collectIconBtn.Visible = false;//鍏堟殏鏃堕殣钘忔敹钘忓姛鑳�
//鏀惰棌鍥炬爣浜嬩欢
playView.collectIconBtn.MouseUpEventHandler += (sender, e) =>
{
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
index e8677a4..0556fea 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
+++ b/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) =>
{
--
Gitblit v1.8.0