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

更新js库

Browse Source
This commit is contained in:
zhl 2023-05-12 09:55:55 +08:00
parent f417db691b
commit 5fb29b98f8
7 changed files with 114 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/compiler.xml generated
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="CompilerConfiguration"> <component name="CompilerConfiguration">
<bytecodeTargetLevel target="11" /> <bytecodeTargetLevel target="1.8" />
</component> </component>
</project> </project>

9
.idea/gradle.xml generated
View File

@ -7,15 +7,14 @@
<option name="testRunner" value="GRADLE" /> <option name="testRunner" value="GRADLE" />
<option name="distributionType" value="DEFAULT_WRAPPED" /> <option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" /> <option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleHome" value="/usr/local/Cellar/gradle/3.5/libexec" /> <option name="gradleJvm" value="1.8" />
<option name="gradleJvm" value="Embedded JDK" />
<option name="modules"> <option name="modules">
<set> <set>
<option value="$PROJECT_DIR$" /> <option value="$PROJECT_DIR$" />
<option value="$PROJECT_DIR$/app" /> <option value="$PROJECT_DIR$/app" />
<option value="$PROJECT_DIR$/install-time-asset_pack" /> <option value="$PROJECT_DIR$/../../crypto/cocos_js/cocos/platform/android/libcocos2dx" />
<option value="$PROJECT_DIR$/../cocos_js/cocos/platform/android/libcocos2dx" /> <option value="$PROJECT_DIR$/../../game/wallet-test/target/android/UnityDataAssetPack" />
<option value="$PROJECT_DIR$/../pubgv4/trunk/android/unityLibrary" /> <option value="$PROJECT_DIR$/../../game/wallet-test/target/android/unityLibrary" />
</set> </set>
</option> </option>
</GradleProjectSettings> </GradleProjectSettings>

2
.idea/misc.xml generated
View File

@ -15,7 +15,7 @@
</map> </map>
</option> </option>
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="adopt-1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">

24
Data/js/jcwallet.js
View File

File diff suppressed because one or more lines are too long

118
Data/js/main.js
View File

@ -1,4 +1,4 @@
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);
@ -11,57 +11,89 @@ function promiseCb(funId, promiseFun, dataParser) {
}); });
} }
/** /**
* init wallet, must call this before all other method * oauth login for before init internal wallet
* @param {string} type: wallet type, 0: internal wallet, 1: third party wallet * @param {*} funId
* @param {string} chain: chain type, 1: ETH, 2: ICON * @param {*} channel 0: google, 1: apple, 2: tiktok, 3: facebook, 4: twitter 5: tg, 6: email
* @param {string} channel: channel type, 0: google, 1: apple, 2: tiktok, 3: facebook, 4: twitter
*/ */
function initWallet(funId, type, chain, channel = 0) { function walletLogin(funId, channel) {
chain = parseInt(chain); channel = parseInt(channel);
console.log( console.log('walletLogin: ' + channel)
`initWallet:: type: ${type}, chain: ${chain}, channel: ${channel}` const wallet = !window.jc || !jc.wallet
); ? new jcwallet.default({ type: 0 })
try {
const wallet =
!window.jc || !jc.wallet
? new jcwallet.default({ chain, type })
: jc.wallet; : jc.wallet;
wallet.preLogin(channel)
if (parseInt(type) === 1) { .then((result) => {
console.log("wallet init success, begin connect"); jsb.jcCallback(funId, JSON.stringify({ errcode: 0, data: result }));
wallet
.initThirdPartyWallet()
.then(() => {
console.log("walletconnect connect success");
jsb.jcCallback(
funId,
JSON.stringify({ errcode: 0, data: jc.wallet.currentAccount() })
);
}) })
.catch((err) => { .catch((err) => {
console.log("walletconnect connect error: " + JSON.stringify(err));
jsb.jcCallback(funId, JSON.stringify({ errcode: 1, errmsg: err })); jsb.jcCallback(funId, JSON.stringify({ errcode: 1, errmsg: err }));
}); });
} else { }
wallet /**
.initInternalWallet(parseInt(channel)) * init internal wallet with password
.then(() => { * @param {*} funId
console.log("internal init success"); * @param {*} chain
jsb.jcCallback( * @param {*} pass
funId, */
JSON.stringify({ errcode: 0, data: jc.wallet.nativeAccount }) function initInternalWallet(funId, chain, pass) {
); chain = parseInt(chain);
}) const wallet =
.catch((err) => { !window.jc || !jc.wallet
console.log("internal wallet error: " + JSON.stringify(err)); ? new jcwallet.default({ type: 0 })
jsb.jcCallback(funId, JSON.stringify({ errcode: 1, errmsg: err })); : jc.wallet;
}); wallet
} .initInternalWallet(chain, pass)
.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 }));
});
}
/**
* 检查密码是否正确
* @param {*} funId
* @param {*} pass
* @returns
*/
function verifyPassword(funId, pass) {
try {
let result = jsb.verifyLocalPass(pass);
return JSON.stringify({ errcode: 0, data: { result } });
} catch (err) { } catch (err) {
console.error("wallet init with error: " + JSON.stringify(err)); return JSON.stringify({ errcode: 1, errmsg: err });
jsb.jcCallback(funId, JSON.stringify({ errcode: 1, errmsg: err }));
} }
} }
/**
* init third party wallet
* @param {*} funId
* @param {*} chain
*/
function initThirdPartyWallet(funId, chain) {
chain = parseInt(chain);
const wallet =
!window.jc || !jc.wallet
? new jcwallet.default({ type: 1 })
: jc.wallet;
wallet
.initThirdPartyWallet(chain)
.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 }));
});
}
/** /**
* current account for internal wallet * current account for internal wallet
*/ */

36
app/build.gradle
View File

@ -108,24 +108,24 @@ android {
} }
} }
//android.applicationVariants.all { variant -> android.applicationVariants.all { variant ->
// delete previous files first // delete previous files first
// delete "${buildDir}/intermediates/merged_assets/${variant.dirName}" delete "${buildDir}/intermediates/merged_assets/${variant.dirName}"
//
// variant.mergeAssetsProvider.get().doLast { variant.mergeAssetsProvider.get().doLast {
// def sourceDir = rootProject.ext.cfgs.jsFilePath def sourceDir = rootProject.ext.cfgs.jsFilePath
//
// copy{ copy{
// from "${sourceDir}" from "${sourceDir}"
// include "Data/js/**" include "Data/js/**"
// into outputDir into outputDir
// } }
// copy { copy {
// from "${sourceDir}/cert/cacert.pem" from "${sourceDir}/cert/cacert.pem"
// into outputDir into outputDir
// } }
// } }
//} }
dependencies { dependencies {

6
config.gradle
View File

@ -1,11 +1,11 @@
ext{ ext{
cfgs = [ cfgs = [
// 自定义的cocos2d-x项目根路径 // 自定义的cocos2d-x项目根路径
cocos2dxBasePath: '/Users/zhl/Documents/workspace/cocos/cocos2d-x', cocos2dxBasePath: '/Users/zhl/Documents/workspace/crypto/cocos_js',
// js钱包项目路径 // js钱包项目路径
jsFilePath: '/Users/zhl/Documents/workspace/android/HeadlessCocos', jsFilePath: '/Users/zhl/Documents/workspace/android/cocos_android',
// unity export的android项目的根路径 // unity export的android项目的根路径
// unityAndroidProject: '/Users/zhl/Documents/workspace/unity/first/android/tebg' // unityAndroidProject: '/Users/zhl/Documents/workspace/unity/first/android/tebg'
unityAndroidProject: '/Users/zhl/Documents/workspace/unity/first/first/target/android/tebg' unityAndroidProject: '/Users/zhl/Documents/workspace/game/wallet-test/target/android'
] ]
} }