From ebd346ff4ad99ff447c8a68427f356985a7bd2f5 Mon Sep 17 00:00:00 2001
From: azw <vcl_delphi@126.com>
Date: Sun, 29 Oct 2023 10:14:40 +0000
Subject: [PATCH] 1

---
 server/notifyserver/src/app/app.rs | 22 +++++++++++++++++++++-
 server/notifyserver/src/main.rs    |  5 +----
 server/notifyserver/src/mod.rs     |  2 --
 third_party/r9                     |  2 +-
 4 files changed, 23 insertions(+), 8 deletions(-)
 delete mode 100644 server/notifyserver/src/mod.rs

diff --git a/server/notifyserver/src/app/app.rs b/server/notifyserver/src/app/app.rs
index aef15b4..bdf3248 100644
--- a/server/notifyserver/src/app/app.rs
+++ b/server/notifyserver/src/app/app.rs
@@ -1,5 +1,14 @@
-pub struct UserApp {
+use std::rc::{Rc, Weak};
+use std::cell::RefCell;
+use r9_macro::SharedFromSelf;
+use r9_macro_derive::SharedFromSelf;
+//use r9_macro::Singleton;
+use r9_macro_derive::Singleton;
 
+#[derive(SharedFromSelf)]
+#[derive(Singleton)]
+pub struct UserApp {
+    _self_wp: Weak::<RefCell::<Self>>,
 }
 
 impl f9::app::UserApp for UserApp {
@@ -21,3 +30,14 @@ impl f9::app::UserApp for UserApp {
     }
 
 }
+
+impl UserApp {
+
+    pub fn new() -> Self {
+        let p = UserApp{
+            _self_wp: Default::default(),
+        };
+        return p;
+    }
+
+}
diff --git a/server/notifyserver/src/main.rs b/server/notifyserver/src/main.rs
index 1935dfc..15670f1 100755
--- a/server/notifyserver/src/main.rs
+++ b/server/notifyserver/src/main.rs
@@ -1,13 +1,10 @@
-use std::rc::Rc;
-use std::cell::RefCell;
 use f9::app::App;
 
 pub mod app;
 
 fn main() {
     App::instance().borrow_mut().init(
-        Rc::new(RefCell::new(
-            crate::app::app::UserApp{}))
+            crate::app::app::UserApp::instance()
     );
     App::instance().borrow_mut().run();
     App::instance().borrow_mut().uninit();
diff --git a/server/notifyserver/src/mod.rs b/server/notifyserver/src/mod.rs
deleted file mode 100644
index 1f1f367..0000000
--- a/server/notifyserver/src/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-pub mod app;
-asjfklsd
diff --git a/third_party/r9 b/third_party/r9
index 07d53fe..c22ee46 160000
--- a/third_party/r9
+++ b/third_party/r9
@@ -1 +1 @@
-Subproject commit 07d53fe46e2580b2d9413e00404f10bdd755efb5
+Subproject commit c22ee46299d1030ff745d604100d5067c769e510