Merge branch 'guang' of http://git.yoho.cn/mobile/YH_RNComponent into guang

+import React from 'react';
+import ReactNative from 'react-native';
+import {Platform} from 'react-native';
+
+const {
+    Component,
+} = React;
+
+const {
+    NativeModules,
+} = ReactNative;
+
+const YH_ImageView = ReactNative.requireNativeComponent('YH_ImageView', null);
+
+var UIManager = require('UIManager');
+
+export default class YH_Image extends Component {
+
+    constructor(props) {
+        super (props);
+	}
+
+    render() {
+        return (
+            <YH_ImageView
+                {...this.props}
+            />
+        );
+    }
+}

@@ -156,6 +156,7 @@ export default class Detail extends Component {
             <View style={styles.container}>
                 {!isFetching?<ListView
                     ref={(ref)=>this.listView=ref}
+                    initialListSize={1}
                     contentContainerStyle={styles.contentContainer}
                     enableEmptySections={true}
                     showsVerticalScrollIndicator={false}
@@ -176,7 +177,6 @@ let {width, height} = Dimensions.get('window');
 let styles = StyleSheet.create({
     container: {
         flex: 1,
-        backgroundColor: '#f0f0f0',
     },
     contentContainer:{
         backgroundColor: 'white',

@@ -37,17 +37,32 @@ export default class SingleImage extends React.Component {
 		let {resource} = this.props;
 		let template_name = resource.get('data');
 		let src = template_name.get('src');
+        let imageHeight = template_name.get('height');
+        let imageWidth = template_name.get('width');
+        if (!imageHeight || !imageWidth) {
             Image.getSize(src, (width, height) => {
                 if (this.imageView) {
                     this.setState({width, height});
                 }
             });
         }
+     }
 
     render() {
 		let {resource} = this.props;
 		let template_name = resource.get('data');
 		let src = template_name.get('src');
+        let imageHeight = template_name.get('height');
+        let imageWidth = template_name.get('width');
+
+        if (imageHeight && imageWidth) {
+            return (
+                <Image
+                    source={{uri: src}}
+                    style={{width: screenWidth,height: (imageHeight/imageWidth)*screenWidth}}
+                />
+            );
+        }else {
             return (
     			<Image
                     ref={(ref)=>this.imageView=ref}
@@ -56,6 +71,7 @@ export default class SingleImage extends React.Component {
     			/>
     		);
         }
+    }
 };
 
 let screenWidth = Dimensions.get('window').width;

@@ -22,14 +22,17 @@ export default class SmallPic extends React.Component {
 		this.state = {
 			width0: 1,
 			width1: 1,
-			height0: 1,
-			height1: 1,
+			height0: 0,
+			height1: 0,
 		};
     }
 
 	componentDidMount() {
 		let {resource} = this.props;
 		let data = resource.get('data')?resource.get('data').toJS():null;
+        let imageHeight = data?data[0].height:null;
+        let imageWidth = data?data[0].width:null;
+        if (!imageHeight || !imageWidth) {
             let url1 = data?data[0].src:null;
             let url2 = data?data[1].src:null;
             Image.getSize(url1, (width, height) => {
@@ -39,6 +42,7 @@ export default class SmallPic extends React.Component {
                this.setState({width1 : width, height1 : height});
             });
         }
+     }
 
     render() {
 		let {resource} = this.props;
@@ -48,6 +52,19 @@ export default class SmallPic extends React.Component {
 		if (!url1 || !url2) {
 			return null;
 		}
+
+        let imageHeight0 = data?data[0].height:null;
+        let imageWidth0 = data?data[0].width:null;
+        let imageHeight1 = data?data[1].height:null;
+        let imageWidth1 = data?data[1].width:null;
+        if (imageHeight0 && imageWidth0 && imageHeight1 && imageWidth1) {
+            return (
+                <View style={styles.Small_pic}>
+                    <Image source={{uri: url1}} style={{width: width/2,height: (width/2)*(imageHeight0/imageWidth0)}} ></Image>
+                    <Image source={{uri: url2}} style={{width: width/2,height: (width/2)*(imageHeight1/imageWidth1)}} ></Image>
+                </View>
+            );
+        }else {
             return (
     			<View style={styles.Small_pic}>
     				<Image source={{uri: url1}} style={{width: width/2,height: (width/2)*(this.state.height0/this.state.width0)}} ></Image>
@@ -55,6 +72,7 @@ export default class SmallPic extends React.Component {
     			</View>
     		);
         }
+    }
 };
 
 let {width, height} = Dimensions.get('window');