@norcy/react-native-toolkit 0.2.28 → 0.2.30

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 (14) hide show
  1. package/lib/commonjs/MessageModel.js +3 -18
  2. package/lib/commonjs/MessageModel.js.map +1 -1
  3. package/lib/commonjs/ReportUtil.js +13 -2
  4. package/lib/commonjs/ReportUtil.js.map +1 -1
  5. package/lib/module/MessageModel.js +3 -18
  6. package/lib/module/MessageModel.js.map +1 -1
  7. package/lib/module/ReportUtil.js +13 -2
  8. package/lib/module/ReportUtil.js.map +1 -1
  9. package/lib/typescript/MessageModel.d.ts.map +1 -1
  10. package/lib/typescript/ReportUtil.d.ts +1 -0
  11. package/lib/typescript/ReportUtil.d.ts.map +1 -1
  12. package/package.json +1 -1
  13. package/src/MessageModel.ts +3 -23
  14. package/src/ReportUtil.ts +13 -1
package/lib/commonjs/MessageModel.js CHANGED
@@ -147,10 +147,7 @@ const _fetchFromApi = () => {
147
147
  });
148
148
  const result = await response.json();
149
149
  if (result.messages && Array.isArray(result.messages)) {
150
- const items = result.messages.map(msg => ({
151
- toJSON: () => msg
152
- }));
153
- resolve(items);
150
+ resolve(result.messages);
154
151
  } else {
155
152
  reject(new Error('API 返回数据格式错误'));
156
153
  }
@@ -159,17 +156,6 @@ const _fetchFromApi = () => {
159
156
  }
160
157
  });
161
158
  };
162
- const _deduplicateMessages = items => {
163
- const map = new Map();
164
- items.forEach(item => {
165
- const json = _Tool.Tool.jsonify(item);
166
- const id = json.objectId;
167
- if (!map.has(id)) {
168
- map.set(id, item);
169
- }
170
- });
171
- return Array.from(map.values());
172
- };
173
159
  const MessageModel = exports.MessageModel = {
174
160
  init: customFilter => {
175
161
  _Notification.Notification.addListener('onVipRefresh', () => {
@@ -222,10 +208,9 @@ const MessageModel = exports.MessageModel = {
222
208
 
223
209
  // 只要有任一数据源成功（即使返回空数组），就标记为已完成
224
210
  if (hasSuccess) {
225
- const uniqueItems = _deduplicateMessages(allItems);
226
- console.log(`Message 抓取完毕，共 ${uniqueItems.length} 条`);
211
+ console.log(`Message 抓取完毕，共 ${allItems.length} 条`);
227
212
  isNetwordDataReady = true;
228
- OnlineItems = uniqueItems;
213
+ OnlineItems = allItems;
229
214
  _handleResponse(customFilter);
230
215
  } else {
231
216
  console.error('所有消息数据源获取失败');
package/lib/commonjs/MessageModel.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"names":["_reactNative","require","_ConfigDataModel","_Frequence","_LoginManager","_Notification","_PrefData","_Tool","_VersionManager","_VipManager","AV","EventEmitter","eventEmitter","MyMessages","_filterByVersion","items","ret","item","VersionManager","isValidVersion","minVer","maxVer","push","_handleReadMessages","__DEV__","readMsgs","PrefData","getValue","BuildInPrefs","Messages","includes","objectId","isRead","key","ConfigDataModel","get","hasNewAppVer","updatedAt","Date","toString","length","freConfig","limit","gap","FrequenceManager","canRun","configValue","_getConfigValue","lastTimestamp","isDataReady","isConfigStateReady","isNetwordDataReady","OnlineItems","_handleResponse","customFilter","isDanger","map","Tool","jsonify","sort","a","b","dateA","getTime","dateB","console","log","MessageModel","emitChange","_fetchFromLeanCloud","Promise","resolve","reject","query","Query","equalTo","Platform","OS","VipManager","isForeverVip","isVip","notEqualTo","userQuery","sizeEqualTo","userId","LoginManager","currentUser","AVUser","selectUserQuery","or","and","descending","find","then","catch","e","_fetchFromApi","vipStatus","response","fetch","ToolkitConfig","MessageApiUrl","method","headers","body","JSON","stringify","platform","result","json","messages","Array","isArray","msg","toJSON","Error","_deduplicateMessages","Map","forEach","id","has","set","from","values","exports","init","Notification","addListener","isAuto","promises","allSettled","results","allItems","hasSuccess","index","status","value","warn","reason","uniqueItems","error","getUnreadMessages","filter","getAllMessages","removeMessage","message","findIndex","splice","readIndex","indexOf","setValue","reset","markMessageRead","markFinish","emit","slice","addListenerOnce","callback","once","on","removeListener"],"sourceRoot":"../../src","sources":["MessageModel.ts"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["_reactNative","require","_ConfigDataModel","_Frequence","_LoginManager","_Notification","_PrefData","_Tool","_VersionManager","_VipManager","AV","EventEmitter","eventEmitter","MyMessages","_filterByVersion","items","ret","item","VersionManager","isValidVersion","minVer","maxVer","push","_handleReadMessages","__DEV__","readMsgs","PrefData","getValue","BuildInPrefs","Messages","includes","objectId","isRead","key","ConfigDataModel","get","hasNewAppVer","updatedAt","Date","toString","length","freConfig","limit","gap","FrequenceManager","canRun","configValue","_getConfigValue","lastTimestamp","isDataReady","isConfigStateReady","isNetwordDataReady","OnlineItems","_handleResponse","customFilter","isDanger","map","Tool","jsonify","sort","a","b","dateA","getTime","dateB","console","log","MessageModel","emitChange","_fetchFromLeanCloud","Promise","resolve","reject","query","Query","equalTo","Platform","OS","VipManager","isForeverVip","isVip","notEqualTo","userQuery","sizeEqualTo","userId","LoginManager","currentUser","AVUser","selectUserQuery","or","and","descending","find","then","catch","e","_fetchFromApi","vipStatus","response","fetch","ToolkitConfig","MessageApiUrl","method","headers","body","JSON","stringify","platform","result","json","messages","Array","isArray","Error","exports","init","Notification","addListener","isAuto","promises","allSettled","results","allItems","hasSuccess","forEach","index","status","value","warn","reason","error","getUnreadMessages","filter","getAllMessages","removeMessage","message","findIndex","splice","readIndex","indexOf","setValue","reset","markMessageRead","markFinish","emit","slice","addListenerOnce","callback","once","on","removeListener"],"sourceRoot":"../../src","sources":["MessageModel.ts"],"mappings":"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","ignoreList":[]}
package/lib/commonjs/ReportUtil.js CHANGED
@@ -6,14 +6,14 @@ Object.defineProperty(exports, "__esModule", {
6
6
  exports.ReportUtil = void 0;
7
7
  var _reactNative = require("react-native");
8
8
  var _reactNativeDeviceInfo = require("react-native-device-info");
9
+ var _ = require(".");
9
10
  var _Notification = require("./Notification");
10
11
  const CommonInfo = {
11
12
  appVer: (0, _reactNativeDeviceInfo.getReadableVersion)(),
12
13
  platform: _reactNative.Platform.OS,
13
14
  sysVer: _reactNative.Platform.Version,
14
15
  model: (0, _reactNativeDeviceInfo.getModel)(),
15
- brand: (0, _reactNativeDeviceInfo.getBrand)(),
16
- device: (0, _reactNativeDeviceInfo.getDeviceId)()
16
+ brand: (0, _reactNativeDeviceInfo.getBrand)()
17
17
  };
18
18
  const isValidReport = (eventId, params) => {
19
19
  if (typeof eventId !== 'string' || eventId?.length === 0) {
@@ -45,6 +45,17 @@ const convertToValidParams = params => {
45
45
  };
46
46
  const ReportUtil = exports.ReportUtil = {
47
47
  init: () => {
48
+ if (_.Tool.isAgreed()) {
49
+ ReportUtil.doInit();
50
+ } else {
51
+ _Notification.Notification.addListenerOnce('onAgree', () => {
52
+ ReportUtil.doInit();
53
+ });
54
+ }
55
+ },
56
+ doInit: () => {
57
+ // 避免在用户同意之前获取 did
58
+ ReportUtil.setCommonInfo('device', (0, _reactNativeDeviceInfo.getDeviceId)());
48
59
  _Notification.Notification.addListener('onLoginSuccess', ({
49
60
  user
50
61
  }) => {
package/lib/commonjs/ReportUtil.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"names":["_reactNative","require","_reactNativeDeviceInfo","_Notification","CommonInfo","appVer","getReadableVersion","platform","Platform","OS","sysVer","Version","model","getModel","brand","getBrand","device","getDeviceId","isValidReport","eventId","params","length","console","error","Array","isArray","key","convertToValidParams","ret","value","JSON","stringify","ReportUtil","exports","init","Notification","addListener","user","__DEV__","NativeModules","NCYReport","signIn","AVUser","get","setCommonInfo","signOut","report","validParams","realParams","getCommonInfo","log","viewAppear","page","enterPage","viewDisappear","leavePage"],"sourceRoot":"../../src","sources":["ReportUtil.ts"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["_reactNative","require","_reactNativeDeviceInfo","_","_Notification","CommonInfo","appVer","getReadableVersion","platform","Platform","OS","sysVer","Version","model","getModel","brand","getBrand","isValidReport","eventId","params","length","console","error","Array","isArray","key","convertToValidParams","ret","value","JSON","stringify","ReportUtil","exports","init","Tool","isAgreed","doInit","Notification","addListenerOnce","setCommonInfo","getDeviceId","addListener","user","__DEV__","NativeModules","NCYReport","signIn","AVUser","get","signOut","report","validParams","realParams","getCommonInfo","log","viewAppear","page","enterPage","viewDisappear","leavePage"],"sourceRoot":"../../src","sources":["ReportUtil.ts"],"mappings":"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","ignoreList":[]}
package/lib/module/MessageModel.js CHANGED
@@ -143,10 +143,7 @@ const _fetchFromApi = () => {
143
143
  });
144
144
  const result = await response.json();
145
145
  if (result.messages && Array.isArray(result.messages)) {
146
- const items = result.messages.map(msg => ({
147
- toJSON: () => msg
148
- }));
149
- resolve(items);
146
+ resolve(result.messages);
150
147
  } else {
151
148
  reject(new Error('API 返回数据格式错误'));
152
149
  }
@@ -155,17 +152,6 @@ const _fetchFromApi = () => {
155
152
  }
156
153
  });
157
154
  };
158
- const _deduplicateMessages = items => {
159
- const map = new Map();
160
- items.forEach(item => {
161
- const json = Tool.jsonify(item);
162
- const id = json.objectId;
163
- if (!map.has(id)) {
164
- map.set(id, item);
165
- }
166
- });
167
- return Array.from(map.values());
168
- };
169
155
  export const MessageModel = {
170
156
  init: customFilter => {
171
157
  Notification.addListener('onVipRefresh', () => {
@@ -218,10 +204,9 @@ export const MessageModel = {
218
204
 
219
205
  // 只要有任一数据源成功（即使返回空数组），就标记为已完成
220
206
  if (hasSuccess) {
221
- const uniqueItems = _deduplicateMessages(allItems);
222
- console.log(`Message 抓取完毕，共 ${uniqueItems.length} 条`);
207
+ console.log(`Message 抓取完毕，共 ${allItems.length} 条`);
223
208
  isNetwordDataReady = true;
224
- OnlineItems = uniqueItems;
209
+ OnlineItems = allItems;
225
210
  _handleResponse(customFilter);
226
211
  } else {
227
212
  console.error('所有消息数据源获取失败');
package/lib/module/MessageModel.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"names":["Platform","ConfigDataModel","FrequenceManager","LoginManager","Notification","BuildInPrefs","PrefData","Tool","ToolkitConfig","VersionManager","VipManager","AV","require","EventEmitter","eventEmitter","MyMessages","_filterByVersion","items","ret","item","isValidVersion","minVer","maxVer","push","_handleReadMessages","__DEV__","readMsgs","getValue","Messages","includes","objectId","isRead","key","get","hasNewAppVer","updatedAt","Date","toString","length","freConfig","limit","gap","canRun","configValue","_getConfigValue","lastTimestamp","isDataReady","isConfigStateReady","isNetwordDataReady","OnlineItems","_handleResponse","customFilter","isDanger","map","jsonify","sort","a","b","dateA","getTime","dateB","console","log","MessageModel","emitChange","_fetchFromLeanCloud","Promise","resolve","reject","query","Query","equalTo","OS","isForeverVip","isVip","notEqualTo","userQuery","sizeEqualTo","userId","currentUser","AVUser","selectUserQuery","or","and","descending","find","then","catch","e","_fetchFromApi","vipStatus","response","fetch","MessageApiUrl","method","headers","body","JSON","stringify","platform","result","json","messages","Array","isArray","msg","toJSON","Error","_deduplicateMessages","Map","forEach","id","has","set","from","values","init","addListener","isAuto","promises","allSettled","results","allItems","hasSuccess","index","status","value","warn","reason","uniqueItems","error","getUnreadMessages","filter","getAllMessages","removeMessage","message","findIndex","splice","readIndex","indexOf","setValue","reset","markMessageRead","markFinish","emit","slice","addListenerOnce","callback","once","on","removeListener"],"sourceRoot":"../../src","sources":["MessageModel.ts"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["Platform","ConfigDataModel","FrequenceManager","LoginManager","Notification","BuildInPrefs","PrefData","Tool","ToolkitConfig","VersionManager","VipManager","AV","require","EventEmitter","eventEmitter","MyMessages","_filterByVersion","items","ret","item","isValidVersion","minVer","maxVer","push","_handleReadMessages","__DEV__","readMsgs","getValue","Messages","includes","objectId","isRead","key","get","hasNewAppVer","updatedAt","Date","toString","length","freConfig","limit","gap","canRun","configValue","_getConfigValue","lastTimestamp","isDataReady","isConfigStateReady","isNetwordDataReady","OnlineItems","_handleResponse","customFilter","isDanger","map","jsonify","sort","a","b","dateA","getTime","dateB","console","log","MessageModel","emitChange","_fetchFromLeanCloud","Promise","resolve","reject","query","Query","equalTo","OS","isForeverVip","isVip","notEqualTo","userQuery","sizeEqualTo","userId","currentUser","AVUser","selectUserQuery","or","and","descending","find","then","catch","e","_fetchFromApi","vipStatus","response","fetch","MessageApiUrl","method","headers","body","JSON","stringify","platform","result","json","messages","Array","isArray","Error","init","addListener","isAuto","promises","allSettled","results","allItems","hasSuccess","forEach","index","status","value","warn","reason","error","getUnreadMessages","filter","getAllMessages","removeMessage","message","findIndex","splice","readIndex","indexOf","setValue","reset","markMessageRead","markFinish","emit","slice","addListenerOnce","callback","once","on","removeListener"],"sourceRoot":"../../src","sources":["MessageModel.ts"],"mappings":"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","ignoreList":[]}
package/lib/module/ReportUtil.js CHANGED
@@ -2,14 +2,14 @@
2
2
 
3
3
  import { NativeModules, Platform } from 'react-native';
4
4
  import { getBrand, getDeviceId, getModel, getReadableVersion } from 'react-native-device-info';
5
+ import { Tool } from '.';
5
6
  import { Notification } from './Notification';
6
7
  const CommonInfo = {
7
8
  appVer: getReadableVersion(),
8
9
  platform: Platform.OS,
9
10
  sysVer: Platform.Version,
10
11
  model: getModel(),
11
- brand: getBrand(),
12
- device: getDeviceId()
12
+ brand: getBrand()
13
13
  };
14
14
  const isValidReport = (eventId, params) => {
15
15
  if (typeof eventId !== 'string' || eventId?.length === 0) {
@@ -41,6 +41,17 @@ const convertToValidParams = params => {
41
41
  };
42
42
  export const ReportUtil = {
43
43
  init: () => {
44
+ if (Tool.isAgreed()) {
45
+ ReportUtil.doInit();
46
+ } else {
47
+ Notification.addListenerOnce('onAgree', () => {
48
+ ReportUtil.doInit();
49
+ });
50
+ }
51
+ },
52
+ doInit: () => {
53
+ // 避免在用户同意之前获取 did
54
+ ReportUtil.setCommonInfo('device', getDeviceId());
44
55
  Notification.addListener('onLoginSuccess', ({
45
56
  user
46
57
  }) => {
package/lib/module/ReportUtil.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"names":["NativeModules","Platform","getBrand","getDeviceId","getModel","getReadableVersion","Notification","CommonInfo","appVer","platform","OS","sysVer","Version","model","brand","device","isValidReport","eventId","params","length","console","error","Array","isArray","key","convertToValidParams","ret","value","JSON","stringify","ReportUtil","init","addListener","user","__DEV__","NCYReport","signIn","AVUser","get","setCommonInfo","signOut","report","validParams","realParams","getCommonInfo","log","viewAppear","page","enterPage","viewDisappear","leavePage"],"sourceRoot":"../../src","sources":["ReportUtil.ts"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["NativeModules","Platform","getBrand","getDeviceId","getModel","getReadableVersion","Tool","Notification","CommonInfo","appVer","platform","OS","sysVer","Version","model","brand","isValidReport","eventId","params","length","console","error","Array","isArray","key","convertToValidParams","ret","value","JSON","stringify","ReportUtil","init","isAgreed","doInit","addListenerOnce","setCommonInfo","addListener","user","__DEV__","NCYReport","signIn","AVUser","get","signOut","report","validParams","realParams","getCommonInfo","log","viewAppear","page","enterPage","viewDisappear","leavePage"],"sourceRoot":"../../src","sources":["ReportUtil.ts"],"mappings":"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","ignoreList":[]}
package/lib/typescript/MessageModel.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"MessageModel.d.ts","sourceRoot":"","sources":["../../src/MessageModel.ts"],"names":[],"mappings":"AAeA,MAAM,WAAW,OAAO;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,GAAG,EAAE,OAAO,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,OAAO,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,OAAO,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAoGD,MAAM,MAAM,aAAa,GAAG,CAAC,UAAU,EAAE,OAAO,EAAE,KAAK,OAAO,EAAE,CAAC;AAyFjE,eAAO,MAAM,YAAY;0BACD,aAAa;2BA0BZ,aAAa;6BAuDb,OAAO,EAAE;0BAIZ,OAAO,EAAE;6BAIE,OAAO;+BAkCL,OAAO;;gCA0BZ,QAAQ;4BAQZ,QAAQ;+BASL,QAAQ;CAGpC,CAAC"}
1
+ {"version":3,"file":"MessageModel.d.ts","sourceRoot":"","sources":["../../src/MessageModel.ts"],"names":[],"mappings":"AAeA,MAAM,WAAW,OAAO;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,GAAG,EAAE,OAAO,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,OAAO,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,OAAO,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAoGD,MAAM,MAAM,aAAa,GAAG,CAAC,UAAU,EAAE,OAAO,EAAE,KAAK,OAAO,EAAE,CAAC;AAuEjE,eAAO,MAAM,YAAY;0BACD,aAAa;2BA0BZ,aAAa;6BAqDb,OAAO,EAAE;0BAIZ,OAAO,EAAE;6BAIE,OAAO;+BAkCL,OAAO;;gCA0BZ,QAAQ;4BAQZ,QAAQ;+BASL,QAAQ;CAGpC,CAAC"}
package/lib/typescript/ReportUtil.d.ts CHANGED
@@ -3,6 +3,7 @@ export interface ReportItemType {
3
3
  }
4
4
  export declare const ReportUtil: {
5
5
  init: () => void;
6
+ doInit: () => void;
6
7
  report: (eventId: string, params?: ReportItemType) => void;
7
8
  setCommonInfo: (key: string, value: string) => void;
8
9
  getCommonInfo: () => ReportItemType;
package/lib/typescript/ReportUtil.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ReportUtil.d.ts","sourceRoot":"","sources":["../../src/ReportUtil.ts"],"names":[],"mappings":"AAUA,MAAM,WAAW,cAAc;IAC7B,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;CAChC;AA6CD,eAAO,MAAM,UAAU;;sBAoBH,MAAM,WAAW,cAAc;yBAa5B,MAAM,SAAS,MAAM;;uBAQvB,MAAM;0BAUH,MAAM;CAS7B,CAAC"}
1
+ {"version":3,"file":"ReportUtil.d.ts","sourceRoot":"","sources":["../../src/ReportUtil.ts"],"names":[],"mappings":"AAWA,MAAM,WAAW,cAAc;IAC7B,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;CAChC;AA4CD,eAAO,MAAM,UAAU;;;sBAgCH,MAAM,WAAW,cAAc;yBAa5B,MAAM,SAAS,MAAM;;uBAQvB,MAAM;0BAUH,MAAM;CAS7B,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@norcy/react-native-toolkit",
3
- "version": "0.2.28",
3
+ "version": "0.2.30",
4
4
  "private": false,
5
5
  "description": "My Toolkit",
6
6
  "main": "lib/commonjs/index",
package/src/MessageModel.ts CHANGED
@@ -192,10 +192,7 @@ const _fetchFromApi = (): Promise<any[]> => {
192
192
  const result = await response.json();
193
193
 
194
194
  if (result.messages && Array.isArray(result.messages)) {
195
- const items = result.messages.map((msg: any) => ({
196
- toJSON: () => msg,
197
- }));
198
- resolve(items);
195
+ resolve(result.messages);
199
196
  } else {
200
197
  reject(new Error('API 返回数据格式错误'));
201
198
  }
@@ -205,21 +202,6 @@ const _fetchFromApi = (): Promise<any[]> => {
205
202
  });
206
203
  };
207
204
 
208
- const _deduplicateMessages = (items: Object[]): Object[] => {
209
- const map = new Map<string, Object>();
210
-
211
- items.forEach((item) => {
212
- const json = Tool.jsonify(item);
213
- const id = json.objectId;
214
-
215
- if (!map.has(id)) {
216
- map.set(id, item);
217
- }
218
- });
219
-
220
- return Array.from(map.values());
221
- };
222
-
223
205
  export const MessageModel = {
224
206
  init: (customFilter?: MessageFilter) => {
225
207
  Notification.addListener('onVipRefresh', () => {
@@ -290,11 +272,9 @@ export const MessageModel = {
290
272
 
291
273
  // 只要有任一数据源成功（即使返回空数组），就标记为已完成
292
274
  if (hasSuccess) {
293
- const uniqueItems = _deduplicateMessages(allItems);
294
-
295
- console.log(`Message 抓取完毕，共 ${uniqueItems.length} 条`);
275
+ console.log(`Message 抓取完毕，共 ${allItems.length} 条`);
296
276
  isNetwordDataReady = true;
297
- OnlineItems = uniqueItems;
277
+ OnlineItems = allItems;
298
278
  _handleResponse(customFilter);
299
279
  } else {
300
280
  console.error('所有消息数据源获取失败');
package/src/ReportUtil.ts CHANGED
@@ -5,6 +5,7 @@ import {
5
5
  getModel,
6
6
  getReadableVersion,
7
7
  } from 'react-native-device-info';
8
+ import { Tool } from '.';
8
9
  import { LoginSuccessResultType } from './LoginManager';
9
10
  import { Notification } from './Notification';
10
11
 
@@ -18,7 +19,6 @@ const CommonInfo: ReportItemType = {
18
19
  sysVer: Platform.Version,
19
20
  model: getModel(),
20
21
  brand: getBrand(),
21
- device: getDeviceId(),
22
22
  };
23
23
 
24
24
  const isValidReport = (eventId: string, params?: ReportItemType) => {
@@ -57,6 +57,18 @@ const convertToValidParams = (params?: ReportItemType) => {
57
57
 
58
58
  export const ReportUtil = {
59
59
  init: () => {
60
+ if (Tool.isAgreed()) {
61
+ ReportUtil.doInit();
62
+ } else {
63
+ Notification.addListenerOnce('onAgree', () => {
64
+ ReportUtil.doInit();
65
+ });
66
+ }
67
+ },
68
+
69
+ doInit: () => {
70
+ // 避免在用户同意之前获取 did
71
+ ReportUtil.setCommonInfo('device', getDeviceId());
60
72
  Notification.addListener(
61
73
  'onLoginSuccess',
62
74
  ({ user }: LoginSuccessResultType) => {