jfinn
/
jitsi_corner9
关注 1
点赞 0
派生 0
代码 工单 0 合并请求 0 版本发布 0 百科 动态
浏览代码

feat(rn) update React Native to version 0.63 

I'm updating to RN 0.63 instead of the latest (0.66 at the time of this writing)
so we can update the navigation related libraries to their latest versions, and
then proceed with the larger leap towards the latest RN.
master
Saúl Ibarra Corretgé 3 年前
父节点
fe2f97b15d
当前提交
90321ca016
共有 15 个文件被更改，包括 3592 次插入 和 4595 次删除
分列视图 显示文件统计
  1. 5
    36
      .flowconfig
  2. 1
    0
      android/build.gradle
  3. 31
    20
      android/gradlew
  4. 103
    84
      android/gradlew.bat
  5. 0
    8
      android/sdk/src/main/java/org/jitsi/meet/sdk/ReactInstanceManagerHolder.java
  6. 6
    65
      ios/Podfile
  7. 228
    215
      ios/Podfile.lock
  8. 2
    0
      ios/sdk/sdk.xcodeproj/project.pbxproj
  9. 3164
    4083
      package-lock.json
  10. 5
    5
      package.json
  11. 0
    77
      patches/react-native+0.61.5-jitsi.2.patch
  12. 33
    0
      patches/react-native+0.63.4.patch
  13. 12
    0
      react-native.config.js
  14. 1
    1
      react/features/base/avatar/components/Avatar.js
  15. 1
    1
      react/features/conference/components/native/Labels.js

+ 5
- 36
.flowconfig 查看文件 

@@ -2,18 +2,6 @@
2 2 
 ; We fork some components by platform
3 3 
 .*/*[.]android.js
4 4
5 
-; Ignore unexpected extra "@providesModule"
6 
-.*/node_modules/.*/node_modules/fbjs/.*
7 
-node_modules/react-native/Libraries/react-native/React.js
8 
-
9 
-; Ignore duplicate module providers
10 
-; For RN Apps installed via npm, "Libraries" folder is inside
11 
-; "node_modules/react-native" but in the source repo it is in the root
12 
-node_modules/react-native/Libraries/react-native/React.js
13 
-
14 
-; Flow doesn't support platforms
15 
-.*/Libraries/Utilities/LoadingView.js
16 
-
17 5 
 ; Ignore polyfills
18 6 
 node_modules/react-native/Libraries/polyfills/.*
19 7 
 
@@ -22,7 +10,7 @@ node_modules/react-native/Libraries/polyfills/.*
22 10 
 node_modules/warning/.*
23 11
24 12 
 ; Flow doesn't support platforms
25 
-.*/Libraries/Utilities/HMRLoadingView.js
13 
+.*/Libraries/Utilities/LoadingView.js
26 14
27 15 
 [untyped]
28 16 
 .*/node_modules/@react-native-community/cli/.*/.*
 
@@ -39,7 +27,7 @@ node_modules/warning/.*
39 27 
 [include]
40 28
41 29 
 [libs]
42 
-node_modules/react-native/Libraries/react-native/react-native-interface.js
30 
+node_modules/react-native/interface.js
43 31 
 node_modules/react-native/flow/
44 32
45 33 
 [options]
 
@@ -60,27 +48,10 @@ module.file_ext=.js
60 48 
 module.file_ext=.json
61 49 
 module.file_ext=.ios.js
62 50
63 
-module.system=haste
64 
-module.system.haste.use_name_reducers=true
65 
-# get basename
66 
-module.system.haste.name_reducers='^.*/\([a-zA-Z0-9$_.-]+\.js\(\.flow\)?\)$' -> '\1'
67 
-# strip .js or .js.flow suffix
68 
-module.system.haste.name_reducers='^\(.*\)\.js\(\.flow\)?$' -> '\1'
69 
-# strip .ios suffix
70 
-module.system.haste.name_reducers='^\(.*\)\.ios$' -> '\1'
71 
-module.system.haste.name_reducers='^\(.*\)\.android$' -> '\1'
72 
-module.system.haste.name_reducers='^\(.*\)\.native$' -> '\1'
73 
-module.system.haste.paths.blacklist=.*/__tests__/.*
74 
-module.system.haste.paths.blacklist=.*/__mocks__/.*
75 
-module.system.haste.paths.whitelist=<PROJECT_ROOT>/node_modules/react-native/Libraries/.*
76 
-module.system.haste.paths.whitelist=<PROJECT_ROOT>/node_modules/react-native/RNTester/.*
77 
-module.system.haste.paths.whitelist=<PROJECT_ROOT>/node_modules/react-native/IntegrationTests/.*
78 
-module.system.haste.paths.blacklist=<PROJECT_ROOT>/node_modules/react-native/Libraries/react-native/react-native-implementation.js
79 
-module.system.haste.paths.blacklist=<PROJECT_ROOT>/node_modules/react-native/Libraries/Animated/src/polyfills/.*
80 
-
81 51 
 munge_underscores=true
82 52
83 
-module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> 'RelativeImageStub'
53 
+module.name_mapper='^react-native/\(.*\)$' -> '<PROJECT_ROOT>/node_modules/react-native/\1'
54 
+module.name_mapper='^@?[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> '<PROJECT_ROOT>/node_modules/react-native/Libraries/Image/RelativeImageStub'
84 55
85 56 
 suppress_type=$FlowIssue
86 57 
 suppress_type=$FlowFixMe
 
@@ -89,7 +60,6 @@ suppress_type=$FlowFixMeState
89 60
90 61 
 suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native\\(_ios\\)?_\\(oss\\|fb\\)[a-z,_]*\\)?)\\)
91 62 
 suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native\\(_ios\\)?_\\(oss\\|fb\\)[a-z,_]*\\)?)\\)?:? #[0-9]+
92 
-
93 63 
 suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
94 64
95 65 
 [lints]
 
@@ -100,7 +70,6 @@ untyped-type-import=warn
100 70 
 nonstrict-import=warn
101 71 
 deprecated-type=warn
102 72 
 unsafe-getters-setters=warn
103 
-inexact-spread=warn
104 73 
 unnecessary-invariant=warn
105 74 
 signature-verification-failure=warn
106 75 
 deprecated-utility=error
 
@@ -115,4 +84,4 @@ untyped-import
115 84 
 untyped-type-import
116 85
117 86 
 [version]
118 
-^0.104.0
87 
+^0.122.0

+ 1
- 0
android/build.gradle 查看文件 

@@ -44,6 +44,7 @@ allprojects {
44 44 
     repositories {
45 45 
         google()
46 46 
         jcenter()
47 
+        maven { url 'https://www.jitpack.io' }
47 48 
         // React Native (JS, Obj-C sources, Android binaries) is installed from npm.
48 49 
         maven { url "$rootDir/../node_modules/react-native/android" }
49 50 
         // Android JSC is installed from npm.

+ 31
- 20
android/gradlew 查看文件 

@@ -1,5 +1,21 @@
1 1 
 #!/usr/bin/env sh
2 2
3 
+#
4 
+# Copyright 2015 the original author or authors.
5 
+#
6 
+# Licensed under the Apache License, Version 2.0 (the "License");
7 
+# you may not use this file except in compliance with the License.
8 
+# You may obtain a copy of the License at
9 
+#
10 
+#      https://www.apache.org/licenses/LICENSE-2.0
11 
+#
12 
+# Unless required by applicable law or agreed to in writing, software
13 
+# distributed under the License is distributed on an "AS IS" BASIS,
14 
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15 
+# See the License for the specific language governing permissions and
16 
+# limitations under the License.
17 
+#
18 
+
3 19 
 ##############################################################################
4 20 
 ##
5 21 
 ##  Gradle start up script for UN*X
 
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
28 44 
 APP_BASE_NAME=`basename "$0"`
29 45
30 46 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
31 
-DEFAULT_JVM_OPTS=""
47 
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
32 48
33 49 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
34 50 
 MAX_FD="maximum"
 
@@ -109,8 +125,8 @@ if $darwin; then
109 125 
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
110 126 
 fi
111 127
112 
-# For Cygwin, switch paths to Windows format before running java
113 
-if $cygwin ; then
128 
+# For Cygwin or MSYS, switch paths to Windows format before running java
129 
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
114 130 
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
115 131 
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
116 132 
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
@@ -138,19 +154,19 @@ if $cygwin ; then
138 154 
         else
139 155 
             eval `echo args$i`="\"$arg\""
140 156 
         fi
141 
-        i=$((i+1))
157 
+        i=`expr $i + 1`
142 158 
     done
143 159 
     case $i in
144 
-        (0) set -- ;;
145 
-        (1) set -- "$args0" ;;
146 
-        (2) set -- "$args0" "$args1" ;;
147 
-        (3) set -- "$args0" "$args1" "$args2" ;;
148 
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
149 
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
150 
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
151 
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
152 
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
153 
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
160 
+        0) set -- ;;
161 
+        1) set -- "$args0" ;;
162 
+        2) set -- "$args0" "$args1" ;;
163 
+        3) set -- "$args0" "$args1" "$args2" ;;
164 
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
165 
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
166 
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
167 
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
168 
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
169 
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
154 170 
     esac
155 171 
 fi
156 172 
 
@@ -159,14 +175,9 @@ save () {
159 175 
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
160 176 
     echo " "
161 177 
 }
162 
-APP_ARGS=$(save "$@")
178 
+APP_ARGS=`save "$@"`
163 179
164 180 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
165 181 
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
166 182
167 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
168 
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
169 
-  cd "$(dirname "$0")"
170 
-fi
171 
-
172 183 
 exec "$JAVACMD" "$@"

+ 103
- 84
android/gradlew.bat 查看文件 

@@ -1,84 +1,103 @@
1 
-@if "%DEBUG%" == "" @echo off
2 
-@rem ##########################################################################
3 
-@rem
4 
-@rem  Gradle startup script for Windows
5 
-@rem
6 
-@rem ##########################################################################
7 
-
8 
-@rem Set local scope for the variables with windows NT shell
9 
-if "%OS%"=="Windows_NT" setlocal
10 
-
11 
-set DIRNAME=%~dp0
12 
-if "%DIRNAME%" == "" set DIRNAME=.
13 
-set APP_BASE_NAME=%~n0
14 
-set APP_HOME=%DIRNAME%
15 
-
16 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
17 
-set DEFAULT_JVM_OPTS=
18 
-
19 
-@rem Find java.exe
20 
-if defined JAVA_HOME goto findJavaFromJavaHome
21 
-
22 
-set JAVA_EXE=java.exe
23 
-%JAVA_EXE% -version >NUL 2>&1
24 
-if "%ERRORLEVEL%" == "0" goto init
25 
-
26 
-echo.
27 
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
28 
-echo.
29 
-echo Please set the JAVA_HOME variable in your environment to match the
30 
-echo location of your Java installation.
31 
-
32 
-goto fail
33 
-
34 
-:findJavaFromJavaHome
35 
-set JAVA_HOME=%JAVA_HOME:"=%
36 
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
37 
-
38 
-if exist "%JAVA_EXE%" goto init
39 
-
40 
-echo.
41 
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
42 
-echo.
43 
-echo Please set the JAVA_HOME variable in your environment to match the
44 
-echo location of your Java installation.
45 
-
46 
-goto fail
47 
-
48 
-:init
49 
-@rem Get command-line arguments, handling Windows variants
50 
-
51 
-if not "%OS%" == "Windows_NT" goto win9xME_args
52 
-
53 
-:win9xME_args
54 
-@rem Slurp the command line arguments.
55 
-set CMD_LINE_ARGS=
56 
-set _SKIP=2
57 
-
58 
-:win9xME_args_slurp
59 
-if "x%~1" == "x" goto execute
60 
-
61 
-set CMD_LINE_ARGS=%*
62 
-
63 
-:execute
64 
-@rem Setup the command line
65 
-
66 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
67 
-
68 
-@rem Execute Gradle
69 
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
70 
-
71 
-:end
72 
-@rem End local scope for the variables with windows NT shell
73 
-if "%ERRORLEVEL%"=="0" goto mainEnd
74 
-
75 
-:fail
76 
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
77 
-rem the _cmd.exe /c_ return code!
78 
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
79 
-exit /b 1
80 
-
81 
-:mainEnd
82 
-if "%OS%"=="Windows_NT" endlocal
83 
-
84 
-:omega
1 
+@rem
2 
+@rem Copyright 2015 the original author or authors.
3 
+@rem
4 
+@rem Licensed under the Apache License, Version 2.0 (the "License");
5 
+@rem you may not use this file except in compliance with the License.
6 
+@rem You may obtain a copy of the License at
7 
+@rem
8 
+@rem      https://www.apache.org/licenses/LICENSE-2.0
9 
+@rem
10 
+@rem Unless required by applicable law or agreed to in writing, software
11 
+@rem distributed under the License is distributed on an "AS IS" BASIS,
12 
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 
+@rem See the License for the specific language governing permissions and
14 
+@rem limitations under the License.
15 
+@rem
16 
+
17 
+@if "%DEBUG%" == "" @echo off
18 
+@rem ##########################################################################
19 
+@rem
20 
+@rem  Gradle startup script for Windows
21 
+@rem
22 
+@rem ##########################################################################
23 
+
24 
+@rem Set local scope for the variables with windows NT shell
25 
+if "%OS%"=="Windows_NT" setlocal
26 
+
27 
+set DIRNAME=%~dp0
28 
+if "%DIRNAME%" == "" set DIRNAME=.
29 
+set APP_BASE_NAME=%~n0
30 
+set APP_HOME=%DIRNAME%
31 
+
32 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
33 
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
34 
+
35 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
36 
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
37 
+
38 
+@rem Find java.exe
39 
+if defined JAVA_HOME goto findJavaFromJavaHome
40 
+
41 
+set JAVA_EXE=java.exe
42 
+%JAVA_EXE% -version >NUL 2>&1
43 
+if "%ERRORLEVEL%" == "0" goto init
44 
+
45 
+echo.
46 
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
47 
+echo.
48 
+echo Please set the JAVA_HOME variable in your environment to match the
49 
+echo location of your Java installation.
50 
+
51 
+goto fail
52 
+
53 
+:findJavaFromJavaHome
54 
+set JAVA_HOME=%JAVA_HOME:"=%
55 
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
56 
+
57 
+if exist "%JAVA_EXE%" goto init
58 
+
59 
+echo.
60 
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
61 
+echo.
62 
+echo Please set the JAVA_HOME variable in your environment to match the
63 
+echo location of your Java installation.
64 
+
65 
+goto fail
66 
+
67 
+:init
68 
+@rem Get command-line arguments, handling Windows variants
69 
+
70 
+if not "%OS%" == "Windows_NT" goto win9xME_args
71 
+
72 
+:win9xME_args
73 
+@rem Slurp the command line arguments.
74 
+set CMD_LINE_ARGS=
75 
+set _SKIP=2
76 
+
77 
+:win9xME_args_slurp
78 
+if "x%~1" == "x" goto execute
79 
+
80 
+set CMD_LINE_ARGS=%*
81 
+
82 
+:execute
83 
+@rem Setup the command line
84 
+
85 
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
86 
+
87 
+@rem Execute Gradle
88 
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
89 
+
90 
+:end
91 
+@rem End local scope for the variables with windows NT shell
92 
+if "%ERRORLEVEL%"=="0" goto mainEnd
93 
+
94 
+:fail
95 
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
96 
+rem the _cmd.exe /c_ return code!
97 
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
98 
+exit /b 1
99 
+
100 
+:mainEnd
101 
+if "%OS%"=="Windows_NT" endlocal
102 
+
103 
+:omega

+ 0
- 8
android/sdk/src/main/java/org/jitsi/meet/sdk/ReactInstanceManagerHolder.java 查看文件 

@@ -26,7 +26,6 @@ import com.facebook.react.bridge.NativeModule;
26 26 
 import com.facebook.react.bridge.ReactApplicationContext;
27 27 
 import com.facebook.react.bridge.ReactContext;
28 28 
 import com.facebook.react.common.LifecycleState;
29 
-import com.facebook.react.devsupport.DevInternalSettings;
30 29 
 import com.facebook.react.jscexecutor.JSCExecutorFactory;
31 30 
 import com.facebook.react.modules.core.DeviceEventManagerModule;
32 31 
 import com.facebook.react.uimanager.ViewManager;
 
@@ -242,13 +241,6 @@ class ReactInstanceManagerHolder {
242 241 
                 .setInitialLifecycleState(LifecycleState.RESUMED)
243 242 
                 .build();
244 243
245 
-        // Disable delta updates on Android, they have caused trouble.
246 
-        DevInternalSettings devSettings
247 
-            = (DevInternalSettings)reactInstanceManager.getDevSupportManager().getDevSettings();
248 
-        if (devSettings != null) {
249 
-            devSettings.setBundleDeltasEnabled(false);
250 
-        }
251 
-
252 244 
         // Register our uncaught exception handler.
253 245 
         JitsiMeetUncaughtExceptionHandler.register();
254 246 
     }

+ 6
- 65
ios/Podfile 查看文件 

@@ -1,6 +1,9 @@
1 
+require_relative '../node_modules/react-native/scripts/react_native_pods'
2 
+require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
3 
+
1 4 
 platform :ios, '12.0'
2 5 
 workspace 'jitsi-meet'
3 
-require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
6 
+
4 7 
 install! 'cocoapods', :deterministic_uuids => false
5 8
6 9 
 target 'JitsiMeet' do
 
@@ -17,76 +20,14 @@ target 'JitsiMeetSDK' do
17 20 
   # React Native and its dependencies
18 21 
   #
19 22
20 
-  pod 'FBLazyVector', :path => '../node_modules/react-native/Libraries/FBLazyVector/'
21 
-  pod 'FBReactNativeSpec', :path => '../node_modules/react-native/Libraries/FBReactNativeSpec/'
22 
-  pod 'RCTRequired', :path => '../node_modules/react-native/Libraries/RCTRequired/'
23 
-  pod 'RCTTypeSafety', :path => '../node_modules/react-native/Libraries/TypeSafety/'
24 
-  pod 'React', :path => '../node_modules/react-native/'
25 
-  pod 'ReactCommon', :path => '../node_modules/react-native/ReactCommon', :subspecs => [
26 
-    'turbomodule'
27 
-  ]
28 
-  pod 'React-Core', :path => '../node_modules/react-native/', :subspecs => [
29 
-    'CoreModulesHeaders',
30 
-    'DevSupport',
31 
-    'RCTWebSocket'
32 
-  ], :modular_headers => true
33 
-  pod 'React-CoreModules', :path => '../node_modules/react-native/React/CoreModules'
34 
-  pod 'React-RCTActionSheet', :path => '../node_modules/react-native/Libraries/ActionSheetIOS'
35 
-  pod 'React-RCTAnimation', :path => '../node_modules/react-native/Libraries/NativeAnimation'
36 
-  pod 'React-RCTBlob', :path => '../node_modules/react-native/Libraries/Blob'
37 
-  pod 'React-RCTImage', :path => '../node_modules/react-native/Libraries/Image'
38 
-  pod 'React-RCTLinking', :path => '../node_modules/react-native/Libraries/LinkingIOS'
39 
-  pod 'React-RCTNetwork', :path => '../node_modules/react-native/Libraries/Network'
40 
-  pod 'React-RCTSettings', :path => '../node_modules/react-native/Libraries/Settings'
41 
-  pod 'React-RCTText', :path => '../node_modules/react-native/Libraries/Text'
42 
-  pod 'React-RCTVibration', :path => '../node_modules/react-native/Libraries/Vibration'
43 
-
44 
-  pod 'React-cxxreact', :path => '../node_modules/react-native/ReactCommon/cxxreact'
45 
-  pod 'React-jsi', :path => '../node_modules/react-native/ReactCommon/jsi'
46 
-  pod 'React-jsiexecutor', :path => '../node_modules/react-native/ReactCommon/jsiexecutor'
47 
-  pod 'React-jsinspector', :path => '../node_modules/react-native/ReactCommon/jsinspector'
48 
-  pod 'Yoga', :path => '../node_modules/react-native/ReactCommon/yoga'
49 
-
50 
-  pod 'DoubleConversion', :podspec => '../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec'
51 
-  pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec'
52 
-  pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec'
53 
-
54 
-  # React Native plugins
55 
-  #
56 
-
57 
-  pod 'amplitude-react-native', :path => '../node_modules/@amplitude/react-native'
58 
-  pod 'react-native-background-timer', :path => '../node_modules/react-native-background-timer'
59 
-  pod 'react-native-get-random-values', :path => '../node_modules/react-native-get-random-values'
60 
-  pod 'react-native-keep-awake', :path => '../node_modules/react-native-keep-awake'
61 
-  pod 'react-native-netinfo', :path => '../node_modules/@react-native-community/netinfo'
62 
-  pod 'react-native-performance', :path => '../node_modules/react-native-performance/ios'
63 
-  pod 'react-native-safe-area-context', :path => '../node_modules/react-native-safe-area-context'
64 
-  pod 'react-native-slider', :path => '../node_modules/@react-native-community/slider'
65 
-  pod 'react-native-splash-screen', :path => '../node_modules/react-native-splash-screen'
66 
-  pod 'react-native-video', :path => '../node_modules/react-native-video/react-native-video.podspec'
67 
-  pod 'react-native-webview', :path => '../node_modules/react-native-webview'
68 
-  pod 'react-native-webrtc', :path => '../node_modules/react-native-webrtc'
69 
-  pod 'RNCAsyncStorage', :path => '../node_modules/@react-native-async-storage/async-storage'
70 
-  pod 'RNCalendarEvents', :path => '../node_modules/react-native-calendar-events'
71 
-  pod 'RNCClipboard', :path => '../node_modules/@react-native-community/clipboard'
72 
-  pod 'RNCMaskedView', :path => '../node_modules/@react-native-masked-view/masked-view'
73 
-  pod 'RNDefaultPreference', :path => '../node_modules/react-native-default-preference'
74 
-  pod 'RNDeviceInfo', :path => '../node_modules/react-native-device-info'
75 
-  pod 'RNGestureHandler', :path => '../node_modules/react-native-gesture-handler'
76 
-  pod 'RNGoogleSignin', :path => '../node_modules/@react-native-google-signin/google-signin'
77 
-  pod 'RNReanimated', :path => '../node_modules/react-native-reanimated'
78 
-  pod 'RNScreens', :path => '../node_modules/react-native-screens'
79 
-  pod 'RNSound', :path => '../node_modules/react-native-sound'
80 
-  pod 'RNSVG', :path => '../node_modules/react-native-svg'
81 
-  pod 'RNWatch', :path => '../node_modules/react-native-watch-connectivity'
23 
+  config = use_native_modules!
24 
+  use_react_native!(:path => config["reactNativePath"])
82 25
83 26 
   # Native pod dependencies
84 27 
   #
85 28
86 29 
   pod 'CocoaLumberjack', '~>3.5.3'
87 30 
   pod 'ObjectiveDropboxOfficial', '~>6.1.0'
88 
-
89 
-  use_native_modules!
90 31 
 end
91 32
92 33 
 post_install do |installer|

+ 228
- 215
ios/Podfile.lock 查看文件 

@@ -13,14 +13,14 @@ PODS:
13 13 
     - CocoaLumberjack/Core (= 3.5.3)
14 14 
   - CocoaLumberjack/Core (3.5.3)
15 15 
   - DoubleConversion (1.1.6)
16 
-  - FBLazyVector (0.61.5-jitsi.2)
17 
-  - FBReactNativeSpec (0.61.5-jitsi.2):
18 
-    - Folly (= 2018.10.22.00)
19 
-    - RCTRequired (= 0.61.5-jitsi.2)
20 
-    - RCTTypeSafety (= 0.61.5-jitsi.2)
21 
-    - React-Core (= 0.61.5-jitsi.2)
22 
-    - React-jsi (= 0.61.5-jitsi.2)
23 
-    - ReactCommon/turbomodule/core (= 0.61.5-jitsi.2)
16 
+  - FBLazyVector (0.63.4)
17 
+  - FBReactNativeSpec (0.63.4):
18 
+    - Folly (= 2020.01.13.00)
19 
+    - RCTRequired (= 0.63.4)
20 
+    - RCTTypeSafety (= 0.63.4)
21 
+    - React-Core (= 0.63.4)
22 
+    - React-jsi (= 0.63.4)
23 
+    - ReactCommon/turbomodule/core (= 0.63.4)
24 24 
   - Firebase/Analytics (6.33.0):
25 25 
     - Firebase/Core
26 26 
   - Firebase/Core (6.33.0):
 
@@ -65,12 +65,12 @@ PODS:
65 65 
     - GoogleUtilities/Environment (~> 6.7)
66 66 
     - GoogleUtilities/UserDefaults (~> 6.7)
67 67 
     - PromisesObjC (~> 1.2)
68 
-  - Folly (2018.10.22.00):
68 
+  - Folly (2020.01.13.00):
69 69 
     - boost-for-react-native
70 70 
     - DoubleConversion
71 
-    - Folly/Default (= 2018.10.22.00)
71 
+    - Folly/Default (= 2020.01.13.00)
72 72 
     - glog
73 
-  - Folly/Default (2018.10.22.00):
73 
+  - Folly/Default (2020.01.13.00):
74 74 
     - boost-for-react-native
75 75 
     - DoubleConversion
76 76 
     - glog
 
@@ -117,169 +117,172 @@ PODS:
117 117 
   - nanopb/encode (1.30906.0)
118 118 
   - ObjectiveDropboxOfficial (6.1.0)
119 119 
   - PromisesObjC (1.2.12)
120 
-  - RCTRequired (0.61.5-jitsi.2)
121 
-  - RCTTypeSafety (0.61.5-jitsi.2):
122 
-    - FBLazyVector (= 0.61.5-jitsi.2)
123 
-    - Folly (= 2018.10.22.00)
124 
-    - RCTRequired (= 0.61.5-jitsi.2)
125 
-    - React-Core (= 0.61.5-jitsi.2)
126 
-  - React (0.61.5-jitsi.2):
127 
-    - React-Core (= 0.61.5-jitsi.2)
128 
-    - React-Core/DevSupport (= 0.61.5-jitsi.2)
129 
-    - React-Core/RCTWebSocket (= 0.61.5-jitsi.2)
130 
-    - React-RCTActionSheet (= 0.61.5-jitsi.2)
131 
-    - React-RCTAnimation (= 0.61.5-jitsi.2)
132 
-    - React-RCTBlob (= 0.61.5-jitsi.2)
133 
-    - React-RCTImage (= 0.61.5-jitsi.2)
134 
-    - React-RCTLinking (= 0.61.5-jitsi.2)
135 
-    - React-RCTNetwork (= 0.61.5-jitsi.2)
136 
-    - React-RCTSettings (= 0.61.5-jitsi.2)
137 
-    - React-RCTText (= 0.61.5-jitsi.2)
138 
-    - React-RCTVibration (= 0.61.5-jitsi.2)
139 
-  - React-Core (0.61.5-jitsi.2):
140 
-    - Folly (= 2018.10.22.00)
120 
+  - RCTRequired (0.63.4)
121 
+  - RCTTypeSafety (0.63.4):
122 
+    - FBLazyVector (= 0.63.4)
123 
+    - Folly (= 2020.01.13.00)
124 
+    - RCTRequired (= 0.63.4)
125 
+    - React-Core (= 0.63.4)
126 
+  - React (0.63.4):
127 
+    - React-Core (= 0.63.4)
128 
+    - React-Core/DevSupport (= 0.63.4)
129 
+    - React-Core/RCTWebSocket (= 0.63.4)
130 
+    - React-RCTActionSheet (= 0.63.4)
131 
+    - React-RCTAnimation (= 0.63.4)
132 
+    - React-RCTBlob (= 0.63.4)
133 
+    - React-RCTImage (= 0.63.4)
134 
+    - React-RCTLinking (= 0.63.4)
135 
+    - React-RCTNetwork (= 0.63.4)
136 
+    - React-RCTSettings (= 0.63.4)
137 
+    - React-RCTText (= 0.63.4)
138 
+    - React-RCTVibration (= 0.63.4)
139 
+  - React-callinvoker (0.63.4)
140 
+  - React-Core (0.63.4):
141 
+    - Folly (= 2020.01.13.00)
141 142 
     - glog
142 
-    - React-Core/Default (= 0.61.5-jitsi.2)
143 
-    - React-cxxreact (= 0.61.5-jitsi.2)
144 
-    - React-jsi (= 0.61.5-jitsi.2)
145 
-    - React-jsiexecutor (= 0.61.5-jitsi.2)
143 
+    - React-Core/Default (= 0.63.4)
144 
+    - React-cxxreact (= 0.63.4)
145 
+    - React-jsi (= 0.63.4)
146 
+    - React-jsiexecutor (= 0.63.4)
146 147 
     - Yoga
147 
-  - React-Core/CoreModulesHeaders (0.61.5-jitsi.2):
148 
-    - Folly (= 2018.10.22.00)
148 
+  - React-Core/CoreModulesHeaders (0.63.4):
149 
+    - Folly (= 2020.01.13.00)
149 150 
     - glog
150 151 
     - React-Core/Default
151 
-    - React-cxxreact (= 0.61.5-jitsi.2)
152 
-    - React-jsi (= 0.61.5-jitsi.2)
153 
-    - React-jsiexecutor (= 0.61.5-jitsi.2)
152 
+    - React-cxxreact (= 0.63.4)
153 
+    - React-jsi (= 0.63.4)
154 
+    - React-jsiexecutor (= 0.63.4)
154 155 
     - Yoga
155 
-  - React-Core/Default (0.61.5-jitsi.2):
156 
-    - Folly (= 2018.10.22.00)
156 
+  - React-Core/Default (0.63.4):
157 
+    - Folly (= 2020.01.13.00)
157 158 
     - glog
158 
-    - React-cxxreact (= 0.61.5-jitsi.2)
159 
-    - React-jsi (= 0.61.5-jitsi.2)
160 
-    - React-jsiexecutor (= 0.61.5-jitsi.2)
159 
+    - React-cxxreact (= 0.63.4)
160 
+    - React-jsi (= 0.63.4)
161 
+    - React-jsiexecutor (= 0.63.4)
161 162 
     - Yoga
162 
-  - React-Core/DevSupport (0.61.5-jitsi.2):
163 
-    - Folly (= 2018.10.22.00)
163 
+  - React-Core/DevSupport (0.63.4):
164 
+    - Folly (= 2020.01.13.00)
164 165 
     - glog
165 
-    - React-Core/Default (= 0.61.5-jitsi.2)
166 
-    - React-Core/RCTWebSocket (= 0.61.5-jitsi.2)
167 
-    - React-cxxreact (= 0.61.5-jitsi.2)
168 
-    - React-jsi (= 0.61.5-jitsi.2)
169 
-    - React-jsiexecutor (= 0.61.5-jitsi.2)
170 
-    - React-jsinspector (= 0.61.5-jitsi.2)
166 
+    - React-Core/Default (= 0.63.4)
167 
+    - React-Core/RCTWebSocket (= 0.63.4)
168 
+    - React-cxxreact (= 0.63.4)
169 
+    - React-jsi (= 0.63.4)
170 
+    - React-jsiexecutor (= 0.63.4)
171 
+    - React-jsinspector (= 0.63.4)
171 172 
     - Yoga
172 
-  - React-Core/RCTActionSheetHeaders (0.61.5-jitsi.2):
173 
-    - Folly (= 2018.10.22.00)
173 
+  - React-Core/RCTActionSheetHeaders (0.63.4):
174 
+    - Folly (= 2020.01.13.00)
174 175 
     - glog
175 176 
     - React-Core/Default
176 
-    - React-cxxreact (= 0.61.5-jitsi.2)
177 
-    - React-jsi (= 0.61.5-jitsi.2)
178 
-    - React-jsiexecutor (= 0.61.5-jitsi.2)
177 
+    - React-cxxreact (= 0.63.4)
178 
+    - React-jsi (= 0.63.4)
179 
+    - React-jsiexecutor (= 0.63.4)
179 180 
     - Yoga
180 
-  - React-Core/RCTAnimationHeaders (0.61.5-jitsi.2):
181 
-    - Folly (= 2018.10.22.00)
181 
+  - React-Core/RCTAnimationHeaders (0.63.4):
182 
+    - Folly (= 2020.01.13.00)
182 183 
     - glog
183 184 
     - React-Core/Default
184 
-    - React-cxxreact (= 0.61.5-jitsi.2)
185 
-    - React-jsi (= 0.61.5-jitsi.2)
186 
-    - React-jsiexecutor (= 0.61.5-jitsi.2)
185 
+    - React-cxxreact (= 0.63.4)
186 
+    - React-jsi (= 0.63.4)
187 
+    - React-jsiexecutor (= 0.63.4)
187 188 
     - Yoga
188 
-  - React-Core/RCTBlobHeaders (0.61.5-jitsi.2):
189 
-    - Folly (= 2018.10.22.00)
189 
+  - React-Core/RCTBlobHeaders (0.63.4):
190 
+    - Folly (= 2020.01.13.00)
190 191 
     - glog
191 192 
     - React-Core/Default
192 
-    - React-cxxreact (= 0.61.5-jitsi.2)
193 
-    - React-jsi (= 0.61.5-jitsi.2)
194 
-    - React-jsiexecutor (= 0.61.5-jitsi.2)
193 
+    - React-cxxreact (= 0.63.4)
194 
+    - React-jsi (= 0.63.4)
195 
+    - React-jsiexecutor (= 0.63.4)
195 196 
     - Yoga
196 
-  - React-Core/RCTImageHeaders (0.61.5-jitsi.2):
197 
-    - Folly (= 2018.10.22.00)
197 
+  - React-Core/RCTImageHeaders (0.63.4):
198 
+    - Folly (= 2020.01.13.00)
198 199 
     - glog
199 200 
     - React-Core/Default
200 
-    - React-cxxreact (= 0.61.5-jitsi.2)
201 
-    - React-jsi (= 0.61.5-jitsi.2)
202 
-    - React-jsiexecutor (= 0.61.5-jitsi.2)
201 
+    - React-cxxreact (= 0.63.4)
202 
+    - React-jsi (= 0.63.4)
203 
+    - React-jsiexecutor (= 0.63.4)
203 204 
     - Yoga
204 
-  - React-Core/RCTLinkingHeaders (0.61.5-jitsi.2):
205 
-    - Folly (= 2018.10.22.00)
205 
+  - React-Core/RCTLinkingHeaders (0.63.4):
206 
+    - Folly (= 2020.01.13.00)
206 207 
     - glog
207 208 
     - React-Core/Default
208 
-    - React-cxxreact (= 0.61.5-jitsi.2)
209 
-    - React-jsi (= 0.61.5-jitsi.2)
210 
-    - React-jsiexecutor (= 0.61.5-jitsi.2)
209 
+    - React-cxxreact (= 0.63.4)
210 
+    - React-jsi (= 0.63.4)
211 
+    - React-jsiexecutor (= 0.63.4)
211 212 
     - Yoga
212 
-  - React-Core/RCTNetworkHeaders (0.61.5-jitsi.2):
213 
-    - Folly (= 2018.10.22.00)
213 
+  - React-Core/RCTNetworkHeaders (0.63.4):
214 
+    - Folly (= 2020.01.13.00)
214 215 
     - glog
215 216 
     - React-Core/Default
216 
-    - React-cxxreact (= 0.61.5-jitsi.2)
217 
-    - React-jsi (= 0.61.5-jitsi.2)
218 
-    - React-jsiexecutor (= 0.61.5-jitsi.2)
217 
+    - React-cxxreact (= 0.63.4)
218 
+    - React-jsi (= 0.63.4)
219 
+    - React-jsiexecutor (= 0.63.4)
219 220 
     - Yoga
220 
-  - React-Core/RCTSettingsHeaders (0.61.5-jitsi.2):
221 
-    - Folly (= 2018.10.22.00)
221 
+  - React-Core/RCTSettingsHeaders (0.63.4):
222 
+    - Folly (= 2020.01.13.00)
222 223 
     - glog
223 224 
     - React-Core/Default
224 
-    - React-cxxreact (= 0.61.5-jitsi.2)
225 
-    - React-jsi (= 0.61.5-jitsi.2)
226 
-    - React-jsiexecutor (= 0.61.5-jitsi.2)
225 
+    - React-cxxreact (= 0.63.4)
226 
+    - React-jsi (= 0.63.4)
227 
+    - React-jsiexecutor (= 0.63.4)
227 228 
     - Yoga
228 
-  - React-Core/RCTTextHeaders (0.61.5-jitsi.2):
229 
-    - Folly (= 2018.10.22.00)
229 
+  - React-Core/RCTTextHeaders (0.63.4):
230 
+    - Folly (= 2020.01.13.00)
230 231 
     - glog
231 232 
     - React-Core/Default
232 
-    - React-cxxreact (= 0.61.5-jitsi.2)
233 
-    - React-jsi (= 0.61.5-jitsi.2)
234 
-    - React-jsiexecutor (= 0.61.5-jitsi.2)
233 
+    - React-cxxreact (= 0.63.4)
234 
+    - React-jsi (= 0.63.4)
235 
+    - React-jsiexecutor (= 0.63.4)
235 236 
     - Yoga
236 
-  - React-Core/RCTVibrationHeaders (0.61.5-jitsi.2):
237 
-    - Folly (= 2018.10.22.00)
237 
+  - React-Core/RCTVibrationHeaders (0.63.4):
238 
+    - Folly (= 2020.01.13.00)
238 239 
     - glog
239 240 
     - React-Core/Default
240 
-    - React-cxxreact (= 0.61.5-jitsi.2)
241 
-    - React-jsi (= 0.61.5-jitsi.2)
242 
-    - React-jsiexecutor (= 0.61.5-jitsi.2)
241 
+    - React-cxxreact (= 0.63.4)
242 
+    - React-jsi (= 0.63.4)
243 
+    - React-jsiexecutor (= 0.63.4)
243 244 
     - Yoga
244 
-  - React-Core/RCTWebSocket (0.61.5-jitsi.2):
245 
-    - Folly (= 2018.10.22.00)
245 
+  - React-Core/RCTWebSocket (0.63.4):
246 
+    - Folly (= 2020.01.13.00)
246 247 
     - glog
247 
-    - React-Core/Default (= 0.61.5-jitsi.2)
248 
-    - React-cxxreact (= 0.61.5-jitsi.2)
249 
-    - React-jsi (= 0.61.5-jitsi.2)
250 
-    - React-jsiexecutor (= 0.61.5-jitsi.2)
248 
+    - React-Core/Default (= 0.63.4)
249 
+    - React-cxxreact (= 0.63.4)
250 
+    - React-jsi (= 0.63.4)
251 
+    - React-jsiexecutor (= 0.63.4)
251 252 
     - Yoga
252 
-  - React-CoreModules (0.61.5-jitsi.2):
253 
-    - FBReactNativeSpec (= 0.61.5-jitsi.2)
254 
-    - Folly (= 2018.10.22.00)
255 
-    - RCTTypeSafety (= 0.61.5-jitsi.2)
256 
-    - React-Core/CoreModulesHeaders (= 0.61.5-jitsi.2)
257 
-    - React-RCTImage (= 0.61.5-jitsi.2)
258 
-    - ReactCommon/turbomodule/core (= 0.61.5-jitsi.2)
259 
-  - React-cxxreact (0.61.5-jitsi.2):
253 
+  - React-CoreModules (0.63.4):
254 
+    - FBReactNativeSpec (= 0.63.4)
255 
+    - Folly (= 2020.01.13.00)
256 
+    - RCTTypeSafety (= 0.63.4)
257 
+    - React-Core/CoreModulesHeaders (= 0.63.4)
258 
+    - React-jsi (= 0.63.4)
259 
+    - React-RCTImage (= 0.63.4)
260 
+    - ReactCommon/turbomodule/core (= 0.63.4)
261 
+  - React-cxxreact (0.63.4):
260 262 
     - boost-for-react-native (= 1.63.0)
261 263 
     - DoubleConversion
262 
-    - Folly (= 2018.10.22.00)
264 
+    - Folly (= 2020.01.13.00)
263 265 
     - glog
264 
-    - React-jsinspector (= 0.61.5-jitsi.2)
265 
-  - React-jsi (0.61.5-jitsi.2):
266 
+    - React-callinvoker (= 0.63.4)
267 
+    - React-jsinspector (= 0.63.4)
268 
+  - React-jsi (0.63.4):
266 269 
     - boost-for-react-native (= 1.63.0)
267 270 
     - DoubleConversion
268 
-    - Folly (= 2018.10.22.00)
271 
+    - Folly (= 2020.01.13.00)
269 272 
     - glog
270 
-    - React-jsi/Default (= 0.61.5-jitsi.2)
271 
-  - React-jsi/Default (0.61.5-jitsi.2):
273 
+    - React-jsi/Default (= 0.63.4)
274 
+  - React-jsi/Default (0.63.4):
272 275 
     - boost-for-react-native (= 1.63.0)
273 276 
     - DoubleConversion
274 
-    - Folly (= 2018.10.22.00)
277 
+    - Folly (= 2020.01.13.00)
275 278 
     - glog
276 
-  - React-jsiexecutor (0.61.5-jitsi.2):
279 
+  - React-jsiexecutor (0.63.4):
277 280 
     - DoubleConversion
278 
-    - Folly (= 2018.10.22.00)
281 
+    - Folly (= 2020.01.13.00)
279 282 
     - glog
280 
-    - React-cxxreact (= 0.61.5-jitsi.2)
281 
-    - React-jsi (= 0.61.5-jitsi.2)
282 
-  - React-jsinspector (0.61.5-jitsi.2)
283 
+    - React-cxxreact (= 0.63.4)
284 
+    - React-jsi (= 0.63.4)
285 
+  - React-jsinspector (0.63.4)
283 286 
   - react-native-background-timer (2.4.1):
284 287 
     - React-Core
285 288 
   - react-native-get-random-values (1.7.2):
 
@@ -305,60 +308,66 @@ PODS:
305 308 
     - React-Core
306 309 
   - react-native-webview (11.15.0):
307 310 
     - React-Core
308 
-  - React-RCTActionSheet (0.61.5-jitsi.2):
309 
-    - React-Core/RCTActionSheetHeaders (= 0.61.5-jitsi.2)
310 
-  - React-RCTAnimation (0.61.5-jitsi.2):
311 
-    - React-Core/RCTAnimationHeaders (= 0.61.5-jitsi.2)
312 
-  - React-RCTBlob (0.61.5-jitsi.2):
313 
-    - React-Core/RCTBlobHeaders (= 0.61.5-jitsi.2)
314 
-    - React-Core/RCTWebSocket (= 0.61.5-jitsi.2)
315 
-    - React-jsi (= 0.61.5-jitsi.2)
316 
-    - React-RCTNetwork (= 0.61.5-jitsi.2)
317 
-  - React-RCTImage (0.61.5-jitsi.2):
318 
-    - React-Core/RCTImageHeaders (= 0.61.5-jitsi.2)
319 
-    - React-RCTNetwork (= 0.61.5-jitsi.2)
320 
-  - React-RCTLinking (0.61.5-jitsi.2):
321 
-    - React-Core/RCTLinkingHeaders (= 0.61.5-jitsi.2)
322 
-  - React-RCTNetwork (0.61.5-jitsi.2):
323 
-    - React-Core/RCTNetworkHeaders (= 0.61.5-jitsi.2)
324 
-  - React-RCTSettings (0.61.5-jitsi.2):
325 
-    - React-Core/RCTSettingsHeaders (= 0.61.5-jitsi.2)
326 
-  - React-RCTText (0.61.5-jitsi.2):
327 
-    - React-Core/RCTTextHeaders (= 0.61.5-jitsi.2)
328 
-  - React-RCTVibration (0.61.5-jitsi.2):
329 
-    - React-Core/RCTVibrationHeaders (= 0.61.5-jitsi.2)
330 
-  - ReactCommon/jscallinvoker (0.61.5-jitsi.2):
311 
+  - React-RCTActionSheet (0.63.4):
312 
+    - React-Core/RCTActionSheetHeaders (= 0.63.4)
313 
+  - React-RCTAnimation (0.63.4):
314 
+    - FBReactNativeSpec (= 0.63.4)
315 
+    - Folly (= 2020.01.13.00)
316 
+    - RCTTypeSafety (= 0.63.4)
317 
+    - React-Core/RCTAnimationHeaders (= 0.63.4)
318 
+    - React-jsi (= 0.63.4)
319 
+    - ReactCommon/turbomodule/core (= 0.63.4)
320 
+  - React-RCTBlob (0.63.4):
321 
+    - FBReactNativeSpec (= 0.63.4)
322 
+    - Folly (= 2020.01.13.00)
323 
+    - React-Core/RCTBlobHeaders (= 0.63.4)
324 
+    - React-Core/RCTWebSocket (= 0.63.4)
325 
+    - React-jsi (= 0.63.4)
326 
+    - React-RCTNetwork (= 0.63.4)
327 
+    - ReactCommon/turbomodule/core (= 0.63.4)
328 
+  - React-RCTImage (0.63.4):
329 
+    - FBReactNativeSpec (= 0.63.4)
330 
+    - Folly (= 2020.01.13.00)
331 
+    - RCTTypeSafety (= 0.63.4)
332 
+    - React-Core/RCTImageHeaders (= 0.63.4)
333 
+    - React-jsi (= 0.63.4)
334 
+    - React-RCTNetwork (= 0.63.4)
335 
+    - ReactCommon/turbomodule/core (= 0.63.4)
336 
+  - React-RCTLinking (0.63.4):
337 
+    - FBReactNativeSpec (= 0.63.4)
338 
+    - React-Core/RCTLinkingHeaders (= 0.63.4)
339 
+    - React-jsi (= 0.63.4)
340 
+    - ReactCommon/turbomodule/core (= 0.63.4)
341 
+  - React-RCTNetwork (0.63.4):
342 
+    - FBReactNativeSpec (= 0.63.4)
343 
+    - Folly (= 2020.01.13.00)
344 
+    - RCTTypeSafety (= 0.63.4)
345 
+    - React-Core/RCTNetworkHeaders (= 0.63.4)
346 
+    - React-jsi (= 0.63.4)
347 
+    - ReactCommon/turbomodule/core (= 0.63.4)
348 
+  - React-RCTSettings (0.63.4):
349 
+    - FBReactNativeSpec (= 0.63.4)
350 
+    - Folly (= 2020.01.13.00)
351 
+    - RCTTypeSafety (= 0.63.4)
352 
+    - React-Core/RCTSettingsHeaders (= 0.63.4)
353 
+    - React-jsi (= 0.63.4)
354 
+    - ReactCommon/turbomodule/core (= 0.63.4)
355 
+  - React-RCTText (0.63.4):
356 
+    - React-Core/RCTTextHeaders (= 0.63.4)
357 
+  - React-RCTVibration (0.63.4):
358 
+    - FBReactNativeSpec (= 0.63.4)
359 
+    - Folly (= 2020.01.13.00)
360 
+    - React-Core/RCTVibrationHeaders (= 0.63.4)
361 
+    - React-jsi (= 0.63.4)
362 
+    - ReactCommon/turbomodule/core (= 0.63.4)
363 
+  - ReactCommon/turbomodule/core (0.63.4):
331 364 
     - DoubleConversion
332 
-    - Folly (= 2018.10.22.00)
365 
+    - Folly (= 2020.01.13.00)
333 366 
     - glog
334 
-    - React-cxxreact (= 0.61.5-jitsi.2)
335 
-  - ReactCommon/turbomodule (0.61.5-jitsi.2):
336 
-    - DoubleConversion
337 
-    - Folly (= 2018.10.22.00)
338 
-    - glog
339 
-    - React-Core (= 0.61.5-jitsi.2)
340 
-    - React-cxxreact (= 0.61.5-jitsi.2)
341 
-    - React-jsi (= 0.61.5-jitsi.2)
342 
-    - ReactCommon/jscallinvoker (= 0.61.5-jitsi.2)
343 
-    - ReactCommon/turbomodule/core (= 0.61.5-jitsi.2)
344 
-    - ReactCommon/turbomodule/samples (= 0.61.5-jitsi.2)
345 
-  - ReactCommon/turbomodule/core (0.61.5-jitsi.2):
346 
-    - DoubleConversion
347 
-    - Folly (= 2018.10.22.00)
348 
-    - glog
349 
-    - React-Core (= 0.61.5-jitsi.2)
350 
-    - React-cxxreact (= 0.61.5-jitsi.2)
351 
-    - React-jsi (= 0.61.5-jitsi.2)
352 
-    - ReactCommon/jscallinvoker (= 0.61.5-jitsi.2)
353 
-  - ReactCommon/turbomodule/samples (0.61.5-jitsi.2):
354 
-    - DoubleConversion
355 
-    - Folly (= 2018.10.22.00)
356 
-    - glog
357 
-    - React-Core (= 0.61.5-jitsi.2)
358 
-    - React-cxxreact (= 0.61.5-jitsi.2)
359 
-    - React-jsi (= 0.61.5-jitsi.2)
360 
-    - ReactCommon/jscallinvoker (= 0.61.5-jitsi.2)
361 
-    - ReactCommon/turbomodule/core (= 0.61.5-jitsi.2)
367 
+    - React-callinvoker (= 0.63.4)
368 
+    - React-Core (= 0.63.4)
369 
+    - React-cxxreact (= 0.63.4)
370 
+    - React-jsi (= 0.63.4)
362 371 
   - RNCalendarEvents (2.2.0):
363 372 
     - React
364 373 
   - RNCAsyncStorage (1.15.14):
 
@@ -395,18 +404,19 @@ DEPENDENCIES:
395 404 
   - "amplitude-react-native (from `../node_modules/@amplitude/react-native`)"
396 405 
   - CocoaLumberjack (~> 3.5.3)
397 406 
   - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
398 
-  - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector/`)
399 
-  - FBReactNativeSpec (from `../node_modules/react-native/Libraries/FBReactNativeSpec/`)
407 
+  - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
408 
+  - FBReactNativeSpec (from `../node_modules/react-native/Libraries/FBReactNativeSpec`)
400 409 
   - Firebase/Analytics (~> 6.33.0)
401 410 
   - Firebase/Crashlytics (~> 6.33.0)
402 411 
   - Firebase/DynamicLinks (~> 6.33.0)
403 412 
   - Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`)
404 413 
   - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
405 414 
   - ObjectiveDropboxOfficial (~> 6.1.0)
406 
-  - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired/`)
407 
-  - RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety/`)
415 
+  - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
416 
+  - RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`)
408 417 
   - React (from `../node_modules/react-native/`)
409 
-  - React-Core/CoreModulesHeaders (from `../node_modules/react-native/`)
418 
+  - React-callinvoker (from `../node_modules/react-native/ReactCommon/callinvoker`)
419 
+  - React-Core (from `../node_modules/react-native/`)
410 420 
   - React-Core/DevSupport (from `../node_modules/react-native/`)
411 421 
   - React-Core/RCTWebSocket (from `../node_modules/react-native/`)
412 422 
   - React-CoreModules (from `../node_modules/react-native/React/CoreModules`)
 
@@ -422,7 +432,7 @@ DEPENDENCIES:
422 432 
   - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
423 433 
   - "react-native-slider (from `../node_modules/@react-native-community/slider`)"
424 434 
   - react-native-splash-screen (from `../node_modules/react-native-splash-screen`)
425 
-  - react-native-video (from `../node_modules/react-native-video/react-native-video.podspec`)
435 
+  - react-native-video (from `../node_modules/react-native-video`)
426 436 
   - react-native-webrtc (from `../node_modules/react-native-webrtc`)
427 437 
   - react-native-webview (from `../node_modules/react-native-webview`)
428 438 
   - React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`)
 
@@ -434,7 +444,7 @@ DEPENDENCIES:
434 444 
   - React-RCTSettings (from `../node_modules/react-native/Libraries/Settings`)
435 445 
   - React-RCTText (from `../node_modules/react-native/Libraries/Text`)
436 446 
   - React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`)
437 
-  - ReactCommon/turbomodule (from `../node_modules/react-native/ReactCommon`)
447 
+  - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`)
438 448 
   - RNCalendarEvents (from `../node_modules/react-native-calendar-events`)
439 449 
   - "RNCAsyncStorage (from `../node_modules/@react-native-async-storage/async-storage`)"
440 450 
   - "RNCClipboard (from `../node_modules/@react-native-community/clipboard`)"
 
@@ -479,19 +489,21 @@ EXTERNAL SOURCES:
479 489 
   DoubleConversion:
480 490 
     :podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec"
481 491 
   FBLazyVector:
482 
-    :path: "../node_modules/react-native/Libraries/FBLazyVector/"
492 
+    :path: "../node_modules/react-native/Libraries/FBLazyVector"
483 493 
   FBReactNativeSpec:
484 
-    :path: "../node_modules/react-native/Libraries/FBReactNativeSpec/"
494 
+    :path: "../node_modules/react-native/Libraries/FBReactNativeSpec"
485 495 
   Folly:
486 496 
     :podspec: "../node_modules/react-native/third-party-podspecs/Folly.podspec"
487 497 
   glog:
488 498 
     :podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec"
489 499 
   RCTRequired:
490 
-    :path: "../node_modules/react-native/Libraries/RCTRequired/"
500 
+    :path: "../node_modules/react-native/Libraries/RCTRequired"
491 501 
   RCTTypeSafety:
492 
-    :path: "../node_modules/react-native/Libraries/TypeSafety/"
502 
+    :path: "../node_modules/react-native/Libraries/TypeSafety"
493 503 
   React:
494 504 
     :path: "../node_modules/react-native/"
505 
+  React-callinvoker:
506 
+    :path: "../node_modules/react-native/ReactCommon/callinvoker"
495 507 
   React-Core:
496 508 
     :path: "../node_modules/react-native/"
497 509 
   React-CoreModules:
 
@@ -521,7 +533,7 @@ EXTERNAL SOURCES:
521 533 
   react-native-splash-screen:
522 534 
     :path: "../node_modules/react-native-splash-screen"
523 535 
   react-native-video:
524 
-    :path: "../node_modules/react-native-video/react-native-video.podspec"
536 
+    :path: "../node_modules/react-native-video"
525 537 
   react-native-webrtc:
526 538 
     :path: "../node_modules/react-native-webrtc"
527 539 
   react-native-webview:
 
@@ -581,9 +593,9 @@ SPEC CHECKSUMS:
581 593 
   AppAuth: 31bcec809a638d7bd2f86ea8a52bd45f6e81e7c7
582 594 
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
583 595 
   CocoaLumberjack: 2f44e60eb91c176d471fdba43b9e3eae6a721947
584 
-  DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2
585 
-  FBLazyVector: ca7f56c8ff6cd8590f7a673d7903b06019805581
586 
-  FBReactNativeSpec: 8136c3cf27de2bb310a69cffbb423c5643f5c1c4
596 
+  DoubleConversion: cde416483dac037923206447da6e1454df403714
597 
+  FBLazyVector: 3bb422f41b18121b71783a905c10e58606f7dc3e
598 
+  FBReactNativeSpec: f2c97f2529dd79c083355182cc158c9f98f4bd6e
587 599 
   Firebase: 8db6f2d1b2c5e2984efba4949a145875a8f65fe5
588 600 
   FirebaseAnalytics: 5dd088bd2e67bb9d13dbf792d1164ceaf3052193
589 601 
   FirebaseCore: d889d9e12535b7f36ac8bfbf1713a0836a3012cd
 
@@ -591,8 +603,8 @@ SPEC CHECKSUMS:
591 603 
   FirebaseCrashlytics: 1a747c9cc084a24dc6d9511c991db1cd078154eb
592 604 
   FirebaseDynamicLinks: 6eac37d86910382eafb6315d952cc44c9e176094
593 605 
   FirebaseInstallations: 466c7b4d1f58fe16707693091da253726a731ed2
594 
-  Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51
595 
-  glog: 1f3da668190260b06b429bb211bfbee5cd790c28
606 
+  Folly: b73c3869541e86821df3c387eb0af5f65addfab4
607 
+  glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3
596 608 
   GoogleAppMeasurement: 966e88df9d19c15715137bb2ddaf52373f111436
597 609 
   GoogleDataTransport: f56af7caa4ed338dc8e138a5d7c5973e66440833
598 610 
   GoogleSignIn: fd381840dbe7c1137aa6dc30849a5c3e070c034a
 
@@ -602,15 +614,16 @@ SPEC CHECKSUMS:
602 614 
   nanopb: 59317e09cf1f1a0af72f12af412d54edf52603fc
603 615 
   ObjectiveDropboxOfficial: b4765572e334d6fc6214b43a7595510324bbbbaa
604 616 
   PromisesObjC: 3113f7f76903778cf4a0586bd1ab89329a0b7b97
605 
-  RCTRequired: a686731276578c125dff205f08b6ec9cee6ede32
606 
-  RCTTypeSafety: 88e5500e801c00d16a3d1895e3470d13beed6584
607 
-  React: 8b2bcf6a93846e47a7a365a54ec6edeb78b37701
608 
-  React-Core: 3fbdbc87c18c4742b735ff9a0c02fa38c87e0fba
609 
-  React-CoreModules: f6f8a8212aec52a21251c0af58bdb037b57c70b3
610 
-  React-cxxreact: c6ad34143db06a5c3cb0e8e169c775475287ac9c
611 
-  React-jsi: ddb471a56185e4007835a1bba0882ecb5ce3dc0e
612 
-  React-jsiexecutor: 67106691c60030ec888d7cbbc4f48a3168e27a02
613 
-  React-jsinspector: 92ceee6c66dc19886289b52436ade7e020b89602
617 
+  RCTRequired: 082f10cd3f905d6c124597fd1c14f6f2655ff65e
618 
+  RCTTypeSafety: 8c9c544ecbf20337d069e4ae7fd9a377aadf504b
619 
+  React: b0a957a2c44da4113b0c4c9853d8387f8e64e615
620 
+  React-callinvoker: c3f44dd3cb195b6aa46621fff95ded79d59043fe
621 
+  React-Core: d3b2a1ac9a2c13c3bcde712d9281fc1c8a5b315b
622 
+  React-CoreModules: 0581ff36cb797da0943d424f69e7098e43e9be60
623 
+  React-cxxreact: c1480d4fda5720086c90df537ee7d285d4c57ac3
624 
+  React-jsi: a0418934cf48f25b485631deb27c64dc40fb4c31
625 
+  React-jsiexecutor: 93bd528844ad21dc07aab1c67cb10abae6df6949
626 
+  React-jsinspector: 58aef7155bc9a9683f5b60b35eccea8722a4f53a
614 627 
   react-native-background-timer: 17ea5e06803401a379ebf1f20505b793ac44d0fe
615 628 
   react-native-get-random-values: 30b3f74ca34e30e2e480de48e4add2706a40ac8f
616 629 
   react-native-keep-awake: afad8a51dfef9fe9655a6344771be32c8596d774
 
@@ -622,16 +635,16 @@ SPEC CHECKSUMS:
622 635 
   react-native-video: a4c2635d0802f983594b7057e1bce8f442f0ad28
623 636 
   react-native-webrtc: 2f20515f3ebb9dbf1f2aad638cc7573396cf948f
624 637 
   react-native-webview: e89bf2dba26a04cda967814df3ed1be99f291233
625 
-  React-RCTActionSheet: bcbc311dc3b47bc8efb2737ff0940239a45789a9
626 
-  React-RCTAnimation: 65f61080ce632f6dea23d52e354ffac9948396c6
627 
-  React-RCTBlob: 70d88f7b68b5c44953cdb286ac2e36a7a509a97e
628 
-  React-RCTImage: e0d25b620e42de91ed791ef129e2d3a0df1eb5ab
629 
-  React-RCTLinking: bc2287cfd9e56403ecea5dafdbdac8c57fa1ac36
630 
-  React-RCTNetwork: cd8ae8fc787c02ed5152fe9cbf7521ee70c1bce7
631 
-  React-RCTSettings: f6667271ccd8876a934134b73002b5a2714e1525
632 
-  React-RCTText: 4f1b99f228278d2a5e9008eced8dc9c974c4a270
633 
-  React-RCTVibration: c1041024893fdfdb8371e7c720c437751b711676
634 
-  ReactCommon: 18014e1d98dbeb9141e935cfe35fc93bd511ffb6
638 
+  React-RCTActionSheet: 89a0ca9f4a06c1f93c26067af074ccdce0f40336
639 
+  React-RCTAnimation: 1bde3ecc0c104c55df246eda516e0deb03c4e49b
640 
+  React-RCTBlob: a97d378b527740cc667e03ebfa183a75231ab0f0
641 
+  React-RCTImage: c1b1f2d3f43a4a528c8946d6092384b5c880d2f0
642 
+  React-RCTLinking: 35ae4ab9dc0410d1fcbdce4d7623194a27214fb2
643 
+  React-RCTNetwork: 29ec2696f8d8cfff7331fac83d3e893c95ef43ae
644 
+  React-RCTSettings: 60f0691bba2074ef394f95d4c2265ec284e0a46a
645 
+  React-RCTText: 5c51df3f08cb9dedc6e790161195d12bac06101c
646 
+  React-RCTVibration: ae4f914cfe8de7d4de95ae1ea6cc8f6315d73d9d
647 
+  ReactCommon: 73d79c7039f473b76db6ff7c6b159c478acbbb3b
635 648 
   RNCalendarEvents: 7e65eb4a94f53c1744d1e275f7fafcfaa619f7a3
636 649 
   RNCAsyncStorage: ea6b5c280997b2b32a587793163b1f10e580c4f7
637 650 
   RNCClipboard: 41d8d918092ae8e676f18adada19104fa3e68495
 
@@ -645,8 +658,8 @@ SPEC CHECKSUMS:
645 658 
   RNSound: 27e8268bdb0a1f191f219a33267f7e0445e8d62f
646 659 
   RNSVG: ce9d996113475209013317e48b05c21ee988d42e
647 660 
   RNWatch: 99637948ec9b5c9ec5a41920642594ad5ba07e80
648 
-  Yoga: 96b469c5e81ff51b917b92e8c3390642d4ded30c
661 
+  Yoga: 4bd86afe9883422a7c4028c00e34790f560923d6
649 662
650 
-PODFILE CHECKSUM: 2e6a49cec4d0e9eb135654df2dddb3448d26cb4a
663 
+PODFILE CHECKSUM: e54f2f2e86709ccebbf8673ba9df71589886c81d
651 664
652 665 
 COCOAPODS: 1.11.2

+ 2
- 0
ios/sdk/sdk.xcodeproj/project.pbxproj 查看文件 

@@ -409,11 +409,13 @@
409 409 
 				"${PODS_ROOT}/Target Support Files/Pods-JitsiMeetSDK/Pods-JitsiMeetSDK-resources.sh",
410 410 
 				"${PODS_ROOT}/Amplitude/Sources/Resources/ComodoRsaDomainValidationCA.der",
411 411 
 				"${PODS_CONFIGURATION_BUILD_DIR}/GoogleSignIn/GoogleSignIn.bundle",
412 
+				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle",
412 413 
 			);
413 414 
 			name = "[CP] Copy Pods Resources";
414 415 
 			outputPaths = (
415 416 
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ComodoRsaDomainValidationCA.der",
416 417 
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleSignIn.bundle",
418 
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle",
417 419 
 			);
418 420 
 			runOnlyForDeploymentPostprocessing = 0;
419 421 
 			shellPath = /bin/sh;

+ 3164
- 4083
package-lock.json
文件差异内容过多而无法显示
查看文件


+ 5
- 5
package.json 查看文件 

@@ -79,13 +79,13 @@
79 79 
     "optional-require": "1.0.3",
80 80 
     "promise.allsettled": "1.0.4",
81 81 
     "punycode": "2.1.1",
82 
-    "react": "16.12",
83 
-    "react-dom": "16.12",
82 
+    "react": "16.13.1",
83 
+    "react-dom": "16.13.1",
84 84 
     "react-emoji-render": "1.2.4",
85 85 
     "react-focus-lock": "2.5.1",
86 86 
     "react-i18next": "10.11.4",
87 87 
     "react-linkify": "1.0.0-alpha",
88 
-    "react-native": "github:jitsi/react-native#891986ec5ecaef65d1c8a7fe472f86cf84fe7551",
88 
+    "react-native": "0.63.4",
89 89 
     "react-native-background-timer": "2.4.1",
90 90 
     "react-native-calendar-events": "2.2.0",
91 91 
     "react-native-callstats": "3.73.7",
 
@@ -149,10 +149,10 @@
149 149 
     "eslint-plugin-react": "7.26.1",
150 150 
     "eslint-plugin-react-native": "3.11.0",
151 151 
     "expose-loader": "3.0.0",
152 
-    "flow-bin": "0.104.0",
152 
+    "flow-bin": "0.122.0",
153 153 
     "imports-loader": "0.7.1",
154 154 
     "jetifier": "1.6.4",
155 
-    "metro-react-native-babel-preset": "0.56.0",
155 
+    "metro-react-native-babel-preset": "0.59.0",
156 156 
     "patch-package": "6.4.7",
157 157 
     "process": "0.11.10",
158 158 
     "sass": "1.26.8",

+ 0
- 77
patches/react-native+0.61.5-jitsi.2.patch 查看文件 

@@ -1,78 +0,0 @@
1 
-diff --git a/node_modules/react-native/Libraries/WebSocket/RCTWebSocketModule.m b/node_modules/react-native/Libraries/WebSocket/RCTWebSocketModule.m
2 
-index d9387c4..a487da0 100644
3 
---- a/node_modules/react-native/Libraries/WebSocket/RCTWebSocketModule.m
4 
-+++ b/node_modules/react-native/Libraries/WebSocket/RCTWebSocketModule.m
5 
-@@ -165,10 +165,10 @@ - (void)webSocket:(RCTSRWebSocket *)webSocket didFailWithError:(NSError *)error
6 
-   NSNumber *socketID = [webSocket reactTag];
7 
-   _contentHandlers[socketID] = nil;
8 
-   _sockets[socketID] = nil;
9 
--  [self sendEventWithName:@"websocketFailed" body:@{
10 
--    @"message": error.localizedDescription,
11 
--    @"id": socketID
12 
--  }];
13 
-+  NSDictionary *body =
14 
-+      @{@"message" : error.localizedDescription ?: @"Undefined, error is nil",
15 
-+        @"id" : socketID ?: @(-1)};
16 
-+  [self sendEventWithName:@"websocketFailed" body:body];
17 
- }
18 
-
19 
- - (void)webSocket:(RCTSRWebSocket *)webSocket
20 
-diff --git a/node_modules/react-native/React/CxxBridge/RCTCxxBridge.mm b/node_modules/react-native/React/CxxBridge/RCTCxxBridge.mm
21 
-index bd48f44..d243ed0 100644
22 
---- a/node_modules/react-native/React/CxxBridge/RCTCxxBridge.mm
23 
-+++ b/node_modules/react-native/React/CxxBridge/RCTCxxBridge.mm
24 
-@@ -767,7 +767,7 @@ - (void)registerExtraLazyModules
25 
- #endif
26 
- }
27 
-
28 
-+- (NSArray<RCTModuleData *> *)_initializeModules:(NSArray<Class> *)modules
29 
-                                withDispatchGroup:(dispatch_group_t)dispatchGroup
30 
-                                 lazilyDiscovered:(BOOL)lazilyDiscovered
31 
- {
32 
-diff --git a/node_modules/react-native/React/Modules/RCTTiming.m b/node_modules/react-native/React/Modules/RCTTiming.m
33 
-index 8a09022..265d7b6 100644
34 
---- a/node_modules/react-native/React/Modules/RCTTiming.m
35 
-+++ b/node_modules/react-native/React/Modules/RCTTiming.m
36 
-@@ -130,6 +130,11 @@ - (void)setBridge:(RCTBridge *)bridge
37 
-                                                object:nil];
38 
-   }
39 
-
40 
-+  [[NSNotificationCenter defaultCenter] addObserver:self
41 
-+                                           selector:@selector(proximityChanged)
42 
-+                                               name:UIDeviceProximityStateDidChangeNotification
43 
-+                                             object:nil];
44 
-+
45 
-   _bridge = bridge;
46 
- }
47 
-
48 
-@@ -276,6 +281,16 @@ - (void)didUpdateFrame:(RCTFrameUpdate *)update
49 
-   }
50 
- }
51 
-
52 
-+-(void)proximityChanged
53 
-+{
54 
-+  BOOL near = [UIDevice currentDevice].proximityState;
55 
-+  if (near) {
56 
-+    [self appDidMoveToBackground];
57 
-+  } else {
58 
-+    [self appDidMoveToForeground];
59 
-+  }
60 
-+}
61 
-+
62 
- - (void)scheduleSleepTimer:(NSDate *)sleepTarget
63 
- {
64 
-   @synchronized (self) {
65 
-diff --git a/node_modules/react-native/ReactCommon/turbomodule/core/platform/ios/RCTTurboModuleManager.mm b/node_modules/react-native/ReactCommon/turbomodule/core/platform/ios/RCTTurboModuleManager.mm
66 
-index 3cb73b5..e4a14b4 100644
67 
---- a/node_modules/react-native/ReactCommon/turbomodule/core/platform/ios/RCTTurboModuleManager.mm
68 
-+++ b/node_modules/react-native/ReactCommon/turbomodule/core/platform/ios/RCTTurboModuleManager.mm
69 
-@@ -297,7 +297,7 @@ - (void)notifyAboutTurboModuleSetup:(const char *)name
70 
-           @"%@ has no setter or ivar for its bridge, which is not "
71 
-            "permitted. You must either @synthesize the bridge property, "
72 
-            "or provide your own setter method.",
73 
--          RCTBridgeModuleNameForClass(module));
74 
-+          RCTBridgeModuleNameForClass(Class(module)));
75 
-     }
76 
-   }
77 
-

+ 33
- 0
patches/react-native+0.63.4.patch 查看文件 

@@ -0,0 +1,33 @@
1 
+diff --git a/node_modules/react-native/React/CoreModules/RCTTiming.mm b/node_modules/react-native/React/CoreModules/RCTTiming.mm
2 
+index 7517771..5af8bdc 100644
3 
+--- a/node_modules/react-native/React/CoreModules/RCTTiming.mm
4 
++++ b/node_modules/react-native/React/CoreModules/RCTTiming.mm
5 
+@@ -148,6 +148,11 @@ - (void)setup
6 
+                                                  name:name
7 
+                                                object:nil];
8 
+   }
9 
++
10 
++  [[NSNotificationCenter defaultCenter] addObserver:self
11 
++                                           selector:@selector(proximityChanged)
12 
++                                               name:UIDeviceProximityStateDidChangeNotification
13 
++                                             object:nil];
14 
+ }
15 
+
16 
+ - (void)dealloc
17 
+@@ -184,6 +189,16 @@ - (void)appDidMoveToForeground
18 
+   [self startTimers];
19 
+ }
20 
+
21 
++- (void)proximityChanged
22 
++{
23 
++  BOOL isClose = [UIDevice currentDevice].proximityState;
24 
++  if (isClose) {
25 
++    [self appDidMoveToBackground];
26 
++  } else {
27 
++    [self appDidMoveToForeground];
28 
++  }
29 
++}
30 
++
31 
+ - (void)stopTimers
32 
+ {
33 
+   if (_inBackground) {

+ 12
- 0
react-native.config.js 查看文件 

@@ -0,0 +1,12 @@
1 
+/**
2 
+ * This is needed because the RN cli incorrectly detects the iOS app path as
3 
+ * jitsi-meet/ios/app and thus all pod references in the now dynamically generated
4 
+ * Podfile are wrong.
5 
+ */
6 
+module.exports = {
7 
+    project: {
8 
+        ios: {
9 
+            project: '.ios/jitsi-meet.xcworkspace'
10 
+        }
11 
+    }
12 
+};

+ 1
- 1
react/features/base/avatar/components/Avatar.js 查看文件 

@@ -6,7 +6,7 @@ import { getParticipantById } from '../../participants';
6 6 
 import { connect } from '../../redux';
7 7 
 import { getAvatarColor, getInitials, isCORSAvatarURL } from '../functions';
8 8
9 
-import { StatelessAvatar } from '.';
9 
+import { StatelessAvatar } from './';
10 10
11 11 
 export type Props = {
12 12

+ 1
- 1
react/features/conference/components/native/Labels.js 查看文件 

@@ -11,7 +11,7 @@ import { VideoQualityExpandedLabel, VideoQualityLabel } from '../../../video-qua
11 11 
 import InsecureRoomNameExpandedLabel from './InsecureRoomNameExpandedLabel';
12 12 
 import styles from './styles';
13 13
14 
-import { InsecureRoomNameLabel } from '.';
14 
+import { InsecureRoomNameLabel } from './';
15 15
16 16 
 type Props = {}
17 17

撰写 预览
正在加载...
取消
保存