MOD：回归0.47.2版本。

fegos · Apr 18, 2018 · 9a8a20b · 9a8a20b
1 parent be9a07a
commit 9a8a20b
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 48 deletions.
diff --git a/demo/app/src/ui/Carousel/index.js b/demo/app/src/ui/Carousel/index.js
@@ -15,8 +15,6 @@ const imageArray = [
   require('./img/girl.jpg'),
 ];
 
-
-
 export default class Page extends Component {
   constructor(props) {
     super(props);
@@ -106,10 +104,11 @@ export default class Page extends Component {
         </Text>
 
         <View style={{
-          flexDirection: 'row', marginLeft: 15, alignItems: 'center'
-        }}>
-          < Text style={{
-            fontSize: 13, color: '#55555'
+          flexDirection: 'row', marginLeft: 15, alignItems: 'center',
+        }}
+        >
+          <Text style={{
+            fontSize: 13, color: '#555555',
           }}
           >子view类型
           </Text>
@@ -120,14 +119,17 @@ export default class Page extends Component {
             onChange={(value) => {
               this.setState({
                 childrenType: value,
-              })
+              });
             }}
           >
             <Radio value="image">image</Radio>
             <Radio style={{ marginLeft: 5 }} value="custom">custom</Radio>
           </Group>
         </View >
-        <View style={{ flexDirection: 'row', marginLeft: 15, marginTop: 5, }}>
+        <View style={{
+          flexDirection: 'row', marginLeft: 15, marginTop: 5,
+        }}
+        >
           <Radio
             style={{ marginLeft: 5, marginTop: 10 }}
             checked={autoPlay}
@@ -150,7 +152,10 @@ export default class Page extends Component {
           </Radio>
         </View>
 
-        <View style={{ flexDirection: 'row', marginLeft: 15, marginTop: 5, }}>
+        <View style={{
+          flexDirection: 'row', marginLeft: 15, marginTop: 5,
+        }}
+        >
           <Radio
             style={{ marginLeft: 5, marginTop: 10 }}
             checked={showDot}

diff --git a/demo/ios/fegoRN.xcodeproj/project.pbxproj b/demo/ios/fegoRN.xcodeproj/project.pbxproj
@@ -119,8 +119,6 @@
 				13B07F8C1A680F5B00A75B9A /* Frameworks */,
 				13B07F8E1A680F5B00A75B9A /* Resources */,
 				00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
-				9B300951D9028DC08A26C709 /* [CP] Embed Pods Frameworks */,
-				AF48C4391C5553CF887A258C /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -194,21 +192,6 @@
 			shellPath = /bin/sh;
 			shellScript = "export NODE_BINARY=node\n../../node_modules/react-native/scripts/react-native-xcode.sh";
 		};
-		9B300951D9028DC08A26C709 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-fegoRN/Pods-fegoRN-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		A1F6A6935C2FBCC72012E4C5 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -227,21 +210,6 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		AF48C4391C5553CF887A258C /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-fegoRN/Pods-fegoRN-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		B0B2281C1FFBB1DC0060FA5E /* Set IP */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;

diff --git a/demo/ios/podfile b/demo/ios/podfile
@@ -21,13 +21,12 @@ def mainPods
 	'ART',
 	'RCTAnimation',
 	'RCTWebSocket', # needed for debugging
-    'jschelpers',
-    'cxxreact',
-    'CxxBridge',
-    'fabric'
+    'jschelpers_legacy',
+    'cxxreact_legacy',
+    'BatchedBridge'
 	]
 	# 如果你的RN版本 >= 0.42.0，则加入下面这行
-    pod "yoga", :path => '../../node_modules/react-native/ReactCommon/yoga'
+    pod "Yoga", :path => '../../node_modules/react-native/ReactCommon/yoga'
 end
 
 target 'fegoRN' do

diff --git a/package.json b/package.json
@@ -33,9 +33,9 @@
     "babel-plugin-module-resolver": "^3.0.0"
   },
   "devDependencies": {
-    "react": "^16.3.1",
+    "react": "16.0.0-alpha.12",
     "react-dom": "16.0.0-alpha.12",
-    "react-native": "0.55.1",
+    "react-native": "0.47.2",
     "babel-jest": "21.2.0",
     "babel-preset-react-native": "4.0.0",
     "babel-eslint": "8.0.2",