From e3f8c396f708a52ec938453e9346aaf863893d0c Mon Sep 17 00:00:00 2001 From: "guoqing.zhu" <1521292690@qq.com> Date: Tue, 31 May 2022 22:10:17 +0800 Subject: [PATCH] update --- assets/scripts/UILogin.js | 1 - assets/scripts/tips/ChainErrTip.ts | 4 +--- .../app/src/org/cocos2dx/javascript/AppActivity.java | 12 +++++------- settings/project.json | 1 - 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/assets/scripts/UILogin.js b/assets/scripts/UILogin.js index 54c4cf7c..d6cf4c4c 100644 --- a/assets/scripts/UILogin.js +++ b/assets/scripts/UILogin.js @@ -172,7 +172,6 @@ cc.Class({ }, showchainErrTip(){ - console.log("链id错误") uimanger.showUI(ChainErrTip.prefabPath); }, diff --git a/assets/scripts/tips/ChainErrTip.ts b/assets/scripts/tips/ChainErrTip.ts index 21035e66..820d5596 100644 --- a/assets/scripts/tips/ChainErrTip.ts +++ b/assets/scripts/tips/ChainErrTip.ts @@ -5,7 +5,6 @@ const { ccclass, property } = cc._decorator; @ccclass export default class ChainErrTip extends UIBase { public static prefabPath = "prefabs/tips/pb_chainerr"; - init(data: any) { // @@ -33,8 +32,7 @@ export default class ChainErrTip extends UIBase { ); } - this.node.destroy() - + this.node.destroy(); } onClose() { diff --git a/build-templates/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/AppActivity.java b/build-templates/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/AppActivity.java index f83a73e8..1645c8ba 100644 --- a/build-templates/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/AppActivity.java +++ b/build-templates/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/AppActivity.java @@ -40,13 +40,13 @@ import com.youme.voiceengine.api; import com.youme.voiceengine.mgr.YouMeManager; import org.cocos2dx.javascript.wc.JWCSession; -import org.cocos2dx.javascript.wc.entity.CallResult; -import org.cocos2dx.javascript.wc.entity.ChainObj; -import org.cocos2dx.javascript.wc.entity.ChangeChainObj; +import org.cocos2dx.javascript.wc.CallResult; +import org.cocos2dx.javascript.wc.ChainObj; import org.cocos2dx.lib.Cocos2dxActivity; import org.cocos2dx.lib.Cocos2dxGLSurfaceView; import org.cocos2dx.lib.Cocos2dxJavascriptJavaBridge; import org.jetbrains.annotations.NotNull; +import org.json.JSONObject; import org.walletconnect.Session; import java.io.IOException; @@ -418,17 +418,15 @@ public class AppActivity extends Cocos2dxActivity implements YouMeCallBackInterf * } */ public static void addChain(String paramStr){ + System.out.println("链信息"+paramStr); final Moshi moshi = new Moshi.Builder().build(); JsonAdapter jsonAdapter = moshi.adapter(ChainObj.class); try { final ChainObj chainObj = jsonAdapter.fromJson(paramStr); - Log.i(TAG, chainObj.toString()); List paramList = new ArrayList<>(); paramList.add(chainObj); - Log.i(TAG, "addChain"); long time = System.currentTimeMillis(); - - ExampleApplication.session.performMethodCall(new Session.MethodCall.Custom(time, "eth_signTypedData", paramList), new Function1() { + ExampleApplication.session.performMethodCall(new Session.MethodCall.Custom(time, "wallet_addEthereumChain", paramList), new Function1() { @Override public Unit invoke(Session.MethodCall.Response resp) { CallResult result = new CallResult("addChain"); diff --git a/settings/project.json b/settings/project.json index e96b7d91..bf3fe5a4 100644 --- a/settings/project.json +++ b/settings/project.json @@ -36,7 +36,6 @@ "height": 640, "width": 960 }, - "start-scene": "current", "use-customize-simulator": true, "use-project-simulator-setting": false } \ No newline at end of file