Merge branch 'dev-tzy' into dev-2020xm

xm

2020-06-19 eb5a57942bae8eb57fd7fb61124c247bebb67e8e

 Home0618/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs

@@ -55,7 +55,7 @@
        /// </summary>
        private System.Collections.Generic.List<CommonDevice> localDeviceList = new System.Collections.Generic.List<CommonDevice>();
        /// <summary>
        /// 本地场景列表 
        /// 本地场景列表
        /// </summary>
        private System.Collections.Generic.List<SceneUI> scList = new System.Collections.Generic.List<SceneUI> { };
        /// <summary>
@@ -193,7 +193,7 @@
                            }
                            currentKey.ReSave();
                        }
                        #endregion 
                        #endregion
                        Application.RunOnMainThread(() =>
                        {
                            RefreshList();
@@ -392,13 +392,13 @@
        }
        /// <summary>
        /// 按键绑定表显示
        /// </summary> 
        /// </summary>
        async void RefreshList()
        {
            midVerticalRefreshLayout.RemoveAll();
            this.midFrameLayout.RemoveAll();
            middleFrameLayout();
            #region 数据处理 
            #region 数据处理
            if (currentKey.bindList.Count == 0)
            {
                entryStatusPic.Height = Application.GetRealHeight(556);
@@ -434,7 +434,7 @@

                    var rowLayout = new RowLayoutControl(midVerticalRefreshLayout.rowSpace / 2);
                    rowLayout.BackgroundColor = ZigbeeColor.Current.XMWhite;
                    midVerticalRefreshLayout.AddChidrenRow(rowLayout);
                    midVerticalRefreshLayout.AddChidren2(rowLayout);
                    rowLayout.frameTable.UseClickStatu = false;
                    var devicePic = rowLayout.frameTable.AddLeftIcon();
                    devicePic.Y = Application.GetRealHeight(49);
@@ -501,7 +501,7 @@
                                    //获取房间的名字
                                    var tempDevRoomName = tempDevRoom.Name;
                                    //获取楼层的名字
                                    var tempDevFloorName = Common.Config.Instance.Home.GetFloorNameById(tempDevFloorId);
                                    var tempDevFloorName = HdlResidenceLogic.Current.GetFloorNameById(tempDevFloorId);
                                    if (string.IsNullOrEmpty(tempDevFloorName))
                                    {
                                        if (string.IsNullOrEmpty(tempDevRoomName))
@@ -552,9 +552,9 @@
                    var btnFloorRoomName = rowLayout.frameTable.AddBottomView(btnFloorRoomNameText, 800);
                    rowLayout.frameTable.AddBottomLine();
                    var btnDel = rowLayout.AddDeleteControl();
                    btnDel.ButtonClickEvent += async (sender, e) =>
                    {
                        RemoveTargets(bindDevice, btnDel);
                    btnDel.ButtonClickEvent += (sender, e) =>
                    {

                        RemoveTargets(bindDevice, btnDel);

                    };
                    #endregion
                }
@@ -570,7 +570,7 @@
        {
            var modeRowLayout = new RowLayoutControl(midVerticalRefreshLayout.rowSpace / 2);
            modeRowLayout.BackgroundColor = ZigbeeColor.Current.XMWhite;
            midVerticalRefreshLayout.AddChidrenRow(modeRowLayout);
            midVerticalRefreshLayout.AddChidren2(modeRowLayout);
            modeRowLayout.frameTable.UseClickStatu = false;
            modeRowLayout.frameTable.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.keyMode), 400);
            var btnKeyModeTipText = "";
@@ -1188,4 +1188,3 @@
        }
    }
}