Merge branch 'Dev-Wxr' into wjc

wjc

2023-04-11 e74f8bfbe6c52f220deef5fc99a53c3a7872808d

 HDL_ON/Common/Utlis/FloorSelectPopupDialog.cs

@@ -30,7 +30,7 @@
        /// </summary>
        /// <param name="selectAction">回调选中事件，回调选中的uid</param>
        /// <param name="selectTag">设置选中的tga标记</param>
        public void ShowView(Action<string> selectAction, string selectTag = DiySelectPopupDialog.ALLSELECT)
        public void ShowView(Action<string> selectAction, string selectTag = DiySelectPopupDialog.ALLSELECT, int offsetY = 0)
        {
            //楼层集合数据
            var floorList = SpatialInfo.CurrentSpatial.FloorList;
@@ -54,7 +54,7 @@
                }
                //弹窗一级联动选择窗口
                var roomSelectPopupDialog = new DiySelectPopupDialog();
                roomSelectPopupDialog.ShowView(mFirstList, null, selectAction, selectTag);
                roomSelectPopupDialog.ShowView(mFirstList, null, selectAction, selectTag,offsetY);
            }
            else
            {
@@ -80,7 +80,7 @@
                }
                //弹窗二级联动选择窗口
                var roomSelectPopupDialog = new DiySelectPopupDialog();
                roomSelectPopupDialog.ShowView(mFirstList, mSecondList, selectAction, selectTag);
                roomSelectPopupDialog.ShowView(mFirstList, mSecondList, selectAction, selectTag,offsetY);

            }