@smart-link/rn-im 1.0.24 → 1.1.1

package/dist/utils/upload.js

@@ -7,59 +7,23 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { backgroundUpload, UploadType } from 'react-native-compressor';
-import { getCookieString } from './cookie';
 import request, { getBaseURL } from './request';
-import { Platform } from 'react-native';
 import { toAbsolutePath } from './file';
-import { throttle } from "lodash-es";
 const uploadFile = (filePath, type, onProgress) => __awaiter(void 0, void 0, void 0, function* () {
     const url = getBaseURL();
     const uploadUrl = `${url}/api-file/file/uploadFile`;
-    const cookies = yield getCookieString();
-    const throttledFn = throttle((o) => {
-        onProgress === null || onProgress === void 0 ? void 0 : onProgress(o);
-    }, 500);
-    if (Platform.OS === 'android') {
-        const resp = yield backgroundUpload(uploadUrl, filePath, {
-            httpMethod: 'POST',
-            uploadType: UploadType.MULTIPART,
-            headers: {
-                Cookie: cookies,
-                accept: 'application/json',
-            },
-        }, (written, total) => {
-            // console.log('uploadFile progress: ', written, total);
-            throttledFn({ loaded: written, total });
-        });
-        console.log('uploadFile: ', resp);
-        try {
-            let body = JSON.parse(resp.body);
-            if (body.data) {
-                return body.data;
-            }
-            else {
-                throw new Error(body.codeMsg);
-            }
-        }
-        catch (e) {
-            console.log('uploadFile error: ', e);
-            throw e;
-        }
-    }
-    else {
-        const formData = new FormData();
-        formData.append('file', {
-            // @ts-ignore
-            uri: toAbsolutePath(filePath),
-            name: filePath.split('/').pop(),
-            type: type,
-        });
-        const resp = yield request.postFile(uploadUrl, formData, {
-            onUploadProgress: throttledFn,
-        });
-        console.log('uploadFile: ', resp);
-        return resp.data;
-    }
+    const formData = new FormData();
+    // @ts-ignore
+    formData.append('file', {
+        // @ts-ignore
+        uri: toAbsolutePath(filePath),
+        name: filePath.split('/').pop(),
+        type: type,
+    });
+    const resp = yield request.postFile(uploadUrl, formData, {
+        onUploadProgress: onProgress,
+    });
+    console.log('uploadFile: ', resp);
+    return resp.data;
 });
 export default uploadFile;

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@smart-link/rn-im",
-  "version": "1.0.24",
+  "version": "1.1.1",
   "description": "",
   "main": "./dist/index.js",
   "dependencies": {
     "color": "^5.0.0",
     "lodash-es": "^4.17.21",
-    "emoji-regex": "^10.4.0"
+    "emoji-regex": "^10.4.0",
+    "await-to-js": "^3.0.0"
   },
   "devDependencies": {
     "@react-native/eslint-config": "0.73.2",
@@ -23,7 +24,6 @@
   },
   "peerDependencies": {
     "@baronha/react-native-photo-editor": "1.1.6",
-    "@react-native-async-storage/async-storage": "1.24.0",
     "@react-native-camera-roll/camera-roll": "7.10.0",
     "@react-native-clipboard/clipboard": "1.16.2",
     "@react-native-community/netinfo": "11.4.1",
@@ -62,8 +62,8 @@
     "react-redux": "^8.1.3",
     "redux": "^4.2.1",
     "redux-thunk": "^2.4.2",
-    "@smart-link/rn-ui": "^1.0.6",
-    "@smart-link/im-base": "^1.0.24"
+    "@smart-link/rn-ui": "^1.1.0",
+    "@smart-link/im-base": "^1.1.1"
   },
   "files": [
     "dist/**",

package/dist/pages/address-list/Icons.d.ts

@@ -1,5 +0,0 @@
-import React from 'react';
-export declare const Unfold: (props: {
-    size: number;
-    color: string;
-}) => React.JSX.Element;

package/dist/pages/address-list/Icons.js

@@ -1,9 +0,0 @@
-import { dp } from '@smart-link/rn-ui';
-import React from 'react';
-import { Svg, Path } from 'react-native-svg';
-export const Unfold = (props) => {
-    const { size = 32, color } = props || {};
-    return (<Svg viewBox="0 0 1024 1024" width={dp(size)} height={dp(size)}>
-            <Path d="M832 800H256a32 32 0 0 1-32-32V192a32 32 0 0 1 64 0v544h544a32 32 0 1 1 0 64z" fill={color}/>
-        </Svg>);
-};

package/dist/slice/contact/contact.action.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/slice/contact/contact.action.js

@@ -1 +0,0 @@
-export {};

package/dist/utils/cookie.d.ts

@@ -1,2 +0,0 @@
-export declare const getCookieString: () => Promise<string>;
-export declare const clearCookies: () => Promise<void>;

package/dist/utils/cookie.js

@@ -1,25 +0,0 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-import { getBaseURL } from '../utils/request';
-import CookieManager from '@react-native-cookies/cookies';
-let cookiesStr = '';
-export const getCookieString = () => __awaiter(void 0, void 0, void 0, function* () {
-    if (cookiesStr)
-        return cookiesStr;
-    const url = getBaseURL();
-    const cookies = yield CookieManager.get(url);
-    cookiesStr = Object.keys(cookies).map((key) => {
-        return `${key}=${cookies[key].value}`;
-    }).join(';');
-    return cookiesStr;
-});
-export const clearCookies = () => __awaiter(void 0, void 0, void 0, function* () {
-    cookiesStr = '';
-});

package/dist/utils/file-operate.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/utils/file-operate.js

@@ -1,3 +0,0 @@
-// import {NativeModules, PermissionsAndroid, Platform} from "react-native";
-// import CameraRoll from '@react-native-community/cameraroll';
-export {};

package/dist/utils/text-mix.d.ts

@@ -1,9 +0,0 @@
-export type TextType = 'text' | 'phone' | 'url';
-export type TextItem = {
-    type: TextType;
-    value: string;
-};
-export declare function mixPhone(text: string): TextItem[];
-export declare function mixUrl(text: string): TextItem[];
-export declare function mixWithReg(text: string, type: TextType, reg: RegExp): TextItem[];
-export declare function mix(text: string): TextItem[];

package/dist/utils/text-mix.js

@@ -1,75 +0,0 @@
-// export function mixEmoji(text: string, textEmojiItems: TextItem[]) {
-//     if (!text || text.length === 0) {
-//         return;
-//     }
-//
-//     let leftIndex = text.indexOf('[');
-//     let rightIndex = text.indexOf(']');
-//
-//     if (leftIndex < 0 || rightIndex < 0) {
-//         textEmojiItems.push({type: 'text', value: text});
-//         return;
-//     }
-//
-//
-//     let leftText = text.substring(0, leftIndex);
-//     if(textEmojiItems.length > 0 && (leftText.length === 0 || leftText.lastIndexOf(' ') !== leftText.length -1)){
-//         leftText = leftText +' ';
-//     }
-//     textEmojiItems.push({type: 'text', value: leftText });
-//
-//     const emoji = text.substring(leftIndex + 1, rightIndex);
-//     textEmojiItems.push({type: 'emoji', value: emoji});
-//
-//     text = ' ' + text.substring(rightIndex + 1);
-//     mixEmoji(text, textEmojiItems);
-// }
-export function mixPhone(text) {
-    const phoneReg = /(1[\d]{10}|0\d{2,3}-\d{7,8}|400-?\d{3}-?\d{4})/g;
-    return mixWithReg(text, 'phone', phoneReg);
-}
-export function mixUrl(text) {
-    let urlReg = /(https?|http|ftp|file):\/\/[-A-Za-z0-9+&@#/%?=~_|!:,.;]+[-A-Za-z0-9+&@#/%=~_|]/g;
-    return mixWithReg(text, 'url', urlReg);
-}
-export function mixWithReg(text, type, reg) {
-    const items = [];
-    const tags = text.match(reg);
-    tags && tags.forEach(tag => {
-        let leftIndex = text.indexOf(tag);
-        let rightIndex = leftIndex + tag.length;
-        const leftText = text.substring(0, leftIndex);
-        items.push({ type: 'text', value: leftText + '' });
-        const tagText = text.substring(leftIndex, rightIndex);
-        items.push({ type: type, value: tagText });
-        text = '' + text.substring(rightIndex);
-    });
-    items.push({ type: 'text', value: text });
-    return items;
-}
-export function mix(text) {
-    const viewItems = [];
-    if (!text || text === '') {
-        return viewItems;
-    }
-    mixUrl(text).forEach(textUrlItem => {
-        if (textUrlItem.type === 'text') {
-            mixPhone(textUrlItem.value).forEach(textPhoneItem => {
-                // if (textPhoneItem.type === 'text') {
-                //     const textEmojiItems: TextItem[] = [];
-                //     // mixEmoji(textPhoneItem.value, textEmojiItems);
-                //     textEmojiItems.forEach(textEmojiItem => {
-                //         viewItems.push(textEmojiItem);
-                //     })
-                // } else {
-                //    viewItems.push(textPhoneItem);
-                // }
-                viewItems.push(textPhoneItem);
-            });
-        }
-        else {
-            viewItems.push(textUrlItem);
-        }
-    });
-    return viewItems;
-}