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

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

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

@@ -45,6 +45,7 @@
                Height = Application.GetRealHeight(69),
                Y = Application.GetRealHeight(92),
                TextID = MyInternationalizationString.addscene,
                IsBold = true,
            };
            topRowLayout.AddChidren(titleName);

@@ -150,9 +151,9 @@
            {
                if (clickTag == "no" || tempScene == null)
                {
                    var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
                                              Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
                                              Language.StringByID(MyInternationalizationString.complete));
                    var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
           Language.StringByID(MyInternationalizationString.scenetip),
           Language.StringByID(MyInternationalizationString.confrim));
                    alert.Show();
                    return;
                }