autobots-commonlib 1.3.6 → 1.3.8

package/.idea/workspace.xml

@@ -318,7 +318,13 @@
       <workItem from="1715841212364" duration="699000" />
       <workItem from="1716272524681" duration="9005000" />
       <workItem from="1716814998133" duration="2987000" />
-      <workItem from="1717124536462" duration="598000" />
+      <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" />
     </task>
     <task id="LOCAL-00001" summary="1、增加新组件NewNavbar；&#10;2、修改jump方法，增加一个参数；">
       <created>1561551696357</created>
@@ -567,12 +573,38 @@
   <component name="Vcs.Log.Tabs.Properties">
     <option name="OPEN_GENERIC_TABS">
       <map>
+        <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="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>

package/README.md

@@ -1,5 +1,11 @@
 autobots commonlib
 
+"1.3.8"
+添加写缓存接口支持和ios支持json数组数据
+
+"1.3.7"
+实现console.log日志开关控制
+
 "1.3.6"
 解决Android下form类型post请求缓存获取不到的问题
 

package/app.js

@@ -1,4 +1,4 @@
-import { AppRegistry } from 'react-native';
+import { AppRegistry, Platform, NativeModules } from 'react-native';
 import RootController from './controller';
 import config from './config';
 
@@ -10,6 +10,21 @@ 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 = () => {};
+    }
+  }
+}
+
 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.6",
+  "version": "1.3.8",
   "description": "autobots common lib",
   "main": "index.js",
   "scripts": {