autobots-commonlib 1.3.5 → 1.3.7

package/.idea/workspace.xml

@@ -4,11 +4,8 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="30c1af58-4d10-4799-8434-f7c14eade97a" name="Default Changelist" comment="处理asyncFetch和asyncPostForm传递的参数为null的场景">
+    <list default="true" id="30c1af58-4d10-4799-8434-f7c14eade97a" name="Default Changelist" comment="">
       <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$/lib/QCRNetworkModule.js" beforeDir="false" afterPath="$PROJECT_DIR$/lib/QCRNetworkModule.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -320,7 +317,12 @@
       <workItem from="1713170876054" duration="10998000" />
       <workItem from="1715841212364" duration="699000" />
       <workItem from="1716272524681" duration="9005000" />
-      <workItem from="1716814998133" duration="636000" />
+      <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="886000" />
     </task>
     <task id="LOCAL-00001" summary="1、增加新组件NewNavbar；&#10;2、修改jump方法，增加一个参数；">
       <created>1561551696357</created>
@@ -513,7 +515,15 @@
       <option name="project" value="LOCAL" />
       <updated>1716813889290</updated>
     </task>
-    <option name="localTasksCounter" value="26" />
+    <task id="LOCAL-00026" summary="更新asyncFetch和asyncPostForm传递的参数，使用更严谨方式判断，防止非字符串型参数也传&quot;&quot;的错误处理">
+      <option name="closed" value="true" />
+      <created>1716815699201</created>
+      <option name="number" value="00026" />
+      <option name="presentableId" value="LOCAL-00026" />
+      <option name="project" value="LOCAL" />
+      <updated>1716815699201</updated>
+    </task>
+    <option name="localTasksCounter" value="27" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
@@ -561,12 +571,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>
@@ -636,7 +672,8 @@
     <MESSAGE value="修改主软件网络库的js桥接代码，兼容js的fetch缓存方法" />
     <MESSAGE value="更新版本号到1.3.3" />
     <MESSAGE value="处理asyncFetch和asyncPostForm传递的参数为null的场景" />
-    <option name="LAST_COMMIT_MESSAGE" value="处理asyncFetch和asyncPostForm传递的参数为null的场景" />
+    <MESSAGE value="更新asyncFetch和asyncPostForm传递的参数，使用更严谨方式判断，防止非字符串型参数也传&quot;&quot;的错误处理" />
+    <option name="LAST_COMMIT_MESSAGE" value="更新asyncFetch和asyncPostForm传递的参数，使用更严谨方式判断，防止非字符串型参数也传&quot;&quot;的错误处理" />
   </component>
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/window.js">

package/README.md

@@ -1,5 +1,11 @@
 autobots commonlib
 
+"1.3.7"
+实现console.log日志开关控制
+
+"1.3.6"
+解决Android下form类型post请求缓存获取不到的问题
+
 "1.3.5"
 更新asyncFetch和asyncPostForm传递的参数，使用更严谨方式判断，防止非字符串型参数也传""的错误处理
 

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

@@ -96,6 +96,20 @@ async function asyncFetch(url: String, config: Object, params: Object, cacheFunc
   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, params);
       if (typeof response === 'string') {
         if (response.trim() != '') {

package/package.json

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