autobots-commonlib 1.3.7 → 1.3.9

package/.idea/workspace.xml

@@ -322,7 +322,22 @@
       <workItem from="1719543986343" duration="1315000" />
       <workItem from="1719557850708" duration="158000" />
       <workItem from="1720788061545" duration="659000" />
-      <workItem from="1723022063800" duration="886000" />
+      <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" />
     </task>
     <task id="LOCAL-00001" summary="1、增加新组件NewNavbar；&#10;2、修改jump方法，增加一个参数；">
       <created>1561551696357</created>
@@ -523,7 +538,15 @@
       <option name="project" value="LOCAL" />
       <updated>1716815699201</updated>
     </task>
-    <option name="localTasksCounter" value="27" />
+    <task id="LOCAL-00027" summary="更新版本号到1.3.8">
+      <option name="closed" value="true" />
+      <created>1728909568868</created>
+      <option name="number" value="00027" />
+      <option name="presentableId" value="LOCAL-00027" />
+      <option name="project" value="LOCAL" />
+      <updated>1728909568868</updated>
+    </task>
+    <option name="localTasksCounter" value="28" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
@@ -571,6 +594,7 @@
   <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" />
@@ -578,6 +602,31 @@
     </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>
@@ -628,6 +677,11 @@
             </State>
           </value>
         </entry>
+        <entry key="MAIN">
+          <value>
+            <State />
+          </value>
+        </entry>
         <entry key="af60ef88-1ce1-4b05-af70-286a8a22b0ce">
           <value>
             <State>
@@ -673,7 +727,23 @@
     <MESSAGE value="更新版本号到1.3.3" />
     <MESSAGE value="处理asyncFetch和asyncPostForm传递的参数为null的场景" />
     <MESSAGE value="更新asyncFetch和asyncPostForm传递的参数，使用更严谨方式判断，防止非字符串型参数也传&quot;&quot;的错误处理" />
-    <option name="LAST_COMMIT_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>
   </component>
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/window.js">

package/README.md

@@ -1,5 +1,11 @@
 autobots commonlib
 
+"1.3.9"
+重定向console log，通过RN桥写日志
+
+"1.3.8"
+添加写缓存接口支持和ios支持json数组数据
+
 "1.3.7"
 实现console.log日志开关控制
 

package/app.js

@@ -1,7 +1,7 @@
-import { AppRegistry, Platform, NativeModules } from 'react-native';
+import { AppRegistry } from 'react-native';
 import RootController from './controller';
 import config from './config';
-
+import Utils from "./util/utils";
 const app = {
   Register: function(opt) {
     config.set(opt);
@@ -10,21 +10,6 @@ const app = {
   }
 }
 
-if (NativeModules.RNDeviceInfo) {
-  console.log('NativeModules.RNDeviceInfo.isConsoleLogShow', NativeModules.RNDeviceInfo.isConsoleLogShow);
-  if (typeof NativeModules.RNDeviceInfo.isConsoleLogShow != 'undefined') {
-    let isConsoleLogShow = NativeModules.RNDeviceInfo.isConsoleLogShow;
-    if (!isConsoleLogShow) {
-      console.log('console log switch is off');
-      console.info = () => {};
-      console.log = () => {};
-      console.warn = () => {};
-      console.debug = () => {};
-      console.error = () => {};
-    }
-  }
-}
+Utils.consoleLogOutput();
 
 module.exports = app;
-
-

package/lib/QCRNetworkModule.js

@@ -5,6 +5,47 @@ import Utils from "../util/utils";
 var QCRRNNetworkModule = NativeModules.QCRRNNetworkModule;
 
 var NetworkModule = {
+
+  async getCacheData(cacheKey: String) {
+    if (QCRRNNetworkModule && QCRRNNetworkModule.getCacheData) {
+      try {
+        return await QCRRNNetworkModule.getCacheData(cacheKey, Platform.OS === 'android' ? null : {});
+      } catch (error) {
+        console.error('getCacheData发生了异常：' + error);
+        return '';
+      }
+    } else {
+      return '';
+    }
+  },
+
+  writeCacheData(cacheKey: String, params: Object, isAdd: boolean, expireTime: number) {
+    if (QCRRNNetworkModule && QCRRNNetworkModule.writeCache) {
+      const isAddNumber = Platform.OS === 'android' ? (isAdd ? 1 : 0) : isAdd;
+      if (Platform.OS === 'android' && typeof params === 'object') {
+        QCRRNNetworkModule.writeCache(cacheKey, JSON.stringify(params), isAddNumber, expireTime);
+      } else {
+        QCRRNNetworkModule.writeCache(cacheKey, params, isAddNumber, expireTime);
+      }
+    }
+  },
+
+  clearCacheData(cacheKey: String) {
+    if (QCRRNNetworkModule && QCRRNNetworkModule.clearCache) {
+      QCRRNNetworkModule.clearCache(cacheKey);
+    }
+  },
+
+  fetchList(url: String, config: Object, params: Object, cacheFunction: Function) {
+    return new Promise(function (resolve, reject) {
+      if (QCRRNNetworkModule && (!Utils.isChooseOldNetApi(params) || QCRRNNetworkModule.postList)) {
+        asyncListFetch(url, config, params, cacheFunction, resolve, reject);
+      } else {
+        asyncPostJsonFetch(url, config, params, resolve, reject);
+      }
+    });
+  },
+
   fetch(url: String, config: Object, params: Object, cacheFunction: Function) {
     return new Promise(function (resolve, reject) {
       if (QCRRNNetworkModule && !Utils.isChooseOldNetApi(params)) {
@@ -180,6 +221,94 @@ async function asyncFetch(url: String, config: Object, params: Object, cacheFunc
   }
 }
 
+async function asyncListFetch(url: String, config: Object, params: Object, cacheFunction: Function, resolveCallback: Function, rejectCallback: Function) {
+  let needReadCache = (config && config.method && config.method.indexOf('cache') >= 0) ? true : false;
+  if (needReadCache && cacheFunction) {
+    try {
+      if (Platform.OS === 'android') {
+        //处理body为form类型要将param全部字段转为字条串类型，与请求网络接口写缓存时类型一致
+        if (params && config && config.headers) {
+          if (!(config.headers['Content-Type'] && config.headers['Content-Type'].indexOf('application/json') >= 0)) {
+            const stringFieldParams = {};
+            Object.keys(params).forEach(key => {
+              if (typeof params[key] !== 'undefined' && params[key] !== null) {
+                stringFieldParams[key] = String(params[key]);
+              }
+            });
+            params = stringFieldParams;
+          }
+        }
+      }
+      let response = await QCRRNNetworkModule.getCacheData(url, []);
+      if (typeof response === 'string') {
+        if (response.trim() != '') {
+          response = JSON.parse(response);
+          cacheFunction(response);
+        }
+      } else {
+        cacheFunction(response);
+      }
+    } catch (error) {
+      console.log('缓存结果出错：', error)
+    }
+  }
+
+  try {
+    var events;
+    if (Platform.OS === 'ios') {
+      events = await QCRRNNetworkModule.postList(url, config, params, needReadCache);
+    } else {//android
+      try {
+        //处理body为json类型
+        let isJsonPost = false;
+        if (config && config.headers) {
+          if (config.headers['Content-Type'] && config.headers['Content-Type'].indexOf('application/json') >= 0) {
+            //if(params && Object.keys(params).length !== 0){
+            let jsonparam = {};
+            jsonparam.json = params ? JSON.stringify(params) : {};
+            config.body = jsonparam;
+            isJsonPost = true;
+          }
+        }
+        config = config || {}
+        //处理body为form类型
+        if (!isJsonPost) {
+          config.headers = config.headers || {}
+          config.headers['Content-Type'] = 'application/x-www-form-urlencoded; charset=utf-8'
+          // 将参数对象中的所有值转换为字符串类型，因为原生只按string类型来处理，否则有其它类型会报解析异常
+          const stringifiedParams = {};
+          if (params) {
+            Object.keys(params).forEach(key => {
+              if (typeof params[key] !== 'undefined' && params[key] !== null) {
+                stringifiedParams[key] = String(params[key]);
+              }
+              // else {
+              //   stringifiedParams[key] = ""; // 将undefined值设为""
+              // }
+            });
+          }
+
+          let formparam = {};
+          formparam.form = JSON.stringify(stringifiedParams);
+          config.body = formparam;
+        }
+
+        console.log('asyncFetch 配置信息：', config);
+        events = await QCRRNNetworkModule.fetch(url, config);
+        if (typeof events === 'string') {
+          events = JSON.parse(events);
+        }
+      } catch (error) {
+        rejectCallback(error);
+      }
+    }
+    resolveCallback(events);
+  } catch (error) {
+    console.log('结果：', error)
+    rejectCallback(error);
+  }
+}
+
 async function asyncFromFetch(url: String, config: Object, params: Object, resolveCallback: Function, rejectCallback: Function) {
   try {
     let isJsonPost = false;

package/package.json

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

package/util/utils.js

@@ -1,5 +1,8 @@
 import DeviceInfo from "react-native-device-info";
-import { Platform } from 'react-native';
+import { Platform, NativeModules } from 'react-native';
+import config from "../config";
+
+let appCode = "";
 
 /**
  * 是否使用旧版网络接口
@@ -42,9 +45,57 @@ function compareVersion(version1, version2) {
     return 0;
 }
 
+function newConsoleLog(type, msg) {
+    if (appCode === "") {
+        let data = config.get();
+        appCode = (data && data.name) ? data.name : '';
+    }
+    NativeModules.QCRLoganModule.writeLog({ tag: appCode, type: type, log:  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！');
+        console.log = (...args) => {
+            newConsoleLog(11, args.join(" "));
+        };
+        console.debug = (...args) => {
+            newConsoleLog(11, args.join(" "));
+        };
+        console.info = (...args) => {
+            newConsoleLog(12, args.join(" "));
+        };
+        console.warn = (...args) => {
+            newConsoleLog(13, args.join(" "));
+        };
+        console.error = (...args) => {
+            newConsoleLog(14, args.join(" "));
+        };
+    }
+}
+
 const Utils = {
     isChooseOldNetApi,
-    compareVersion
+    compareVersion,
+    consoleLogOutput
 };
 
 export default Utils;