質問編集履歴
2
DialogBaseの引数を使用するよう修正
title
CHANGED
|
File without changes
|
body
CHANGED
|
@@ -47,7 +47,7 @@
|
|
|
47
47
|
window.rootViewController?.view.removeFromSuperview()
|
|
48
48
|
window.rootViewController = nil
|
|
49
49
|
|
|
50
|
-
objc_setAssociatedObject(UIApplication.shared,
|
|
50
|
+
objc_setAssociatedObject(UIApplication.shared, key, nil, .OBJC_ASSOCIATION_RETAIN_NONATOMIC)
|
|
51
51
|
|
|
52
52
|
// 一つ前のwindowを表示する
|
|
53
53
|
let windows = UIApplication.shared.windows
|
1
記載ミスがありましたので修正しました（DialogBaseのcloseメソッドで使用しているkeyが変数を使用していなかった）
title
CHANGED
|
File without changes
|
body
CHANGED
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
|
|
37
37
|
func close(key: UnsafeRawPointer) {
|
|
38
38
|
// ここでobjectがnilになってしまう
|
|
39
|
-
guard let window = objc_getAssociatedObject(UIApplication.shared,
|
|
39
|
+
guard let window = objc_getAssociatedObject(UIApplication.shared, key) as? UIWindow else {
|
|
40
40
|
return
|
|
41
41
|
}
|
|
42
42
|
|
|
@@ -67,8 +67,8 @@
|
|
|
67
67
|
static let getInstance: CustomDialog = CustomDialog()
|
|
68
68
|
|
|
69
69
|
func show() {
|
|
70
|
-
let viewController = UIStoryboard(name: "CustomDialog", bundle: nil).instantiateInitialViewController
|
|
70
|
+
let viewController = UIStoryboard(name: "CustomDialog", bundle: nil).instantiateInitialViewController()
|
|
71
|
-
super.show(viewController: viewController, key: Utility.bridge(obj: self))
|
|
71
|
+
super.show(viewController: viewController!, key: Utility.bridge(obj: self))
|
|
72
72
|
}
|
|
73
73
|
|
|
74
74
|
func close() {
|