weianzi
diff --git a/‎android/.gradle/2.4/taskArtifacts/cache.properties.lock
0 Bytes b/‎android/.gradle/2.4/taskArtifacts/cache.properties.lock
0 Bytes
diff --git a/‎android/.gradle/2.4/taskArtifacts/fileSnapshots.bin
0 Bytes b/‎android/.gradle/2.4/taskArtifacts/fileSnapshots.bin
0 Bytes
diff --git a/‎android/.gradle/2.4/taskArtifacts/taskArtifacts.bin
0 Bytes b/‎android/.gradle/2.4/taskArtifacts/taskArtifacts.bin
0 Bytes
diff --git a/‎views/StoryList.react.js
+37-5 b/‎views/StoryList.react.js
+37-5
diff --git a/‎web/output/bundle.js
+14-13 b/‎web/output/bundle.js
+14-13
diff --git a/‎web/output/index.html
+1-1 b/‎web/output/index.html
+1-1
@@ -8,6 +8,7 @@ var {
   Image,
   ListView,
   Platform,
+  RefreshControl,
   ActivityIndicatorIOS,
   TouchableHighlight,
 } = React;
@@ -24,6 +25,7 @@ module.exports = React.createClass({
           currentPage: 0,
           totalCount: 0,//总数量
           pageSize: 10,
+          isRefreshing: false,
       };
   },
   componentDidMount: function(){
@@ -41,7 +43,8 @@ module.exports = React.createClass({
         totalCount: data.TotalCount,
         pageSize: data.PageSize,
         loaded: true,
-        isloadingNextPage: false
+        isloadingNextPage: false,
+        isRefreshing: false,
     }); 
   },
   _getStoryList: function(page, callback) {
@@ -60,6 +63,19 @@ module.exports = React.createClass({
     if(!this.state.loaded){
         return this._renderLoadingView();
     }
+    if(Platform.OS == 'web'){
+        return (
+          <ListView
+              dataSource={this.state.dataSource}
+              renderRow={this._renderRow}
+              onEndReachedThreshold={66}
+              automaticallyAdjustContentInsets={false}
+              showsVerticalScrollIndicator={false}
+              renderFooter={this._renderFooter}
+              onEndReached={this._loadMore}
+              style={styles.listView} />
+        );
+    }
     return (
       <ListView
           dataSource={this.state.dataSource}
@@ -69,12 +85,28 @@ module.exports = React.createClass({
           showsVerticalScrollIndicator={false}
           renderFooter={this._renderFooter}
           onEndReached={this._loadMore}
-          onRefreshStart={(endRefreshing) => {
-              setTimeout(()=>{console.log(endRefreshing)}, 1000);
-          }}
-          style={styles.listView} />
+          style={styles.listView}
+          refreshControl={
+              <RefreshControl
+                  refreshing={this.state.isRefreshing}
+                  onRefresh={this._onRefresh}
+                  tintColor='#ccc'
+                  title='正在刷新'
+                  colors={['#bbb','#ccc','#333']}
+                  progressBackgroundColor='#f9f9f9' />
+          }
+      />
     );
   },
+  _onRefresh: function(){
+      var This = this;
+      this.setState({isRefreshing: true});
+      setTimeout(function(){
+        This._getStoryList(1, function(data){
+            This._setNewData(data);
+        });
+      }, 1000);
+  },
   _renderRow: function(rowData) {
       return (
           <TouchableHighlight 
 
@@ -3,7 +3,7 @@
   <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
-    <title>Webpack App</title>
+    <title>我的webApp</title>
 
 
   </head>