瀏覽代碼

call init

Guy Carmeli 8 年之前
父節點
當前提交
4432c4d1f0

+ 5
- 22
android/app/src/main/java/com/reactnativenavigation/controllers/NavigationActivity.java 查看文件

8
 
8
 
9
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
9
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
10
 import com.reactnativenavigation.NavigationApplication;
10
 import com.reactnativenavigation.NavigationApplication;
11
-import com.reactnativenavigation.layouts.Layout;
12
 import com.reactnativenavigation.layouts.ScreenLayout;
11
 import com.reactnativenavigation.layouts.ScreenLayout;
13
 import com.reactnativenavigation.params.ActivityParams;
12
 import com.reactnativenavigation.params.ActivityParams;
14
 import com.reactnativenavigation.params.parsers.ActivityParamsParser;
13
 import com.reactnativenavigation.params.parsers.ActivityParamsParser;
28
     private static Activity currentActivity;
27
     private static Activity currentActivity;
29
     private ActivityParams activityParams;
28
     private ActivityParams activityParams;
30
     private ModalController modalController;
29
     private ModalController modalController;
31
-    private Layout layout = new Layout() {
32
-        @Override
33
-        public boolean onBackPressed() {
34
-            return false;
35
-        }
36
-
37
-        @Override
38
-        public void onDestroy() {
39
-
40
-        }
41
-
42
-        @Override
43
-        public void removeAllReactViews() {
44
-
45
-        }
46
-    };
47
 
30
 
48
     @Override
31
     @Override
49
     protected void onCreate(Bundle savedInstanceState) {
32
     protected void onCreate(Bundle savedInstanceState) {
79
     @Override
62
     @Override
80
     protected void onDestroy() {
63
     protected void onDestroy() {
81
         modalController.onDestroy();
64
         modalController.onDestroy();
82
-        layout.onDestroy();
65
+//        layout.onDestroy();
83
         super.onDestroy();
66
         super.onDestroy();
84
         if (currentActivity == null || currentActivity.isFinishing()) {
67
         if (currentActivity == null || currentActivity.isFinishing()) {
85
             getNavigationReactInstance().onHostDestroy();
68
             getNavigationReactInstance().onHostDestroy();
88
 
71
 
89
     @Override
72
     @Override
90
     public void onJsDevReload() {
73
     public void onJsDevReload() {
91
-        layout.removeAllReactViews();
74
+//        layout.removeAllReactViews();
92
     }
75
     }
93
 
76
 
94
     @Override
77
     @Override
101
         if (modalController.onBackPressed()) {
84
         if (modalController.onBackPressed()) {
102
             return;
85
             return;
103
         }
86
         }
104
-        if (layout.onBackPressed()) {
105
-            return;
106
-        }
87
+//        if (layout.onBackPressed()) {
88
+//            return;
89
+//        }
107
         getNavigationReactInstance().onBackPressed();
90
         getNavigationReactInstance().onBackPressed();
108
     }
91
     }
109
 
92
 

+ 1
- 0
android/app/src/main/java/com/reactnativenavigation/layouts/ScreenLayout.java 查看文件

55
     private void addContentView() {
55
     private void addContentView() {
56
         contentView = new ContentView(getContext(), screenId, passProps, this);
56
         contentView = new ContentView(getContext(), screenId, passProps, this);
57
         addView(contentView, new LayoutParams(MATCH_PARENT, MATCH_PARENT));
57
         addView(contentView, new LayoutParams(MATCH_PARENT, MATCH_PARENT));
58
+        contentView.init();
58
     }
59
     }
59
 
60
 
60
     private void setStyle(ScreenStyleParams styleParams) {
61
     private void setStyle(ScreenStyleParams styleParams) {