Merge branch 'local' into develop

@@ -296,6 +296,7 @@ export default function community(platform) {
 								key="SubjectPost"
 								key="SubjectPost"
 								title="主题帖"
 								title="主题帖"
 								hideNavBar={false}
 								hideNavBar={false}
+								clone={true}
 								component={SubjectPostContainer}
 								component={SubjectPostContainer}
 								initial={false}
 								initial={false}
 								rightButtonImage={require('./images/posting/share.png')}
 								rightButtonImage={require('./images/posting/share.png')}
@@ -317,9 +318,9 @@ export default function community(platform) {
 							<Scene
 							<Scene
 								key='LikeList'
 								key='LikeList'
 								hideNavBar={false}
 								hideNavBar={false}
+								clone={true}
 								component={LikeListContainer}
 								component={LikeListContainer}
 								initial={false}
 								initial={false}
-								clone={true}
 								getSceneStyle={(props) => {
 								getSceneStyle={(props) => {
 									return this.navPushStyle(props);
 									return this.navPushStyle(props);
 								}}
 								}}

@@ -166,7 +166,7 @@ export default class NavBarTitle extends React.Component {
 
 
     render() {
     render() {
         let index = this.props.index;
         let index = this.props.index;
-console.log(width);
+        
         return (
         return (
             <Animated.View
             <Animated.View
                 style={[
                 style={[

@@ -171,7 +171,6 @@ export default class User extends React.Component {
         this._renderRow = this._renderRow.bind(this);
         this._renderRow = this._renderRow.bind(this);
         this._renderSeparator = this._renderSeparator.bind(this);
         this._renderSeparator = this._renderSeparator.bind(this);
         this._updateHorizontalScrollValue = this._updateHorizontalScrollValue.bind(this);
         this._updateHorizontalScrollValue = this._updateHorizontalScrollValue.bind(this);
-        this._updateVerticalScrollValue = this._updateVerticalScrollValue.bind(this);
         this._getCurrentPageHeight = this._getCurrentPageHeight.bind(this);
         this._getCurrentPageHeight = this._getCurrentPageHeight.bind(this);
         this.getPageList = this.getPageList.bind(this);
         this.getPageList = this.getPageList.bind(this);
 
 
@@ -314,10 +313,6 @@ export default class User extends React.Component {
         this.state.scrollValueH.setValue(value);
         this.state.scrollValueH.setValue(value);
     }
     }
 
 
-    _updateVerticalScrollValue(value) {
-        this.state.scrollValueV.setValue(value);
-    }
-
     _getCurrentPageHeight(page) {
     _getCurrentPageHeight(page) {
         let ref = null;
         let ref = null;
         if (page == 0) {
         if (page == 0) {
@@ -398,10 +393,13 @@ export default class User extends React.Component {
                             />
                             />
                         }
                         }
                     }}
                     }}
-                    onScroll={(e) => {
-                        const offsetY = e.nativeEvent.contentOffset.y;
-                        this._updateVerticalScrollValue(offsetY/150);
-                    }}
+                    onScroll={Animated.event([{
+                        nativeEvent: {
+                            contentOffset: {
+                                y: this.state.scrollValueV
+                            }
+                        }
+                    }])}
                 />
                 />
 
 
                 <UserNavBar
                 <UserNavBar

@@ -98,50 +98,14 @@ class UserNavBar extends React.Component {
 
 
         this.renderBackButton = this.renderBackButton.bind(this);
         this.renderBackButton = this.renderBackButton.bind(this);
         this.renderRightButton = this.renderRightButton.bind(this);
         this.renderRightButton = this.renderRightButton.bind(this);
-        this.setAnimationValue = this.setAnimationValue.bind(this);
-        this.headerColor = this.headerColor.bind(this);
     }
     }
 
 
     componentDidMount() {
     componentDidMount() {
-        this._listener = this.props.scrollValue.addListener(this.setAnimationValue);
-    }
-
-    componentWillUnmount() {
-        this.props.scrollValue.removeListener(this._listener);
-    }
 
 
-    setAnimationValue({ value, }) {
-        if (value >= 0 && value <= 2) {
-            
-            if (value > 0.5 && value < 1) {
-                value = value + 0.1;
     }
     }
 
 
-            this.headerView.setNativeProps({
-                style: {
-                    backgroundColor: this.headerColor(value),
-                },
-            });
-
-            // value = value > 1 ? 1 : value;
-            // this.image.setNativeProps({
-            //     style: {
-            //         opacity: value,
-            //     },
-            // });
-        }
-    }
+    componentWillUnmount() {
 
 
-    //color between rgb(255,255,255) and rgb(0,0,0)
-    headerColor(progress) {
-        const red = 255 + (0 - 255) * progress;
-        const green = 255 + (0 - 255) * progress;
-        const blue = 255 + (0 - 255) * progress;
-        if (progress > 1) {
-            return `rgb(0, 0, 0)`; //`darkgray`
-        } else {
-            return `rgba(${red}, ${green}, ${blue}, ${progress})`;
-        }
     }
     }
 
 
     renderBackButton() {
     renderBackButton() {
@@ -192,6 +156,16 @@ class UserNavBar extends React.Component {
     }
     }
 
 
     render() {
     render() {
+        let interpolatedColor = this.props.scrollValue.interpolate({
+            inputRange: [0, 64],
+            outputRange:  ['rgba(255, 255, 255, 0)', 'rgba(255, 255, 255, 1)'],
+            extrapolate: 'clamp'
+        });
+        let interpolatedOpacity = this.props.scrollValue.interpolate({
+            inputRange: [0, 64],
+            outputRange:  [0, 1],
+            extrapolate: 'clamp'
+        });
         return (
         return (
             <Animated.View
             <Animated.View
                 ref={(c) => {
                 ref={(c) => {
@@ -199,17 +173,18 @@ class UserNavBar extends React.Component {
                 }}
                 }}
                 style={[
                 style={[
                     styles.header,
                     styles.header,
+                    {backgroundColor: interpolatedColor}
                 ]}
                 ]}
             >
             >
-                <Image
+                <Animated.Image
                     ref={(c) => {
                     ref={(c) => {
                         this.image = c;
                         this.image = c;
                     }}
                     }}
                     source={this.getNavBarBackgroundImage(this.props.channel)}
                     source={this.getNavBarBackgroundImage(this.props.channel)}
-                    style={[styles.image, {opacity: 0,}]}
+                    style={[styles.image, {opacity: interpolatedOpacity}]}
                 >
                 >
 
 
-                </Image>
+                </Animated.Image>
                 {this.renderBackButton()}
                 {this.renderBackButton()}
                 {this.renderRightButton()}
                 {this.renderRightButton()}
             </Animated.View>
             </Animated.View>

@@ -79,7 +79,6 @@ export default class UserThatNotMe extends React.Component {
         this._renderRow = this._renderRow.bind(this);
         this._renderRow = this._renderRow.bind(this);
         this._renderSectionHeader = this._renderSectionHeader.bind(this);
         this._renderSectionHeader = this._renderSectionHeader.bind(this);
         this._renderSeparator = this._renderSeparator.bind(this);
         this._renderSeparator = this._renderSeparator.bind(this);
-        this._updateScrollValue = this._updateScrollValue.bind(this);
         this.dataSource = new ListView.DataSource({
         this.dataSource = new ListView.DataSource({
             rowHasChanged: (r1, r2) => !Immutable.is(r1, r2),
             rowHasChanged: (r1, r2) => !Immutable.is(r1, r2),
             sectionHeaderHasChanged: (s1, s2) => !Immutable.is(s1, s2),
             sectionHeaderHasChanged: (s1, s2) => !Immutable.is(s1, s2),
@@ -149,10 +148,6 @@ export default class UserThatNotMe extends React.Component {
 		}
 		}
     }
     }
 
 
-    _updateScrollValue(value) {
-        this.state.scrollValue.setValue(value);
-    }
-
     render() {
     render() {
         let {posts, endReached, isRefreshing, isLoadingMore, isFetching} = this.props;
         let {posts, endReached, isRefreshing, isLoadingMore, isFetching} = this.props;
         let dataSource = {
         let dataSource = {
@@ -165,10 +160,13 @@ export default class UserThatNotMe extends React.Component {
                     ref={(c) => {
                     ref={(c) => {
                         this.listView = c;
                         this.listView = c;
                     }}
                     }}
-                    onScroll={(e) => {
-                        const offsetY = e.nativeEvent.contentOffset.y;
-                        this._updateScrollValue(offsetY / 150);
-                    }}
+                    onScroll={Animated.event([{
+                        nativeEvent: {
+                            contentOffset: {
+                                y: this.state.scrollValue
+                            }
+                        }
+                    }])}
                     dataSource={this.dataSource.cloneWithRowsAndSections(dataSource)}
                     dataSource={this.dataSource.cloneWithRowsAndSections(dataSource)}
                     renderHeader={this._renderHeader}
                     renderHeader={this._renderHeader}
                     renderRow={this._renderRow}
                     renderRow={this._renderRow}

@@ -36,27 +36,39 @@ const {
 } = require('../../constants/actionTypes').default;
 } = require('../../constants/actionTypes').default;
 
 
 export function goToSection(section) {
 export function goToSection(section) {
+	return (dispatch, getState) => {
+		let {route} = getState();
+		let tryToClean = route.lastPopScene == 'Section';
 		Actions.Section();
 		Actions.Section();
-	return {
+		dispatch({
 			type: GO_TO_SECTION,
 			type: GO_TO_SECTION,
-        payload: section,
-	};
+	        payload: {...section, tryToClean},
+		});
+	}
 }
 }
 
 
 export function goToPost(id) {
 export function goToPost(id) {
+	return (dispatch, getState) => {
+		let {route} = getState();
+		let tryToClean = route.lastPopScene == 'SubjectPost';
 		Actions.SubjectPost({postId:id});
 		Actions.SubjectPost({postId:id});
-	return {
+		dispatch({
 			type: GO_TO_POST,
 			type: GO_TO_POST,
-        payload: id,
-	};
+	        payload: {id, tryToClean},
+		});
+	}
 }
 }
 
 
 export function goToLikeList(postId, likeCount) {
 export function goToLikeList(postId, likeCount) {
+	return (dispatch, getState) => {
+		let {route} = getState();
+		let tryToClean = route.lastPopScene == 'LikeList';
 		Actions.LikeList({title: `共${likeCount}个赞`});
 		Actions.LikeList({title: `共${likeCount}个赞`});
-    return {
+		dispatch({
 			type: GO_TO_LIKE_LIST,
 			type: GO_TO_LIKE_LIST,
-        payload: postId,
-	};
+	        payload: {postId, tryToClean},
+		});
+	}
 }
 }
 
 
 export function goToUserOrMe(uid) {
 export function goToUserOrMe(uid) {
@@ -68,11 +80,7 @@ export function goToUserOrMe(uid) {
 	            type: GO_TO_USER,
 	            type: GO_TO_USER,
 	        });
 	        });
         } else {
         } else {
-            Actions.UserThatNotMe();
-			dispatch({
-	            type: GO_TO_USER_THAT_NOT_ME,
-	            payload: uid,
-	        });
+            dispatch(goToUserThatNotMe(uid));
         }
         }
 	};
 	};
 }
 }
@@ -97,14 +105,15 @@ export function goToUser() {
 
 
 export function goToUserThatNotMe(uid) {
 export function goToUserThatNotMe(uid) {
     return (dispatch, getState) => {
     return (dispatch, getState) => {
-        let {user} = getState();
+        let {user, route} = getState();
         if (user.profile.uid == uid) {
         if (user.profile.uid == uid) {
 
 
         } else {
         } else {
+			let tryToClean = route.lastPopScene == 'UserThatNotMe';
 			Actions.UserThatNotMe();
 			Actions.UserThatNotMe();
 			dispatch({
 			dispatch({
 	            type: GO_TO_USER_THAT_NOT_ME,
 	            type: GO_TO_USER_THAT_NOT_ME,
-	            payload: uid,
+	            payload: {uid, tryToClean},
 	        });
 	        });
         }
         }
 	};
 	};

@@ -17,6 +17,7 @@ let InitialState = Record({
 	sid: -1,
 	sid: -1,
 	items: List(),
 	items: List(),
 	item: item,
 	item: item,
+    cleaned: false,
 });
 });
 
 
 export default InitialState;
 export default InitialState;

@@ -24,15 +24,26 @@ export default function likeList(state = initialState, action) {
 
 
     switch (action.type) {
     switch (action.type) {
         case GO_TO_LIKE_LIST: {
         case GO_TO_LIKE_LIST: {
-            let sid = state.sid + 1;
+            
+            let currentSid = state.sid;
+			let newItems = state.items;
+			let newSid = currentSid;
+			// componentWillUnmount未调用，导致clean操作未进行
+			if (action.payload.tryToClean && currentSid > -1 && !state.cleaned) {
+				newItems = newItems.pop();
+				newSid = newSid - 1;
+			}
+
+            let sid = newSid + 1;
 			// 获取新的初始状态item
 			// 获取新的初始状态item
 			let item = initialState.item;
 			let item = initialState.item;
 			// 设置item的value
 			// 设置item的value
-			item = item.set('postId', action.payload);
+			item = item.set('postId', action.payload.postId);
 			// items新增item
 			// items新增item
-			let newItems = state.items.push(item);
+			newItems = newItems.push(item);
 			let nextState =  state.set('sid', sid)
 			let nextState =  state.set('sid', sid)
-				.set('items', newItems);
+				.set('items', newItems)
+                .set('cleaned', false);
 			return nextState;
 			return nextState;
         }
         }
 
 
@@ -69,7 +80,8 @@ export default function likeList(state = initialState, action) {
 			if (state.items.size > sid) {
 			if (state.items.size > sid) {
 				let items = state.items.pop();
 				let items = state.items.pop();
 				let nextState =  state.set('sid', sid - 1)
 				let nextState =  state.set('sid', sid - 1)
-					.set('items', items);
+					.set('items', items)
+                    .set('cleaned', true);
 				return nextState;
 				return nextState;
 			}
 			}
         }
         }

@@ -2,6 +2,7 @@ import { ActionConst } from 'react-native-router-flux';
 
 
 const initialState = {
 const initialState = {
   scene: {},
   scene: {},
+  lastPopScene: '',
 };
 };
 
 
 export default function reducer(state = initialState, action = {}) {
 export default function reducer(state = initialState, action = {}) {
@@ -13,6 +14,12 @@ export default function reducer(state = initialState, action = {}) {
                 scene: action.scene,
                 scene: action.scene,
             };
             };
 
 
+        case ActionConst.BACK_ACTION:
+            return {
+                ...state,
+                lastPopScene: state.scene.sceneKey,
+            };
+
         // ...other actions
         // ...other actions
 
 
         default:
         default:

@@ -54,6 +54,7 @@ let InitialState = Record({
 	sid: -1,
 	sid: -1,
 	items: List(),
 	items: List(),
 	item: item,
 	item: item,
+	cleaned: false,
 });
 });
 
 
 export default InitialState;
 export default InitialState;

@@ -10,7 +10,7 @@
  * InitialState
  * InitialState
  */
  */
 import InitialState from './sectionInitialState';
 import InitialState from './sectionInitialState';
-import Immutable, {Map} from 'immutable';
+import Immutable, {Map, List} from 'immutable';
 
 
 const {
 const {
 	SECTION_HEADER_REQUEST,
 	SECTION_HEADER_REQUEST,
@@ -46,16 +46,27 @@ export default function sectionReducer(state = initialState, action) {
     switch (action.type) {
     switch (action.type) {
 
 
 		case GO_TO_SECTION: {
 		case GO_TO_SECTION: {
-			let sid = state.sid + 1;
+
+			let currentSid = state.sid;
+			let newItems = state.items;
+			let newSid = currentSid;
+			// componentWillUnmount未调用，导致clean操作未进行
+			if (action.payload.tryToClean && currentSid > -1 && !state.cleaned) {
+				newItems = newItems.pop();
+				newSid = newSid - 1;
+			}
+
+			let sid = newSid + 1;
 			// 获取新的初始状态item
 			// 获取新的初始状态item
 			let item = initialState.item;
 			let item = initialState.item;
 			// 设置item的value
 			// 设置item的value
 			item = item.set('id', action.payload.id)
 			item = item.set('id', action.payload.id)
 				.set('name', action.payload.name);
 				.set('name', action.payload.name);
 			// items新增item
 			// items新增item
-			let newItems = state.items.push(item);
+			let items = newItems.push(item);
 			let nextState =  state.set('sid', sid)
 			let nextState =  state.set('sid', sid)
-				.set('items', newItems);
+				.set('items', items)
+				.set('cleaned', false);
 			return nextState;
 			return nextState;
 		}
 		}
 
 
@@ -172,7 +183,8 @@ export default function sectionReducer(state = initialState, action) {
 			if (state.items.size > sid) {
 			if (state.items.size > sid) {
 				let items = state.items.pop();
 				let items = state.items.pop();
 				let nextState =  state.set('sid', sid - 1)
 				let nextState =  state.set('sid', sid - 1)
-					.set('items', items);
+					.set('items', items)
+					.set('cleaned', true);
 				return nextState;
 				return nextState;
 			}
 			}
 		}
 		}

@@ -68,6 +68,7 @@ let InitialState = Record({
     sid: -1,
     sid: -1,
     items: List(),
     items: List(),
     item: item,
     item: item,
+    cleaned: false,
 });
 });
 
 
 export default InitialState;
 export default InitialState;

@@ -56,17 +56,27 @@ export default function postingReducer(state = initialState, action) {
 
 
     switch (action.type) {
     switch (action.type) {
         case GO_TO_POST: {
         case GO_TO_POST: {
-            let sid = state.sid + 1;
+
+            let currentSid = state.sid;
+			let newItems = state.items;
+			let newSid = currentSid;
+			// componentWillUnmount未调用，导致clean操作未进行
+			if (action.payload.tryToClean && currentSid > -1 && !state.cleaned) {
+				newItems = newItems.pop();
+				newSid = newSid - 1;
+			}
+
+            let sid = newSid + 1;
 			// 获取新的初始状态item
 			// 获取新的初始状态item
 			let item = initialState.item;
 			let item = initialState.item;
 			// 设置item的value
 			// 设置item的value
-			item = item.set('id', action.payload);
+			item = item.set('id', action.payload.id);
 			// items新增item
 			// items新增item
-			let newItems = state.items.push(item);
+			newItems = newItems.push(item);
 			let nextState =  state.set('sid', sid)
 			let nextState =  state.set('sid', sid)
-				.set('items', newItems);
+				.set('items', newItems)
+                .set('cleaned', false);
 			return nextState;
 			return nextState;
-            // return state.set('id', action.payload);
         }
         }
 
 
         case SUBJECT_CONTENT_REQUEST: {
         case SUBJECT_CONTENT_REQUEST: {
@@ -287,7 +297,8 @@ export default function postingReducer(state = initialState, action) {
             if (state.items.size > sid) {
             if (state.items.size > sid) {
                 let items = state.items.pop();
                 let items = state.items.pop();
                 let nextState =  state.set('sid', sid - 1)
                 let nextState =  state.set('sid', sid - 1)
-                    .set('items', items);
+                    .set('items', items)
+                    .set('cleaned', true);
                 return nextState;
                 return nextState;
             }
             }
         }
         }

@@ -32,6 +32,7 @@ let InitialState = Record({
 	sid: -1,
 	sid: -1,
 	items: List(),
 	items: List(),
 	item: item,
 	item: item,
+    cleaned: false,
 });
 });
 
 
 export default InitialState;
 export default InitialState;

@@ -28,15 +28,26 @@ export default function userThatNotMe(state = initialState, action) {
 
 
     switch (action.type) {
     switch (action.type) {
         case GO_TO_USER_THAT_NOT_ME: {
         case GO_TO_USER_THAT_NOT_ME: {
-            let sid = state.sid + 1;
+
+            let currentSid = state.sid;
+			let newItems = state.items;
+			let newSid = currentSid;
+			// componentWillUnmount未调用，导致clean操作未进行
+			if (action.payload.tryToClean && currentSid > -1 && !state.cleaned) {
+				newItems = newItems.pop();
+				newSid = newSid - 1;
+			}
+
+            let sid = newSid + 1;
 			// 获取新的初始状态item
 			// 获取新的初始状态item
 			let item = initialState.item;
 			let item = initialState.item;
 			// 设置item的value
 			// 设置item的value
-			item = item.setIn(['profile', 'uid'], action.payload);
+			item = item.setIn(['profile', 'uid'], action.payload.uid);
 			// items新增item
 			// items新增item
-			let newItems = state.items.push(item);
+			newItems = newItems.push(item);
 			let nextState =  state.set('sid', sid)
 			let nextState =  state.set('sid', sid)
-				.set('items', newItems);
+				.set('items', newItems)
+                .set('cleaned', false);
 			return nextState;
 			return nextState;
         }
         }
 
 
@@ -106,7 +117,8 @@ export default function userThatNotMe(state = initialState, action) {
 			if (state.items.size > sid) {
 			if (state.items.size > sid) {
 				let items = state.items.pop();
 				let items = state.items.pop();
 				let nextState =  state.set('sid', sid - 1)
 				let nextState =  state.set('sid', sid - 1)
-					.set('items', items);
+					.set('items', items)
+                    .set('cleaned', true);
 				return nextState;
 				return nextState;
 			}
 			}
         }
         }