mirror of
https://gitee.com/willfree/minoaClientWindows_gradle.git
synced 2026-06-03 08:16:56 +08:00
通知部分进行实时刷新时,为了保证刚发布的通知在列表最顶端,由原来的增加通知到数据结构,转变为重新请求所有通知
This commit is contained in:
Generated
+94
-71
@@ -8,7 +8,8 @@
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="f2ca1002-1ec5-49f3-ab6f-fb7dec9c9e4d" name="Default Changelist" comment="">
|
||||
<change beforePath="$PROJECT_DIR$/ndn/pib.db" beforeDir="false" afterPath="$PROJECT_DIR$/ndn/pib.db" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/cn/minoa/view/mine/MyEmailController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/minoa/view/mine/MyEmailController.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/cn/minoa/MainApp.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/minoa/MainApp.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/cn/minoa/view/login/LoginOverviewController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/minoa/view/login/LoginOverviewController.java" afterDir="false" />
|
||||
</list>
|
||||
<ignored path="$PROJECT_DIR$/out/" />
|
||||
<ignored path="$PROJECT_DIR$/.gradle/" />
|
||||
@@ -101,7 +102,7 @@
|
||||
<entry key="css" value="14" />
|
||||
<entry key="fxml" value="20" />
|
||||
<entry key="gradle" value="5" />
|
||||
<entry key="java" value="158" />
|
||||
<entry key="java" value="161" />
|
||||
<entry key="png" value="4" />
|
||||
<entry key="txt" value="2" />
|
||||
<entry key="xml" value="1" />
|
||||
@@ -113,7 +114,7 @@
|
||||
<entry key="CSS" value="14" />
|
||||
<entry key="Groovy" value="5" />
|
||||
<entry key="Image" value="4" />
|
||||
<entry key="JAVA" value="158" />
|
||||
<entry key="JAVA" value="161" />
|
||||
<entry key="Manifest" value="1" />
|
||||
<entry key="PLAIN_TEXT" value="2" />
|
||||
<entry key="XML" value="21" />
|
||||
@@ -124,14 +125,14 @@
|
||||
<entry key="MF" value="92" />
|
||||
<entry key="fxml" value="4" />
|
||||
<entry key="gradle" value="366" />
|
||||
<entry key="java" value="11381" />
|
||||
<entry key="java" value="11483" />
|
||||
<entry key="txt" value="89" />
|
||||
</counts>
|
||||
</usages-collector>
|
||||
<usages-collector id="statistics.file.types.edit">
|
||||
<counts>
|
||||
<entry key="Groovy" value="366" />
|
||||
<entry key="JAVA" value="11381" />
|
||||
<entry key="JAVA" value="11483" />
|
||||
<entry key="Manifest" value="92" />
|
||||
<entry key="PLAIN_TEXT" value="89" />
|
||||
<entry key="XML" value="4" />
|
||||
@@ -144,11 +145,11 @@
|
||||
</component>
|
||||
<component name="FileEditorManager">
|
||||
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<file pinned="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/cn/minoa/MainApp.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="229">
|
||||
<caret line="237" column="65" lean-forward="true" selection-start-line="237" selection-start-column="65" selection-end-line="237" selection-end-column="65" />
|
||||
<state relative-caret-position="100">
|
||||
<caret line="340" column="57" selection-start-line="340" selection-start-column="57" selection-end-line="340" selection-end-column="57" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
<element signature="e#6678#6679#0" expanded="true" />
|
||||
@@ -164,6 +165,28 @@
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/cn/minoa/view/mine/MyNoticeController.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="27">
|
||||
<caret line="51" column="21" lean-forward="true" selection-start-line="51" selection-start-column="21" selection-end-line="51" selection-end-column="21" />
|
||||
<folding>
|
||||
<element signature="e#484#973#0" expanded="true" />
|
||||
<element signature="e#972#973#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/cn/minoa/view/mine/NewFolderDialogController.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="125">
|
||||
<caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/cn/minoa/dataRequestInterface/MinoaDataAPI.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
@@ -181,8 +204,8 @@
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/cn/minoa/view/login/LoginOverviewController.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="50">
|
||||
<caret line="655" column="30" lean-forward="true" selection-start-line="655" selection-start-column="30" selection-end-line="655" selection-end-column="30" />
|
||||
<state relative-caret-position="290">
|
||||
<caret line="581" column="22" selection-start-line="581" selection-start-column="22" selection-end-line="581" selection-end-column="22" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
@@ -190,11 +213,11 @@
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="true">
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/cn/minoa/view/mine/MyEmailController.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="98">
|
||||
<caret line="355" column="45" lean-forward="true" selection-start-line="355" selection-start-column="45" selection-end-line="355" selection-end-column="45" />
|
||||
<state relative-caret-position="131">
|
||||
<caret line="380" column="24" lean-forward="true" selection-start-line="380" selection-start-column="24" selection-end-line="380" selection-end-column="24" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
@@ -239,11 +262,11 @@
|
||||
<find>GetNewN</find>
|
||||
<find>初始化</find>
|
||||
<find>详细信息</find>
|
||||
<find>通知</find>
|
||||
<find>201</find>
|
||||
<find>getReim</find>
|
||||
<find>getDataSlice</find>
|
||||
<find>6</find>
|
||||
<find>通知</find>
|
||||
</findStrings>
|
||||
</component>
|
||||
<component name="Git.Settings">
|
||||
@@ -699,11 +722,11 @@
|
||||
<option value="$PROJECT_DIR$/src/main/java/cn/minoa/model/SingleNotice.java" />
|
||||
<option value="$PROJECT_DIR$/src/main/java/cn/minoa/view/mine/WrittenNoticeController.java" />
|
||||
<option value="$PROJECT_DIR$/src/main/java/cn/minoa/dataRequestInterface/MinoaDataAPI.java" />
|
||||
<option value="$PROJECT_DIR$/src/main/java/cn/minoa/view/login/LoginOverviewController.java" />
|
||||
<option value="$PROJECT_DIR$/src/main/java/cn/minoa/MainApp.java" />
|
||||
<option value="$PROJECT_DIR$/src/main/java/cn/minoa/view/home/ReimbursementApplyController.java" />
|
||||
<option value="$PROJECT_DIR$/src/main/java/cn/minoa/view/home/ReimbursementDealController.java" />
|
||||
<option value="$PROJECT_DIR$/src/main/java/cn/minoa/view/mine/MyEmailController.java" />
|
||||
<option value="$PROJECT_DIR$/src/main/java/cn/minoa/view/login/LoginOverviewController.java" />
|
||||
<option value="$PROJECT_DIR$/src/main/java/cn/minoa/MainApp.java" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
@@ -820,7 +843,7 @@
|
||||
<item name="java" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="minoa" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="view" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="mine" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="login" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="Demo_gradle_javafx11_01" type="b2602c69:ProjectViewProjectNode" />
|
||||
@@ -840,7 +863,7 @@
|
||||
<component name="PropertiesComponent">
|
||||
<property name="SearchEverywhereHistoryKey" value="reformat	ACTION	ReformatCode file	ACTION	ChangeFileEncodingAction" />
|
||||
<property name="WebServerToolWindowFactoryState" value="false" />
|
||||
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1583249418823" />
|
||||
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1583250560541" />
|
||||
<property name="last_opened_file_path" value="$PROJECT_DIR$/lib/sqlite-jdbc-3.30.1.jar" />
|
||||
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
|
||||
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
|
||||
@@ -999,18 +1022,18 @@
|
||||
<workItem from="1582199584649" duration="14818000" />
|
||||
<workItem from="1582298070552" duration="40738000" />
|
||||
<workItem from="1582631725284" duration="1253000" />
|
||||
<workItem from="1583216488193" duration="21579000" />
|
||||
<workItem from="1583216488193" duration="22843000" />
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TimeTrackingManager">
|
||||
<option name="totallyTimeSpent" value="138793000" />
|
||||
<option name="totallyTimeSpent" value="140057000" />
|
||||
</component>
|
||||
<component name="ToolWindowManager">
|
||||
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
|
||||
<editor active="true" />
|
||||
<layout>
|
||||
<window_info content_ui="combo" id="Project" order="0" sideWeight="0.4977029" visible="true" weight="0.27836612" />
|
||||
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.4977029" visible="true" weight="0.27836612" />
|
||||
<window_info id="Structure" order="1" sideWeight="0.5022971" side_tool="true" weight="0.30542988" />
|
||||
<window_info id="Designer" order="2" />
|
||||
<window_info id="Image Layers" order="3" />
|
||||
@@ -1019,7 +1042,7 @@
|
||||
<window_info id="Capture Tool" order="6" />
|
||||
<window_info anchor="bottom" id="Message" order="0" />
|
||||
<window_info anchor="bottom" id="Find" order="1" weight="0.32874617" />
|
||||
<window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.37438422" />
|
||||
<window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.113300495" />
|
||||
<window_info anchor="bottom" id="Debug" order="3" weight="0.39901477" />
|
||||
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
|
||||
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
|
||||
@@ -1031,13 +1054,13 @@
|
||||
<window_info anchor="bottom" id="Database Changes" order="11" show_stripe_button="false" />
|
||||
<window_info anchor="bottom" id="Version Control" order="12" />
|
||||
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
|
||||
<window_info anchor="right" id="Ant Build" order="1" weight="0.14630468" />
|
||||
<window_info anchor="right" id="Ant Build" order="1" visible="true" weight="0.14599092" />
|
||||
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
|
||||
<window_info anchor="right" id="Palette" order="3" />
|
||||
<window_info anchor="right" id="Capture Analysis" order="4" />
|
||||
<window_info anchor="right" id="Maven Projects" order="5" weight="0.3295626" />
|
||||
<window_info anchor="right" id="Gradle" order="6" weight="0.23600605" />
|
||||
<window_info anchor="right" id="Database" order="7" weight="0.3295626" />
|
||||
<window_info anchor="right" id="Database" order="7" weight="0.3290469" />
|
||||
<window_info anchor="right" id="Palette	" order="8" />
|
||||
<window_info anchor="right" id="Theme Preview" order="9" />
|
||||
</layout>
|
||||
@@ -1166,13 +1189,6 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/cn/minoa/view/mine/NewFolderDialogController.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="925">
|
||||
<caret line="44" selection-start-line="44" selection-end-line="44" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/cn/minoa/model/Reimbursement.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state>
|
||||
@@ -1388,24 +1404,6 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/cn/minoa/view/mine/WrittenNoticeController.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="197">
|
||||
<caret line="72" column="26" lean-forward="true" selection-start-line="72" selection-start-column="26" selection-end-line="72" selection-end-column="26" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/cn/minoa/view/mine/MyNoticeController.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="77">
|
||||
<caret line="53" column="45" lean-forward="true" selection-start-line="53" selection-start-column="45" selection-end-line="53" selection-end-column="45" />
|
||||
<folding>
|
||||
<element signature="e#484#973#0" expanded="true" />
|
||||
<element signature="e#972#973#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/cn/minoa/view/home/ReimbursementDealController.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="125">
|
||||
@@ -1439,10 +1437,55 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/cn/minoa/view/mine/MyEmailController.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="131">
|
||||
<caret line="380" column="24" lean-forward="true" selection-start-line="380" selection-start-column="24" selection-end-line="380" selection-end-column="24" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/cn/minoa/view/mine/NewFolderDialogController.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="125">
|
||||
<caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/cn/minoa/view/login/LoginOverviewController.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="290">
|
||||
<caret line="581" column="22" selection-start-line="581" selection-start-column="22" selection-end-line="581" selection-end-column="22" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/cn/minoa/view/mine/WrittenNoticeController.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="25">
|
||||
<caret line="43" column="30" lean-forward="true" selection-start-line="43" selection-start-column="30" selection-end-line="43" selection-end-column="30" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/cn/minoa/view/mine/MyNoticeController.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="27">
|
||||
<caret line="51" column="21" lean-forward="true" selection-start-line="51" selection-start-column="21" selection-end-line="51" selection-end-column="21" />
|
||||
<folding>
|
||||
<element signature="e#484#973#0" expanded="true" />
|
||||
<element signature="e#972#973#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/cn/minoa/MainApp.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="229">
|
||||
<caret line="237" column="65" lean-forward="true" selection-start-line="237" selection-start-column="65" selection-end-line="237" selection-end-column="65" />
|
||||
<state relative-caret-position="100">
|
||||
<caret line="340" column="57" selection-start-line="340" selection-start-column="57" selection-end-line="340" selection-end-column="57" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
<element signature="e#6678#6679#0" expanded="true" />
|
||||
@@ -1457,26 +1500,6 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/cn/minoa/view/login/LoginOverviewController.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="50">
|
||||
<caret line="655" column="30" lean-forward="true" selection-start-line="655" selection-start-column="30" selection-end-line="655" selection-end-column="30" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/cn/minoa/view/mine/MyEmailController.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="98">
|
||||
<caret line="355" column="45" lean-forward="true" selection-start-line="355" selection-start-column="45" selection-end-line="355" selection-end-column="45" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</component>
|
||||
<component name="masterDetails">
|
||||
<states>
|
||||
|
||||
BIN
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -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();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -577,6 +577,12 @@ public class LoginOverviewController {
|
||||
return jsonObject.toString();
|
||||
}
|
||||
|
||||
//重新加载所有通知列表信息
|
||||
public void reloadNoticeList(){
|
||||
mainApp.noticeList.clear();
|
||||
updateNoticeList();
|
||||
}
|
||||
|
||||
// 初始化通知列表信息
|
||||
private void updateNoticeList() {
|
||||
// 发送数据请求
|
||||
|
||||
Reference in New Issue
Block a user