kylefang/react-native
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native.git synced 2026-05-12 11:40:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add AppIdentity and DeviceIdentity to Inspector

Browse Source 
Reviewed By: Hypuk

Differential Revision: D5924011

fbshipit-source-id: a81d420dbe1a5ede203d2fa313548e19664b9587
This commit is contained in:
Paco Estevez Garcia
2017-10-03 05:45:31 -07:00
committed by Facebook Github Bot
parent 96f23e7416
commit da14fad829
7 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,8 +2,12 @@
package com.facebook.react;
import static com.facebook.react.modules.systeminfo.AndroidInfoHelpers.getFriendlyDeviceName;
import android.app.Activity;
import android.app.Application;
import android.net.Uri;
import android.os.Build;
import com.facebook.infer.annotation.Assertions;
import com.facebook.react.bridge.JSBundleLoader;
import com.facebook.react.bridge.JSCJavaScriptExecutorFactory;
@@ -262,12 +266,15 @@ public class ReactInstanceManagerBuilder {
mUIImplementationProvider = new UIImplementationProvider();
}
String appName = Uri.encode(mApplication.getPackageName());
String deviceName = Uri.encode(getFriendlyDeviceName());
return new ReactInstanceManager(
mApplication,
mCurrentActivity,
mDefaultHardwareBackBtnHandler,
mJavaScriptExecutorFactory == null
? new JSCJavaScriptExecutorFactory()
? new JSCJavaScriptExecutorFactory(appName, deviceName)
: mJavaScriptExecutorFactory,
(mJSBundleLoader == null && mJSBundleAssetUrl != null)
? JSBundleLoader.createAssetLoader(

10
ReactAndroid/src/main/java/com/facebook/react/bridge/JSCJavaScriptExecutorFactory.java
View File

@@ -10,10 +10,20 @@
package com.facebook.react.bridge;
public class JSCJavaScriptExecutorFactory implements JavaScriptExecutorFactory {
private final String mAppName;
private final String mDeviceName;
public JSCJavaScriptExecutorFactory(String appName, String deviceName) {
this.mAppName = appName;
this.mDeviceName = deviceName;
}
@Override
public JavaScriptExecutor create() throws Exception {
WritableNativeMap jscConfig = new WritableNativeMap();
jscConfig.putString("OwnerIdentity", "ReactNative");
jscConfig.putString("AppIdentity", mAppName);
jscConfig.putString("OwnerIdentity", mDeviceName);
return new JSCJavaScriptExecutor(jscConfig);
}
}

1
ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/AndroidInfoHelpers.java
View File

@@ -31,6 +31,7 @@ public class AndroidInfoHelpers {
return getServerIpAddress(INSPECTOR_PROXY_PORT);
}
// FIXME(festevezga): This method is duplicated in an internal module. Any changes should be applied to both.
public static String getFriendlyDeviceName() {
if (isRunningOnGenymotion()) {
// Genymotion already has a friendly name by default