Skip to content

Commit 021948a

Browse files
author
z50902677
committed
修改
1 parent 07b00dc commit 021948a

File tree

8 files changed

+15
-4
lines changed

8 files changed

+15
-4
lines changed

android/app/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ dependencies {
129129
compile fileTree(dir: "libs", include: ["*.jar"])
130130
compile "com.android.support:appcompat-v7:23.0.1"
131131
compile "com.facebook.react:react-native:+" // From node_modules
132+
compile project(':react-native-image-picker')
132133
}
133134

134135
// Run this once to be able to run the application with BUCK

android/app/src/main/AndroidManifest.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55

66
<uses-permission android:name="android.permission.INTERNET" />
77
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
8+
<uses-permission android:name="android.permission.CAMERA" />
9+
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
10+
<uses-feature android:name="android.hardware.camera" android:required="false"/>
11+
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
812

913
<uses-sdk
1014
android:minSdkVersion="16"

android/app/src/main/java/com/wechatarticle/MainApplication.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import com.facebook.react.ReactNativeHost;
99
import com.facebook.react.ReactPackage;
1010
import com.facebook.react.shell.MainReactPackage;
11+
import com.imagepicker.ImagePickerPackage;
1112

1213
import java.util.Arrays;
1314
import java.util.List;
@@ -23,7 +24,8 @@ protected boolean getUseDeveloperSupport() {
2324
@Override
2425
protected List<ReactPackage> getPackages() {
2526
return Arrays.<ReactPackage>asList(
26-
new MainReactPackage()
27+
new MainReactPackage(),
28+
new ImagePickerPackage()
2729
);
2830
}
2931
};

android/settings.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
rootProject.name = 'wechatArticle'
22

33
include ':app'
4+
include ':react-native-image-picker'
5+
project(':react-native-image-picker').projectDir = new File(settingsDir, '../node_modules/react-native-image-picker/android')

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"react": "15.2.1",
1111
"react-native": "0.30.0",
1212
"react-native-button": "^1.6.0",
13+
"react-native-image-picker": "^0.21.4",
1314
"react-native-refreshable-listview": "^1.3.0",
1415
"react-native-router-flux": "^3.31.2",
1516
"react-native-swipeout": "^2.0.12",

src/constants/appConfig.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const appConfig = {
2-
serviceRoot: 'http://172.23.61.142:3000/'
2+
serviceRoot: 'http://172.23.61.111:3000/'
33
};
44

55
export default appConfig;

src/containers/android/ListView.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class listView extends Component {
4444
componentWillReceiveProps(nextProps) {
4545
this.setState({
4646
});
47-
}
47+
}re
4848

4949
componentWillMount() {
5050
//控件加载的时候先发起服务请求

src/containers/android/app.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import { Provider, connect } from 'react-redux';
88
import { Router, Scene, Modal } from 'react-native-router-flux';
99
import login from './../../containers/android/Login';
1010
import ListView from './../../containers/android/ListView';
11+
import ImagePicker from './../../containers/android/ImagePicker';
1112
import main from './../../components/android/Main';
1213
import routeReducerCreator from './../../reducers/routeReducerCreator';
1314
import helper from './../../utils/helper'
@@ -26,7 +27,7 @@ class App extends React.Component {
2627
<Scene key="modal" component={Modal}>
2728
<Scene key="root" hideNavBar hideTabBar>
2829
<Scene key="loginModule" direction="vertical" initial={true}>
29-
<Scene key="login" component={login} title="Login"
30+
<Scene key="login" component={ImagePicker} title="Login"
3031
hideNavBar/>
3132
</Scene>
3233
<Scene key="main" direction="vertical" component={main} title="Main"

0 commit comments

Comments
 (0)