autobots-commonlib 1.3.9 → 1.3.10

package/.idea/workspace.xml

@@ -338,6 +338,7 @@
       <workItem from="1739412050915" duration="155000" />
       <workItem from="1739516604702" duration="755000" />
       <workItem from="1741058434802" duration="1212000" />
+      <workItem from="1744600489536" duration="1575000" />
     </task>
     <task id="LOCAL-00001" summary="1、增加新组件NewNavbar；&#10;2、修改jump方法，增加一个参数；">
       <created>1561551696357</created>

package/README.md

@@ -1,5 +1,8 @@
 autobots commonlib
 
+"1.3.10"
+优化重定向写日志参数处理
+
 "1.3.9"
 重定向console log，通过RN桥写日志
 

package/package.json

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

package/util/utils.js

@@ -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 : '';
     }
@@ -56,7 +69,6 @@ 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) {
@@ -69,25 +81,22 @@ function consoleLogOutput() {
             }
         }
     }
-    console.log('disableLog=', disableLog);
-    console.log('writeLog=', NativeModules.QCRLoganModule && NativeModules.QCRLoganModule.writeLog);
 
     if (!disableLog && NativeModules.QCRLoganModule && NativeModules.QCRLoganModule.writeLog) {
-        console.log('Console log redirect！');
         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(' '));
         };
     }
 }