npm - autobots-commonlib - Versions diffs - 1.3.9 → 1.3.11 - Mend

autobots-commonlib 1.3.9 → 1.3.11

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

package/.idea/workspace.xml CHANGED Viewed

@@ -4,8 +4,11 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="30c1af58-4d10-4799-8434-f7c14eade97a" name="Default Changelist" comment="">
+    <list default="true" id="30c1af58-4d10-4799-8434-f7c14eade97a" name="Default Changelist" comment="优化重定向写日志参数处理1.3.10">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/util/utils.js" beforeDir="false" afterPath="$PROJECT_DIR$/util/utils.js" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -227,20 +230,22 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
-    &quot;last_opened_file_path&quot;: &quot;/Users/xiaojianfeng/Desktop/autohome_project/rn_project/autobots-commonlib&quot;,
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
-    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
-    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.git.unshallow": "true",
+    "WebServerToolWindowFactoryState": "false",
+    "git-widget-placeholder": "master",
+    "last_opened_file_path": "/Users/majing15134/projects/RN/autobots-commonlib",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "nodejs_package_manager_path": "npm",
+    "vue.rearranger.settings.migration": "true"
   }
-}</component>
+}]]></component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$" />
@@ -248,6 +253,13 @@
       <recent name="$PROJECT_DIR$/img" />
     </key>
   </component>
+  <component name="SharedIndexes">
+    <attachedChunks>
+      <set>
+        <option value="bundled-js-predefined-d6986cc7102b-e768b9ed790e-JavaScript-WS-243.21565.180" />
+      </set>
+    </attachedChunks>
+  </component>
   <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="SvnConfiguration">
     <configuration />
@@ -317,27 +329,8 @@
       <workItem from="1713170876054" duration="10998000" />
       <workItem from="1715841212364" duration="699000" />
       <workItem from="1716272524681" duration="9005000" />
-      <workItem from="1716814998133" duration="2987000" />
-      <workItem from="1717124536462" duration="1027000" />
-      <workItem from="1719543986343" duration="1315000" />
-      <workItem from="1719557850708" duration="158000" />
-      <workItem from="1720788061545" duration="659000" />
-      <workItem from="1723022063800" duration="1255000" />
-      <workItem from="1723445600579" duration="44000" />
-      <workItem from="1724206074117" duration="1956000" />
-      <workItem from="1728909453001" duration="438000" />
-      <workItem from="1734510585366" duration="7806000" />
-      <workItem from="1734574254811" duration="14608000" />
-      <workItem from="1734660084102" duration="1178000" />
-      <workItem from="1735107648089" duration="1649000" />
-      <workItem from="1735133340280" duration="453000" />
-      <workItem from="1735729650505" duration="747000" />
-      <workItem from="1735783516156" duration="6837000" />
-      <workItem from="1738999153812" duration="212000" />
-      <workItem from="1739254420113" duration="1284000" />
-      <workItem from="1739412050915" duration="155000" />
-      <workItem from="1739516604702" duration="755000" />
-      <workItem from="1741058434802" duration="1212000" />
+      <workItem from="1716814998133" duration="636000" />
+      <workItem from="1744956907040" duration="306000" />
     </task>
     <task id="LOCAL-00001" summary="1、增加新组件NewNavbar；&#10;2、修改jump方法，增加一个参数；">
       <created>1561551696357</created>
@@ -530,23 +523,39 @@
       <option name="project" value="LOCAL" />
       <updated>1716813889290</updated>
     </task>
-    <task id="LOCAL-00026" summary="更新asyncFetch和asyncPostForm传递的参数，使用更严谨方式判断，防止非字符串型参数也传&quot;&quot;的错误处理">
+    <task id="LOCAL-00026" summary="console log重定向，通过RN桥写日志">
       <option name="closed" value="true" />
-      <created>1716815699201</created>
+      <created>1744626071166</created>
       <option name="number" value="00026" />
       <option name="presentableId" value="LOCAL-00026" />
       <option name="project" value="LOCAL" />
-      <updated>1716815699201</updated>
+      <updated>1744626071166</updated>
     </task>
-    <task id="LOCAL-00027" summary="更新版本号到1.3.8">
+    <task id="LOCAL-00027" summary="console log重定向，通过RN桥写日志">
       <option name="closed" value="true" />
-      <created>1728909568868</created>
+      <created>1744626132485</created>
       <option name="number" value="00027" />
       <option name="presentableId" value="LOCAL-00027" />
       <option name="project" value="LOCAL" />
-      <updated>1728909568868</updated>
+      <updated>1744626132485</updated>
+    </task>
+    <task id="LOCAL-00028" summary="版本号1.3.9">
+      <option name="closed" value="true" />
+      <created>1744626659791</created>
+      <option name="number" value="00028" />
+      <option name="presentableId" value="LOCAL-00028" />
+      <option name="project" value="LOCAL" />
+      <updated>1744626659791</updated>
+    </task>
+    <task id="LOCAL-00029" summary="优化重定向写日志参数处理1.3.10">
+      <option name="closed" value="true" />
+      <created>1744712771644</created>
+      <option name="number" value="00029" />
+      <option name="presentableId" value="LOCAL-00029" />
+      <option name="project" value="LOCAL" />
+      <updated>1744712771644</updated>
     </task>
-    <option name="localTasksCounter" value="28" />
+    <option name="localTasksCounter" value="30" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
@@ -594,64 +603,12 @@
   <component name="Vcs.Log.Tabs.Properties">
     <option name="OPEN_GENERIC_TABS">
       <map>
-        <entry key="37b214ca-431b-4a81-bc9e-5fe3e91842d9" value="TOOL_WINDOW" />
-        <entry key="3c8b0b99-0aa6-41f7-ac7f-4cb445fce607" value="TOOL_WINDOW" />
         <entry key="68016c0f-bd47-47ae-a11b-0f2068b8d124" value="TOOL_WINDOW" />
         <entry key="af60ef88-1ce1-4b05-af70-286a8a22b0ce" value="TOOL_WINDOW" />
       </map>
     </option>
     <option name="TAB_STATES">
       <map>
-        <entry key="37b214ca-431b-4a81-bc9e-5fe3e91842d9">
-          <value>
-            <State>
-              <option name="FILTERS">
-                <map>
-                  <entry key="branch">
-                    <value>
-                      <list>
-                        <option value="HEAD" />
-                      </list>
-                    </value>
-                  </entry>
-                  <entry key="roots">
-                    <value>
-                      <list>
-                        <option value="$PROJECT_DIR$" />
-                      </list>
-                    </value>
-                  </entry>
-                </map>
-              </option>
-              <option name="SHOW_ONLY_AFFECTED_CHANGES" value="true" />
-            </State>
-          </value>
-        </entry>
-        <entry key="3c8b0b99-0aa6-41f7-ac7f-4cb445fce607">
-          <value>
-            <State>
-              <option name="FILTERS">
-                <map>
-                  <entry key="branch">
-                    <value>
-                      <list>
-                        <option value="HEAD" />
-                      </list>
-                    </value>
-                  </entry>
-                  <entry key="roots">
-                    <value>
-                      <list>
-                        <option value="$PROJECT_DIR$" />
-                      </list>
-                    </value>
-                  </entry>
-                </map>
-              </option>
-              <option name="SHOW_ONLY_AFFECTED_CHANGES" value="true" />
-            </State>
-          </value>
-        </entry>
         <entry key="68016c0f-bd47-47ae-a11b-0f2068b8d124">
           <value>
             <State>
@@ -726,24 +683,10 @@
     <MESSAGE value="修改主软件网络库的js桥接代码，兼容js的fetch缓存方法" />
     <MESSAGE value="更新版本号到1.3.3" />
     <MESSAGE value="处理asyncFetch和asyncPostForm传递的参数为null的场景" />
-    <MESSAGE value="更新asyncFetch和asyncPostForm传递的参数，使用更严谨方式判断，防止非字符串型参数也传&quot;&quot;的错误处理" />
-    <MESSAGE value="更新版本号到1.3.8" />
-    <option name="LAST_COMMIT_MESSAGE" value="更新版本号到1.3.8" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="javascript">
-          <url>file://$PROJECT_DIR$/app.js</url>
-          <line>10</line>
-          <option name="timeStamp" value="1" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="javascript">
-          <url>file://$PROJECT_DIR$/native.js</url>
-          <option name="timeStamp" value="2" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
+    <MESSAGE value="console log重定向，通过RN桥写日志" />
+    <MESSAGE value="版本号1.3.9" />
+    <MESSAGE value="优化重定向写日志参数处理1.3.10" />
+    <option name="LAST_COMMIT_MESSAGE" value="优化重定向写日志参数处理1.3.10" />
   </component>
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/window.js">

package/README.md CHANGED Viewed

@@ -1,5 +1,11 @@
 autobots commonlib
+"1.3.11"
+去掉consolelog开关，由原生开关着统一控制
+"1.3.10"
+优化重定向写日志参数处理
 "1.3.9"
 重定向console log，通过RN桥写日志

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "autobots-commonlib",
-  "version": "1.3.9",
+  "version": "1.3.11",
   "description": "autobots common lib",
   "main": "index.js",
   "scripts": {

package/util/utils.js CHANGED Viewed

@@ -1,5 +1,6 @@
 import DeviceInfo from "react-native-device-info";
 import { Platform, NativeModules } from 'react-native';
+import Config from "../index";
 import config from "../config";
 let appCode = "";
@@ -45,8 +46,20 @@ function compareVersion(version1, version2) {
     return 0;
 }
+function object2String(value) {
+    if (typeof value === 'object' && value !== null && value !== undefined) {
+        try {
+            return JSON.stringify(value)
+        } catch (e) {
+            return value;
+        }
+    } else {
+        return value + '';
+    }
+}
 function newConsoleLog(type, msg) {
-    if (appCode === "") {
+    if (appCode === '') {
         let data = config.get();
         appCode = (data && data.name) ? data.name : '';
     }
@@ -54,40 +67,21 @@ function newConsoleLog(type, msg) {
 }
 function consoleLogOutput() {
-    let disableLog = false;
-    if (NativeModules.RNDeviceInfo) {
-        console.log('isConsoleLogShow', NativeModules.RNDeviceInfo.isConsoleLogShow);
-        if (typeof NativeModules.RNDeviceInfo.isConsoleLogShow != 'undefined') {
-            let isConsoleLogShow = NativeModules.RNDeviceInfo.isConsoleLogShow;
-            if (!isConsoleLogShow) {
-                disableLog = true;
-                console.info = () => {};
-                console.log = () => {};
-                console.warn = () => {};
-                console.debug = () => {};
-                console.error = () => {};
-            }
-        }
-    }
-    console.log('disableLog=', disableLog);
-    console.log('writeLog=', NativeModules.QCRLoganModule && NativeModules.QCRLoganModule.writeLog);
-    if (!disableLog && NativeModules.QCRLoganModule && NativeModules.QCRLoganModule.writeLog) {
-        console.log('Console log redirect！');
+    if (NativeModules.QCRLoganModule && NativeModules.QCRLoganModule.writeLog) {
         console.log = (...args) => {
-            newConsoleLog(11, args.join(" "));
+            newConsoleLog(11, args.map(value=> object2String(value)).join(' '));
         };
         console.debug = (...args) => {
-            newConsoleLog(11, args.join(" "));
+            newConsoleLog(11, args.map(value=> object2String(value)).join(' '));
         };
         console.info = (...args) => {
-            newConsoleLog(12, args.join(" "));
+            newConsoleLog(12, args.map(value=> object2String(value)).join(' '));
         };
         console.warn = (...args) => {
-            newConsoleLog(13, args.join(" "));
+            newConsoleLog(13, args.map(value=> object2String(value)).join(' '));
         };
         console.error = (...args) => {
-            newConsoleLog(14, args.join(" "));
+            newConsoleLog(14, args.map(value=> object2String(value)).join(' '));
         };
     }
 }