@flashist/appframework 0.0.285 → 0.0.287
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.
- package/app/data/local-storage/IAppModelLocalStorageVO.d.ts +1 -1
- package/app/data/state/AppModuleState.d.ts +1 -1
- package/app/data/state/AppModuleState.js +1 -1
- package/app/data/state/AppModuleState.js.map +1 -1
- package/app/managers/AppManager.js +9 -12
- package/app/managers/AppManager.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
export interface IAppModelLocalStorageVO {
|
|
2
2
|
appLaunchesCount: number;
|
|
3
3
|
totalUsageDuration: number;
|
|
4
|
-
|
|
4
|
+
curLaunchTimestamp: number;
|
|
5
5
|
prevLaunchTimestamp: number;
|
|
6
6
|
appDaysLaunchesCount: number;
|
|
7
7
|
appDaysLaunchesCount_consequent_withMaxBreaks_Day1: number;
|
|
@@ -2,7 +2,7 @@ export const AppModuleInitialState = {
|
|
|
2
2
|
app: {
|
|
3
3
|
debug: false,
|
|
4
4
|
// The timestamp of the current launching date
|
|
5
|
-
|
|
5
|
+
curLaunchTimestamp: 0,
|
|
6
6
|
// curLaunchTimestamp: 0,
|
|
7
7
|
// The last previous timestamp of the current launching date
|
|
8
8
|
prevLaunchTimestamp: 0,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AppModuleState.js","sourceRoot":"","sources":["../../../../src/app/data/state/AppModuleState.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,qBAAqB,GAAG;IACjC,GAAG,EAAE;QACD,KAAK,EAAE,KAAK;QAEZ,8CAA8C;QAC9C,
|
|
1
|
+
{"version":3,"file":"AppModuleState.js","sourceRoot":"","sources":["../../../../src/app/data/state/AppModuleState.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,qBAAqB,GAAG;IACjC,GAAG,EAAE;QACD,KAAK,EAAE,KAAK;QAEZ,8CAA8C;QAC9C,kBAAkB,EAAE,CAAC;QACrB,yBAAyB;QACzB,4DAA4D;QAC5D,mBAAmB,EAAE,CAAC;QAEtB,gBAAgB,EAAE,CAAC;QAEnB,6DAA6D;QAC7D,oBAAoB,EAAE,CAAC;QACvB,6DAA6D;QAC7D,iDAAiD;QACjD,EAAE;QACF,SAAS;QACT,qEAAqE;QACrE,4DAA4D;QAC5D,+CAA+C;QAC/C,iDAAiD;QACjD,EAAE;QACF,mDAAmD;QACnD,6CAA6C;QAC7C,EAAE;QACF,iDAAiD;QACjD,wDAAwD;QACxD,EAAE;QACF,gDAAgD;QAChD,oDAAoD;QACpD,kDAAkD,EAAE,CAAC;QACrD,kDAAkD,EAAE,CAAC;QACrD,kDAAkD,EAAE,CAAC;QACrD,mEAAmE;QACnE,6DAA6D;QAC7D,qCAAqC;QACrC,uEAAuE;QACvE,kDAAkD;QAClD,8CAA8C;QAC9C,uEAAuE;QACvE,kDAAkD;QAClD,8CAA8C;QAE9C,eAAe,EAAE,CAAC;QAElB,kBAAkB,EAAE,CAAC;QACrB,6BAA6B,EAAE,CAAC;QAEhC,MAAM,EAAE;YACJ,OAAO,EAAE,IAAI;YACb,UAAU,EAAE,IAAI;YAChB,KAAK,EAAE,IAAI;YACX,gBAAgB;YAChB,gBAAgB,EAAE,IAAI;YACtB,mBAAmB;YACnB,QAAQ,EAAE;gBACN,CAAC,EAAE,CAAC;gBACJ,CAAC,EAAE,CAAC;gBACJ,KAAK,EAAE,IAAI;gBACX,MAAM,EAAE,IAAI;aACF;SACD;KACpB;CACJ,CAAC"}
|
|
@@ -13,7 +13,7 @@ export class AppManager extends BaseAppManager {
|
|
|
13
13
|
this.applyStorageData(appModelStorageData);
|
|
14
14
|
// Make sure the prev session start time is updated
|
|
15
15
|
appStateStorage().change()("app", {
|
|
16
|
-
prevLaunchTimestamp: this.appState.app.
|
|
16
|
+
prevLaunchTimestamp: this.appState.app.curLaunchTimestamp
|
|
17
17
|
});
|
|
18
18
|
// // Increase app launch counter
|
|
19
19
|
// this.appState.app.appLaunchesCount++;
|
|
@@ -26,7 +26,7 @@ export class AppManager extends BaseAppManager {
|
|
|
26
26
|
}
|
|
27
27
|
appStateStorage().change()("app", {
|
|
28
28
|
prevSessionTotalUsageDuration: this.appState.app.totalUsageDuration,
|
|
29
|
-
|
|
29
|
+
curLaunchTimestamp: curLaunchStartTimeFirstValue,
|
|
30
30
|
appLaunchesCount: this.appState.app.appLaunchesCount + 1
|
|
31
31
|
});
|
|
32
32
|
// Days Launches
|
|
@@ -34,22 +34,22 @@ export class AppManager extends BaseAppManager {
|
|
|
34
34
|
//
|
|
35
35
|
if (this.appState.app.prevLaunchTimestamp) {
|
|
36
36
|
//
|
|
37
|
-
let
|
|
37
|
+
let curPrevDaysNumberDelta = 0;
|
|
38
38
|
//
|
|
39
39
|
let curPrevDatesDelta = curDateTimestamp - this.appState.app.prevLaunchTimestamp;
|
|
40
40
|
let fullDaysDelta = Math.floor(curPrevDatesDelta / DateSettings.MS_IN_DAY);
|
|
41
41
|
let curPrevDatesDeltaLeftoverFromFullDay = curPrevDatesDelta % DateSettings.MS_IN_DAY;
|
|
42
42
|
//
|
|
43
|
-
|
|
43
|
+
curPrevDaysNumberDelta = fullDaysDelta;
|
|
44
44
|
//
|
|
45
45
|
let prevDateTimestampTillNextDay = this.appState.app.prevLaunchTimestamp % DateSettings.MS_IN_DAY;
|
|
46
46
|
// If the leftover from the cur-prev dates is equal or greater,
|
|
47
47
|
// than the leftover 'till the next day for the prev date,
|
|
48
48
|
// it means, that there is 1 additional day difference between the dates
|
|
49
49
|
if (curPrevDatesDeltaLeftoverFromFullDay >= prevDateTimestampTillNextDay) {
|
|
50
|
-
|
|
50
|
+
curPrevDaysNumberDelta += 1;
|
|
51
51
|
}
|
|
52
|
-
if (
|
|
52
|
+
if (curPrevDaysNumberDelta > 0) {
|
|
53
53
|
appStateStorage().change()("app", {
|
|
54
54
|
appDaysLaunchesCount: this.appState.app.appDaysLaunchesCount + 1
|
|
55
55
|
});
|
|
@@ -103,7 +103,7 @@ export class AppManager extends BaseAppManager {
|
|
|
103
103
|
1000 * 60);
|
|
104
104
|
}
|
|
105
105
|
updateUsageTime() {
|
|
106
|
-
let sessionTimeDelta = Date.now() - this.appState.app.
|
|
106
|
+
let sessionTimeDelta = Date.now() - this.appState.app.curLaunchTimestamp;
|
|
107
107
|
// this.appState.app.totalUsageDuration = this.appState.app.prevSessionTotalUsageDuration + sessionTimeDelta;
|
|
108
108
|
appStateStorage().change()("app", {
|
|
109
109
|
sessionDuration: sessionTimeDelta,
|
|
@@ -117,10 +117,7 @@ export class AppManager extends BaseAppManager {
|
|
|
117
117
|
}
|
|
118
118
|
// this.appState.app.appLaunchesCount = data.appLaunchesCount;
|
|
119
119
|
// this.appState.app.totalUsageDuration = data.totalUsageDuration;
|
|
120
|
-
appStateStorage().change()("app", {
|
|
121
|
-
appLaunchesCount: data.appLaunchesCount,
|
|
122
|
-
totalUsageDuration: data.totalUsageDuration
|
|
123
|
-
});
|
|
120
|
+
appStateStorage().change()("app", Object.assign({}, data));
|
|
124
121
|
}
|
|
125
122
|
updateStorageData() {
|
|
126
123
|
const storageData = this.generateStorageData();
|
|
@@ -130,7 +127,7 @@ export class AppManager extends BaseAppManager {
|
|
|
130
127
|
return {
|
|
131
128
|
appLaunchesCount: this.appState.app.appLaunchesCount,
|
|
132
129
|
totalUsageDuration: this.appState.app.totalUsageDuration,
|
|
133
|
-
|
|
130
|
+
curLaunchTimestamp: this.appState.app.curLaunchTimestamp,
|
|
134
131
|
prevLaunchTimestamp: this.appState.app.prevLaunchTimestamp,
|
|
135
132
|
appDaysLaunchesCount: this.appState.app.appDaysLaunchesCount,
|
|
136
133
|
appDaysLaunchesCount_consequent_withMaxBreaks_Day1: this.appState.app.appDaysLaunchesCount_consequent_withMaxBreaks_Day1,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AppManager.js","sourceRoot":"","sources":["../../../src/app/managers/AppManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,kDAAkD,CAAC;AACvF,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAE7D,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAG7C,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAGvD,MAAM,OAAO,UAAW,SAAQ,cAAc;IAQhC,YAAY,CAAC,GAAG,IAAI;QAC1B,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAEzB,IAAI,CAAC,cAAc,GAAG,WAAW,CAAC,mBAAmB,CAAC,CAAC;QAEvD,IAAI,CAAC,QAAQ,GAAG,eAAe,EAAE,CAAC,QAAQ,EAAkB,CAAC;QAC7D,MAAM,mBAAmB,GAA4B,IAAI,CAAC,cAAc,CAAC,QAAQ,CAA0B,WAAW,CAAC,cAAc,CAAC,CAAC;QACvI,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,CAAC;QAE3C,mDAAmD;QACnD,eAAe,EAAE,CAAC,MAAM,EAAkB,CACtC,KAAK,EACL;YACI,mBAAmB,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"AppManager.js","sourceRoot":"","sources":["../../../src/app/managers/AppManager.ts"],"names":[],"mappings":"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"}
|