autobots-commonlib 1.2.8 → 1.3.3

package/README.md

@@ -1,4 +1,20 @@
 autobots commonlib
+
+"1.3.3"
+支持android下fetch接口json数组数据并兼容旧版本
+
+"1.3.2"
+兼容js的fetch缓存方法修改异常情况
+
+"1.3.1"
+修改主软件网络库的js桥接代码，兼容js的fetch缓存方法
+
+"1.3.0"
+修改主软件网络库的js桥接代码，增加fetch支持缓存接口数据
+
+"1.2.9"
+增加主软件网络库的js桥接代码，对外提供js端的网络访问方法和demo程序
+
 "1.2.8"
 优化小程序右滑返回操作，增加普通RN应用右滑返回支持
 

package/http-demo.js

@@ -0,0 +1,236 @@
+import { Toast, Native, QCRNetworkModule } from 'autobots-commonlib';
+const NetworkModule = QCRNetworkModule
+
+/**
+ * fetch方式-消息体为form类型
+ * @param url
+ * @param params
+ * @param config
+ * @returns {Promise<unknown | [any,null]>}
+ */
+const fetchForm = (url, params = {}, config = {}) => {
+    const options = {
+        method: 'post',
+        headers: {
+            'Content-Type': 'application/x-www-form-urlencoded; charset=utf-8'
+        },
+        timeout: 15000,
+        ...config
+    };
+    return NetworkModule.fetch(Native.getPostUrl(url), options, params).then((result) => {
+        //console.log("***--fetch--*** request----res="+result);
+        const res = typeof (result) == "string" ? JSON.parse(result) : result;
+        if (String(res.status) === '1' || String(res.code) === '0') {
+            // 网络请求成功和业务数据成功
+            return ([null, res]);
+        } else {
+            // Toast.Show(res.data.info);
+            return ([new Error('status不为1'), res]);
+        }
+    }).catch(error => {
+        return [error, null];
+    })
+};
+
+/**
+ * fetch方式-消息体为json类型
+ * @param url
+ * @param params
+ * @param config
+ * @returns {Promise<unknown | [any,null]>}
+ */
+const fetchJson = (url, params = {}, config = {}) => {
+    const options = {
+        method: 'post',
+        headers: {
+            Accept: 'application/json',
+            'Content-Type': 'application/json'
+        },
+        timeout: 15000,
+        ...config
+    };
+    return NetworkModule.fetch(Native.getPostUrl(url), options, params).then((result) => {
+        const res = typeof (result) == "string" ? JSON.parse(result) : result;
+        if (res.status === 1) {
+            // 网络请求成功和业务数据成功
+            return [null, res.returnObject];
+        } else {
+            return [new Error('status不为1'), res.info];
+        }
+    }).catch(error => {
+        console.log(url)
+        console.log(error);
+        Toast.Show('网络请求失败');
+        return [error, null];
+    })
+};
+
+/**
+ * post方式-消息体为form类型
+ * @param url
+ * @param params
+ * @param header
+ * @returns {Promise<any>}
+ */
+const postUseForm = (url, params = {}, header = {}) => {
+    const eventId = url.split('?')[0];
+    let queryParam = sliptParams(url);
+    let param = Object.assign(params, queryParam);
+    let json = JSON.stringify(param);
+    return NetworkModule.postForm(Native.getPostUrl(url), header, params).then((result) => {
+        const res = typeof (result) == "string" ? JSON.parse(result) : result;
+        if (String(res.status) === '1' || String(res.code) === '0') {
+            // 网络请求成功和业务数据成功
+            return ([null, res]);
+        } else {
+            // Toast.Show(res.data.info);
+            return ([new Error('status不为1'), res]);
+        }
+    }).catch(error => {
+        return [error, null];
+    })
+};
+
+/**
+ * post方式-消息体为json类型
+ * @param url
+ * @param params
+ * @param header
+ * @returns {Promise<any>}
+ */
+const postUseJson = (url, params = {}, header = {}) => {
+    //console.log("***--fetch--*** postUseJson----url="+Native.getPostUrl(url));
+    //console.log("***--fetch--*** postUseJson----params="+JSON.stringify(params));
+    return NetworkModule.postJson(Native.getPostUrl(url), header, params).then((result) => {
+        //console.log("***--fetch--*** postUseJson----result="+result);
+        const res = typeof (result) == "string" ? JSON.parse(result) : result;
+        if (res.status === 1) {
+            // 网络请求成功和业务数据成功
+            return [null, res.returnObject];
+        } else {
+            //Toast.Show(res.data.info);
+            return [new Error('status不为1'), res.info];
+        }
+    }).catch(error => {
+        console.log(url);
+        console.log(error);
+        Toast.Show('网络请求失败');
+        return [error, null];
+    })
+};
+
+/**
+ * get方式
+ * @param url
+ * @param body
+ * @param empId
+ * @returns {any}
+ */
+const httpGet = function (url, body, empId) {
+    //增加汽车人网页传递参数
+    url = addUrlParams(url);
+    if (body != {}) {
+        var queryString = toQueryString(body);
+        var urlStr = url + (url.indexOf("?") < 0 ? "?" : "&") + queryString;
+        return NetworkModule.get(urlStr, { "auto-eid": empId, "Accept": "application/json;charset=UTF-8" }, {}).then(result => {
+            const res = typeof (result) == "string" ? JSON.parse(result) : result;
+            return res
+        });
+    }
+};
+const addUrlParams = function (url) {
+    var c = Config.get();
+    return c && c.urlParams
+        ? url + (url.indexOf("?") < 0 ? "?" : "&") + c.urlParams
+        : url;
+};
+const toQueryString = function (obj) {
+    var ret = [];
+    for (var key in obj) {
+        key = encodeURIComponent(key);
+        var values = obj[key];
+        if (values && values.constructor == Array) {
+            //数组
+            var queryValues = [];
+            for (var i = 0, len = values.length, value; i < len; i++) {
+                value = values[i];
+                queryValues.push(toQueryPair(key, value));
+            }
+            ret = ret.concat(queryValues);
+        } else {
+            //字符串
+            ret.push(toQueryPair(key, values));
+        }
+    }
+    return ret.join("&");
+};
+const toQueryPair = function (key, value) {
+    if (typeof value == "undefined") {
+        return key;
+    }
+    return key + "=" + encodeURIComponent(value === null ? "" : String(value));
+};
+
+/**
+ * 下载文件方式
+ * @param url
+ * @param fileName
+ * @returns {Promise<any>}
+ */
+const downloadFile = (url, fileName = '') => {
+    if (fileName.length == 0) {
+        let timestamp = (new Date()).getTime();//获取当前时间错
+        let random = String(((Math.random() * 1000000) | 0))//六位随机数
+        fileName = `${timestamp + random}.jpg`;
+    }
+    console.log('---downloadFile---url=' + url);
+    console.log('---downloadFile---fileName=' + fileName);
+    return NetworkModule.downFile(url, fileName).then(res => {
+        //res=storage/emulated/0/Android/data/com.autohome.helper/files/371be190c42a0125fd3f5c223835fcbf/1712193802418823497.jpg
+        return res
+    }).catch(error => {
+        return error
+    })
+}
+
+/**
+ * 上传文件方式
+ * @param url
+ * @param pictures 路径数组，支持多文件上传
+ * @param empId
+ * @returns {Promise<any>}
+ */
+const uploadImage = (url, pictures) => {
+    let formList = [];
+    pictures.map((val, idx) => {
+        const splits = val.split('.');
+        const suffix = splits[splits.length - 1];
+        const fileName = idx + '.' + suffix;
+        //fileKey，文件标识
+        let file = { uri: val, type: 'multipart/form-data', name: fileName, fileKey: 'fileData' };
+        formList.push(file);
+    });
+    return NetworkModule.postFile(Native.getPostUrl(url), {}, {}, formList).then(res => {
+        if (typeof (res) == 'string') {
+            res = JSON.parse(res)
+        }
+        if (res.status === 1) {
+            // 网络请求成功和业务数据成功
+            return [null, res.returnObject];
+        } else {
+            // Toast.Show(res.data.info);
+            let errorMessage = res.info ? res.info.replace(/\s+/g, "") : ''
+            if (errorMessage && errorMessage.length > 0) {
+                Toast.Show(errorMessage);
+            }
+            return [new Error('status不为1'), null];
+        }
+    }).catch(error => {
+        console.log('url === ' + url)
+        console.log(error);
+        Toast.Show('网络请求失败');
+        return [error, null];
+    });
+}
+
+module.exports = { fetchForm, fetchJson, postUseForm, postUseJson, httpGet, downloadFile, uploadFile };

package/index.js

@@ -12,6 +12,7 @@ import BackAndroid from './BackAndroid';
 import ImageBackground from './ImageBackground';
 import ViewPropTypes from './ViewPropTypes';
 import NativeManager from './lib/NativeManager'
+import NetworkModule from './lib/QCRNetworkModule'
 
 module.exports = {
   NativeManager,
@@ -26,5 +27,6 @@ module.exports = {
   Others,
   BackAndroid,
   ImageBackground,
-  ViewPropTypes
+  ViewPropTypes,
+  NetworkModule
 }

package/lib/QCRNetworkModule.js

@@ -0,0 +1,419 @@
+'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 && !Utils.isChooseOldNetApi(params)) {
+        asyncFetch(url, config, params, cacheFunction, resolve, reject);
+      } else {
+        asyncFromFetch(url, config, params, resolve, reject);
+      }
+    });
+  },
+
+  get(url: String, headers: Object, params: Object) {
+    let requestUrl = url;
+    if (params && Object.keys(params).length > 0) {
+      if (requestUrl.indexOf('?') >= 0) {
+        requestUrl += '&'
+      } else {
+        requestUrl += '?'
+      }
+      for (let key in params) {
+        requestUrl += `${key}=${params[key]}`
+      }
+    }
+    return new Promise(function (resolve, reject) {
+      if (QCRRNNetworkModule) {
+        asyncGet(requestUrl, headers, resolve, reject);
+      } else {
+        asyncGetFromFetch(requestUrl, headers, resolve, reject);
+      }
+    });
+  },
+
+  postForm(url: String, header: Object, form: Object) {
+    return new Promise(function (resolve, reject) {
+      if (QCRRNNetworkModule) {
+        asyncPostForm(url, header, form, resolve, reject);
+      } else {
+        asyncPostFormFetch(url, header, form, resolve, reject);
+      }
+    });
+  },
+
+  postJson(url: String, header: Object, json: Object) {
+    return new Promise(function (resolve, reject) {
+      if (QCRRNNetworkModule) {
+        asyncPostJson(url, header, json, resolve, reject);
+      } else {
+        asyncPostJsonFetch(url, header, json, resolve, reject);
+      }
+    });
+  },
+
+  postFile(url: String, header: Object, param: Object, files: Array) {
+    return new Promise(function (resolve, reject) {
+      if (QCRRNNetworkModule) {
+        asyncPostFile(url, header, param, files, resolve, reject);
+      } else {
+        asyncPostFileFromFetch(url, header, param, files, resolve, reject);
+      }
+    });
+  },
+
+  downFile(url: String, fileName: String) {
+    return new Promise(function (resolve, reject) {
+      if (QCRRNNetworkModule) {
+        asyncDownFile(url, fileName, resolve, reject);
+      } else {
+        asyncDownFileRN(url, fileName, resolve, reject);
+      }
+    });
+  },
+
+  cancel(url: String) {
+    return new Promise(function (resolve, reject) {
+      asyncCancel(url, resolve, reject);
+    });
+  },
+
+  checkNetState(callback: Function) {
+    QCRRNNetworkModule && QCRRNNetworkModule.checkNetState(callback);
+  },
+
+  getNetType(callback: Function) {
+    QCRRNNetworkModule && QCRRNNetworkModule.getNetType(callback);
+  },
+
+};
+
+async function asyncFetch(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 {
+      let response = await QCRRNNetworkModule.getCacheData(url, params);
+      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.fetch(url, config, params);
+    } 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') {
+                stringifiedParams[key] = ""; // 将undefined值设为""
+              } else {
+                stringifiedParams[key] = String(params[key]);
+              }
+            });
+          }
+
+          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;
+    if (config && config.headers) {
+      if (config.headers['Content-Type'] && config.headers['Content-Type'].indexOf('application/json') >= 0) {
+        config.body = params ? JSON.stringify(params) : {};
+        isJsonPost = true;
+      }
+    }
+    config = config || {}
+    if (!isJsonPost) {
+      config.headers = config.headers || {}
+      config.headers['Content-Type'] = 'application/x-www-form-urlencoded; charset=utf-8'
+      let requestBody = '';
+      for (let key in params) {
+        requestBody += `${key}=${params[key] || ''}&`
+      }
+      config.body = requestBody.length > 0 ? requestBody.slice(0, -1) : ""
+    }
+
+    let requestMethod = (config.method && config.method.length > 0) ? config.method : 'get';
+    if (config.method && config.method.length > 0 && config.method.indexOf('_cache') >= 0) {
+      requestMethod = config.method.replace('_cache', '');
+    }
+    config.method = requestMethod;
+
+    console.log('配置信息：', config);
+    const response = await fetch(url, config);
+    const json = await response.json();
+    resolveCallback(json);
+  } catch (error) {
+    rejectCallback(error);
+  }
+}
+
+async function asyncGet(url: String, header: Object, resolveCallback: Function, rejectCallback: Function) {
+  try {
+    var events;
+    if (Platform.OS === 'ios') {
+      events = await QCRRNNetworkModule.get(url, header);
+    } else {
+      events = await QCRRNNetworkModule.get(url, header, null);
+      if (typeof events === 'string') {
+        events = JSON.parse(events);
+      }
+    }
+    resolveCallback(events);
+  } catch (error) {
+    rejectCallback(error);
+  }
+}
+
+async function asyncGetFromFetch(url: String, header: Object, resolveCallback: Function, rejectCallback: Function) {
+  try {
+    var events = await fetch(url, { headers: header || {} })
+    const json = await events.json();
+    resolveCallback(json);
+  } catch (error) {
+    rejectCallback(error);
+  }
+}
+
+async function asyncPostForm(url: String, headers: Object, form: Object, resolveCallback: Function, rejectCallback: Function) {
+  try {
+    console.log('--fetch--asyncPostForm url：', url);
+    var events;
+    if (Platform.OS === 'ios') {
+      events = await QCRRNNetworkModule.postForm(url, headers, form);
+    } else {//android
+      try {
+        headers = headers || {};
+        headers['Content-Type'] = 'application/x-www-form-urlencoded; charset=utf-8';
+        // 将参数对象中的所有值转换为字符串类型，因为原生只按string类型来处理，否则有其它类型会报解析异常
+        const stringifiedForms = {};
+        if (form) {
+          Object.keys(form).forEach(key => {
+            if (typeof form[key] === 'undefined') {
+              stringifiedForms[key] = ""; // 将undefined值设为""
+            } else {
+              stringifiedForms[key] = String(form[key]);
+            }
+          });
+        }
+        console.log('--fetch--asyncPostForm 配置信息：', stringifiedForms);
+        events = await QCRRNNetworkModule.postForm(url, headers, stringifiedForms);
+        if (typeof events === 'string') {
+          events = JSON.parse(events);
+        }
+      } catch (error) {
+        rejectCallback(error);
+      }
+    }
+    resolveCallback(events);
+
+  } catch (error) {
+    rejectCallback(error);
+  }
+}
+
+async function asyncPostJson(url: String, headers: Object, json: Object, resolveCallback: Function, rejectCallback: Function) {
+  try {
+    console.log('--fetch--asyncPostJson url：', url);
+    var events;
+    if (Platform.OS === 'ios') {
+      events = await QCRRNNetworkModule.postJSON(url, headers, json);
+    } else {//android
+      try {
+        headers = headers || {};
+        headers['Content-Type'] = 'application/json';
+        headers['Accept'] = 'application/json';
+
+        // let jsonparam = {};
+        let jsonparam = json ? json : {};
+        console.log('--fetch--asyncPostJson 配置信息：', jsonparam);
+        events = await QCRRNNetworkModule.postJSON(url, headers, jsonparam);
+        if (typeof events === 'string') {
+          events = JSON.parse(events);
+        }
+      } catch (error) {
+        rejectCallback(error);
+      }
+    }
+    resolveCallback(events);
+  } catch (error) {
+    rejectCallback(error);
+  }
+}
+
+async function asyncPostFormFetch(url: String, header: Object, params: Object, resolveCallback: Function, rejectCallback: Function) {
+  try {
+    let headerDic = header || {}
+    headerDic['Content-Type'] = "application/x-www-form-urlencoded; charset=utf-8";
+    let requestBody = '';
+    if (params) {
+      for (let key in params) {
+        requestBody += `${key}=${params[key] || ''}&`
+      }
+      requestBody = requestBody.length > 0 ? requestBody.slice(0, -1) : ""
+    }
+    var events = await fetch(url, { method: 'POST', headers: headerDic, body: requestBody })
+    const json = await events.json();
+    resolveCallback(json);
+  } catch (error) {
+    rejectCallback(error);
+  }
+}
+
+async function asyncPostJsonFetch(url: String, header: Object, params: Object, resolveCallback: Function, rejectCallback: Function) {
+  try {
+    let headerDic = header || {}
+    headerDic['Content-Type'] = "application/json";
+    var events = await fetch(url, { method: 'POST', headers: headerDic, body: JSON.stringify(params) })
+    const json = await events.json();
+    resolveCallback(json);
+  } catch (error) {
+    rejectCallback(error);
+  }
+}
+
+// let file = {uri: params.path, type: 'application/octet-stream', name: 'image.jpg'};
+async function asyncPostFile(url: String, header: Object, param: Object, files: Array, resolveCallback: Function, rejectCallback: Function) {
+  try {
+    var events = await QCRRNNetworkModule.postFile(url, header, param, files);
+    resolveCallback(events);
+  } catch (error) {
+    rejectCallback(error);
+  }
+}
+
+async function asyncPostFileFromFetch(url: String, header: Object, param: Object, files: Array, resolveCallback: Function, rejectCallback: Function) {
+  try {
+    let headerDic = JSON.parse(JSON.stringify(header));
+    headerDic['Content-Type'] = 'multipart/form-data';
+
+    const fd = new FormData()
+    files.forEach((element, index) => {
+      const fileKey = element['fileKey'];
+      fd.append(fileKey, element)
+    })
+    for (var key in param) {
+      fd.append(key, param[key]);
+    }
+
+    var events = await fetch(url, {
+      method: 'POST',
+      body: fd,
+      headers: headerDic
+    })
+    const json = await events.json();
+    resolveCallback(json);
+  } catch (error) {
+    rejectCallback(error);
+  }
+}
+
+async function asyncDownFile(url: String, fileName: String, resolveCallback: Function, rejectCallback: Function) {
+  try {
+    var events = await QCRRNNetworkModule.downFile(url, fileName);
+    resolveCallback(events);
+  } catch (error) {
+    rejectCallback(error);
+  }
+}
+
+async function asyncDownFileRN(url: String, fileName: String, resolveCallback: Function, rejectCallback: Function) {
+  let timestamp = (new Date()).getTime();//获取当前时间错
+  let random = String(((Math.random() * 1000000) | 0))//六位随机数
+  let dirs = Platform.OS === 'ios' ? RNFS.LibraryDirectoryPath : RNFS.ExternalDirectoryPath; //外部文件，共享目录的绝对路径（仅限android）
+  const downloadDest = `${dirs}/${fileName}`;
+  const formUrl = url;
+  const options = {
+    fromUrl: formUrl,
+    toFile: downloadDest,
+    background: true,
+    begin: (res) => {
+      console.log('begin', res);
+      console.log('contentLength:', res.contentLength / 1024 / 1024, 'M');
+    },
+  };
+  try {
+    const ret = RNFS.downloadFile(options);
+    ret.promise.then(res => {
+      console.log('success', res);
+      console.log('file://' + downloadDest)
+      let promise = CameraRoll.saveToCameraRoll(downloadDest);
+      promise.then(function (result) {
+        resolveCallback(result);
+      }).catch(function (error) {
+        console.log('error', error);
+        rejectCallback(new Error(error))
+      });
+    }).catch(err => {
+      rejectCallback(new Error(err))
+    });
+  } catch (e) {
+    rejectCallback(new Error(e))
+  }
+}
+
+async function asyncCancel(url: String, resolveCallback: Function, rejectCallback: Function) {
+  if (!QCRRNNetworkModule) {
+    return;
+  }
+  try {
+    var events = await QCRRNNetworkModule.cancel(url);
+    resolveCallback(events);
+  } catch (error) {
+    rejectCallback(error);
+  }
+}
+
+module.exports = NetworkModule;