Skip to content

M
meme_image
Commit fbd74640 authored by brent's avatar brent
Browse files
Options

update aonweb

parent f654a483
Show whitespace changes
Inline Side-by-side
Showing with 140 additions and 39 deletions
package-lock.json
View file @ fbd74640
......@@ -8,7 +8,7 @@
"name": "AONET",
"version": "0.0.0",
"dependencies": {
"aonweb": "^1.0.8",
"aonweb": "^1.0.13",
"aos": "^2.3.4",
"axios": "^1.6.8",
"element-plus": "^2.7.5",
......@@ -1854,13 +1854,14 @@
}
},
"node_modules/aonweb": {
"version": "1.0.8",
"resolved": "https://registry.npmjs.org/aonweb/-/aonweb-1.0.8.tgz",
"integrity": "sha512-xZkmdL74CcrVjNS+wx8bijL75SMPPB38sWk8MrIr856LgbMPQgBGyyvkI1KPP3V+/kqwK4g6HRajPBEw6VY9gQ==",
"version": "1.0.13",
"resolved": "https://registry.npmjs.org/aonweb/-/aonweb-1.0.13.tgz",
"integrity": "sha512-ya0UOwJmWIQk4BLuJfUlcLFDPjRkybsD2D7OsF8G9jDZJYANEPo9hqSTqY8ucO2bA/RR+tSVvzKM5dKM3NvR8Q==",
"dependencies": {
"@fingerprintjs/fingerprintjs": "^4.4.0",
"bignumber.js": "^9.1.2",
"crypto-js": "^4.2.0",
"moment": "^2.30.1",
"uuid": "^9.0.1",
"web3": "^4.8.0",
"web3-eth-accounts": "^4.1.2"
......@@ -3105,6 +3106,14 @@
"integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==",
"dev": true
},
"node_modules/moment": {
"version": "2.30.1",
"resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
"integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
"engines": {
"node": "*"
}
},
"node_modules/mrmime": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/mrmime/-/mrmime-2.0.0.tgz",
......@@ -5678,13 +5687,14 @@
}
},
"aonweb": {
"version": "1.0.8",
"resolved": "https://registry.npmjs.org/aonweb/-/aonweb-1.0.8.tgz",
"integrity": "sha512-xZkmdL74CcrVjNS+wx8bijL75SMPPB38sWk8MrIr856LgbMPQgBGyyvkI1KPP3V+/kqwK4g6HRajPBEw6VY9gQ==",
"version": "1.0.13",
"resolved": "https://registry.npmjs.org/aonweb/-/aonweb-1.0.13.tgz",
"integrity": "sha512-ya0UOwJmWIQk4BLuJfUlcLFDPjRkybsD2D7OsF8G9jDZJYANEPo9hqSTqY8ucO2bA/RR+tSVvzKM5dKM3NvR8Q==",
"requires": {
"@fingerprintjs/fingerprintjs": "^4.4.0",
"bignumber.js": "^9.1.2",
"crypto-js": "^4.2.0",
"moment": "^2.30.1",
"uuid": "^9.0.1",
"web3": "^4.8.0",
"web3-eth-accounts": "^4.1.2"
......@@ -6551,6 +6561,11 @@
"integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==",
"dev": true
},
"moment": {
"version": "2.30.1",
"resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
"integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how=="
},
"mrmime": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/mrmime/-/mrmime-2.0.0.tgz",
......
package.json
View file @ fbd74640
......@@ -11,7 +11,7 @@
"type-check": "vue-tsc --build --force"
},
"dependencies": {
"aonweb": "^1.0.8",
"aonweb": "^1.0.13",
"aos": "^2.3.4",
"axios": "^1.6.8",
"element-plus": "^2.7.5",
......
src/components/Header.vue
View file @ fbd74640
......@@ -67,7 +67,7 @@ const balance = async () => {
}
// console.log("Header balanceValue.value ", balanceValue.value)
localStorage.setItem("aon_balance",balanceValue.value)
closeToast();
// closeToast();
} catch (error) {
console.log(error, "balance error")
if (error && typeof error == 'string'){
......
src/views/Index.vue
View file @ fbd74640
......@@ -243,21 +243,21 @@ function selectTemplate(id, imageUrl, prompt_) {
prompt.value = prompt_
}
async function login() {
async function login_108() {
try {
let time = new Date().getTime()
console.log(`demo index login in time = ${time}`)
let user = new User()
let temp = await user.islogin()
console.log(`demo index islogin res time = ${new Date().getTime() - time}`)
if (!temp) {
showLoadingToast({
duration: 0,
forbidClick: true,
message: 'Loading...',
});
console.log(`demo index login after showLoadingToast time = ${new Date().getTime() - time}`)
let user = new User()
let temp = await user.islogin()
console.log(`demo index islogin res time = ${new Date().getTime() - time}`)
if (!temp) {
console.log(`demo index before login time = ${new Date().getTime() - time}`)
user.login((acc, userId, error) => {
closeToast();
......@@ -292,24 +292,59 @@ async function login() {
}
function sleep(ms) {
return new Promise(resolve => setTimeout(resolve, ms));
}
async function login_1012() {
try {
let time = new Date().getTime()
console.log(`demo index login start time = ${time}`)
let user = new User()
let temp = await user.islogin()
console.log(`demo index islogin end time = ${time}, temp = ${temp}`)
if (!temp) {
showLoadingToast({
duration: 0,
forbidClick: true,
message: 'Loading...',
});
console.log(`demo index showLoadingToast end time = ${time}`)
for (let i = 0; i < 5; i++) {
// console.log("getOwnedUsers i = ",i)
let result = await user.getOwnedUsers()
let userid = result && result._userIds && result._userIds.length && result._userIds[0]
if (userid && userid.length) {
break
}
await sleep(300)
}
closeToast();
temp = await user.islogin()
if (!temp) {
showToast("login failed,please try again later");
return
}
}
bus.emit('get_balance', "login");
console.log(`demo index login end time = ${new Date().getTime() - time}`)
} catch (error) {
console.log("index demo error", error)
closeToast();
if (error && typeof error == 'string') {
showToast(error);
} else {
showToast(error.message);
}
} finally {
}
}
onMounted(() => {
// let fingerprint = localStorage.getItem("aon_fingerprint")
// let userId = localStorage.removeItem("aon_logedUserId")
// if (fingerprint && window.Telegram && window.Telegram.WebApp && window.Telegram.WebApp.initData) {
// console.log("onMounted")
// localStorage.removeItem("aon_logedUserId")
// localStorage.removeItem("aon_fingerprint")
// localStorage.removeItem("token")
// }
// if (userId && !fingerprint && !(window.Telegram && window.Telegram.WebApp && window.Telegram.WebApp.initData)) {
// console.log("onMounted")
// localStorage.removeItem("aon_logedUserId")
// localStorage.removeItem("aon_fingerprint")
// localStorage.removeItem("token")
// }
getTemplateList()
login()
// login_108()
login_1012()
})
</script>
......
src/views/User.vue
View file @ fbd74640
......@@ -69,16 +69,16 @@ function goToComplete() {
// https://app.aonet.ai/kvapi
async function getAccount() {
try {
showLoadingToast({
duration: 0,
forbidClick: true,
message: 'Loading...',
});
//User 的使用方法
let user = new User()
const isLogin_status = await user.islogin()
console.log(isLogin_status, 'isLogin_status')
if (!isLogin_status) {
showLoadingToast({
duration: 0,
forbidClick: true,
message: 'Loading...',
});
user.login((acc, userId, error) => {
closeToast()
console.log("getWeb3 account", acc)
......@@ -150,8 +150,59 @@ async function getAccount() {
// console.log("test", response)
}
function sleep(ms) {
return new Promise(resolve => setTimeout(resolve, ms));
}
async function login() {
try {
let time = new Date().getTime()
console.log(`demo user login start time = ${time}`)
let user = new User()
let temp = await user.islogin()
if (!temp) {
showLoadingToast({
duration: 0,
forbidClick: true,
message: 'Loading...',
});
for (let i = 0; i < 5; i++) {
// console.log("getOwnedUsers i = ",i)
let result = await user.getOwnedUsers()
let userid = result && result._userIds && result._userIds.length && result._userIds[0]
if (userid && userid.length) {
break
}
await sleep(300)
}
closeToast();
temp = await user.islogin()
if (!temp) {
showToast("login failed,please try again later");
return
}
}
let ethereum = await detectEthereumProvider()
let get_account = await ethereum.request({ method: 'eth_requestAccounts' })
get_account = get_account[0]
account.value = get_account
bus.emit('get_balance', "login");
console.log(`demo user login end time = ${new Date().getTime() - time}`)
} catch (error) {
console.log("index demo error", error)
closeToast();
if (error && typeof error == 'string') {
showToast(error);
} else {
showToast(error.message);
}
} finally {
}
}
onMounted(() => {
getAccount()
// getAccount()
login()
})
</script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment