增加分享设备的时候,判断当前房间分享设备总数,从而决定是否需要增加或者移除房间分享
2个文件已修改
92 ■■■■■ 已修改文件
.vs/HDL_APP_Project/xs/UserPrefs.xml 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs 66 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,24 +1,8 @@
<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" />
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs">
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs">
    <Files>
      <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="157" Column="54" />
      <File FileName="HDL_ON/UI/UI1-Login/SelectServerDialog.cs" Line="109" Column="37" />
      <File FileName="HDL_ON/DAL/Server/NewAPI.cs" Line="15" Column="29" />
      <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="729" Column="51" />
      <File FileName="HDL_ON/Entity/UserInfo.cs" Line="45" Column="13" />
      <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs" Line="435" Column="1" />
      <File FileName="HDL_ON/UI/MainPage.cs" Line="12" Column="19" />
      <File FileName="HDL_ON/Common/Constant.cs" Line="199" Column="26" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPageBLL.cs" Line="1" Column="1" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/ChooseShareMemberTargetListPage.cs" Line="1" Column="1" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/ChooseShareMemberTargetListPageBLL.cs" Line="1" Column="1" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs" Line="76" Column="21" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs" Line="259" Column="34" />
      <File FileName="HDL_ON/DAL/Server/NewApiRes.cs" Line="1334" Column="18" />
      <File FileName="HDL_ON/Entity/Room.cs" Line="51" Column="23" />
      <File FileName="HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs" Line="41" Column="32" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs" Line="219" Column="31" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs" Line="1" Column="1" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
@@ -36,7 +20,7 @@
                <Node name="UI2" expanded="True">
                  <Node name="4-PersonalCenter" expanded="True">
                    <Node name="MemberManagement" expanded="True">
                      <Node name="MemberFunctionPermissionPage.cs" selected="True" />
                      <Node name="MemberFunctionPermissionPageBLL.cs" selected="True" />
                    </Node>
                    <Node name="RoomListManage" expanded="True" />
                    <Node name="SearchDevice" expanded="True" />
@@ -65,9 +49,7 @@
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
  <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.822QECU5228FU" />
  <MonoDevelop.Ide.DebuggingService.Breakpoints>
    <BreakpointStore>
      <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/ON+/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs" line="60" column="1" />
    </BreakpointStore>
    <BreakpointStore />
  </MonoDevelop.Ide.DebuggingService.Breakpoints>
  <MultiItemStartupConfigurations />
</Properties>
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs
@@ -24,6 +24,26 @@
            {
                if (titleId == StringId.PermissionToUse)//从个人中心进入单独分享
                {
                    UploadShareDeviceList();
                }
                else
                {
                    //var sharedBytes = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(funs_New));
                    //2020-12-01 屏蔽页面
                    //var page = new ChooseShareMemberTargetListPage(funs_New, memberInfo);
                    //MainPage.BasePageView.AddChidren(page);
                    //page.LoadPage();
                    //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                }
            };
        }
        /// <summary>
        /// 管理设备分享
        /// 2020-12-08 1.增加分享设备的时候,判断当前房间分享设备总数,从而决定是否需要增加或者移除房间分享
        /// </summary>
        void UploadShareDeviceList()
        {
                    new Thread(() =>
                    {
                        try
@@ -35,10 +55,10 @@
                                act = new PublicAssmebly().TipLoadingMsgDialog(Language.StringByID(StringId.SavingPleaseWait));
                            });
                            //1.管理房间分享
                    //1.管理最终属于房间的分享
                            if (funs_New != null && funs_New.Count > 0)
                            {
                                //分享设备大于0
                        //最终属于房间的分享大于0
                                var success = ShareRoom();
                                if (success)
                                {
@@ -79,10 +99,9 @@
                                if (null == sd)
                                {
                                    funs_NeedAdd.Add(f);
                                }
                            }
                    //3.1 提交请求
                            List<string> childAccountIds = new List<string>();
                            childAccountIds.Add(memberInfo.childAccountId);
                            var addShareObj = new AddShareObj()
@@ -100,7 +119,6 @@
                                    new PublicAssmebly().TipMsgAutoClose(Language.StringByID(StringId.FunctionSharingFailed), true);
                                });
                            }
                            Application.RunOnMainThread(() =>
                            {
@@ -145,17 +163,6 @@
                        }
                    })
                    { IsBackground = true }.Start();
                }
                else
                {
                    //var sharedBytes = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(funs_New));
                    //2020-12-01 屏蔽页面
                    //var page = new ChooseShareMemberTargetListPage(funs_New, memberInfo);
                    //MainPage.BasePageView.AddChidren(page);
                    //page.LoadPage();
                    //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                }
            };
        }
        /// <summary>
@@ -202,7 +209,8 @@
        bool ShareRoom()
        {
            var roomList = new List<ShareData>();
            roomList.Add(new ShareData() {
            roomList.Add(new ShareData()
            {
                shareType = ShareType.ROOM.ToString(),
                shareTypeId = room.roomId
            });
@@ -254,22 +262,13 @@
            }
        }
        ///// <summary>
        ///// 更新共享数据
        ///// </summary>
        //bool EditShareData(ShareData sd)
        //{
        //    var responePack = new HttpServerRequest().EditShareData(sd);
        //    if (responePack.Code == StateCode.SUCCESS)
        //    {
        //        return true;
        //    }
        //    else
        //    {
        //        return false;
        //    }
        //}
        /// <summary>
        /// LoadMethod_SharedDataChange
        /// </summary>
        /// <param name="btnChoose"></param>
        /// <param name="btn2"></param>
        /// <param name="btn3"></param>
        /// <param name="function"></param>
        void LoadMethod_SharedDataChange(Button btnChoose, Button btn2, FrameLayout btn3, Function function)
        {
            EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
@@ -335,6 +334,7 @@
            btn2.MouseUpEventHandler = eventHandler;
            btn3.MouseUpEventHandler = eventHandler;
        }
        /// <summary>
        /// 全选按钮点击事件
        /// </summary>