kylefang/react-native
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native.git synced 2026-04-13 22:43:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

break dependency between JSPackagerClient.RequestHandler and WebSocketListener

Browse Source 
Reviewed By: amnn

Differential Revision: D4810406

fbshipit-source-id: a447bc15c6619921edd7adf0b3d1d93ae04e2e43
This commit is contained in:
Charles Dick
2017-03-31 10:59:34 -07:00
committed by Facebook Github Bot
parent ec68c97d72
commit 175e77d004
9 changed files with 125 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java
View File

@@ -23,7 +23,6 @@ import java.util.regex.Pattern;
import android.content.Context;
import android.os.AsyncTask;
import android.os.Handler;
import android.text.TextUtils;
import com.facebook.common.logging.FLog;
import com.facebook.infer.annotation.Assertions;
@@ -34,6 +33,10 @@ import com.facebook.react.devsupport.interfaces.PackagerStatusCallback;
import com.facebook.react.modules.systeminfo.AndroidInfoHelpers;
import com.facebook.react.packagerconnection.FileIoHandler;
import com.facebook.react.packagerconnection.JSPackagerClient;
import com.facebook.react.packagerconnection.RequestHandler;
import com.facebook.react.packagerconnection.NotificationOnlyHandler;
import com.facebook.react.packagerconnection.RequestOnlyHandler;
import com.facebook.react.packagerconnection.Responder;
import org.json.JSONException;
import org.json.JSONObject;
@@ -95,8 +98,8 @@ public class DevServerHelper {
public interface PackagerCommandListener {
void onPackagerReloadCommand();
void onCaptureHeapCommand(@Nullable final JSPackagerClient.Responder responder);
void onPokeSamplingProfilerCommand(@Nullable final JSPackagerClient.Responder responder);
void onCaptureHeapCommand(@Nullable final Responder responder);
void onPokeSamplingProfilerCommand(@Nullable final Responder responder);
}
private final DevInternalSettings mSettings;
@@ -129,23 +132,23 @@ public class DevServerHelper {
new AsyncTask<Void, Void, Void>() {
@Override
protected Void doInBackground(Void... backgroundParams) {
Map<String, JSPackagerClient.RequestHandler> handlers =
new HashMap<String, JSPackagerClient.RequestHandler>();
handlers.put("reload", new JSPackagerClient.NotificationOnlyHandler() {
Map<String, RequestHandler> handlers =
new HashMap<String, RequestHandler>();
handlers.put("reload", new NotificationOnlyHandler() {
@Override
public void onNotification(@Nullable Object params) {
commandListener.onPackagerReloadCommand();
}
});
handlers.put("captureHeap", new JSPackagerClient.RequestOnlyHandler() {
handlers.put("captureHeap", new RequestOnlyHandler() {
@Override
public void onRequest(@Nullable Object params, JSPackagerClient.Responder responder) {
public void onRequest(@Nullable Object params, Responder responder) {
commandListener.onCaptureHeapCommand(responder);
}
});
handlers.put("pokeSamplingProfiler", new JSPackagerClient.RequestOnlyHandler() {
handlers.put("pokeSamplingProfiler", new RequestOnlyHandler() {
@Override
public void onRequest(@Nullable Object params, JSPackagerClient.Responder responder) {
public void onRequest(@Nullable Object params, Responder responder) {
commandListener.onPokeSamplingProfilerCommand(responder);
}
});

9
ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java
View File

@@ -44,6 +44,7 @@ import com.facebook.react.devsupport.interfaces.PackagerStatusCallback;
import com.facebook.react.devsupport.interfaces.StackFrame;
import com.facebook.react.modules.debug.interfaces.DeveloperSettings;
import com.facebook.react.packagerconnection.JSPackagerClient;
import com.facebook.react.packagerconnection.Responder;
import java.io.File;
import java.io.IOException;
@@ -674,7 +675,7 @@ public class DevSupportManagerImpl implements
}
@Override
public void onCaptureHeapCommand(final JSPackagerClient.Responder responder) {
public void onCaptureHeapCommand(final Responder responder) {
UiThreadUtil.runOnUiThread(new Runnable() {
@Override
public void run() {
@@ -684,7 +685,7 @@ public class DevSupportManagerImpl implements
}
@Override
public void onPokeSamplingProfilerCommand(@Nullable final JSPackagerClient.Responder responder) {
public void onPokeSamplingProfilerCommand(@Nullable final Responder responder) {
UiThreadUtil.runOnUiThread(new Runnable() {
@Override
public void run() {
@@ -693,7 +694,7 @@ public class DevSupportManagerImpl implements
});
}
private void handleCaptureHeap(final JSPackagerClient.Responder responder) {
private void handleCaptureHeap(final Responder responder) {
if (mCurrentContext == null) {
return;
}
@@ -713,7 +714,7 @@ public class DevSupportManagerImpl implements
});
}
private void handlePokeSamplingProfiler(@Nullable final JSPackagerClient.Responder responder) {
private void handlePokeSamplingProfiler(@Nullable final Responder responder) {
try {
List<String> pokeResults = JSCSamplingProfiler.poke(60000);
for (String result : pokeResults) {