From 320d7cc8feb394d0ce3db2ec1d01593b554d990f Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 23 十二月 2020 10:57:13 +0800
Subject: [PATCH] 2020-12-23 1.更新
---
HDL_ON/Common/.DS_Store | 0
HDL_ON/Common/Constant.cs | 6 +++---
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs | 1 +
.vs/HDL_APP_Project/xs/UserPrefs.xml | 17 +++++------------
4 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index a60a543..4086709 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,12 +1,6 @@
-锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
+锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
<MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.08FD445C-3EE8-4ED2-BF28-B42ADD0DA92C" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/1-HomePage/HomePage.cs">
- <Files>
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs" Line="312" Column="46" />
- <File FileName="HDL_ON/Common/HDLCommon.cs" Line="297" Column="21" />
- <File FileName="HDL_ON/DAL/Mqtt/MqttClient.cs" Line="563" Column="35" />
- <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" Line="133" Column="20" />
- </Files>
+ <MonoDevelop.Ide.Workbench>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
@@ -20,14 +14,13 @@
</Node>
<Node name="Entity" expanded="True">
<Node name="Function" expanded="True" />
+ <Node name="FunctionList.cs" selected="True" />
</Node>
<Node name="UI" expanded="True">
<Node name="BindingResidence" expanded="True" />
<Node name="UI1-Login" expanded="True" />
<Node name="UI2" expanded="True">
- <Node name="1-HomePage" expanded="True">
- <Node name="HomePage.cs" selected="True" />
- </Node>
+ <Node name="1-HomePage" expanded="True" />
<Node name="2-Classification" expanded="True" />
<Node name="3-Intelligence" expanded="True">
<Node name="Automation" expanded="True" />
@@ -65,7 +58,7 @@
<String>Shared.IOS/Shared.IOS.csproj</String>
</DisabledProjects>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
- <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.364c4b3158493098" />
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />
</MonoDevelop.Ide.DebuggingService.Breakpoints>
diff --git a/HDL_ON/Common/.DS_Store b/HDL_ON/Common/.DS_Store
index 799442b..da7acbe 100644
--- a/HDL_ON/Common/.DS_Store
+++ b/HDL_ON/Common/.DS_Store
Binary files differ
diff --git a/HDL_ON/Common/Constant.cs b/HDL_ON/Common/Constant.cs
old mode 100755
new mode 100644
index f611384..79920f1
--- a/HDL_ON/Common/Constant.cs
+++ b/HDL_ON/Common/Constant.cs
@@ -199,15 +199,15 @@
public enum ShareType
{
/// <summary>
- ///
+ /// 鎴块棿绫诲瀷
/// </summary>
ROOM = 1,
/// <summary>
- ///
+ /// 璁惧绫诲瀷
/// </summary>
DEVICE,
/// <summary>
- ///
+ /// 鍦烘櫙绫诲瀷
/// </summary>
SCENE,
/// <summary>
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs
index 5dad07a..99d8881 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs
@@ -322,6 +322,7 @@
{
var newSd = new ShareData();
newSd.shareTypeId = roomData.shareTypeId;
+ newSd.shareType = roomData.shareType;
funs_RoomAll.Add(newSd);
}
--
Gitblit v1.8.0