合并了代码

黄学彪

2019-12-31 737c036a39176fd2085ce82b7c60391da8cb508c

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

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