Skip to content

Commit 6e8198f

Browse files
committed
added logs
1 parent 8c5d768 commit 6e8198f

File tree

6 files changed

+112
-0
lines changed

6 files changed

+112
-0
lines changed
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>react-native-external-display</name>
4+
<comment>Project react-native-external-display created by Buildship.</comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
</buildSpec>
14+
<natures>
15+
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
16+
</natures>
17+
<filteredResources>
18+
<filter>
19+
<id>1733156198568</id>
20+
<name></name>
21+
<type>30</type>
22+
<matcher>
23+
<id>org.eclipse.core.resources.regexFilterMatcher</id>
24+
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
25+
</matcher>
26+
</filter>
27+
</filteredResources>
28+
</projectDescription>

packages/react-native-external-display/android/src/main/java/com/externaldisplay/ExternalDisplayHelper.java

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import java.util.Map;
1919
import java.util.HashMap;
20+
import android.util.Log;
2021

2122
import com.facebook.react.bridge.LifecycleEventListener;
2223
import com.facebook.react.bridge.ReactApplicationContext;
@@ -25,17 +26,24 @@
2526
class ExternalDisplayScreen extends Presentation {
2627
ExternalDisplayScreen(Context ctx, Display display) {
2728
super(ctx, display);
29+
Log.d("RNExternalDisplayEvent", "ExternalDisplayScreen init");
30+
2831
}
2932

3033
@Override
3134
protected void onCreate(Bundle savedInstanceState) {
35+
Log.d("RNExternalDisplayEvent", "ExternalDisplayScreen onCreate");
36+
3237
super.onCreate(savedInstanceState);
3338
}
3439
}
3540

3641
@TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
3742
class ExternalDisplayHelper implements DisplayManager.DisplayListener {
43+
3844
public static Map<String, Object> getScreenInfo(Display[] displays) {
45+
Log.d("RNExternalDisplayEvent", "ExternalDisplayScreen getScreenInfo");
46+
3947
HashMap<String, Object> info = new HashMap<String, Object>();
4048
for (Display display : displays) {
4149
int displayId = display.getDisplayId();
@@ -74,25 +82,35 @@ public ExternalDisplayHelper(Context context, Listener listener) {
7482
}
7583

7684
public Display getDisplay(int displayId) {
85+
Log.d("RNExternalDisplayEvent", "ExternalDisplayScreen getDisplay");
86+
7787
return dm.getDisplay(displayId);
7888
}
7989

8090
public Display[] getDisplays() {
91+
Log.d("RNExternalDisplayEvent", "ExternalDisplayScreen getDisplays");
92+
8193
return dm.getDisplays(DisplayManager.DISPLAY_CATEGORY_PRESENTATION);
8294
}
8395

8496
@Override
8597
public void onDisplayAdded(int displayId) {
98+
Log.d("RNExternalDisplayEvent", "ExternalDisplayScreen onDisplayAdded");
99+
86100
listener.onDisplayAdded(getDisplays(), displayId);
87101
}
88102

89103
@Override
90104
public void onDisplayChanged(int displayId) {
105+
Log.d("RNExternalDisplayEvent", "ExternalDisplayScreen onDisplayChanged");
106+
91107
listener.onDisplayChanged(getDisplays(), displayId);
92108
}
93109

94110
@Override
95111
public void onDisplayRemoved(int displayId) {
112+
Log.d("RNExternalDisplayEvent", "ExternalDisplayScreen onDisplayRemoved");
113+
96114
listener.onDisplayRemoved(getDisplays(), displayId);
97115
}
98116
}

packages/react-native-external-display/android/src/main/java/com/externaldisplay/RNExternalDisplayPackage.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import com.facebook.react.module.model.ReactModuleInfoProvider;
88
import com.facebook.react.TurboReactPackage;
99
import com.facebook.react.uimanager.ViewManager;
10+
import android.util.Log;
1011

1112
import java.util.ArrayList;
1213
import java.util.Collections;
@@ -15,11 +16,15 @@
1516
import java.util.Map;
1617

1718
import android.util.Log;
19+
import com.externaldisplay.RNExternalDisplayManager;
20+
import com.externaldisplay.RNExternalDisplayModule;
1821

1922
public class RNExternalDisplayPackage extends TurboReactPackage {
2023

2124
@Override
2225
public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
26+
Log.d("RNExternalDisplayEvent", "RNExternalDisplayPackage createViewManagers");
27+
2328
List<ViewManager> viewManagers = new ArrayList<>();
2429
viewManagers.add(new RNExternalDisplayManager(reactContext));
2530
return viewManagers;
@@ -28,6 +33,8 @@ public List<ViewManager> createViewManagers(ReactApplicationContext reactContext
2833
@Nullable
2934
@Override
3035
public NativeModule getModule(String name, ReactApplicationContext reactContext) {
36+
Log.d("RNExternalDisplayEvent", "RNExternalDisplayPackage getModule");
37+
3138
if (name.equals(RNExternalDisplayModule.REACT_CLASS)) {
3239
return new com.externaldisplay.RNExternalDisplayModule(reactContext);
3340
} else {
@@ -37,6 +44,8 @@ public NativeModule getModule(String name, ReactApplicationContext reactContext)
3744

3845
@Override
3946
public ReactModuleInfoProvider getReactModuleInfoProvider() {
47+
Log.d("RNExternalDisplayEvent", "RNExternalDisplayPackage getReactModuleInfoProvider");
48+
4049
return () -> {
4150
final Map<String, ReactModuleInfo> moduleInfos = new HashMap<>();
4251
boolean isTurboModule = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;

packages/react-native-external-display/android/src/main/java/com/externaldisplay/RNExternalDisplayView.java

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import android.widget.LinearLayout;
1010
import com.facebook.common.logging.FLog;
1111
import com.facebook.react.common.ReactConstants;
12+
import android.util.Log;
1213

1314
import android.view.Display;
1415
import android.util.DisplayMetrics;
@@ -30,11 +31,15 @@ public RNExternalDisplayView(Context context, ExternalDisplayHelper helper) {
3031
((ReactContext) context).addLifecycleEventListener(this);
3132
this.context = context;
3233
this.helper = helper;
34+
Log.d("RNExternalDisplayEvent", "RNExternalDisplayView init");
35+
3336
}
3437

3538
@Override
3639
public void addView(View child, int index) {
3740
subviews.add(index, child);
41+
Log.d("RNExternalDisplayEvent", "RNExternalDisplayView addView");
42+
3843
updateScreen();
3944
}
4045

@@ -44,22 +49,30 @@ protected void onLayout(boolean changed, int l, int t, int r, int b) {
4449

4550
@Override
4651
public int getChildCount() {
52+
Log.d("RNExternalDisplayEvent", "RNExternalDisplayView getChildCount");
53+
4754
return subviews.size();
4855
}
4956

5057
@Override
5158
public View getChildAt(int index) {
59+
Log.d("RNExternalDisplayEvent", "RNExternalDisplayView getChildAt");
60+
5261
return subviews.get(index);
5362
}
5463

5564
@Override
5665
public void removeView(View view) {
66+
Log.d("RNExternalDisplayEvent", "RNExternalDisplayView removeView");
67+
5768
super.removeView(view);
5869
}
5970

6071
@Override
6172
public void removeViewAt(int index) {
6273
View child = getChildAt(index);
74+
Log.d("RNExternalDisplayEvent", "RNExternalDisplayView removeViewAt");
75+
6376
super.removeView(child);
6477
subviews.remove(index);
6578
if (wrap != null) {
@@ -72,6 +85,8 @@ public void removeViewAt(int index) {
7285
}
7386

7487
public void onDropInstance() {
88+
Log.d("RNExternalDisplayEvent", "RNExternalDisplayView onDropInstance");
89+
7590
((ReactContext) getContext()).removeLifecycleEventListener(this);
7691
if (wrap != null && wrap.getChildCount() > 0) {
7792
for (int i = 0; i < wrap.getChildCount(); i++) {
@@ -89,6 +104,8 @@ public void addChildrenForAccessibility(ArrayList<View> outChildren) {
89104

90105
@Override
91106
public void onHostResume() {
107+
Log.d("RNExternalDisplayEvent", "RNExternalDisplayView onHostResume");
108+
92109
if (displayScreen == null && !pausedWithDisplayScreen) {
93110
return;
94111
}
@@ -98,6 +115,8 @@ public void onHostResume() {
98115

99116
@Override
100117
public void onHostPause() {
118+
Log.d("RNExternalDisplayEvent", "RNExternalDisplayView onHostPause");
119+
101120
if (displayScreen == null) {
102121
return;
103122
}
@@ -112,11 +131,16 @@ public void onHostPause() {
112131

113132
@Override
114133
public void onHostDestroy() {
134+
Log.d("RNExternalDisplayEvent", "RNExternalDisplayView onHostDestroy");
135+
115136
onDropInstance();
116137
}
117138

118139
public void updateScreen() {
140+
Log.d("RNExternalDisplayEvent", "RNExternalDisplayView updateScreen");
141+
119142
if (getChildCount() == 0) return;
143+
120144
if (screen > 0) {
121145
Display display = helper.getDisplay(screen);
122146
if (display != null) {
@@ -159,6 +183,8 @@ public void updateScreen() {
159183
}
160184

161185
private void destroyScreen() {
186+
Log.d("RNExternalDisplayEvent", "RNExternalDisplayView destroyScreen");
187+
162188
if (displayScreen != null) {
163189
displayScreen.hide();
164190
displayScreen.dismiss();
@@ -168,6 +194,8 @@ private void destroyScreen() {
168194
}
169195

170196
public void setScreen(String screen) {
197+
Log.d("RNExternalDisplayEvent", "RNExternalDisplayView setScreen");
198+
171199
if (getChildCount() > 0 && wrap != null && wrap.getChildCount() > 0) {
172200
for (int i = 0; i < wrap.getChildCount(); i++) {
173201
wrap.removeViewAt(i);
@@ -191,10 +219,14 @@ public void setScreen(String screen) {
191219
}
192220

193221
public int getScreen() {
222+
Log.d("RNExternalDisplayEvent", "RNExternalDisplayView getScreen");
223+
194224
return this.screen;
195225
}
196226

197227
public void setFallbackInMainScreen(boolean value) {
228+
Log.d("RNExternalDisplayEvent", "RNExternalDisplayView setFallbackInMainScreen");
229+
198230
this.fallbackInMainScreen = value;
199231
}
200232
}

packages/react-native-external-display/android/src/oldarch/java/com/externaldisplay/RNExternalDisplayManager.java

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import android.util.DisplayMetrics;
1616
import android.view.Display;
1717
import android.graphics.Rect;
18+
import android.util.Log;
1819

1920
import javax.annotation.Nullable;
2021
import java.util.Map;
@@ -29,6 +30,8 @@ public class RNExternalDisplayManager extends ViewGroupManager<RNExternalDisplay
2930
public RNExternalDisplayManager(ReactApplicationContext reactContext) {
3031
super();
3132
this.reactContext = reactContext;
33+
Log.d("RNExternalDisplayEvent", "RNExternalDisplayManager init");
34+
3235
}
3336

3437
@Override
@@ -38,6 +41,8 @@ public String getName() {
3841

3942
@Override
4043
public RNExternalDisplayView createViewInstance(ThemedReactContext context) {
44+
Log.d("RNExternalDisplayEvent", "RNExternalDisplayManager createViewInstance");
45+
4146
if (this.helper == null) {
4247
this.helper = new ExternalDisplayHelper(reactContext, this);
4348
}
@@ -48,12 +53,16 @@ public RNExternalDisplayView createViewInstance(ThemedReactContext context) {
4853

4954
@Override
5055
public void onDropViewInstance(RNExternalDisplayView view) {
56+
Log.d("RNExternalDisplayEvent", "RNExternalDisplayManager onDropViewInstance");
57+
5158
views.remove(view);
5259
super.onDropViewInstance(view);
5360
view.onDropInstance();
5461
}
5562

5663
private void checkScreen() {
64+
Log.d("RNExternalDisplayEvent", "RNExternalDisplayManager checkScreen");
65+
5766
int screenId = -1;
5867
for (RNExternalDisplayView view : views.values()) {
5968
int viewScreenId = view.getScreen();
@@ -69,22 +78,30 @@ private void checkScreen() {
6978

7079
@ReactProp(name = "screen")
7180
public void setScreen(RNExternalDisplayView view, @Nullable String screen) {
81+
Log.d("RNExternalDisplayEvent", "RNExternalDisplayManager setScreen");
82+
7283
view.setScreen(screen);
7384
checkScreen();
7485
}
7586

7687
@ReactProp(name = "fallbackInMainScreen", defaultBoolean = false)
7788
public void setFallbackInMainScreen(RNExternalDisplayView view, boolean fallbackInMainScreen) {
89+
Log.d("RNExternalDisplayEvent", "RNExternalDisplayManager setFallbackInMainScreen");
90+
7891
view.setFallbackInMainScreen(fallbackInMainScreen);
7992
}
8093

8194
private void sendEvent(String eventName, @Nullable WritableMap params) {
95+
Log.d("RNExternalDisplayEvent", "RNExternalDisplayManager sendEvent:"+eventName);
96+
8297
reactContext
8398
.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
8499
.emit(eventName, params);
85100
}
86101

87102
public void onDisplayAdded(Display[] displays, int displayId) {
103+
Log.d("RNExternalDisplayEvent", "RNExternalDisplayManager onDisplayAdded:"+displayId);
104+
88105
sendEvent(
89106
"@RNExternalDisplay_screenDidConnect",
90107
Arguments.makeNativeMap(
@@ -93,6 +110,8 @@ public void onDisplayAdded(Display[] displays, int displayId) {
93110
);
94111
}
95112
public void onDisplayChanged(Display[] displays, int displayId) {
113+
Log.d("RNExternalDisplayEvent", "RNExternalDisplayManager onDisplayChanged:"+displayId);
114+
96115
sendEvent(
97116
"@RNExternalDisplay_screenDidChange",
98117
Arguments.makeNativeMap(
@@ -101,6 +120,8 @@ public void onDisplayChanged(Display[] displays, int displayId) {
101120
);
102121
}
103122
public void onDisplayRemoved(Display[] displays, int displayId) {
123+
Log.d("RNExternalDisplayEvent", "RNExternalDisplayManager onDisplayRemoved:"+displayId);
124+
104125
sendEvent(
105126
"@RNExternalDisplay_screenDidDisconnect",
106127
Arguments.makeNativeMap(

packages/react-native-external-display/android/src/oldarch/java/com/externaldisplay/RNExternalDisplayModule.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import android.view.Display;
99
import android.hardware.display.DisplayManager;
10+
import android.util.Log;
1011

1112
import java.util.Map;
1213
import java.util.HashMap;
@@ -18,6 +19,7 @@ public class RNExternalDisplayModule extends ReactContextBaseJavaModule {
1819

1920
public RNExternalDisplayModule(ReactApplicationContext context) {
2021
super(context);
22+
Log.d("RNExternalDisplayEvent", "RNExternalDisplayModule init");
2123
reactContext = context;
2224
dm = (DisplayManager) context.getSystemService(Context.DISPLAY_SERVICE);
2325
}
@@ -29,6 +31,8 @@ public String getName() {
2931

3032
@Override
3133
public Map<String, Object> getConstants() {
34+
Log.d("RNExternalDisplayEvent", "RNExternalDisplayModule getConstants");
35+
3236
HashMap<String, Object> map = new HashMap<String, Object>();
3337
map.put("SCREEN_INFO", ExternalDisplayHelper.getScreenInfo(dm.getDisplays()));
3438
return map;

0 commit comments

Comments
 (0)