Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-14 a7adf98ff4ac801342853b1f9231cc1ab5acebf3

 ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddScene.cs

@@ -347,6 +347,12 @@

                EventHandler<MouseEventArgs> roomclick = (sender, e) =>
                {

                    clickTag = "no";
                    tempScene = null;
                    clickbutton = null;
                    clickbutton = new Button();

                    roombjButton.IsSelected = false;
                    roombjButton = roombjBtn;
                    roombjBtn.IsSelected = true;