tools/cocos_android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update js lib

Browse Source
This commit is contained in:
zhl 2023-05-16 19:43:14 +08:00
parent a7d7df0b4c
commit a862eeeeef
2 changed files with 35 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Data/js/jcwallet.js
View File

File diff suppressed because one or more lines are too long

60
Data/js/main.js
View File

@ -1,14 +1,19 @@
console.log(">> begin load wallet main file."); console.log(">> begin load wallet main file.");
function promiseCb(funId, promiseFun, dataParser) { function promiseCb(funId, promiseFun, dataParser) {
dataParser = dataParser || ((v) => v); dataParser = dataParser || ((v) => v);
promiseFun promiseFun
.then((result) => { .then((result) => {
jsb.jcCallback(funId, JSON.stringify({ errcode: 0, data: result })); jsb.jcCallback(
funId,
JSON.stringify({ errcode: 0, data: dataParser(result) })
);
}) })
.catch((err) => { .catch((err) => {
console.log(JSON.stringify(err)); let code = err.statusCode || 1;
jsb.jcCallback(funId, JSON.stringify({ errcode: 1, errmsg: err })); jsb.jcCallback(
funId,
JSON.stringify({ errcode: code, errmsg: err.message || err })
);
}); });
} }
/** /**
@ -31,18 +36,8 @@ function initInternalWallet(funId, chain, pass) {
chain = parseInt(chain); chain = parseInt(chain);
const wallet = const wallet =
!window.jc || !jc.wallet ? new jcwallet.default({ type: 0 }) : jc.wallet; !window.jc || !jc.wallet ? new jcwallet.default({ type: 0 }) : jc.wallet;
wallet promiseCb(funId, wallet.initInternalWallet(chain, pass), () => {
.initInternalWallet(chain, pass) return jc.wallet.nativeAccount;
.then(() => {
console.log("internal init success");
jsb.jcCallback(
funId,
JSON.stringify({ errcode: 0, data: jc.wallet.nativeAccount })
);
})
.catch((err) => {
console.log("internal wallet error: " + JSON.stringify(err));
jsb.jcCallback(funId, JSON.stringify({ errcode: 1, errmsg: err }));
}); });
} }
/** /**
@ -55,7 +50,7 @@ function verifyPassword(funId, pass) {
let result = jsb.verifyLocalPass(pass); let result = jsb.verifyLocalPass(pass);
return JSON.stringify({ errcode: 0, data: result }); return JSON.stringify({ errcode: 0, data: result });
} catch (err) { } catch (err) {
return JSON.stringify({ errcode: 1, errmsg: err }); return JSON.stringify({ errcode: 1, errmsg: err.message || err });
} }
} }
/** /**
@ -66,18 +61,8 @@ function initThirdPartyWallet(funId, chain) {
chain = parseInt(chain); chain = parseInt(chain);
const wallet = const wallet =
!window.jc || !jc.wallet ? new jcwallet.default({ type: 1 }) : jc.wallet; !window.jc || !jc.wallet ? new jcwallet.default({ type: 1 }) : jc.wallet;
wallet promiseCb(funId, wallet.initThirdPartyWallet(chain), () => {
.initThirdPartyWallet(chain) return jc.wallet.currentAccount();
.then(() => {
console.log("walletconnect connect success");
jsb.jcCallback(
funId,
JSON.stringify({ errcode: 0, data: jc.wallet.currentAccount() })
);
})
.catch((err) => {
console.log("walletconnect connect error: " + JSON.stringify(err));
jsb.jcCallback(funId, JSON.stringify({ errcode: 1, errmsg: err }));
}); });
} }
/** /**
@ -88,7 +73,7 @@ function currentAccount(funId) {
let data = jc.wallet.currentAccountData; let data = jc.wallet.currentAccountData;
return JSON.stringify({ errcode: 0, data }); return JSON.stringify({ errcode: 0, data });
} catch (err) { } catch (err) {
return JSON.stringify({ errcode: 1, errmsg: err }); return JSON.stringify({ errcode: 1, errmsg: err.message || err });
} }
} }
@ -100,7 +85,7 @@ function chainList(funId) {
let data = jc.wallet.chainList; let data = jc.wallet.chainList;
return JSON.stringify({ errcode: 0, data }); return JSON.stringify({ errcode: 0, data });
} catch (err) { } catch (err) {
return JSON.stringify({ errcode: 1, errmsg: err }); return JSON.stringify({ errcode: 1, errmsg: err.message || err });
} }
} }
/** /**
@ -111,10 +96,7 @@ function currentChain(funId) {
let data = jc.wallet.currentChain; let data = jc.wallet.currentChain;
return JSON.stringify({ errcode: 0, data }); return JSON.stringify({ errcode: 0, data });
} catch (err) { } catch (err) {
return JSON.stringify({ return JSON.stringify({ errcode: 1, errmsg: err.message || err });
errcode: 1,
errmsg: err,
});
} }
} }
/** /**
@ -164,7 +146,7 @@ function generateIcon(funId, msg, diameter) {
let result = jc.wallet.generateIconData(msg, diameter); let result = jc.wallet.generateIconData(msg, diameter);
return JSON.stringify({ errcode: 0, data: result }); return JSON.stringify({ errcode: 0, data: result });
} catch (err) { } catch (err) {
return JSON.stringify({ errcode: 1, errmsg: err }); return JSON.stringify({ errcode: 1, errmsg: err.message || err });
} }
} }
@ -227,7 +209,7 @@ function showQRCode(funId, content) {
jsb.showQRCode(funId, content); jsb.showQRCode(funId, content);
return JSON.stringify({ errcode: 0, data: 1 }); return JSON.stringify({ errcode: 0, data: 1 });
} catch (err) { } catch (err) {
return JSON.stringify({ errcode: 1, errmsg: err }); return JSON.stringify({ errcode: 1, errmsg: err.message || err });
} }
} }
@ -237,7 +219,7 @@ function showWebPage(funId, url) {
// jsb.openURL(url); // jsb.openURL(url);
return JSON.stringify({ errcode: 0, data: 1 }); return JSON.stringify({ errcode: 0, data: 1 });
} catch (err) { } catch (err) {
return JSON.stringify({ errcode: 1, errmsg: err }); return JSON.stringify({ errcode: 1, errmsg: err.message || err });
} }
} }
@ -251,7 +233,7 @@ function exportWalletSecKey(funId, pass) {
let key = jsb.walletSecKey(funId); let key = jsb.walletSecKey(funId);
return JSON.stringify({ errcode: 0, data: key }); return JSON.stringify({ errcode: 0, data: key });
} catch (err) { } catch (err) {
return JSON.stringify({ errcode: 1, errmsg: err }); return JSON.stringify({ errcode: 1, errmsg: err.message || err });
} }
} }