diff --git a/.idea/workspace.xml b/.idea/workspace.xml index ad81ee4..b1ade1c 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -8,7 +8,8 @@ - + + @@ -101,7 +102,7 @@ - + @@ -113,7 +114,7 @@ - + @@ -124,14 +125,14 @@ - + - + @@ -144,11 +145,11 @@ - + - - + + @@ -164,6 +165,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -181,8 +204,8 @@ - - + + @@ -190,11 +213,11 @@ - + - - + + @@ -239,11 +262,11 @@ GetNewN 初始化 详细信息 - 通知 201 getReim getDataSlice 6 + 通知 @@ -699,11 +722,11 @@ @@ -820,7 +843,7 @@ - + @@ -840,7 +863,7 @@ - + @@ -999,18 +1022,18 @@ - + - - + @@ -1019,7 +1042,7 @@ - + @@ -1031,13 +1054,13 @@ - + - + @@ -1166,13 +1189,6 @@ - - - - - - - @@ -1388,24 +1404,6 @@ - - - - - - - - - - - - - - - - - - @@ -1439,10 +1437,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + @@ -1457,26 +1500,6 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/ndn/pib.db b/ndn/pib.db index 677c59f..b81da8b 100644 Binary files a/ndn/pib.db and b/ndn/pib.db differ diff --git a/out/production/classes/cn/minoa/MainApp$1.class b/out/production/classes/cn/minoa/MainApp$1.class index a633994..6230efe 100644 Binary files a/out/production/classes/cn/minoa/MainApp$1.class and b/out/production/classes/cn/minoa/MainApp$1.class differ diff --git a/out/production/classes/cn/minoa/MainApp.class b/out/production/classes/cn/minoa/MainApp.class index a9d24d0..b620ab3 100644 Binary files a/out/production/classes/cn/minoa/MainApp.class and b/out/production/classes/cn/minoa/MainApp.class differ diff --git a/out/production/classes/cn/minoa/view/login/LoginOverviewController.class b/out/production/classes/cn/minoa/view/login/LoginOverviewController.class index 18ef101..fa20960 100644 Binary files a/out/production/classes/cn/minoa/view/login/LoginOverviewController.class and b/out/production/classes/cn/minoa/view/login/LoginOverviewController.class differ diff --git a/src/main/java/cn/minoa/MainApp.java b/src/main/java/cn/minoa/MainApp.java index d8cdab8..38c24df 100644 --- a/src/main/java/cn/minoa/MainApp.java +++ b/src/main/java/cn/minoa/MainApp.java @@ -337,13 +337,15 @@ public class MainApp extends Application { Platform.runLater(() -> { if ((currentSecondPane.equals(SECOND_MINEPANE)) && (currentMainPane.equals(MAIN_NOTICEPANE))){ try { - this.noticeList.add(singleNotice); +// this.noticeList.add(singleNotice); + loginerController.reloadNoticeList(); this.reloadNoticeOverview(); } catch (IOException e) { e.printStackTrace(); } }else{ - this.noticeList.add(singleNotice); +// this.noticeList.add(singleNotice); + loginerController.reloadNoticeList(); } }); } diff --git a/src/main/java/cn/minoa/view/login/LoginOverviewController.java b/src/main/java/cn/minoa/view/login/LoginOverviewController.java index 7228417..4fde285 100644 --- a/src/main/java/cn/minoa/view/login/LoginOverviewController.java +++ b/src/main/java/cn/minoa/view/login/LoginOverviewController.java @@ -577,6 +577,12 @@ public class LoginOverviewController { return jsonObject.toString(); } + //重新加载所有通知列表信息 + public void reloadNoticeList(){ + mainApp.noticeList.clear(); + updateNoticeList(); + } + // 初始化通知列表信息 private void updateNoticeList() { // 发送数据请求