修复点击会话bug以及添加好友bug

Author: caiyg

ReactJChat.iml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="ReactJChat" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/build" />
+    <output-test url="file://$MODULE_DIR$/build" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

android/app/app.iml

@@ -93,8 +93,8 @@
     <orderEntry type="library" exported="" name="stetho-okhttp-1.2.0" level="project" />
     <orderEntry type="library" exported="" name="gson-2.6.2" level="project" />
     <orderEntry type="library" exported="" name="okhttp-2.5.0" level="project" />
-    <orderEntry type="library" exported="" name="jsr305-3.0.0" level="project" />
     <orderEntry type="library" exported="" name="stetho-1.2.0" level="project" />
+    <orderEntry type="library" exported="" name="jsr305-3.0.0" level="project" />
     <orderEntry type="library" exported="" name="jackson-core-2.2.3" level="project" />
     <orderEntry type="library" exported="" name="fbcore-0.8.1" level="project" />
     <orderEntry type="library" exported="" name="commons-cli-1.2" level="project" />

react-native-android/actions/ActionTypes.js

@@ -3,6 +3,7 @@
 export const INITIAL_CONVERSATION_LIST = 'INITIAL_CONVERSATION_LIST';
 export const LOAD_CONVERSATIONS = 'LOAD_CONVERSATIONS';
 export const SELECT_CONVERSATION = 'SELECT_CONVERSATION';
-export const ADD_CONVERSATION = 'ADD_CONVERSATION';
+export const ADDING_FRIEND = "ADDING_FRIEND";
+export const ADD_FRIEND_SUCCESS = "ADD_FRIEND_SUCCESS";
 export const DELETE_CONVERSATION = 'DELETE_CONVERSATION';
 export const LOAD_ERROR = 'LOAD_ERROR';

react-native-android/actions/conversationList.js

@@ -24,4 +24,16 @@ export function loadConversations() {
 			})
 		});
 	}
+}
+
+export function addFriend(username) {
+	return dispatch => {
+		type: types.ADDING_FRIEND,
+		JMessageHelper.addFriend(username, (result) => {
+			dispatch ({
+				type: types.ADD_FRIEND_SUCCESS,
+				conversation: JSON.parse(result)
+			});
+		})
+	}
 }

react-native-android/containers/conv_fragment.js

@@ -209,13 +209,19 @@ export default class Conv extends Component {
     }
 
     addFriend() {
-
-        JMessageHelper.addFriend(this.state.friendId, (result) => {
+        const { addFriend } = this.props.actions;
+        addFriend(this.state.friendId);
+        const { fetching } = this.props.state;
+        if (!fetching) {
             this.dismissAddFriendDialog();
-            var newDs = JSON.parse(result);
-            this.setState({ dataSource: this.getDataSource([newDs, ..._convList]) });
-            _convList = [newDs, ..._convList];
-        });
+        }
+
+        // JMessageHelper.addFriend(this.state.friendId, (result) => {
+        //     this.dismissAddFriendDialog();
+        //     var newDs = JSON.parse(result);
+        //     this.setState({ dataSource: this.getDataSource([newDs, ..._convList]) });
+        //     _convList = [newDs, ..._convList];
+        // });
     }
 
     showAddFriendDialog() {
@@ -249,6 +255,7 @@ export default class Conv extends Component {
 
     render() {
         const { conversationList } = this.props.state;
+        _convList = conversationList.convList;
         console.log('conversationList: ' + conversationList);
         var content = conversationList.dataSource.length === 0 ?
             <View style = { styles.container }>

react-native-android/containers/main_activity.js

@@ -95,6 +95,7 @@ export default class MainActivity extends Component {
         };
 
         this.onSelectMenu = this.onSelectMenu.bind(this);
+        this.onPageSelected = this.onPageSelected.bind(this);
     }
 
     onPageSelected(e) {

react-native-android/reducers/conversationList.js

@@ -37,15 +37,23 @@ export default function conversationList(state, action) {
 				dataSource,
 				fetching: false
 			}
-		case types.ADD_CONVERSATION:
+		case types.ADDING_FRIEND:
+			return {
+				...state,
+				...action,
+				fetching: true
+			}
+			break;
+		case types.ADD_FRIEND_SUCCESS:
 			var convList = [...state.convList];
 			convList.unshift(action.conversation);
 			dataSource = state.dataSource.cloneWithRows(convList);
 			return {
 				...state,
 				...action,
 				convList,
-				dataSource
+				dataSource,
+				fetching: false
 			}
 		case types.DELETE_CONVERSATION:
 			var selected = action.selected;