From 9a8a20bf79742dc6b6fe489f19ea02a3cc2eb5da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E8=85=BE?= Date: Wed, 18 Apr 2018 17:29:14 +0800 Subject: [PATCH] =?UTF-8?q?MOD=EF=BC=9A=E5=9B=9E=E5=BD=920.47.2=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- demo/app/src/ui/Carousel/index.js | 23 +++++++++------- demo/ios/fegoRN.xcodeproj/project.pbxproj | 32 ----------------------- demo/ios/podfile | 9 +++---- package.json | 4 +-- 4 files changed, 20 insertions(+), 48 deletions(-) diff --git a/demo/app/src/ui/Carousel/index.js b/demo/app/src/ui/Carousel/index.js index 29c6609..5769fc2 100644 --- 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 style={{ - fontSize: 13, color: '#55555' + flexDirection: 'row', marginLeft: 15, alignItems: 'center', + }} + > + 子view类型 @@ -120,14 +119,17 @@ export default class Page extends Component { onChange={(value) => { this.setState({ childrenType: value, - }) + }); }} > image custom - + - + /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 index 0080931..86f4a50 100644 --- 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 index 0481157..cd43a06 100644 --- 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",