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

移除一些恢复密钥相关方法

Browse Source
This commit is contained in:
zhl 2023-05-17 11:28:24 +08:00
parent b5989962ff
commit cf4b8d183b
6 changed files with 11 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/platform/CCApplication.h
View File

@ -201,8 +201,6 @@ public:
void copyTextToClipboard(const std::string &text); void copyTextToClipboard(const std::string &text);
void showQRCode(const std::string &content, const std::string &title, const std::string &val);
void toWallet(const std::string &url); void toWallet(const std::string &url);
void saveKeyLocal(const std::string &account, const std::string &key); void saveKeyLocal(const std::string &account, const std::string &key);

4
cocos/platform/android/CCApplication-android.cpp
View File

@ -294,10 +294,6 @@ void Application::copyTextToClipboard(const std::string &text)
} }
void Application::showQRCode(const std::string &content, const std::string &title, const std::string &val) {
showRestoreQRJNI("", content, title, val);
}
void Application::toWallet(const std::string &url) { void Application::toWallet(const std::string &url) {
toWalletJNI(url); toWalletJNI(url);
} }

11
cocos/platform/android/java/.project
View File

@ -30,4 +30,15 @@
<nature>com.android.ide.eclipse.adt.AndroidNature</nature> <nature>com.android.ide.eclipse.adt.AndroidNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.jdt.core.javanature</nature>
</natures> </natures>
<filteredResources>
<filter>
<id>1684288042113</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription> </projectDescription>

10
cocos/platform/android/jni/JniImp.cpp
View File

@ -663,21 +663,11 @@ void showWebPageJNI(const std::string& funid, const std::string& content)
JniHelper::callStaticVoidMethod(JCSDK, "showWebPage", funid, content); JniHelper::callStaticVoidMethod(JCSDK, "showWebPage", funid, content);
} }
void showRestoreQRJNI(const std::string& funid, const std::string& content, const std::string& title, const std::string& oid)
{
JniHelper::callStaticVoidMethod(JCSDK, "showRestoreQR", funid, content, title, oid);
}
void scanQRCodeJNI(const std::string& funid, const std::string& title) void scanQRCodeJNI(const std::string& funid, const std::string& title)
{ {
JniHelper::callStaticVoidMethod(JCSDK, "scanQRCode", funid, title); JniHelper::callStaticVoidMethod(JCSDK, "scanQRCode", funid, title);
} }
void loadRestoreKeyJNI(const std::string& funid, const std::string& oid)
{
JniHelper::callStaticVoidMethod(JCSDK, "loadRestoreKey", funid, oid);
}
void signWithGoogleJNI(const std::string& funid) void signWithGoogleJNI(const std::string& funid)
{ {
JniHelper::callStaticVoidMethod(JCSDK, "signWithGoogle", funid); JniHelper::callStaticVoidMethod(JCSDK, "signWithGoogle", funid);

2
cocos/platform/android/jni/JniImp.h
View File

@ -36,10 +36,8 @@ extern void exitApplication();
extern std::string getApkPathJNI(); extern std::string getApkPathJNI();
extern std::string getPackageNameJNI(); extern std::string getPackageNameJNI();
void showQRCodeJNI(const std::string& funid, const std::string& content); void showQRCodeJNI(const std::string& funid, const std::string& content);
void showRestoreQRJNI(const std::string& funid, const std::string& content, const std::string& title, const std::string& id);
void scanQRCodeJNI(const std::string& funid, const std::string& title); void scanQRCodeJNI(const std::string& funid, const std::string& title);
void showWebPageJNI(const std::string& funid, const std::string& url); void showWebPageJNI(const std::string& funid, const std::string& url);
void loadRestoreKeyJNI(const std::string& funid, const std::string& oid);
void signWithGoogleJNI(const std::string& funid); void signWithGoogleJNI(const std::string& funid);
void signWithAppleJNI(const std::string& funid); void signWithAppleJNI(const std::string& funid);
void signWithTiktokJNI(const std::string& funid); void signWithTiktokJNI(const std::string& funid);

22
cocos/scripting/js-bindings/manual/jsb_global.cpp
View File

@ -838,27 +838,6 @@ static bool JSB_scanQRCode(se::State& s)
} }
SE_BIND_FUNC(JSB_scanQRCode) SE_BIND_FUNC(JSB_scanQRCode)
static bool JSB_restoreKey(se::State& s)
{
const auto& args = s.args();
size_t argc = args.size();
CC_UNUSED bool ok = true;
if (argc > 1) {
std::string funid;
ok = seval_to_std_string(args[0], &funid);
SE_PRECONDITION2(ok, false, "funid is invalid!");
std::string oid;
ok = seval_to_std_string(args[1], &oid);
SE_PRECONDITION2(ok, false, "oid is invalid!");
loadRestoreKeyJNI(funid, oid);
return true;
}
SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 2);
return false;
}
SE_BIND_FUNC(JSB_restoreKey)
static bool JSB_signWithGoogle(se::State& s) static bool JSB_signWithGoogle(se::State& s)
{ {
const auto& args = s.args(); const auto& args = s.args();
@ -1379,7 +1358,6 @@ bool jsb_register_global_variables(se::Object* global)
__jsbObj->defineFunction("copyTextToClipboard", _SE(JSB_copyTextToClipboard)); __jsbObj->defineFunction("copyTextToClipboard", _SE(JSB_copyTextToClipboard));
#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
__jsbObj->defineFunction("scanQRCode", _SE(JSB_scanQRCode)); __jsbObj->defineFunction("scanQRCode", _SE(JSB_scanQRCode));
__jsbObj->defineFunction("restoreKey", _SE(JSB_restoreKey));
__jsbObj->defineFunction("signWithGoogle", _SE(JSB_signWithGoogle)); __jsbObj->defineFunction("signWithGoogle", _SE(JSB_signWithGoogle));
__jsbObj->defineFunction("signWithApple", _SE(JSB_signWithApple)); __jsbObj->defineFunction("signWithApple", _SE(JSB_signWithApple));
__jsbObj->defineFunction("signWithTikTok", _SE(JSB_signWithTiktok)); __jsbObj->defineFunction("signWithTikTok", _SE(JSB_signWithTiktok));