更换日志 TAG

listenzz · May 17, 2021 · 4ed2428 · 4ed2428
1 parent 94bee17
commit 4ed2428
Show file tree

Hide file tree

Showing 14 changed files with 25 additions and 27 deletions.
diff --git a/android/src/main/java/com/reactnative/hybridnavigation/Garden.java b/android/src/main/java/com/reactnative/hybridnavigation/Garden.java
@@ -30,7 +30,7 @@
  */
 public class Garden {
 
-    private static final String TAG = "ReactNative";
+    private static final String TAG = "Navigation";
 
     private static GlobalStyle globalStyle;
 

diff --git a/android/src/main/java/com/reactnative/hybridnavigation/GardenModule.java b/android/src/main/java/com/reactnative/hybridnavigation/GardenModule.java
@@ -38,7 +38,7 @@
 
 public class GardenModule extends ReactContextBaseJavaModule {
 
-    private static final String TAG = "ReactNative";
+    private static final String TAG = "Navigation";
 
 
     static final Handler sHandler = NavigationModule.sHandler;
@@ -73,7 +73,6 @@ public void setStyle(final ReadableMap style) {
             ReactContext context = getReactApplicationContext();
             if (context.hasActiveCatalystInstance()) {
                 ReactAppCompatActivity activity = (ReactAppCompatActivity) getCurrentActivity();
-                // 即使 Activity 真的存在，`getCurrentActivity` 依然可能返回 null，尤其是启动时应用被切换到后台
                 if (activity != null) {
                     activity.inflateStyle();
                 }

diff --git a/android/src/main/java/com/reactnative/hybridnavigation/GlobalStyle.java b/android/src/main/java/com/reactnative/hybridnavigation/GlobalStyle.java
@@ -22,9 +22,9 @@
 
 public class GlobalStyle {
 
-    private static final String TAG = "ReactNative";
+    private static final String TAG = "Navigation";
 
-    private Bundle options;
+    private final Bundle options;
 
     public Bundle getOptions() {
         return options;
@@ -36,11 +36,11 @@ public GlobalStyle(Bundle options) {
 
     public void inflateStyle(Context context, Style style) {
         if (options == null) {
-            FLog.w(TAG, "style options is null");
+            FLog.w(TAG, "Style options is null");
             return;
         }
 
-        FLog.i(TAG, "custom global style");
+        FLog.i(TAG, "GlobalStyle#inflateStyle");
 
         // screenBackgroundColor
         String screenBackgroundColor = options.getString("screenBackgroundColor");

diff --git a/android/src/main/java/com/reactnative/hybridnavigation/HBDReactRootView.java b/android/src/main/java/com/reactnative/hybridnavigation/HBDReactRootView.java
@@ -19,7 +19,7 @@
 
 public class HBDReactRootView extends ReactRootView {
 
-    protected static final String TAG = "ReactNative";
+    protected static final String TAG = "Navigation";
 
     public HBDReactRootView(Context context) {
         super(context);

diff --git a/android/src/main/java/com/reactnative/hybridnavigation/NavigationModule.java b/android/src/main/java/com/reactnative/hybridnavigation/NavigationModule.java
@@ -35,7 +35,7 @@
  */
 public class NavigationModule extends ReactContextBaseJavaModule implements LifecycleEventListener {
 
-    static final String TAG = "ReactNative";
+    static final String TAG = "Navigation";
     static final Handler sHandler = new Handler(Looper.getMainLooper());
 
     private final ReactBridgeManager bridgeManager;
@@ -357,6 +357,4 @@ private AwesomeFragment findFragmentBySceneId(String sceneId) {
         }
         return null;
     }
-
-
 }
diff --git a/android/src/main/java/com/reactnative/hybridnavigation/ReactAppCompatActivity.java b/android/src/main/java/com/reactnative/hybridnavigation/ReactAppCompatActivity.java
@@ -28,7 +28,7 @@
 
 public class ReactAppCompatActivity extends AwesomeActivity implements DefaultHardwareBackBtnHandler, PermissionAwareActivity, ReactBridgeManager.ReactModuleRegisterListener {
 
-    protected static final String TAG = "ReactNative";
+    protected static final String TAG = "Navigation";
 
     private final ReactAppCompatActivityDelegate activityDelegate;
 

diff --git a/android/src/main/java/com/reactnative/hybridnavigation/ReactAppCompatActivityDelegate.java b/android/src/main/java/com/reactnative/hybridnavigation/ReactAppCompatActivityDelegate.java
@@ -32,7 +32,7 @@
 
 public class ReactAppCompatActivityDelegate {
 
-    private static final String TAG = "ReactNative";
+    private static final String TAG = "Navigation";
 
     private final int REQUEST_OVERLAY_PERMISSION_CODE = 1111;
     private static final String REDBOX_PERMISSION_GRANTED_MESSAGE =
@@ -57,10 +57,10 @@ public ReactAppCompatActivityDelegate(@NonNull AppCompatActivity activity, React
 
     private void askPermission() {
         if (getReactNativeHost().getUseDeveloperSupport() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            FLog.i(TAG, "check overlay permission");
+            FLog.i(TAG, "Check overlay permission");
             // Get permission to show redbox in dev builds.
             if (!Settings.canDrawOverlays(getContext())) {
-                FLog.i(TAG, "request overlay permission");
+                FLog.i(TAG, "Request overlay permission");
                 Intent serviceIntent = new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION, Uri.parse("package:" + getContext().getPackageName()));
                 FLog.w(ReactConstants.TAG, REDBOX_PERMISSION_MESSAGE);
                 Toast.makeText(getContext(), REDBOX_PERMISSION_MESSAGE, Toast.LENGTH_LONG).show();

diff --git a/android/src/main/java/com/reactnative/hybridnavigation/ReactBridgeManager.java b/android/src/main/java/com/reactnative/hybridnavigation/ReactBridgeManager.java
@@ -40,7 +40,7 @@ public interface ReactBridgeReloadListener {
         void onReload();
     }
 
-    private static final String TAG = "ReactNative";
+    private static final String TAG = "Navigation";
     private final static ReactBridgeManager instance = new ReactBridgeManager();
 
     public static ReactBridgeManager get() {
@@ -71,7 +71,7 @@ public void install(@NonNull ReactNativeHost reactNativeHost) {
     private void setup() {
         final ReactInstanceManager reactInstanceManager = getReactInstanceManager();
         reactInstanceManager.addReactInstanceEventListener(context -> {
-            FLog.i(TAG, "react instance context initialized.");
+            FLog.i(TAG, "React instance context initialized.");
             rootLayout = null;
             pendingTag = 0;
             stickyLayout = null;
@@ -80,7 +80,7 @@ private void setup() {
         });
 
         if (!reactInstanceManager.hasStartedCreatingInitialContext()) {
-            FLog.i(TAG, "create react context");
+            FLog.i(TAG, "Create react context");
             reactInstanceManager.createReactContextInBackground();
         }
     }
@@ -104,7 +104,7 @@ public ReactContext getCurrentReactContext() {
 
     private void checkReactNativeHost() {
         if (reactNativeHost == null) {
-            throw new IllegalStateException("must call ReactBridgeManager#install first");
+            throw new IllegalStateException("Must call ReactBridgeManager#install first");
         }
     }
 
@@ -145,13 +145,14 @@ public void setReactModuleRegisterCompleted(boolean reactModuleRegisterCompleted
     }
 
     public void startRegisterReactModule() {
+        FLog.i(TAG, "ReactBridgeManager#startRegisterReactModule");
         reactModules.clear();
         setReactModuleRegisterCompleted(false);
     }
 
     public void endRegisterReactModule() {
         setReactModuleRegisterCompleted(true);
-        FLog.i(TAG, "react module registry completed");
+        FLog.i(TAG, "ReactBridgeManager#endRegisterReactModule");
         for (ReactModuleRegisterListener listener : reactModuleRegisterListeners) {
             listener.onReactModuleRegisterCompleted();
         }

diff --git a/android/src/main/java/com/reactnative/hybridnavigation/ReactFragment.java b/android/src/main/java/com/reactnative/hybridnavigation/ReactFragment.java
@@ -36,7 +36,7 @@
  */
 public class ReactFragment extends HybridFragment implements ReactRootViewHolder.VisibilityObserver, ReactBridgeManager.ReactBridgeReloadListener {
 
-    protected static final String TAG = "ReactNative";
+    protected static final String TAG = "Navigation";
     private ViewGroup containerLayout;
     private ReactRootViewHolder reactRootViewHolder;
     private HBDReactRootView reactRootView;

diff --git a/android/src/main/java/com/reactnative/hybridnavigation/ReactFrameLayout.java b/android/src/main/java/com/reactnative/hybridnavigation/ReactFrameLayout.java
@@ -7,7 +7,7 @@
 import android.widget.FrameLayout;
 
 public class ReactFrameLayout extends FrameLayout implements ReactRootViewHolder {
-    protected static final String TAG = "ReactNative";
+    protected static final String TAG = "Navigation";
 
     private HBDReactRootView mReactRootView;
     private VisibilityObserver mVisibilityObserver;

diff --git a/android/src/main/java/com/reactnative/hybridnavigation/ReactLinearLayout.java b/android/src/main/java/com/reactnative/hybridnavigation/ReactLinearLayout.java
@@ -8,7 +8,7 @@
 
 public class ReactLinearLayout extends LinearLayout implements ReactRootViewHolder {
 
-    protected static final String TAG = "ReactNative";
+    protected static final String TAG = "Navigation";
 
     private VisibilityObserver mVisibilityObserver;
     private HBDReactRootView mReactRootView;

diff --git a/android/src/main/java/com/reactnative/hybridnavigation/ReactTabBarProvider.java b/android/src/main/java/com/reactnative/hybridnavigation/ReactTabBarProvider.java
@@ -34,7 +34,7 @@
 
 public class ReactTabBarProvider implements TabBarProvider, ReactBridgeManager.ReactBridgeReloadListener {
 
-    private static final String TAG = "ReactNative";
+    private static final String TAG = "Navigation";
 
     private HBDReactRootView reactRootView;
     private ReactTabBarFragment tabBarFragment;

diff --git a/android/src/main/java/com/reactnative/hybridnavigation/navigator/ScreenNavigator.java b/android/src/main/java/com/reactnative/hybridnavigation/navigator/ScreenNavigator.java
@@ -20,7 +20,7 @@
 
 public class ScreenNavigator implements Navigator {
 
-    final static String TAG = "ReactNative";
+    final static String TAG = "Navigation";
 
     private final List<String> supportActions = Arrays.asList("present", "presentLayout", "dismiss", "showModal", "showModalLayout", "hideModal");
 

diff --git a/example/src/index.ts b/example/src/index.ts
@@ -170,12 +170,12 @@ const drawer: Drawer = {
 Navigator.setRootLayoutUpdateListener(
   () => {
     DeepLink.deactivate()
-    console.log('------------------------inactive router')
+    console.log('------------------------deactivate router')
   },
   () => {
     const prefix = 'hbd://'
     DeepLink.activate(prefix)
-    console.log('------------------------active router')
+    console.log('------------------------activate router')
   },
 )