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

WJC

2019-11-13 a4d525d08da7b6fb985b0069c539c11b06306a9b

 ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs

@@ -275,7 +275,7 @@
                };
                functionSceneBodyView.AddChidren(deviceListScrolView);

                


                tempFunctionTypeBtn = new FunctionButton();

@@ -299,7 +299,7 @@


                    functionTypeIMG.ClickBtn.MouseUpEventHandler += ShowSameTypeFunction;
                    


                    if (deviceType == Shared.Common.Room.AllRoomDeviceUIList[0].CommonDevice.Type)
                    {