~wxr/HDL_APP_Project.git

old mode 100644 new mode 100755

			@@ -8,7 +8,7 @@
			{

			#region 控件集合
			FrameLayout bodyView;
			static CurtainModulePage bodyView;
			/// <summary>
			/// 功能名称按钮
			/// </summary>
			@@ -40,7 +40,7 @@
			#endregion

			#region 区域变量
			Function function;
			Curtain curtain;
			Button btnCollection_Out;
			Button btnFunctionName_Out;
			Button btnFromFloor_Out;
			@@ -49,10 +49,10 @@
			/// </summary>
			Action actionRefresh;
			#endregion
			public CurtainModulePage(Function func)
			public CurtainModulePage(Curtain func)
			{
			bodyView = this;
			function = func;
			curtain = func;
			}

			public void LoadPage(Button btnCollectionIcon, Button btnFunctionNameOut, Button btnFromFloorOut)
			@@ -81,7 +81,7 @@
			TextColor = CSS_Color.FirstLevelTitleColor,
			TextAlignment = TextAlignment.CenterLeft,
			TextSize = CSS_FontSize.EmphasisFontSize_FirstLevel,
			Text = function.name,
			Text = curtain.name,
			};
			controlView.AddChidren(btnFunctionName);

			@@ -94,7 +94,7 @@
			TextColor = CSS_Color.PromptingColor1,
			TextAlignment = TextAlignment.CenterLeft,
			TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
			Text = function.GetRoomListName()
			Text = curtain.GetRoomListName()
			};
			controlView.AddChidren(btnFromFoorAndRoom);

			@@ -106,9 +106,14 @@
			Height = Application.GetMinRealAverage(40),
			SelectedImagePath = "Collection/CollectionIcon.png",
			UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
			IsSelected = function.collection
			IsSelected = curtain.collect
			};
			controlView.AddChidren(btnCollection);
			//controlView.AddChidren(btnCollection);
			//2020-12-16 如果是成员隐藏收藏功能
			if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
			{
			controlView.AddChidren(btnCollection);
			}

			btnCurtainBgIcon = new Button()
			{
			@@ -155,7 +160,12 @@
			controlView.AddChidren(btnCurtainOpen);

			LoadEventList();
			new TopViewDiv(bodyView, Language.StringByID(StringId.LocationManagement)).LoadTopView(function, actionRefresh);
			new TopViewDiv(bodyView,Language.StringByID(StringId.Curtain)).LoadTopView_FunctionTop(curtain, actionRefresh);
			new System.Threading.Thread(() =>
			{
			DriverLayer.Control.Ins.SendReadCommand(curtain);
			})
			{ IsBackground = true }.Start();
			}

			}