autobots-commonlib 1.3.11 → 1.3.13

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 (5) hide show
  1. package/.idea/easycode.ignore +13 -0
  2. package/.idea/workspace.xml +88 -19
  3. package/README.md +6 -0
  4. package/package.json +1 -1
  5. package/util/utils.js +21 -1
package/.idea/easycode.ignore ADDED
@@ -0,0 +1,13 @@
1
+ .idea
2
+ .vscode
3
+ node_modules/
4
+ dist/
5
+ vendor/
6
+ cache/
7
+ .*/
8
+ *.min.*
9
+ *.test.*
10
+ *.spec.*
11
+ *.bundle.*
12
+ *.bundle-min.*
13
+ *.log
package/.idea/workspace.xml CHANGED
@@ -4,11 +4,8 @@
4
4
  <option name="autoReloadType" value="SELECTIVE" />
5
5
  </component>
6
6
  <component name="ChangeListManager">
7
- <list default="true" id="30c1af58-4d10-4799-8434-f7c14eade97a" name="Default Changelist" comment="优化重定向写日志参数处理1.3.10">
7
+ <list default="true" id="30c1af58-4d10-4799-8434-f7c14eade97a" name="Default Changelist" comment="更新版本号到1.3.8">
8
8
  <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
9
- <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
10
- <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
11
- <change beforePath="$PROJECT_DIR$/util/utils.js" beforeDir="false" afterPath="$PROJECT_DIR$/util/utils.js" afterDir="false" />
12
9
  </list>
13
10
  <option name="SHOW_DIALOG" value="false" />
14
11
  <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -230,22 +227,22 @@
230
227
  <option name="hideEmptyMiddlePackages" value="true" />
231
228
  <option name="showLibraryContents" value="true" />
232
229
  </component>
233
- <component name="PropertiesComponent"><![CDATA[{
234
- "keyToString": {
235
- "RunOnceActivity.OpenProjectViewOnStart": "true",
236
- "RunOnceActivity.ShowReadmeOnStart": "true",
237
- "RunOnceActivity.git.unshallow": "true",
238
- "WebServerToolWindowFactoryState": "false",
239
- "git-widget-placeholder": "master",
240
- "last_opened_file_path": "/Users/majing15134/projects/RN/autobots-commonlib",
241
- "node.js.detected.package.eslint": "true",
242
- "node.js.detected.package.tslint": "true",
243
- "node.js.selected.package.eslint": "(autodetect)",
244
- "node.js.selected.package.tslint": "(autodetect)",
245
- "nodejs_package_manager_path": "npm",
246
- "vue.rearranger.settings.migration": "true"
230
+ <component name="PropertiesComponent">{
231
+ &quot;keyToString&quot;: {
232
+ &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
233
+ &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
234
+ &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
235
+ &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
236
+ &quot;git-widget-placeholder&quot;: &quot;master&quot;,
237
+ &quot;last_opened_file_path&quot;: &quot;/Users/xiaojianfeng/Desktop/autohome_project/rn_project/autobots-commonlib&quot;,
238
+ &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
239
+ &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
240
+ &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
241
+ &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
242
+ &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
243
+ &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
247
244
  }
248
- }]]></component>
245
+ }</component>
249
246
  <component name="RecentsManager">
250
247
  <key name="CopyFile.RECENT_KEYS">
251
248
  <recent name="$PROJECT_DIR$" />
@@ -331,6 +328,14 @@
331
328
  <workItem from="1716272524681" duration="9005000" />
332
329
  <workItem from="1716814998133" duration="636000" />
333
330
  <workItem from="1744956907040" duration="306000" />
331
+ <workItem from="1745226099998" duration="607000" />
332
+ <workItem from="1745549538576" duration="690000" />
333
+ <workItem from="1746621824168" duration="3000" />
334
+ <workItem from="1751526509710" duration="25000" />
335
+ <workItem from="1751550314938" duration="563000" />
336
+ <workItem from="1751619765677" duration="1596000" />
337
+ <workItem from="1756799028872" duration="3727000" />
338
+ <workItem from="1758009774494" duration="4682000" />
334
339
  </task>
335
340
  <task id="LOCAL-00001" summary="1、增加新组件NewNavbar；&#10;2、修改jump方法，增加一个参数；">
336
341
  <created>1561551696357</created>
@@ -603,12 +608,51 @@
603
608
  <component name="Vcs.Log.Tabs.Properties">
604
609
  <option name="OPEN_GENERIC_TABS">
605
610
  <map>
611
+ <entry key="37b214ca-431b-4a81-bc9e-5fe3e91842d9" value="TOOL_WINDOW" />
612
+ <entry key="3c8b0b99-0aa6-41f7-ac7f-4cb445fce607" value="TOOL_WINDOW" />
613
+ <entry key="5c78b37c-6e0d-43e9-bd81-bd14797152a6" value="TOOL_WINDOW" />
606
614
  <entry key="68016c0f-bd47-47ae-a11b-0f2068b8d124" value="TOOL_WINDOW" />
615
+ <entry key="9b6542fe-4460-4741-b8e4-fdb961fa41e1" value="TOOL_WINDOW" />
607
616
  <entry key="af60ef88-1ce1-4b05-af70-286a8a22b0ce" value="TOOL_WINDOW" />
608
617
  </map>
609
618
  </option>
610
619
  <option name="TAB_STATES">
611
620
  <map>
621
+ <entry key="37b214ca-431b-4a81-bc9e-5fe3e91842d9">
622
+ <value>
623
+ <State />
624
+ </value>
625
+ </entry>
626
+ <entry key="3c8b0b99-0aa6-41f7-ac7f-4cb445fce607">
627
+ <value>
628
+ <State />
629
+ </value>
630
+ </entry>
631
+ <entry key="5c78b37c-6e0d-43e9-bd81-bd14797152a6">
632
+ <value>
633
+ <State>
634
+ <option name="FILTERS">
635
+ <map>
636
+ <entry key="branch">
637
+ <value>
638
+ <list>
639
+ <option value="HEAD" />
640
+ </list>
641
+ </value>
642
+ </entry>
643
+ <entry key="roots">
644
+ <value>
645
+ <list>
646
+ <option value="$PROJECT_DIR$" />
647
+ </list>
648
+ </value>
649
+ </entry>
650
+ </map>
651
+ </option>
652
+ <option name="SHOW_ONLY_AFFECTED_CHANGES" value="true" />
653
+ </State>
654
+ </value>
655
+ </entry>
612
656
  <entry key="68016c0f-bd47-47ae-a11b-0f2068b8d124">
613
657
  <value>
614
658
  <State>
@@ -634,6 +678,31 @@
634
678
  </State>
635
679
  </value>
636
680
  </entry>
681
+ <entry key="9b6542fe-4460-4741-b8e4-fdb961fa41e1">
682
+ <value>
683
+ <State>
684
+ <option name="FILTERS">
685
+ <map>
686
+ <entry key="branch">
687
+ <value>
688
+ <list>
689
+ <option value="HEAD" />
690
+ </list>
691
+ </value>
692
+ </entry>
693
+ <entry key="roots">
694
+ <value>
695
+ <list>
696
+ <option value="$PROJECT_DIR$" />
697
+ </list>
698
+ </value>
699
+ </entry>
700
+ </map>
701
+ </option>
702
+ <option name="SHOW_ONLY_AFFECTED_CHANGES" value="true" />
703
+ </State>
704
+ </value>
705
+ </entry>
637
706
  <entry key="MAIN">
638
707
  <value>
639
708
  <State />
package/README.md CHANGED
@@ -1,5 +1,11 @@
1
1
  autobots commonlib
2
2
 
3
+ "1.3.13"
4
+ console.log输出通过原生开关控制
5
+
6
+ "1.3.12"
7
+ 日志重定向对象转JSON场景处理循环引用的情况
8
+
3
9
  "1.3.11"
4
10
  去掉consolelog开关，由原生开关着统一控制
5
11
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "autobots-commonlib",
3
- "version": "1.3.11",
3
+ "version": "1.3.13",
4
4
  "description": "autobots common lib",
5
5
  "main": "index.js",
6
6
  "scripts": {
package/util/utils.js CHANGED
@@ -46,12 +46,29 @@ function compareVersion(version1, version2) {
46
46
  return 0;
47
47
  }
48
48
 
49
+ function jsonStringifyWithCircularRef(obj) {
50
+ const seen = new Set();
51
+ try {
52
+ return JSON.stringify(obj, (key, value) => {
53
+ if (typeof value === 'object' && value !== null) {
54
+ if (seen.has(value)) {
55
+ return '[Circular]';
56
+ }
57
+ seen.add(value);
58
+ }
59
+ return value;
60
+ });
61
+ } catch (e) {
62
+ return obj;
63
+ }
64
+ }
65
+
49
66
  function object2String(value) {
50
67
  if (typeof value === 'object' && value !== null && value !== undefined) {
51
68
  try {
52
69
  return JSON.stringify(value)
53
70
  } catch (e) {
54
- return value;
71
+ return jsonStringifyWithCircularRef(value);
55
72
  }
56
73
  } else {
57
74
  return value + '';
@@ -67,6 +84,9 @@ function newConsoleLog(type, msg) {
67
84
  }
68
85
 
69
86
  function consoleLogOutput() {
87
+ if (NativeModules.RNDeviceInfo && NativeModules.RNDeviceInfo.isConsoleLogShow) {
88
+ return;
89
+ }
70
90
  if (NativeModules.QCRLoganModule && NativeModules.QCRLoganModule.writeLog) {
71
91
  console.log = (...args) => {
72
92
  newConsoleLog(11, args.map(value=> object2String(value)).join(' '));