modify demo app

Author: KenChoi

example/android/app/AndroidManifest.xml

@@ -18,6 +18,7 @@
         android:theme="@style/AppTheme">
         <activity
             android:name=".MainActivity"
+            android:windowSoftInputMode="adjustResize"
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
             android:label="@string/app_name">
             <intent-filter>

example/android/app/app.iml

@@ -96,9 +96,10 @@
     <orderEntry type="jdk" jdkName="Android API 25 Platform (1)" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="okio-1.9.0" level="project" />
-    <orderEntry type="library" name="gson-2.3.1" level="project" />
+    <orderEntry type="library" name="chatinput-0.4.7" level="project" />
     <orderEntry type="library" name="imagepipeline-base-1.0.1" level="project" />
     <orderEntry type="library" name="textlayoutbuilder-1.0.0" level="project" />
+    <orderEntry type="library" name="gson-2.8.0" level="project" />
     <orderEntry type="library" name="jsr305-3.0.0" level="project" />
     <orderEntry type="library" name="transition-25.3.1" level="project" />
     <orderEntry type="library" name="design-25.3.1" level="project" />
@@ -114,12 +115,12 @@
     <orderEntry type="library" name="support-core-utils-25.3.1" level="project" />
     <orderEntry type="library" name="support-fragment-25.3.1" level="project" />
     <orderEntry type="library" name="fresco-1.0.1" level="project" />
-    <orderEntry type="library" name="messagelist-0.4.6" level="project" />
     <orderEntry type="library" name="jmessage-android_v2.2.1" level="project" />
-    <orderEntry type="library" name="chatinput-0.4.6-beta" level="project" />
     <orderEntry type="library" name="soloader-0.1.0" level="project" />
     <orderEntry type="library" name="imagepipeline-1.0.1" level="project" />
     <orderEntry type="library" name="javax.inject-1" level="project" />
+    <orderEntry type="library" name="eventbus-3.0.0" level="project" />
+    <orderEntry type="library" name="messagelist-0.4.8" level="project" />
     <orderEntry type="library" name="flexbox-0.2.5" level="project" />
     <orderEntry type="library" name="okhttp-ws-3.4.1" level="project" />
     <orderEntry type="library" name="support-v4-25.3.1" level="project" />

example/android/app/res/drawable-hdpi/ironman.png

@@ -15,7 +15,10 @@ import {
   requireNativeComponent,
   Alert,
   Dimensions,
-  DeviceEventEmitter
+  DeviceEventEmitter,
+  Platform,
+  UIManager,
+  findNodeHandle,
 } from 'react-native';
 
 var ReactNative = require('react-native');          
@@ -42,7 +45,7 @@ export default class Chat extends Component {
   constructor(props) {
     super(props);
     this.state = { 
-      inputViewLayout: {width:window.width, height:86,},
+      inputViewLayout: {width:window.width, height:100,},
       menuContainerHeight: 1000,
       isDismissMenuContainer: false,
     };
@@ -77,14 +80,21 @@ export default class Chat extends Component {
     }
 
     var user = {
-        userId: "",
+        userId: "1",
         displayName: "",
         avatarPath: ""
     }
     user.userId = jmessage.from.username
     user.displayName = jmessage.from.nickname
     user.avatarPath = jmessage.from.avatarThumbPath
+    if (user.displayName == "") {
+      user.displayName = jmessage.from.username
+    }
+    if (user.avatarPath == "") {
+      user.avatarPath = "ironman"
+    }
     auroraMsg.fromUser = user
+    console.log("from user: " + JSON.stringify(auroraMsg.fromUser))
     auroraMsg.status = "send_going"
 
     auroraMsg.isOutgoing = true
@@ -140,7 +150,12 @@ export default class Chat extends Component {
             }
             return normalMessage
           })
-          AuroraIController.insertMessagesToTop(auroraMessages)
+          if (Platform.OS == 'ios') {
+            AuroraIController.insertMessagesToTop(auroraMessages)
+          } else {
+            AuroraIController.insertMessagesToTop(auroraMessages)
+            // AuroraIController.scrollToBottom(true)
+          }
         }, (error) => {
           Alert.alert('error!', JSON.stringify(error))
         })
@@ -174,6 +189,7 @@ export default class Chat extends Component {
   componentWillUnmount() {
     JMessage.removeReceiveMessageListener(this.receiveMessageCallBack)
     AuroraIController.removeMessageListDidLoadListener(this.messageListDidLoadCallback)
+    UIManager.dispatchViewManagerCommand(findNodeHandle(this.refs["MessageList"]), 1, null)
   }
 
   updateLayout(layout) {
@@ -188,13 +204,18 @@ export default class Chat extends Component {
       console.log("Touch msg list, hidding soft input and dismiss menu");
       this.setState({
         isDismissMenuContainer: true,
-        chatInputStyle: {
+        inputViewLayout: {
           width: Dimensions.get('window').width,
           height: 100
         },
       });
     }
 
+  onTouchEditText() {
+    console.log("scroll to bottom")
+    AuroraIController.scrollToBottom(true);
+  }
+
   onMsgClick = (message) => {
       console.log(message)
     }
@@ -337,15 +358,15 @@ export default class Chat extends Component {
   }
 
   onSwitchToMicrophoneMode = () => {
-    this.updateLayout({width:window.width, height:256,})
+    this.updateLayout({width:window.width, height:420,})
   }
 
   onSwitchToGalleryMode = () => {
-    this.updateLayout({width:window.width, height:256,})
+    this.updateLayout({width:window.width, height:420,})
   }
 
   onSwitchToCameraMode = () => {
-    this.updateLayout({width:window.width, height:256,})
+    this.updateLayout({width:window.width, height:420,})
   }
 
   onShowKeyboard = (keyboard_height) => {
@@ -363,6 +384,7 @@ export default class Chat extends Component {
     return (
       <View style={styles.container}>
         <MessageListView style={styles.messageList}
+        ref="MessageList"
         onAvatarClick={this.onAvatarClick}
         onMsgClick={this.onMsgClick}
         onStatusViewClick={this.onStatusViewClick}
@@ -373,7 +395,7 @@ export default class Chat extends Component {
         avatarSize={{width:40,height:40}}
         sendBubbleTextSize={18}
         sendBubbleTextColor={"#000000"}
-        sendBubblePadding={{left:10,top:10,right:10,bottom:10}}
+        sendBubblePadding={{left:10,top:10,right:15,bottom:10}}
         />
         <InputView style={this.state.inputViewLayout}
         menuContainerHeight = {this.state.menuContainerHeight}
@@ -390,6 +412,7 @@ export default class Chat extends Component {
         onSwitchToGalleryMode={this.onSwitchToGalleryMode}
         onSwitchToCameraMode={this.onSwitchToCameraMode}
         onShowKeyboard={this.onShowKeyboard}
+        onTouchEditText={this.onTouchEditText}
         />
       </View>
     );
@@ -404,7 +427,6 @@ const styles = StyleSheet.create({
     backgroundColor: '#F5FCFF',
   },
   messageList: {
-    backgroundColor: 'red',
     flex: 1,
     marginTop: 0,
     width: window.width,

example/android/app/res/drawable-hdpi/send_msg.9.png

@@ -134,6 +134,9 @@ export default class ConversationList extends React.Component {
                     }
                     item.conversationType = 'single'
                     item.displayName = conversation.target.nickname
+                    if (item.displayName == "") {
+                        item.displayName = conversation.target.username
+                    }
                 } else {
                     item = {
                         key: conversation.target.id
@@ -157,7 +160,7 @@ export default class ConversationList extends React.Component {
                 }
 
                 if (conversation.latestMessage.type === 'voice') {
-                    item.latestMessageString = '[语言]'
+                    item.latestMessageString = '[语音]'
                 }
 
                 if (conversation.latestMessage.type === 'file') {