tianlu1677 · tianlu1677 · Aug 12, 2021 · Aug 12, 2021 · Aug 12, 2021 · Aug 12, 2021
diff --git a/App.js b/App.js
@@ -27,10 +27,12 @@ import {init, Geolocation} from 'react-native-amap-geolocation';
 import * as RootNavigation from '@/navigator/root-navigation';
 import * as action from '@/redux/constants';
 import {getChannels, getChannelPosts} from '@/api/home_api';
+import { BasePosthogKey} from "@/utils/config"
 import JPush from 'jpush-react-native';
 WeChat.registerApp('wx17b69998e914b8f0', 'https://app.meirixinxue.com/');
 import JVerification from 'jverification-react-native';
-import { RootSiblingParent } from 'react-native-root-siblings';
+import {RootSiblingParent} from 'react-native-root-siblings';
+import CommentInput from '@/components/comment-input';
 
 const queryString = require('query-string');
 const codePushOptions = {
@@ -62,6 +64,18 @@ class App extends Component {
       scale = 1.08;
     }
 
+    Text.defaultProps = Object.assign({}, Text.defaultProps, {
+      allowFontScaling: false,
+      adjustsFontSizeToFit: true,
+      minimumFontScale: scale,
+    });
+    Text.defaultProps.sytle = {color: 'black'};
+    TextInput.defaultProps = Object.assign({}, TextInput.defaultProps, {
+      defaultProps: false,
+      allowFontScaling: false,
+      textBreakStrategy: 'simple',
+    });
+
     this.loadSplashImg();
     this.loadSettings();
     this.checkPermission();
@@ -75,19 +89,7 @@ class App extends Component {
 
     // this.saveToken(); //保存token
 
-    // console.log('scale', scale);
 
-    Text.defaultProps = Object.assign({}, Text.defaultProps, {
-      allowFontScaling: false,
-      adjustsFontSizeToFit: true,
-      minimumFontScale: scale,
-    });
-    Text.defaultProps.sytle = {color: 'black'};
-    TextInput.defaultProps = Object.assign({}, TextInput.defaultProps, {
-      defaultProps: false,
-      allowFontScaling: false,
-      textBreakStrategy: 'simple',
-    });
   }
 
   loadSplashImg = () => {
@@ -114,8 +116,8 @@ class App extends Component {
     };
     JVerification.init(initParams, result => {
       console.log('JVerification init', result);
-    })
-  }
+    });
+  };
 
   checkPermission = () => {
     checkMultiple([PERMISSIONS.IOS.LOCATION_WHEN_IN_USE]).then(statuses => {
@@ -249,6 +251,8 @@ class App extends Component {
               <ImagePreview />
               <ShareMultiModal />
               <ModalPortal />
+
+              <CommentInput navigation={RootNavigation} />
             </PersistGate>
           </Provider>
         </RootSiblingParent>

diff --git a/ReactotronConfig.js b/ReactotronConfig.js
@@ -0,0 +1,8 @@
+import Reactotron from 'reactotron-react-native'
+import AsyncStorage from '@react-native-community/async-storage';
+
+Reactotron
+  .setAsyncStorageHandler(AsyncStorage) // AsyncStorage would either come from `react-native` or `@react-native-community/async-storage` depending on where you get it from
+  .configure() // controls connection & communication settings
+  .useReactNative() // add all built-in react native plugins
+  .connect() // let's connect!
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -140,8 +140,8 @@ android {
         vectorDrawables.useSupportLibrary = true
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 11
-        versionName "0.0.25"
+        versionCode 13
+        versionName "0.0.27"
 
         manifestPlaceholders = [
               JPUSH_PKGNAME: applicationId,
@@ -236,26 +236,29 @@ dependencies {
     implementation project(':lottie-react-native')
 
     compile project(':react-native-video')
-    implementation "androidx.appcompat:appcompat:1.0.0"
+    //implementation "androidx.appcompat:appcompat:1.1.0"
 
     implementation "com.squareup.okhttp3:okhttp:4.2.1"
     implementation "com.squareup.okhttp3:logging-interceptor:4.2.1"
     implementation "com.squareup.okhttp3:okhttp-urlconnection:4.2.1"
+    implementation "androidx.multidex:multidex:2.0.0"
+    implementation 'androidx.appcompat:appcompat:1.3.0'
+    //implementation 'com.posthog.android:posthog:1.+'
 
 //     compile project(':push')
 
-    debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
-      exclude group:'com.facebook.fbjni'
-    }
+    //debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
+      //exclude group:'com.facebook.fbjni'
+    //}
 
-    debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
-        exclude group:'com.facebook.flipper'
-        exclude group:'com.squareup.okhttp3', module:'okhttp'
-    }
+    //debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
+    //    exclude group:'com.facebook.flipper'
+     //   exclude group:'com.squareup.okhttp3', module:'okhttp'
+    //}
 
-    debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") {
-        exclude group:'com.facebook.flipper'
-    }
+    //debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") {
+    //    exclude group:'com.facebook.flipper'
+    //}
 
     if (enableHermes) {
         def hermesPath = "../../node_modules/hermes-engine/android/";

diff --git a/android/app/src/debug/java/com/vanyah/androidnative/ReactNativeFlipper.java b/android/app/src/debug/java/com/vanyah/androidnative/ReactNativeFlipper.java
@@ -1,72 +1,72 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * <p>This source code is licensed under the MIT license found in the LICENSE file in the root
- * directory of this source tree.
- */
-package com.vanyah.androidnative;
+// /**
+//  * Copyright (c) Facebook, Inc. and its affiliates.
+//  *
+//  * <p>This source code is licensed under the MIT license found in the LICENSE file in the root
+//  * directory of this source tree.
+//  */
+// package com.vanyah.androidnative;
 
-import android.content.Context;
-import com.facebook.flipper.android.AndroidFlipperClient;
-import com.facebook.flipper.android.utils.FlipperUtils;
-import com.facebook.flipper.core.FlipperClient;
-import com.facebook.flipper.plugins.crashreporter.CrashReporterPlugin;
-import com.facebook.flipper.plugins.databases.DatabasesFlipperPlugin;
-import com.facebook.flipper.plugins.fresco.FrescoFlipperPlugin;
-import com.facebook.flipper.plugins.inspector.DescriptorMapping;
-import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin;
-import com.facebook.flipper.plugins.network.FlipperOkhttpInterceptor;
-import com.facebook.flipper.plugins.network.NetworkFlipperPlugin;
-import com.facebook.flipper.plugins.react.ReactFlipperPlugin;
-import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin;
-import com.facebook.react.ReactInstanceManager;
-import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.modules.network.NetworkingModule;
-import okhttp3.OkHttpClient;
+// import android.content.Context;
+// import com.facebook.flipper.android.AndroidFlipperClient;
+// import com.facebook.flipper.android.utils.FlipperUtils;
+// import com.facebook.flipper.core.FlipperClient;
+// import com.facebook.flipper.plugins.crashreporter.CrashReporterPlugin;
+// import com.facebook.flipper.plugins.databases.DatabasesFlipperPlugin;
+// import com.facebook.flipper.plugins.fresco.FrescoFlipperPlugin;
+// import com.facebook.flipper.plugins.inspector.DescriptorMapping;
+// import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin;
+// import com.facebook.flipper.plugins.network.FlipperOkhttpInterceptor;
+// import com.facebook.flipper.plugins.network.NetworkFlipperPlugin;
+// import com.facebook.flipper.plugins.react.ReactFlipperPlugin;
+// import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin;
+// import com.facebook.react.ReactInstanceManager;
+// import com.facebook.react.bridge.ReactContext;
+// import com.facebook.react.modules.network.NetworkingModule;
+// import okhttp3.OkHttpClient;
 
-public class ReactNativeFlipper {
-  public static void initializeFlipper(Context context, ReactInstanceManager reactInstanceManager) {
-    if (FlipperUtils.shouldEnableFlipper(context)) {
-      final FlipperClient client = AndroidFlipperClient.getInstance(context);
+// public class ReactNativeFlipper {
+//   public static void initializeFlipper(Context context, ReactInstanceManager reactInstanceManager) {
+//     if (FlipperUtils.shouldEnableFlipper(context)) {
+//       final FlipperClient client = AndroidFlipperClient.getInstance(context);
 
-      client.addPlugin(new InspectorFlipperPlugin(context, DescriptorMapping.withDefaults()));
-      client.addPlugin(new ReactFlipperPlugin());
-      client.addPlugin(new DatabasesFlipperPlugin(context));
-      client.addPlugin(new SharedPreferencesFlipperPlugin(context));
-      client.addPlugin(CrashReporterPlugin.getInstance());
+//       client.addPlugin(new InspectorFlipperPlugin(context, DescriptorMapping.withDefaults()));
+//       client.addPlugin(new ReactFlipperPlugin());
+//       client.addPlugin(new DatabasesFlipperPlugin(context));
+//       client.addPlugin(new SharedPreferencesFlipperPlugin(context));
+//       client.addPlugin(CrashReporterPlugin.getInstance());
 
-      NetworkFlipperPlugin networkFlipperPlugin = new NetworkFlipperPlugin();
-      NetworkingModule.setCustomClientBuilder(
-          new NetworkingModule.CustomClientBuilder() {
-            @Override
-            public void apply(OkHttpClient.Builder builder) {
-              builder.addNetworkInterceptor(new FlipperOkhttpInterceptor(networkFlipperPlugin));
-            }
-          });
-      client.addPlugin(networkFlipperPlugin);
-      client.start();
+//       NetworkFlipperPlugin networkFlipperPlugin = new NetworkFlipperPlugin();
+//       NetworkingModule.setCustomClientBuilder(
+//           new NetworkingModule.CustomClientBuilder() {
+//             @Override
+//             public void apply(OkHttpClient.Builder builder) {
+//               builder.addNetworkInterceptor(new FlipperOkhttpInterceptor(networkFlipperPlugin));
+//             }
+//           });
+//       client.addPlugin(networkFlipperPlugin);
+//       client.start();
 
-      // Fresco Plugin needs to ensure that ImagePipelineFactory is initialized
-      // Hence we run if after all native modules have been initialized
-      ReactContext reactContext = reactInstanceManager.getCurrentReactContext();
-      if (reactContext == null) {
-        reactInstanceManager.addReactInstanceEventListener(
-            new ReactInstanceManager.ReactInstanceEventListener() {
-              @Override
-              public void onReactContextInitialized(ReactContext reactContext) {
-                reactInstanceManager.removeReactInstanceEventListener(this);
-                reactContext.runOnNativeModulesQueueThread(
-                    new Runnable() {
-                      @Override
-                      public void run() {
-                        client.addPlugin(new FrescoFlipperPlugin());
-                      }
-                    });
-              }
-            });
-      } else {
-        client.addPlugin(new FrescoFlipperPlugin());
-      }
-    }
-  }
-}
+//       // Fresco Plugin needs to ensure that ImagePipelineFactory is initialized
+//       // Hence we run if after all native modules have been initialized
+//       ReactContext reactContext = reactInstanceManager.getCurrentReactContext();
+//       if (reactContext == null) {
+//         reactInstanceManager.addReactInstanceEventListener(
+//             new ReactInstanceManager.ReactInstanceEventListener() {
+//               @Override
+//               public void onReactContextInitialized(ReactContext reactContext) {
+//                 reactInstanceManager.removeReactInstanceEventListener(this);
+//                 reactContext.runOnNativeModulesQueueThread(
+//                     new Runnable() {
+//                       @Override
+//                       public void run() {
+//                         client.addPlugin(new FrescoFlipperPlugin());
+//                       }
+//                     });
+//               }
+//             });
+//       } else {
+//         client.addPlugin(new FrescoFlipperPlugin());
+//       }
+//     }
+//   }
+// }
diff --git a/android/app/src/main/java/com/vanyah/androidnative/MainApplication.java b/android/app/src/main/java/com/vanyah/androidnative/MainApplication.java
@@ -74,7 +74,7 @@ public ReactNativeHost getReactNativeHost() {
   public void onCreate() {
     super.onCreate();
     SoLoader.init(this, /* native exopackage */ false);
-    initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
+    // initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
 
     JPushModule.registerActivityLifecycle(this);
 //    UMConfigure.setLogEnabled(true);
@@ -92,27 +92,27 @@ public void onCreate() {
    * @param context
    * @param reactInstanceManager
    */
-  private static void initializeFlipper(
-      Context context, ReactInstanceManager reactInstanceManager) {
-    if (BuildConfig.DEBUG) {
-      try {
-        /*
-         We use reflection here to pick up the class that initializes Flipper,
-        since Flipper library is not available in release mode
-        */
-        Class<?> aClass = Class.forName("com.vanyah.androidnative.ReactNativeFlipper");
-        aClass
-            .getMethod("initializeFlipper", Context.class, ReactInstanceManager.class)
-            .invoke(null, context, reactInstanceManager);
-      } catch (ClassNotFoundException e) {
-        e.printStackTrace();
-      } catch (NoSuchMethodException e) {
-        e.printStackTrace();
-      } catch (IllegalAccessException e) {
-        e.printStackTrace();
-      } catch (InvocationTargetException e) {
-        e.printStackTrace();
-      }
-    }
-  }
+  // private static void initializeFlipper(
+  //     Context context, ReactInstanceManager reactInstanceManager) {
+  //   if (BuildConfig.DEBUG) {
+  //     try {
+  //       /*
+  //        We use reflection here to pick up the class that initializes Flipper,
+  //       since Flipper library is not available in release mode
+  //       */
+  //       Class<?> aClass = Class.forName("com.vanyah.androidnative.ReactNativeFlipper");
+  //       aClass
+  //           .getMethod("initializeFlipper", Context.class, ReactInstanceManager.class)
+  //           .invoke(null, context, reactInstanceManager);
+  //     } catch (ClassNotFoundException e) {
+  //       e.printStackTrace();
+  //     } catch (NoSuchMethodException e) {
+  //       e.printStackTrace();
+  //     } catch (IllegalAccessException e) {
+  //       e.printStackTrace();
+  //     } catch (InvocationTargetException e) {
+  //       e.printStackTrace();
+  //     }
+  //   }
+  // }
 }
diff --git a/android/gradle.properties b/android/gradle.properties
@@ -25,4 +25,4 @@ android.useAndroidX=true
 android.enableJetifier=true
 
 # Version of flipper SDK to use with React Native
-FLIPPER_VERSION=0.37.0
+# FLIPPER_VERSION=0.37.0
diff --git a/android/settings.gradle b/android/settings.gradle
@@ -21,4 +21,7 @@ project(':jverification-react-native').projectDir = new File(rootProject.project
 include ':jpush-react-native'
 project(':jpush-react-native').projectDir = new File(rootProject.projectDir, '../node_modules/jpush-react-native/android')
 include ':jcore-react-native'
-project(':jcore-react-native').projectDir = new File(rootProject.projectDir, '../node_modules/jcore-react-native/android')
+project(':jcore-react-native').projectDir = new File(rootProject.projectDir, '../node_modules/jcore-react-native/android')
+
+//include ':posthog-react-native'
+//project(':posthog-react-native').projectDir = new File(rootProject.projectDir, '../node_modules/posthog-react-native/android')
diff --git a/iconfont.json b/iconfont.json
@@ -1,7 +1,7 @@
 {
-  "symbol_url": "//at.alicdn.com/t/font_1446105_znjtkpzvld.js",
+  "symbol_url": "//at.alicdn.com/t/font_1446105_dfbygoqunkb.js",
   "use_typescript": false,
   "save_dir": "./src/iconfont",
   "trim_icon_prefix": "icon",
   "default_icon_size": 16
-}
+}
diff --git a/index.js b/index.js
@@ -3,7 +3,9 @@
  */
 
 // import './logbox'
-
+if(__DEV__) {
+  import('./ReactotronConfig').then(() => console.log('Reactotron Configured'))
+}
 import 'react-native-gesture-handler';
 
 import React, {Component} from 'react';

diff --git a/ios/Podfile b/ios/Podfile
@@ -114,10 +114,14 @@ target 'wanya_native' do
   #
   # Note that if you have use_frameworks! enabled, Flipper will not work and
   # you should disable these next few lines.
-  use_flipper!
-  post_install do |installer|
-    flipper_post_install(installer)
-  end
+  #use_flipper!
+  # use_flipper!({ 'Flipper' => '0.101.0' })
+  # 暂时指定版本
+  # https://stackoverflow.com/questions/68264876/xcode-build-error-with-react-native-cxa-increment-exception-refcount
+  # use_flipper!({'Flipper' => '0.92.0', 'Flipper-Folly' => '2.6.7'})
+  # post_install do |installer|
+  #   flipper_post_install(installer)
+  # end
 end
 
 target 'wanya_native-tvOS' do