Merge branch 'master' into WJC

陈嘉乐

2020-12-04 dcb9b9b5561b4e6d1eaf1e602e8ae054e578ec6e

 HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs

@@ -6,6 +6,9 @@

namespace HDL_ON.UI
{
    /// <summary>
    /// 成员管理 成员列表页面
    /// </summary>
    public partial class MemberManagementPage : FrameLayout
    {
        MemberManagementPage bodyView;
@@ -20,6 +23,27 @@
        {
            bodyView = this;
            residenceMemberInfos = new List<ResidenceMemberInfo>();
#if DEBUG
            //tr测试住宅----测试分享
            var light = new Light()
            {
                sid = "030101123456780202010005ABCP",
                deviceId = "1333657366709645314",
                name = "灯1",
            };
            light.SaveFunctionData();


            var light2 = new Light()
            {
                sid = "030101123456780202010005ABCQ",
                deviceId = "1333657366743199746",
                name = "灯2"
            };
            light2.SaveFunctionData();
            DB_ResidenceData.functionList.lights.Add(light);
            DB_ResidenceData.functionList.lights.Add(light2);
#endif
        }

        public void LoadPage()