autobots-commonlib 1.3.2 → 1.3.4

package/.idea/workspace.xml

@@ -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.3">
       <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" />
@@ -314,7 +317,9 @@
       <workItem from="1711957837006" duration="34498000" />
       <workItem from="1712496026818" duration="14011000" />
       <workItem from="1712919421559" duration="73000" />
-      <workItem from="1713170876054" duration="7231000" />
+      <workItem from="1713170876054" duration="10998000" />
+      <workItem from="1715841212364" duration="699000" />
+      <workItem from="1716272524681" duration="8375000" />
     </task>
     <task id="LOCAL-00001" summary="1、增加新组件NewNavbar；&#10;2、修改jump方法，增加一个参数；">
       <created>1561551696357</created>
@@ -491,7 +496,15 @@
       <option name="project" value="LOCAL" />
       <updated>1713235627988</updated>
     </task>
-    <option name="localTasksCounter" value="24" />
+    <task id="LOCAL-00024" summary="更新版本号到1.3.3">
+      <option name="closed" value="true" />
+      <created>1716277032014</created>
+      <option name="number" value="00024" />
+      <option name="presentableId" value="LOCAL-00024" />
+      <option name="project" value="LOCAL" />
+      <updated>1716277032014</updated>
+    </task>
+    <option name="localTasksCounter" value="25" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
@@ -612,7 +625,8 @@
     <MESSAGE value="js端的网络访问demo方法提交，更新版本号" />
     <MESSAGE value="修改主软件网络库的js桥接代码，增加fetch支持缓存接口数据" />
     <MESSAGE value="修改主软件网络库的js桥接代码，兼容js的fetch缓存方法" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改主软件网络库的js桥接代码，兼容js的fetch缓存方法" />
+    <MESSAGE value="更新版本号到1.3.3" />
+    <option name="LAST_COMMIT_MESSAGE" value="更新版本号到1.3.3" />
   </component>
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/window.js">

package/README.md

@@ -1,4 +1,11 @@
 autobots commonlib
+
+"1.3.4"
+处理asyncFetch和asyncPostForm传递的参数为null的场景
+
+"1.3.3"
+支持android下fetch接口json数组数据并兼容旧版本
+
 "1.3.2"
 兼容js的fetch缓存方法修改异常情况
 

package/lib/QCRNetworkModule.js

@@ -1,12 +1,13 @@
 'use strict';
 import { NativeModules, Platform } from 'react-native';
+import Utils from "../util/utils";
 
 var QCRRNNetworkModule = NativeModules.QCRRNNetworkModule;
 
 var NetworkModule = {
   fetch(url: String, config: Object, params: Object, cacheFunction: Function) {
     return new Promise(function (resolve, reject) {
-      if (QCRRNNetworkModule) {
+      if (QCRRNNetworkModule && !Utils.isChooseOldNetApi(params)) {
         asyncFetch(url, config, params, cacheFunction, resolve, reject);
       } else {
         asyncFromFetch(url, config, params, resolve, reject);
@@ -135,7 +136,7 @@ async function asyncFetch(url: String, config: Object, params: Object, cacheFunc
           const stringifiedParams = {};
           if (params) {
             Object.keys(params).forEach(key => {
-              if (typeof params[key] === 'undefined') {
+              if (typeof params[key] === 'undefined' || params[key] === null) {
                 stringifiedParams[key] = ""; // 将undefined值设为""
               } else {
                 stringifiedParams[key] = String(params[key]);
@@ -240,7 +241,7 @@ async function asyncPostForm(url: String, headers: Object, form: Object, resolve
         const stringifiedForms = {};
         if (form) {
           Object.keys(form).forEach(key => {
-            if (typeof form[key] === 'undefined') {
+            if (typeof form[key] === 'undefined' || form[key] === null) {
               stringifiedForms[key] = ""; // 将undefined值设为""
             } else {
               stringifiedForms[key] = String(form[key]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "autobots-commonlib",
-  "version": "1.3.2",
+  "version": "1.3.4",
   "description": "autobots common lib",
   "main": "index.js",
   "scripts": {
@@ -22,6 +22,7 @@
     "react-native-deprecated-custom-components": "^0.1.2",
     "react-native-root-siblings": "1.2.1",
     "react-native-root-toast": "3.0.2",
-    "react-native-storage": "^0.2.3"
+    "react-native-storage": "^0.2.3",
+    "react-native-device-info": "^1.1.0"
   }
 }

package/util/utils.js

@@ -0,0 +1,50 @@
+import DeviceInfo from "react-native-device-info";
+import { Platform } from 'react-native';
+
+/**
+ * 是否使用旧版网络接口
+ * @param params
+ * @returns {boolean}
+ */
+function isChooseOldNetApi(params) {
+    if (Platform.OS === 'ios' || params == null || !Array.isArray(params)) {
+        return false;
+    } else {
+        let currentVersion = DeviceInfo.getVersion();
+        let versioncompare = compareVersion(currentVersion, '5.8.1');
+        return versioncompare < 1;
+    }
+}
+
+/**
+ * 比较版本号
+ * @param {string} version1
+ * @param {string} version2
+ * @return {number} 大于返回1，小于返回-1，等于返回0
+ */
+function compareVersion(version1, version2) {
+    let v1 = version1.split('.');
+    let v2 = version2.split('.');
+
+    let maxLen = Math.max(v1.length, v2.length);
+    for (let i = 0; i < maxLen; i++) {
+        // eslint-disable-next-line no-undefined
+        v1[i] = v1[i] === undefined ? 0 : Number(v1[i]);
+        // eslint-disable-next-line no-undefined
+        v2[i] = v2[i] === undefined ? 0 : Number(v2[i]);
+    }
+
+    for (let i = 0; i < maxLen; i++) {
+        if (v1[i] < v2[i]) return -1;
+        if (v1[i] > v2[i]) return 1;
+    }
+
+    return 0;
+}
+
+const Utils = {
+    isChooseOldNetApi,
+    compareVersion
+};
+
+export default Utils;