Revert "1"

wxr

2021-07-01 43b0d5870d528f23ecd6aeceb6cfd4325188b46f

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

@@ -37,9 +37,10 @@
        /// </summary>
        string roomId;
        /// <summary>
        /// 房间所有功能列表
        /// 房间所有功能和场景列表
        /// </summary>
        List<Function> roomFunctionList = new List<Function>();
        List<RoomData> roomFunctionOrSceneList = new List<RoomData>();
     

        /// <summary>
        /// 刷新回调Action
@@ -63,14 +64,14 @@
        /// 
        /// </summary>
        /// <param name="mInfo"></param>
        /// <param name="roomFunctionList"></param>
        /// <param name="roomFunctionOrSceneList">房间所有功能和场景列表</param>
        /// <param name="roomId"></param>
        /// <param name="refreshAction"></param>
        public MemberFunctionPermissionPage(ResidenceMemberInfo mInfo, List<Function> roomFunctionList, List<ShareData> funs_RoomAll, string roomId, Action refreshAction)
        public MemberFunctionPermissionPage(ResidenceMemberInfo mInfo, List<RoomData> roomFunctionOrSceneList, List<ShareData> funs_RoomAll, string roomId, Action refreshAction)
        {
            bodyView = this;
            this.memberInfo = mInfo;
            this.roomFunctionList = roomFunctionList;
            this.roomFunctionOrSceneList = roomFunctionOrSceneList;
            this.roomId = roomId;
            //this.curResidenceShareData = new List<ShareData>();
            this.curResidenceShareData = memberInfo.CurResidenceShareData;
@@ -160,7 +161,7 @@
        void LoadFunctionRow(List<ShareData> shareDatas)
        {
            contentView.RemoveAll();
            foreach (var function in roomFunctionList)
            foreach (var roomData in roomFunctionOrSceneList)
            {
                var roomView = new FrameLayout()
                {
@@ -177,7 +178,7 @@
                    TextSize = CSS_FontSize.SubheadingFontSize,
                    TextColor = CSS_Color.FirstLevelTitleColor,
                    TextAlignment = TextAlignment.CenterLeft,
                    Text = function.name,
                    Text = roomData.name,
                };
                roomView.AddChidren(btnRoomText);

@@ -193,7 +194,7 @@
                };
                roomView.AddChidren(btnChoose);

                var shareData = shareDatas.Find((obj) => obj.shareTypeId == function.deviceId);
                var shareData = shareDatas.Find((obj) => obj.shareTypeId == roomData.shareTypeId);
                if (shareData != null)
                {
                    btnChoose.IsSelected = true;
@@ -205,7 +206,7 @@
                    if (btnChooseAll.IsSelected)
                        btnChooseAll.IsSelected = false;
                }
                LoadMethod_SharedDataChange(btnChoose, btnRoomText, roomView, function);
                LoadMethod_SharedDataChange(btnChoose, btnRoomText, roomView, roomData);

                var btnLine = new Button()
                {
@@ -217,7 +218,28 @@
                };
                contentView.AddChidren(btnLine);
            }

          
        }

    }

    /// <summary>
    /// 房间所有功能和者场景列表
    /// </summary>
    public class RoomData
    {
        /// <summary>
        /// 设备名字或者场景名字
        /// </summary>
        public string shareTypeId;
        /// <summary>
        /// 设备名字或者场景名字
        /// </summary>
        public string name;
        /// <summary>
        /// 分享类型 1.ROOM  2.DEVICE 3.SCENE
        /// </summary>
        public string shareType = ShareType.DEVICE.ToString();
    }
}