poi-plugin-milk 1.0.7 → 1.0.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/.idea/workspace.xml +27 -25
  2. package/index.js +8 -5
  3. package/package.json +1 -1
  4. package/parts/fleet-list.js +17 -1
package/.idea/workspace.xml CHANGED
@@ -24,17 +24,17 @@
24
24
  <file leaf-file-name="fleet-list.js" pinned="false" current-in-tab="false">
25
25
  <entry file="file://$PROJECT_DIR$/parts/fleet-list.js">
26
26
  <provider selected="true" editor-type-id="text-editor">
27
- <state relative-caret-position="955">
28
- <caret line="203" column="8" lean-forward="true" selection-start-line="203" selection-start-column="8" selection-end-line="203" selection-end-column="8" />
27
+ <state relative-caret-position="729">
28
+ <caret line="60" column="39" lean-forward="true" selection-start-line="60" selection-start-column="39" selection-end-line="60" selection-end-column="39" />
29
29
  <folding />
30
30
  </state>
31
31
  </provider>
32
32
  </entry>
33
33
  </file>
34
- <file leaf-file-name="index.js" pinned="false" current-in-tab="true">
34
+ <file leaf-file-name="index.js" pinned="false" current-in-tab="false">
35
35
  <entry file="file://$PROJECT_DIR$/index.js">
36
36
  <provider selected="true" editor-type-id="text-editor">
37
- <state relative-caret-position="1080">
37
+ <state relative-caret-position="834">
38
38
  <caret line="104" column="10" lean-forward="false" selection-start-line="104" selection-start-column="10" selection-end-line="104" selection-end-column="10" />
39
39
  <folding />
40
40
  </state>
@@ -84,7 +84,7 @@
84
84
  </provider>
85
85
  </entry>
86
86
  </file>
87
- <file leaf-file-name="package.json" pinned="false" current-in-tab="false">
87
+ <file leaf-file-name="package.json" pinned="false" current-in-tab="true">
88
88
  <entry file="file://$PROJECT_DIR$/package.json">
89
89
  <provider selected="true" editor-type-id="text-editor">
90
90
  <state relative-caret-position="82">
@@ -97,7 +97,7 @@
97
97
  <file leaf-file-name="ship-row.js" pinned="false" current-in-tab="false">
98
98
  <entry file="file://$PROJECT_DIR$/parts/ship-row.js">
99
99
  <provider selected="true" editor-type-id="text-editor">
100
- <state relative-caret-position="893">
100
+ <state relative-caret-position="524">
101
101
  <caret line="65" column="42" lean-forward="false" selection-start-line="65" selection-start-column="42" selection-end-line="65" selection-end-column="42" />
102
102
  <folding />
103
103
  </state>
@@ -107,8 +107,8 @@
107
107
  <file leaf-file-name="functions.js" pinned="false" current-in-tab="false">
108
108
  <entry file="file://$PROJECT_DIR$/parts/functions.js">
109
109
  <provider selected="true" editor-type-id="text-editor">
110
- <state relative-caret-position="768">
111
- <caret line="24" column="87" lean-forward="false" selection-start-line="24" selection-start-column="73" selection-end-line="24" selection-end-column="87" />
110
+ <state relative-caret-position="246">
111
+ <caret line="5" column="156" lean-forward="false" selection-start-line="5" selection-start-column="156" selection-end-line="5" selection-end-column="156" />
112
112
  <folding />
113
113
  </state>
114
114
  </provider>
@@ -141,18 +141,20 @@
141
141
  <find>AKASHI_ID</find>
142
142
  <find>SRF_ID</find>
143
143
  <find>akashiFlagship</find>
144
+ <find>api_port</find>
144
145
  <find>expedReturnLock</find>
146
+ <find>lastRefresh</find>
145
147
  </findStrings>
146
148
  </component>
147
149
  <component name="IdeDocumentHistory">
148
150
  <option name="CHANGED_PATHS">
149
151
  <list>
150
152
  <option value="$PROJECT_DIR$/parts/functions.js" />
153
+ <option value="$PROJECT_DIR$/i18n/zh-CN.json" />
151
154
  <option value="$PROJECT_DIR$/parts/fleet-list.js" />
155
+ <option value="$PROJECT_DIR$/index.js" />
152
156
  <option value="$PROJECT_DIR$/parts/ship-row.js" />
153
- <option value="$PROJECT_DIR$/i18n/zh-CN.json" />
154
157
  <option value="$PROJECT_DIR$/package.json" />
155
- <option value="$PROJECT_DIR$/index.js" />
156
158
  </list>
157
159
  </option>
158
160
  </component>
@@ -277,12 +279,12 @@
277
279
  <updated>1764751942683</updated>
278
280
  <workItem from="1764751943836" duration="336000" />
279
281
  <workItem from="1764814660477" duration="9930000" />
280
- <workItem from="1764899367749" duration="2687000" />
282
+ <workItem from="1764899367749" duration="4964000" />
281
283
  </task>
282
284
  <servers />
283
285
  </component>
284
286
  <component name="TimeTrackingManager">
285
- <option name="totallyTimeSpent" value="12953000" />
287
+ <option name="totallyTimeSpent" value="15230000" />
286
288
  </component>
287
289
  <component name="ToolWindowManager">
288
290
  <frame x="140" y="22" width="3700" height="2138" extended-state="0" />
@@ -476,9 +478,17 @@
476
478
  </state>
477
479
  </provider>
478
480
  </entry>
481
+ <entry file="file://$PROJECT_DIR$/index.js">
482
+ <provider selected="true" editor-type-id="text-editor">
483
+ <state relative-caret-position="834">
484
+ <caret line="104" column="10" lean-forward="false" selection-start-line="104" selection-start-column="10" selection-end-line="104" selection-end-column="10" />
485
+ <folding />
486
+ </state>
487
+ </provider>
488
+ </entry>
479
489
  <entry file="file://$PROJECT_DIR$/parts/ship-row.js">
480
490
  <provider selected="true" editor-type-id="text-editor">
481
- <state relative-caret-position="893">
491
+ <state relative-caret-position="524">
482
492
  <caret line="65" column="42" lean-forward="false" selection-start-line="65" selection-start-column="42" selection-end-line="65" selection-end-column="42" />
483
493
  <folding />
484
494
  </state>
@@ -486,16 +496,16 @@
486
496
  </entry>
487
497
  <entry file="file://$PROJECT_DIR$/parts/fleet-list.js">
488
498
  <provider selected="true" editor-type-id="text-editor">
489
- <state relative-caret-position="955">
490
- <caret line="203" column="8" lean-forward="true" selection-start-line="203" selection-start-column="8" selection-end-line="203" selection-end-column="8" />
499
+ <state relative-caret-position="729">
500
+ <caret line="60" column="39" lean-forward="true" selection-start-line="60" selection-start-column="39" selection-end-line="60" selection-end-column="39" />
491
501
  <folding />
492
502
  </state>
493
503
  </provider>
494
504
  </entry>
495
505
  <entry file="file://$PROJECT_DIR$/parts/functions.js">
496
506
  <provider selected="true" editor-type-id="text-editor">
497
- <state relative-caret-position="768">
498
- <caret line="24" column="87" lean-forward="false" selection-start-line="24" selection-start-column="73" selection-end-line="24" selection-end-column="87" />
507
+ <state relative-caret-position="246">
508
+ <caret line="5" column="156" lean-forward="false" selection-start-line="5" selection-start-column="156" selection-end-line="5" selection-end-column="156" />
499
509
  <folding />
500
510
  </state>
501
511
  </provider>
@@ -508,13 +518,5 @@
508
518
  </state>
509
519
  </provider>
510
520
  </entry>
511
- <entry file="file://$PROJECT_DIR$/index.js">
512
- <provider selected="true" editor-type-id="text-editor">
513
- <state relative-caret-position="1080">
514
- <caret line="104" column="10" lean-forward="false" selection-start-line="104" selection-start-column="10" selection-end-line="104" selection-end-column="10" />
515
- <folding />
516
- </state>
517
- </provider>
518
- </entry>
519
521
  </component>
520
522
  </project>
package/index.js CHANGED
@@ -92,7 +92,7 @@ const fleetAkashiConv = (fleet, $ships, ships, equips, repairId) => {
92
92
  if(canRepair){
93
93
  repairStatus = 1;
94
94
  if(secondshipid==996
95
- // ||secondshipid==357 //没有野崎，用初月改测试
95
+ //||secondshipid==357 //没有野崎，用初月改测试
96
96
  ){
97
97
  repairStatus = 4;
98
98
  }
@@ -102,7 +102,7 @@ const fleetAkashiConv = (fleet, $ships, ships, equips, repairId) => {
102
102
  }
103
103
  }else{
104
104
  if(flagshipid==996||secondshipid==996
105
- // ||flagshipid==357||secondshipid==357 //没有野崎，用初月改测试
105
+ //||flagshipid==357||secondshipid==357 //没有野崎，用初月改测试
106
106
  ){
107
107
  repairStatus = 2;
108
108
  }
@@ -231,13 +231,16 @@ const switchPluginPath = exports.switchPluginPath = [{
231
231
  const repairId = repairs.map(dock => dock.api_ship_id);
232
232
 
233
233
  const result = fleets.map(fleet => fleetAkashiConv(fleet, $ships, ships, equips, repairId));
234
- return result.some(fleet =>
235
- ((fleet.canRepair ==1 )&& fleet.repairDetail.some(ship => ship.estimate > 0))
236
- ((fleet.canRepair ==2 || fleet.canRepair ==3 )&& fleet.repairDetail.some(ship => ship.cond < 54))
234
+ //console.log(result)
235
+ var ret = result.some(fleet =>
236
+ ((fleet.canRepair ==1 )&& fleet.repairDetail.some(ship => ship.estimate > 0)) ||
237
+ ((fleet.canRepair ==2 || fleet.canRepair ==3 )&& fleet.repairDetail.some(ship => ship.cond < 54)) ||
237
238
  ((fleet.canRepair ==4 || fleet.canRepair ==5 )&&
238
239
  (fleet.repairDetail.some(ship => ship.cond < 54) || fleet.repairDetail.some(ship => ship.estimate > 0))
239
240
  )
240
241
  );
242
+ //console.log('1111111111:'+ret);
243
+ return ret;
241
244
  }
242
245
  }, {
243
246
  path: '/kcsapi/api_req_mission/result',
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "poi-plugin-milk",
3
- "version": "1.0.7",
3
+ "version": "1.0.9",
4
4
  "description": "Anchorage repair plugin for poi",
5
5
  "main": "index.es",
6
6
  "repository": {
package/parts/fleet-list.js CHANGED
@@ -51,7 +51,23 @@ class FleetList extends _react.Component {
51
51
  const { timeElapsed, lastRefresh } = this.state;
52
52
  switch (path) {
53
53
  case '/kcsapi/api_port/port':
54
- if (timeElapsed >= _functions.AKASHI_INTERVAL / 1000 || lastRefresh === 0) {
54
+
55
+
56
+ const { fleet } = this.props;
57
+
58
+ var needtime = _functions.AKASHI_INTERVAL / 1000;
59
+ //console.log('can repair:'+fleet.canRepair);
60
+ if(fleet.canRepair==0){
61
+ needtime = _functions.AKASHI_INTERVAL / 1000;
62
+ }else if(fleet.canRepair==1){
63
+ needtime = _functions.AKASHI_INTERVAL / 1000;;
64
+ }else if(fleet.canRepair==2||fleet.canRepair==3){
65
+ needtime = 900;
66
+ }else if(fleet.canRepair==4||fleet.canRepair==5){
67
+ needtime = 900;
68
+ }
69
+
70
+ if (timeElapsed >= needtime || lastRefresh === 0) {
55
71
  this.setState({
56
72
  lastRefresh: Date.now(),
57
73
  timeElapsed: 0