提交 9d95351a authored 作者: 吴强's avatar 吴强

Merge branch 'master' of ssh://192.168.1.116:29418/bolan-root/frontend/manager-app-sz into wq

# Conflicts: # src/index.js # src/routes/main/home/index.js
......@@ -6,7 +6,7 @@ android/build/
android/app/build/
npm-debug.*
*.iml
.idea
.idea/
npm-debug.log
yarn-error.log
......
......@@ -113,6 +113,14 @@ android {
abiFilters "armeabi-v7a", "x86"
}
}
signingConfigs {
release {
storeFile file("app.jks")
storePassword "proland305$"
keyAlias "app-alias"
keyPassword "proland305$"
}
}
splits {
abi {
reset()
......
......@@ -73,7 +73,7 @@ export function encrypt(text) {
const jsEncrypt = createJSEncrypt();
jsEncrypt.setPublicKey(pubKey);
let out = jsEncrypt.encryptLong(text);
out = out.split('=')[0];
[out] = out.split('=');
out = out.replace(/\+/g, '-');
return out.replace(/\//g, '_');
}
......@@ -84,7 +84,7 @@ export function encrypt(text) {
*/
export function queryURL(name) {
const reg = new RegExp(`(^|&)${name}=([^&]*)(&|$)`, 'i');
// eslint-disable-next-line no-undef
// eslint-disable-next-line no-undef
const r = window ? window.location.search.substr(1).match(reg) : null;
if (r !== null) return decodeURI(r[2]);
return null;
......@@ -97,7 +97,7 @@ export function padDigits(number, digits) {
export function is(obj, type) {
return (type === 'Null' && obj === null) ||
(type === 'Undefined' && obj === void 0) || // eslint-disable-line no-void
(type === 'Number' && isFinite(obj)) ||
(type === 'Number' && isFinite(obj)) || // eslint-disable-line no-restricted-globals
Object.prototype.toString.call(obj).slice(8, -1) === type;
}
......@@ -125,12 +125,12 @@ export async function tryIt(times, cb, delay) {
let err;
for (let i = 0; i < times; ++i) {
try {
return await cb();
return await cb(); // eslint-disable-line
} catch (e) {
err = e;
}
if (delay) {
await sleep(delay);
await sleep(delay); // eslint-disable-line
}
}
if (err) {
......
......@@ -11,9 +11,9 @@ export default {
},
async setItem(key, value) {
const item = JSON.stringify(value);
return await AsyncStorage.setItem(key, item);
return AsyncStorage.setItem(key, item);
},
async delItem(key) {
return AsyncStorage.removeItem(key);
},
}
\ No newline at end of file
};
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论