jayden/LayaNative2.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

同步

Browse Source
This commit is contained in:
lvfulong
2021-03-22 19:32:28 +08:00
parent e32ab4cd9f
commit 1f6af9ab2a
30 changed files with 137 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Conch/source/conch/JSWrapper/LayaWrap/JSConchConfig.cpp
+6 -5
View File
@@ -321,13 +321,14 @@ namespace laya
m_sGUID = CToObjectCGetGUID();
return m_sGUID.c_str();
#elif ANDROID
CToJavaBridge::JavaRet kRet;
/*CToJavaBridge::JavaRet kRet;
if (CToJavaBridge::GetInstance()->callMethod(CToJavaBridge::JavaClass.c_str(), "getWifiMac", kRet))
{
m_sGUID = CToJavaBridge::GetInstance()->getJavaString(kRet.pJNI, kRet.strRet);
}
LOGI("getGuid::get_Value=%s", m_sGUID.c_str());
return m_sGUID.c_str();
return m_sGUID.c_str();*/
return "android";
#elif WIN32
return "window";
#endif
@@ -335,11 +336,11 @@ namespace laya
const char* JSConchConfig::getRuntimeVersion()
{
#ifdef __APPLE__
return "ios-conch6-release-2.9.0";
return "ios-conch6-release-2.11.0";
#elif ANDROID
return "android-conch6-release-2.9.0";
return "android-conch6-release-2.11.0";
#elif WIN32
return "window-conch6-release-2.9.0";
return "window-conch6-release-2.11.0";
#endif
}
const char* JSConchConfig::getAppVersion()