chore: upgrade RN to 0.62.1

Phecda
Commit 4a73a59b7fb5dacfa8c3a0696f6dde261586059b 4a73a59b 1 parent e356bf61
Showing 23 changed files with 313 additions and 281 deletions
App.tsx
android/app/_BUCK
android/app/build.gradle
android/app/proguard-rules.pro
android/app/src/debug/java/com/ngplay/ReactNativeFlipper.java
android/app/src/main/AndroidManifest.xml
android/app/src/main/java/com/ngplay/MainApplication.java
android/build.gradle
android/gradle.properties
android/gradle/wrapper/gradle-wrapper.properties
android/gradlew
android/gradlew.bat
android/settings.gradle
ios/NGPlay.xcodeproj/project.pbxproj
ios/NGPlay.xcodeproj/xcshareddata/xcschemes/NGPlay-tvOS.xcscheme
ios/NGPlay.xcodeproj/xcshareddata/xcschemes/NGPlay.xcscheme
ios/NGPlay/AppDelegate.m
ios/NGPlay/Base.lproj/LaunchScreen.xib
ios/NGPlay/Info.plist
ios/Podfile
--- a/App.tsx
View file @4a73a59
+++ b/App.tsx
View file @4a73a59
@@ -8,128 +8,112 @@
  * @format
  */
-import React, { useState, useEffect } from 'react';
+import React from 'react';
 import {
   SafeAreaView,
-  Button,
+  StyleSheet,
-  NativeModules,
-  Picker,
   ScrollView,
-  Platform,
+  View,
+  Text,
+  StatusBar,
 } from 'react-native';
-import { Text, ListItem, Card } from 'react-native-elements';
-import Wechat, { WXShareType, WXShareScene } from './src';
-const { BCWechat } = NativeModules;
+import {
-Wechat.registerApp('wx32beae1b4606079a', 'https://pm.yfchangketong.com/');
+  Header,
-
+  LearnMoreLinks,
-const App = () => {
+  Colors,
-  const [err, setErr] = useState<Error>();
+  DebugInstructions,
-  const [version, setVersion] = useState('');
+  ReloadInstructions,
-  const [isWXInstalled, setIsWXInstalled] = useState(false);
+} from 'react-native/Libraries/NewAppScreen';
-  const [apiLevel, setApiLevel] = useState<number | boolean>();
-  const [scene, setScene] = useState(WXShareScene.WXSceneSession);
-  const constants = BCWechat.getConstants();
+declare var global: { HermesInternal: null | {} };
-  useEffect(() => {
+const App = () => {
-    Wechat.getApiVersion().then(setVersion);
-    Wechat.isWXAppInstalled().then(setIsWXInstalled);
-    if (Platform.OS === 'android') {
-      Wechat.getWXAppSupportAPI().then(setApiLevel);
-    } else {
-      Wechat.isWXAppSupportApi().then(setApiLevel);
-    }
-  }, []);
   return (
-    <SafeAreaView style={{ flex: 1 }}>
+    <>
-      <Card>
+      <StatusBar barStyle="dark-content" />
-        <Text h4>Error</Text>
+      <SafeAreaView>
-        <Text>{`${err?.message}`}</Text>
+        <ScrollView
-      </Card>
+          contentInsetAdjustmentBehavior="automatic"
-      <ScrollView
+          style={styles.scrollView}
-        style={{ flex: 1 }}
+        >
-        contentInsetAdjustmentBehavior="automatic"
+          <Header />
-      >
+          {global.HermesInternal == null ? null : (
-        <Text h4>Native</Text>
+            <View style={styles.engine}>
-        {Object.keys(BCWechat).map((k, i) => (
+              <Text style={styles.footer}>Engine: Hermes</Text>
-          <Text key={i}>{k}</Text>
+            </View>
-        ))}
+          )}
-        <Text h4>Info</Text>
+          <View style={styles.body}>
-        <ListItem title="version" rightTitle={version} />
+            <View style={styles.sectionContainer}>
-        <ListItem title="wx installed" rightTitle={`${isWXInstalled}`} />
+              <Text style={styles.sectionTitle}>Step One</Text>
-        <ListItem title="api support" rightTitle={`${apiLevel}`} />
+              <Text style={styles.sectionDescription}>
-        <Text h4>Constants</Text>
+                Edit <Text style={styles.highlight}>App.tsx</Text> to change
-        {Object.keys(constants).map((k, i) => (
+                this screen and then come back to see your edits.
-          <ListItem key={k} title={k} rightTitle={`${constants[k]}`} />
+              </Text>
-        ))}
+            </View>
-        <Button title="open WX" onPress={Wechat.openWXApp} />
+            <View style={styles.sectionContainer}>
-        <Text h4>分享</Text>
+              <Text style={styles.sectionTitle}>See Your Changes</Text>
-        <Picker selectedValue={scene} onValueChange={v => setScene(v)}>
+              <Text style={styles.sectionDescription}>
-          <Picker.Item label="对话" value={WXShareScene.WXSceneSession} />
+                <ReloadInstructions />
-          <Picker.Item label="朋友圈" value={WXShareScene.WXSceneTimeline} />
+              </Text>
-          <Picker.Item label="收藏" value={WXShareScene.WXSceneFavorite} />
+            </View>
-        </Picker>
+            <View style={styles.sectionContainer}>
-        <Button
+              <Text style={styles.sectionTitle}>Debug</Text>
-          title="分享文字"
+              <Text style={styles.sectionDescription}>
-          onPress={() => {
+                <DebugInstructions />
-            Wechat.shareMessage({
+              </Text>
-              type: WXShareType.WXShareTypeText,
+            </View>
-              text: 'Some test text',
+            <View style={styles.sectionContainer}>
-              scene,
+              <Text style={styles.sectionTitle}>Learn More</Text>
-            })
+              <Text style={styles.sectionDescription}>
-              .then(resp => {
+                Read the docs to discover what to do next:
-                console.log(resp);
+              </Text>
-              })
+            </View>
-              .catch(setErr);
+            <LearnMoreLinks />
-          }}
+          </View>
-        />
+        </ScrollView>
-        <Button
+      </SafeAreaView>
-          title="分享图片"
+    </>
-          onPress={() => {
-            Wechat.shareMessage({
-              type: WXShareType.WXShareTypeImage,
-              title: '标题',
-              description: '描述',
-              thumbUrl: '',
-              scene,
-              imageUrl:
-                'https://i0.hdslb.com/bfs/archive/45b8d2f84ec662df05b829bbe866cf620833cce5.jpg@412w_232h_1c_100q.jpg',
-            });
-          }}
-        />
-        <Button
-          title="分享音乐"
-          onPress={() => {
-            Wechat.shareMessage({
-              type: WXShareType.WXShareTypeMusic,
-              musicUrl: 'https://music.163.com/#/song?id=1410448577',
-              title: '标题',
-              description: '描述',
-              thumbUrl:
-                'https://i0.hdslb.com/bfs/archive/45b8d2f84ec662df05b829bbe866cf620833cce5.jpg@412w_232h_1c_100q.jpg',
-              scene,
-            });
-          }}
-        />
-        <Button
-          title="分享视频"
-          onPress={() => {
-            Wechat.shareMessage({
-              type: WXShareType.WXShareTypeVideo,
-              videoUrl:
-                'https://www.bilibili.com/video/BV1o7411177j?spm_id_from=333.851.b_7265706f7274466972737431.8',
-              title: '标题',
-              description: '描述',
-              thumbUrl:
-                'https://i0.hdslb.com/bfs/archive/45b8d2f84ec662df05b829bbe866cf620833cce5.jpg@412w_232h_1c_100q.jpg',
-              scene,
-            });
-          }}
-        />
-      </ScrollView>
-    </SafeAreaView>
   );
 };
+const styles = StyleSheet.create({
+  scrollView: {
+    backgroundColor: Colors.lighter,
+  },
+  engine: {
+    position: 'absolute',
+    right: 0,
+  },
+  body: {
+    backgroundColor: Colors.white,
+  },
+  sectionContainer: {
+    marginTop: 32,
+    paddingHorizontal: 24,
+  },
+  sectionTitle: {
+    fontSize: 24,
+    fontWeight: '600',
+    color: Colors.black,
+  },
+  sectionDescription: {
+    marginTop: 8,
+    fontSize: 18,
+    fontWeight: '400',
+    color: Colors.dark,
+  },
+  highlight: {
+    fontWeight: '700',
+  },
+  footer: {
+    color: Colors.dark,
+    fontSize: 12,
+    fontWeight: '600',
+    padding: 4,
+    paddingRight: 12,
+    textAlign: 'right',
+  },
+});
+
 export default App;
--- a/android/app/_BUCK 100755 → 100644
View file @4a73a59
+++ b/android/app/_BUCK 100755 → 100644
View file @4a73a59
--- a/android/app/build.gradle 100755 → 100644
View file @4a73a59
+++ b/android/app/build.gradle 100755 → 100644
View file @4a73a59
 apply plugin: "com.android.application"
-apply plugin: 'kotlin-android-extensions'
-apply plugin: 'kotlin-android'
 import com.android.build.OutputFile
@@ -17,7 +15,9 @@ import com.android.build.OutputFile
  *   // the name of the generated asset file containing your JS bundle
  *   bundleAssetName: "index.android.bundle",
  *
- *   // the entry file for bundle generation
+ *   // the entry file for bundle generation. If none specified and
+ *   // "index.android.js" exists, it will be used. Otherwise "index.js" is
+ *   // default. Can be overridden with ENTRY_FILE environment variable.
  *   entryFile: "index.android.js",
  *
  *   // https://facebook.github.io/react-native/docs/performance#enable-the-ram-format
@@ -164,6 +164,14 @@ android {
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
         }
     }
+
+    packagingOptions {
+        pickFirst "lib/armeabi-v7a/libc++_shared.so"
+        pickFirst "lib/arm64-v8a/libc++_shared.so"
+        pickFirst "lib/x86/libc++_shared.so"
+        pickFirst "lib/x86_64/libc++_shared.so"
+    }
+
     // applicationVariants are e.g. debug, release
     applicationVariants.all { variant ->
         variant.outputs.each { output ->
@@ -181,11 +189,24 @@ android {
 }
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.1.0-rc01'
-    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha02'
     implementation fileTree(dir: "libs", include: ["*.jar"])
+    //noinspection GradleDynamicVersion
     implementation "com.facebook.react:react-native:+"  // From node_modules
+    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
+
+    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'
+    }
+
+    debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") {
+        exclude group:'com.facebook.flipper'
+    }
+
     if (enableHermes) {
         def hermesPath = "../../node_modules/hermes-engine/android/";
         debugImplementation files(hermesPath + "hermes-debug.aar")
@@ -193,8 +214,6 @@ dependencies {
     } else {
         implementation jscFlavor
     }
-    implementation "androidx.core:core-ktx:+"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 // Run this once to be able to run the application with BUCK
@@ -205,6 +224,3 @@ task copyDownloadableDepsToLibs(type: Copy) {
 }
 apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
-repositories {
-  mavenCentral()
-}
--- a/android/app/proguard-rules.pro
View file @4a73a59
+++ b/android/app/proguard-rules.pro
View file @4a73a59
@@ -10,3 +10,5 @@
 # Add any project specific keep options here:
 -keep class com.facebook.hermes.unicode.** { *; }
+
+-keep class com.facebook.jni.** { *; }
--- a/android/app/src/debug/java/com/ngplay/ReactNativeFlipper.java 0 → 100644
View file @4a73a59
+++ b/android/app/src/debug/java/com/ngplay/ReactNativeFlipper.java 0 → 100644
View file @4a73a59
+/**
+ * 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.ngplay;
+
+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);
+
+      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();
+
+      // 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());
+      }
+    }
+  }
+}
--- a/android/app/src/main/AndroidManifest.xml 100755 → 100644
View file @4a73a59
+++ b/android/app/src/main/AndroidManifest.xml 100755 → 100644
View file @4a73a59
@@ -13,7 +13,8 @@
       <activity
         android:name=".MainActivity"
         android:label="@string/app_name"
-        android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
+        android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
+        android:launchMode="singleTask"
         android:windowSoftInputMode="adjustResize">
         <intent-filter>
             <action android:name="android.intent.action.MAIN" />
--- a/android/app/src/main/java/com/ngplay/MainApplication.java
View file @4a73a59
+++ b/android/app/src/main/java/com/ngplay/MainApplication.java
View file @4a73a59
@@ -4,6 +4,7 @@ import android.app.Application;
 import android.content.Context;
 import com.facebook.react.PackageList;
 import com.facebook.react.ReactApplication;
+import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
 import com.facebook.soloader.SoLoader;
@@ -43,23 +44,28 @@ public class MainApplication extends Application implements ReactApplication {
   public void onCreate() {
     super.onCreate();
     SoLoader.init(this, /* native exopackage */ false);
-    initializeFlipper(this); // Remove this line if you don't want Flipper enabled
+    initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
   }
   /**
-   * Loads Flipper in React Native templates.
+   * Loads Flipper in React Native templates. Call this in the onCreate method with something like
+   * initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
    *
    * @param context
+   * @param reactInstanceManager
    */
-  private static void initializeFlipper(Context context) {
+  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.facebook.flipper.ReactNativeFlipper");
+        Class<?> aClass = Class.forName("com.ngplay.ReactNativeFlipper");
-        aClass.getMethod("initializeFlipper", Context.class).invoke(null, context);
+        aClass
+            .getMethod("initializeFlipper", Context.class, ReactInstanceManager.class)
+            .invoke(null, context, reactInstanceManager);
       } catch (ClassNotFoundException e) {
         e.printStackTrace();
       } catch (NoSuchMethodException e) {
--- a/android/build.gradle
View file @4a73a59
+++ b/android/build.gradle
View file @4a73a59
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = '1.3.71'
     ext {
         buildToolsVersion = "28.0.3"
         minSdkVersion = 16
@@ -13,8 +12,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:3.4.2")
+        classpath("com.android.tools.build:gradle:3.5.2")
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -35,6 +33,6 @@ allprojects {
         google()
         jcenter()
-        maven { url 'https://jitpack.io' }
+        maven { url 'https://www.jitpack.io' }
     }
 }
--- a/android/gradle.properties
View file @4a73a59
+++ b/android/gradle.properties
View file @4a73a59
@@ -17,5 +17,12 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app's APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
+# Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
+
+# Version of flipper SDK to use with React Native
+FLIPPER_VERSION=0.33.1
--- a/android/gradle/wrapper/gradle-wrapper.properties
View file @4a73a59
+++ b/android/gradle/wrapper/gradle-wrapper.properties
View file @4a73a59
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/android/gradlew
View file @4a73a59
+++ b/android/gradlew
View file @4a73a59
@@ -7,7 +7,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#      http://www.apache.org/licenses/LICENSE-2.0
+#      https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -125,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
-# For Cygwin, switch paths to Windows format before running java
+# For Cygwin or MSYS, switch paths to Windows format before running java
-if $cygwin ; then
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`
--- a/android/gradlew.bat
View file @4a73a59
+++ b/android/gradlew.bat
View file @4a73a59
@@ -5,7 +5,7 @@
 @rem you may not use this file except in compliance with the License.
 @rem You may obtain a copy of the License at
 @rem
-@rem      http://www.apache.org/licenses/LICENSE-2.0
+@rem      https://www.apache.org/licenses/LICENSE-2.0
 @rem
 @rem Unless required by applicable law or agreed to in writing, software
 @rem distributed under the License is distributed on an "AS IS" BASIS,
--- a/android/settings.gradle 100755 → 100644
View file @4a73a59
+++ b/android/settings.gradle 100755 → 100644
View file @4a73a59
--- a/ios/NGPlay.xcodeproj/project.pbxproj
View file @4a73a59
+++ b/ios/NGPlay.xcodeproj/project.pbxproj
View file @4a73a59
--- a/ios/NGPlay.xcodeproj/xcshareddata/xcschemes/NGPlay-tvOS.xcscheme
View file @4a73a59
+++ b/ios/NGPlay.xcodeproj/xcshareddata/xcschemes/NGPlay-tvOS.xcscheme
View file @4a73a59
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0940"
+   LastUpgradeVersion = "1130"
    version = "1.3">
    <BuildAction
-      parallelizeBuildables = "NO"
+      parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
       <BuildActionEntries>
          <BuildActionEntry
@@ -14,40 +14,12 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "2D2A28121D9B038B00D4039D"
-               BuildableName = "libReact.a"
-               BlueprintName = "React-tvOS"
-               ReferencedContainer = "container:../node_modules/react-native/React/React.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
                BlueprintIdentifier = "2D02E47A1E0B4A5D006451C7"
                BuildableName = "NGPlay-tvOS.app"
                BlueprintName = "NGPlay-tvOS"
                ReferencedContainer = "container:NGPlay.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "2D02E48F1E0B4A5D006451C7"
-               BuildableName = "NGPlay-tvOSTests.xctest"
-               BlueprintName = "NGPlay-tvOSTests"
-               ReferencedContainer = "container:NGPlay.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
@@ -67,17 +39,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "2D02E47A1E0B4A5D006451C7"
-            BuildableName = "NGPlay-tvOS.app"
-            BlueprintName = "NGPlay-tvOS"
-            ReferencedContainer = "container:NGPlay.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -99,8 +60,6 @@
             ReferencedContainer = "container:NGPlay.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
--- a/ios/NGPlay.xcodeproj/xcshareddata/xcschemes/NGPlay.xcscheme
View file @4a73a59
+++ b/ios/NGPlay.xcodeproj/xcshareddata/xcschemes/NGPlay.xcscheme
View file @4a73a59
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0940"
+   LastUpgradeVersion = "1130"
    version = "1.3">
    <BuildAction
-      parallelizeBuildables = "NO"
+      parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
       <BuildActionEntries>
          <BuildActionEntry
@@ -14,40 +14,12 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "83CBBA2D1A601D0E00E9B192"
-               BuildableName = "libReact.a"
-               BlueprintName = "React"
-               ReferencedContainer = "container:../node_modules/react-native/React/React.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
                BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
                BuildableName = "NGPlay.app"
                BlueprintName = "NGPlay"
                ReferencedContainer = "container:NGPlay.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "00E356ED1AD99517003FC87E"
-               BuildableName = "NGPlayTests.xctest"
-               BlueprintName = "NGPlayTests"
-               ReferencedContainer = "container:NGPlay.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
@@ -67,17 +39,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
-            BuildableName = "NGPlay.app"
-            BlueprintName = "NGPlay"
-            ReferencedContainer = "container:NGPlay.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -99,8 +60,6 @@
             ReferencedContainer = "container:NGPlay.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
--- a/ios/NGPlay/AppDelegate.m
View file @4a73a59
+++ b/ios/NGPlay/AppDelegate.m
View file @4a73a59
@@ -12,10 +12,33 @@
 #import <React/RCTLinkingManager.h>
 #import <React/RCTRootView.h>
+#if DEBUG
+#import <FlipperKit/FlipperClient.h>
+#import <FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h>
+#import <FlipperKitUserDefaultsPlugin/FKUserDefaultsPlugin.h>
+#import <FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h>
+#import <SKIOSNetworkPlugin/SKIOSNetworkAdapter.h>
+#import <FlipperKitReactPlugin/FlipperKitReactPlugin.h>
+
+static void InitializeFlipper(UIApplication *application) {
+  FlipperClient *client = [FlipperClient sharedClient];
+  SKDescriptorMapper *layoutDescriptorMapper = [[SKDescriptorMapper alloc] initWithDefaults];
+  [client addPlugin:[[FlipperKitLayoutPlugin alloc] initWithRootNode:application withDescriptorMapper:layoutDescriptorMapper]];
+  [client addPlugin:[[FKUserDefaultsPlugin alloc] initWithSuiteName:nil]];
+  [client addPlugin:[FlipperKitReactPlugin new]];
+  [client addPlugin:[[FlipperKitNetworkPlugin alloc] initWithNetworkAdapter:[SKIOSNetworkAdapter new]]];
+  [client start];
+}
+#endif
+
 @implementation AppDelegate
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
+#if DEBUG
+  InitializeFlipper(application);
+#endif
+
   RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions];
   RCTRootView *rootView = [[RCTRootView alloc] initWithBridge:bridge
                                                    moduleName:@"NGPlay"
--- a/ios/NGPlay/Base.lproj/LaunchScreen.xib
View file @4a73a59
+++ b/ios/NGPlay/Base.lproj/LaunchScreen.xib
View file @4a73a59
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7702" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
-    <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7701"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -13,20 +12,20 @@
             <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Powered by React Native" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Powered by React Native" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
                     <rect key="frame" x="20" y="439" width="441" height="21"/>
                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                     <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                     <nil key="highlightedColor"/>
                 </label>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="NGPlay" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="NGPlay" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
                     <rect key="frame" x="20" y="140" width="441" height="43"/>
                     <fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
                     <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                     <nil key="highlightedColor"/>
                 </label>
             </subviews>
-            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
             <constraints>
                 <constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="5cJ-9S-tgC"/>
                 <constraint firstAttribute="centerX" secondItem="kId-c2-rCX" secondAttribute="centerX" id="Koa-jz-hwk"/>
--- a/ios/NGPlay/Info.plist
View file @4a73a59
+++ b/ios/NGPlay/Info.plist
View file @4a73a59
@@ -20,29 +20,8 @@
 	<string>1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
-	<key>CFBundleURLTypes</key>
-	<array>
-		<dict>
-			<key>CFBundleTypeRole</key>
-			<string>Editor</string>
-			<key>CFBundleURLName</key>
-			<string>weixin</string>
-			<key>CFBundleURLSchemes</key>
-			<array>
-				<string>wx32beae1b4606079a</string>
-			</array>
-		</dict>
-	</array>
 	<key>CFBundleVersion</key>
 	<string>1</string>
-	<key>LSApplicationCategoryType</key>
-	<string></string>
-	<key>LSApplicationQueriesSchemes</key>
-	<array>
-		<string>weixin</string>
-		<string>wechat</string>
-		<string>weixinULAPI</string>
-	</array>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>
--- a/ios/Podfile
View file @4a73a59
+++ b/ios/Podfile
View file @4a73a59
 platform :ios, '9.0'
 require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
+def add_flipper_pods!
+  version = '~> 0.33.1'
+  pod 'FlipperKit', version, :configuration => 'Debug'
+  pod 'FlipperKit/FlipperKitLayoutPlugin', version, :configuration => 'Debug'
+  pod 'FlipperKit/SKIOSNetworkPlugin', version, :configuration => 'Debug'
+  pod 'FlipperKit/FlipperKitUserDefaultsPlugin', version, :configuration => 'Debug'
+  pod 'FlipperKit/FlipperKitReactPlugin', version, :configuration => 'Debug'
+end
+
+# Post Install processing for Flipper
+def flipper_post_install(installer)
+  installer.pods_project.targets.each do |target|
+    if target.name == 'YogaKit'
+      target.build_configurations.each do |config|
+        config.build_settings['SWIFT_VERSION'] = '4.1'
+      end
+    end
+  end
+end
+
 target 'NGPlay' do
   # Pods for NGPlay
   pod 'FBLazyVector', :path => "../node_modules/react-native/Libraries/FBLazyVector"
@@ -26,20 +46,29 @@ target 'NGPlay' do
   pod 'React-jsi', :path => '../node_modules/react-native/ReactCommon/jsi'
   pod 'React-jsiexecutor', :path => '../node_modules/react-native/ReactCommon/jsiexecutor'
   pod 'React-jsinspector', :path => '../node_modules/react-native/ReactCommon/jsinspector'
-  pod 'ReactCommon/jscallinvoker', :path => "../node_modules/react-native/ReactCommon"
+  pod 'ReactCommon/callinvoker', :path => "../node_modules/react-native/ReactCommon"
   pod 'ReactCommon/turbomodule/core', :path => "../node_modules/react-native/ReactCommon"
-  pod 'Yoga', :path => '../node_modules/react-native/ReactCommon/yoga'
+  pod 'Yoga', :path => '../node_modules/react-native/ReactCommon/yoga', :modular_headers => true
   pod 'DoubleConversion', :podspec => '../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec'
   pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec'
   pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec'
   target 'NGPlayTests' do
-    inherit! :search_paths
+    inherit! :complete
     # Pods for testing
   end
   use_native_modules!
+
+  # Enables Flipper.
+  #
+  # Note that if you have use_frameworks! enabled, Flipper will not work and
+  # you should disable these next few lines.
+  add_flipper_pods!
+  post_install do |installer|
+    flipper_post_install(installer)
+  end
 end
 target 'NGPlay-tvOS' do
@@ -49,5 +78,4 @@ target 'NGPlay-tvOS' do
     inherit! :search_paths
     # Pods for testing
   end
-
 end
--- a/ios/Podfile.lock
View file @4a73a59
+++ b/ios/Podfile.lock
View file @4a73a59
--- a/package.json
View file @4a73a59
+++ b/package.json
View file @4a73a59
@@ -12,47 +12,46 @@
   },
   "dependencies": {
     "@react-native-community/masked-view": "^0.1.7",
-    "@react-navigation/bottom-tabs": "^5.1.0",
+    "@react-navigation/bottom-tabs": "^5.2.5",
-    "@react-navigation/drawer": "^5.1.0",
+    "@react-navigation/drawer": "^5.4.0",
-    "@react-navigation/material-top-tabs": "^5.1.0",
+    "@react-navigation/material-top-tabs": "^5.1.7",
-    "@react-navigation/native": "^5.0.8",
+    "@react-navigation/native": "^5.1.4",
-    "@react-navigation/stack": "^5.1.0",
+    "@react-navigation/stack": "^5.2.9",
-    "react": "16.9.0",
+    "react": "16.11.0",
-    "react-native": "0.61.5",
+    "react-native": "0.62.1",
     "react-native-elements": "^1.2.7",
-    "react-native-gesture-handler": "^1.6.0",
+    "react-native-gesture-handler": "^1.6.1",
-    "react-native-reanimated": "^1.7.0",
+    "react-native-reanimated": "^1.7.1",
     "react-native-safe-area-context": "^0.7.3",
-    "react-native-screens": "^2.2.0",
+    "react-native-screens": "^2.4.0",
     "react-native-tab-view": "^2.13.0",
-    "react-native-vector-icons": "^6.6.0",
+    "react-native-vector-icons": "^6.6.0"
-    "rn-wechat": "file:../rn-wechat"
   },
   "devDependencies": {
     "@babel/core": "^7.6.2",
     "@babel/runtime": "^7.6.2",
     "@commitlint/cli": "^8.3.5",
     "@commitlint/config-conventional": "^8.3.4",
-    "@react-native-community/eslint-config": "^0.0.5",
+    "@react-native-community/eslint-config": "^1.0.0",
     "@types/jest": "^24.0.24",
-    "@types/react-native": "^0.60.25",
+    "@types/react-native": "^0.62.0",
-    "@types/react-test-renderer": "16.9.1",
+    "@types/react-test-renderer": "16.9.2",
-    "@typescript-eslint/eslint-plugin": "^2.12.0",
+    "@typescript-eslint/eslint-plugin": "^2.27.0",
-    "@typescript-eslint/parser": "^2.12.0",
+    "@typescript-eslint/parser": "^2.27.0",
     "babel-jest": "^24.9.0",
     "commitizen": "^4.0.3",
     "cz-conventional-changelog": "^3.1.0",
-    "eslint": "^6.5.1",
+    "eslint": "^6.8.0",
-    "eslint-config-prettier": "^6.10.0",
+    "eslint-config-prettier": "^6.10.1",
     "eslint-plugin-prettier": "^3.1.2",
     "husky": "^4.2.3",
     "jest": "^24.9.0",
-    "lint-staged": ">=10",
+    "lint-staged": "^10.1.2",
-    "metro-react-native-babel-preset": "^0.56.0",
+    "metro-react-native-babel-preset": "^0.58.0",
-    "prettier": "1.19.1",
+    "prettier": "^2.0.4",
-    "react-test-renderer": "16.9.0",
+    "react-test-renderer": "16.11.0",
     "standard-version": "^7.1.0",
-    "typescript": "^3.7.3"
+    "typescript": "^3.8.3"
   },
   "jest": {
     "preset": "react-native",
--- a/yarn.lock
View file @4a73a59
+++ b/yarn.lock
View file @4a73a59