Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc

WJC

2019-12-03 f8b647c263f068babb8efcc19ff4e74026a4bd28

 ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs

old mode 100755
new mode 100644
@@ -139,7 +139,7 @@
            bottomFrameLayout.AddChidren(btnFinifh);
            #endregion

            #region 数据处理  
            #region 数据处理
            //获取楼层
            dicFloor = Common.Room.CurrentRoom.GetFloorSortList();
            currentKey.currentSelectFloorId = BindInfo.GetCurrentSelectFloorId();
@@ -207,7 +207,7 @@
                                myTip.CloseTime = 2;
                                myTip.Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime);
                                myTip.Show(Common.CommonPage.Instance);
                             });
                            });
                        }
                    }

@@ -537,7 +537,7 @@
                    Y = Application.GetMinRealAverage(46),
                    Width = Application.GetMinRealAverage(81),
                    Height = Application.GetMinRealAverage(81),
                    UnSelectedImagePath = "SceneIcon/4.png",// scene.IconPath,
                    UnSelectedImagePath = scene.IconPath,
                };
                rowLayout.AddChidren(devicePic);