kylefang/react-native
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native.git synced 2026-04-15 07:28:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert D5850968: Configure JSExector with BundleRegistry instead of JSModulesUnbundle.

Browse Source 
Differential Revision: D5850968

fbshipit-source-id: f4c9dc8d5f14cdd32195463e8786242e708770e9
This commit is contained in:
Jia Li
2017-09-21 21:07:39 -07:00
committed by Facebook Github Bot
parent 526fd6b931
commit 0aa12939fd
16 changed files with 49 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp
View File

@@ -13,7 +13,6 @@
#include <cxxreact/MethodCall.h>
#include <cxxreact/RecoverableError.h>
#include <cxxreact/ModuleRegistry.h>
#include <cxxreact/RAMBundleRegistry.h>
#include <fb/log.h>
#include <folly/dynamic.h>
#include <folly/Memory.h>
@@ -186,10 +185,8 @@ void CatalystInstanceImpl::jniLoadScriptFromAssets(
auto manager = extractAssetManager(assetManager);
auto script = loadScriptFromAssets(manager, sourceURL);
if (JniJSModulesUnbundle::isUnbundle(manager, sourceURL)) {
auto bundle = folly::make_unique<JniJSModulesUnbundle>(manager, sourceURL);
auto registry = folly::make_unique<RAMBundleRegistry>(std::move(bundle));
instance_->loadRAMBundle(
std::move(registry),
instance_->loadUnbundle(
folly::make_unique<JniJSModulesUnbundle>(manager, sourceURL),
std::move(script),
sourceURL,
loadSynchronously);
@@ -217,9 +214,8 @@ void CatalystInstanceImpl::jniLoadScriptFromFile(const std::string& fileName,
if (isIndexedRAMBundle(zFileName)) {
auto bundle = folly::make_unique<JSIndexedRAMBundle>(zFileName);
auto startupScript = bundle->getStartupCode();
auto registry = folly::make_unique<RAMBundleRegistry>(std::move(bundle));
instance_->loadRAMBundle(
std::move(registry),
instance_->loadUnbundle(
std::move(bundle),
std::move(startupScript),
sourceURL,
loadSynchronously);

4
ReactAndroid/src/main/jni/react/jni/ProxyExecutor.cpp
View File

@@ -84,10 +84,10 @@ void ProxyExecutor::loadApplicationScript(
// we launch the application.
}
void ProxyExecutor::setBundleRegistry(std::unique_ptr<RAMBundleRegistry>) {
void ProxyExecutor::setJSModulesUnbundle(std::unique_ptr<JSModulesUnbundle>) {
jni::throwNewJavaException(
"java/lang/UnsupportedOperationException",
"Loading application RAM bundles is not supported for proxy executors");
"Loading application unbundles is not supported for proxy executors");
}
void ProxyExecutor::callFunction(const std::string& moduleId, const std::string& methodId, const folly::dynamic& arguments) {

4
ReactAndroid/src/main/jni/react/jni/ProxyExecutor.h
View File

@@ -35,8 +35,8 @@ public:
virtual void loadApplicationScript(
std::unique_ptr<const JSBigString> script,
std::string sourceURL) override;
virtual void setBundleRegistry(
std::unique_ptr<RAMBundleRegistry> bundle) override;
virtual void setJSModulesUnbundle(
std::unique_ptr<JSModulesUnbundle> bundle) override;
virtual void callFunction(
const std::string& moduleId,
const std::string& methodId,