update demo

huangminlinux · huangminlinux · commit 8dc384a40a06 · 2017-12-01T14:48:46.000+08:00
diff --git a/example/app/routes/Chat/index.js b/example/app/routes/Chat/index.js
@@ -43,12 +43,16 @@ export default class Chat extends Component {
   constructor(props) {
     super(props);
     this.state = {
-      inputViewLayout: { width: window.width, height: 200, },
       menuContainerHeight: 1000,
       isDismissMenuContainer: false,
       shouldExpandMenuContainer: false,
     };
-
+    if (Platform.OS == 'ios') {
+      this.state.inputViewLayout = { width: window.width, height: 86, }
+    } else {
+      this.state.inputViewLayout = { width: window.width, height: 200, }
+    }
+    
     this.updateLayout = this.updateLayout.bind(this);
     this.onTouchMsgList = this.onTouchMsgList.bind(this);
     this.conversation = this.props.navigation.state.params.conversation
@@ -138,7 +142,7 @@ export default class Chat extends Component {
       message.isOutgoing = true
       message.content = '<body bgcolor="#ff3399"><h5>This is a custom message. </h5>\
       <img src="/storage/emulated/0/XhsEmoticonsKeyboard/Emoticons/wxemoticons/icon_040_cover.png"></img></body>'
-      message.contentSize = {'height': 400, 'width': 400}
+      message.contentSize = {'height': 200, 'width': 200}
       message.extras = {"extras": "fdfsf"}
       var user = {
         userId: "1",
@@ -156,6 +160,7 @@ export default class Chat extends Component {
   }
 
   componentDidMount() {
+    this.resetMenu()
     var parames = {
 
       'from': 0,            // 开始的消息下标。
@@ -227,6 +232,31 @@ export default class Chat extends Component {
 
   }
 
+  resetMenu() {
+    if (Platform.OS === "android") {
+      console.log("reset menu, count: " + this.state.lineCount)
+      if (this.lineCount == 1) {
+        this.setState({
+          inputHeight: 120,
+          inputViewLayout: { width: window.width, height: 200 }
+        })
+      } else {
+        this.setState({
+          inputHeight: 80 + this.state.lineCount * 40,
+          inputViewLayout: { width: window.width, height: 160 + 40 * this.state.lineCount }
+        })
+      }
+      this.setState({
+        shouldExpandMenuContainer: false,
+      })
+    } else {
+      this.setState({
+        inputViewLayout: { width: window.width, height: 86 }
+      })
+      AuroraIController.hidenFeatureView(true)
+    }
+  }
+
   updateLayout(layout) {
     this.setState({ inputViewLayout: layout })
   }
@@ -237,14 +267,7 @@ export default class Chat extends Component {
 
   onTouchMsgList() {
     console.log("Touch msg list, hidding soft input and dismiss menu");
-    this.setState({
-      isDismissMenuContainer: true,
-      inputViewLayout: {
-        width: Dimensions.get('window').width,
-        height: 200
-      },
-      shouldExpandMenuContainer: false,
-    });
+    this.resetMenu()
   }
 
   onTouchEditText = () => {
@@ -560,7 +583,6 @@ export default class Chat extends Component {
           sendBubbleTextColor={"#000000"}
           sendBubblePadding={{ left: 10, top: 10, right: 15, bottom: 10 }}
         />
-        }
         <InputView style={this.state.inputViewLayout}
           menuContainerHeight={this.state.menuContainerHeight}
           isDismissMenuContainer={this.state.isDismissMenuContainer}
diff --git a/example/app/routes/Home/ConversationList/index.js b/example/app/routes/Home/ConversationList/index.js
@@ -181,7 +181,6 @@ export default class ConversationList extends React.Component {
     }
 
     _onPress() {
-        Alert.alert("click", "fasdf")
         JMessage.createConversation({
             type: 'single',
             username: '0002'
@@ -197,7 +196,6 @@ export default class ConversationList extends React.Component {
                     key: conv.target.id
                 }
                 item.conversationType = 'group'
-                Alert.alert('conversaion', JSON.stringify(conv))
             }
             this.setState({})
             Alert.alert('the item', JSON.stringify(item))
@@ -223,7 +221,6 @@ export default class ConversationList extends React.Component {
                     key: conv.target.id
                 }
                 item.conversationType = 'group'
-                Alert.alert('conversaion', JSON.stringify(conv))
             }
             this.reloadConversationList()
             this.props.navigation.navigate('Chat', {
diff --git a/example/app/routes/Home/MyInfo/index.js b/example/app/routes/Home/MyInfo/index.js
@@ -72,8 +72,6 @@ export default class MyNotificationsScreen extends React.Component {
   }
   componentWillMount() {
     JMessage.getMyInfo((user) => {
-      Alert.alert("RNFS.MainBundlePath", RNFS.MainBundlePath)
-      Alert.alert("user.avatarThumbPath", user.avatarThumbPath)
       this.setState({
         myInfo: user,
       })
diff --git a/example/app/routes/Login/index.js b/example/app/routes/Login/index.js
@@ -51,7 +51,7 @@ export default class Login extends React.Component {
             Alert.alert('login success')
             navigate('Home')
         }, (error) => {
-            Alert.alert('login success', JSON.stringify(error))
+            Alert.alert('login fail', JSON.stringify(error))
         })
     }
 

Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,6 @@ export default class ConversationList extends React.Component {`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`_onPress() {`
`184`		`- Alert.alert("click", "fasdf")`
`185`	`184`	`JMessage.createConversation({`
`186`	`185`	`type: 'single',`
`187`	`186`	`username: '0002'`
`@@ -197,7 +196,6 @@ export default class ConversationList extends React.Component {`
`197`	`196`	`key: conv.target.id`
`198`	`197`	`}`
`199`	`198`	`item.conversationType = 'group'`
`200`		`- Alert.alert('conversaion', JSON.stringify(conv))`
`201`	`199`	`}`
`202`	`200`	`this.setState({})`
`203`	`201`	`Alert.alert('the item', JSON.stringify(item))`
`@@ -223,7 +221,6 @@ export default class ConversationList extends React.Component {`
`223`	`221`	`key: conv.target.id`
`224`	`222`	`}`
`225`	`223`	`item.conversationType = 'group'`
`226`		`- Alert.alert('conversaion', JSON.stringify(conv))`
`227`	`224`	`}`
`228`	`225`	`this.reloadConversationList()`
`229`	`226`	`this.props.navigation.navigate('Chat', {`
Original file line number	Diff line number	Diff line change
`@@ -72,8 +72,6 @@ export default class MyNotificationsScreen extends React.Component {`
`72`	`72`	`}`
`73`	`73`	`componentWillMount() {`
`74`	`74`	`JMessage.getMyInfo((user) => {`
`75`		`- Alert.alert("RNFS.MainBundlePath", RNFS.MainBundlePath)`
`76`		`- Alert.alert("user.avatarThumbPath", user.avatarThumbPath)`
`77`	`75`	`this.setState({`
`78`	`76`	`myInfo: user,`
`79`	`77`	`})`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ export default class Login extends React.Component {`
`51`	`51`	`Alert.alert('login success')`
`52`	`52`	`navigate('Home')`
`53`	`53`	`}, (error) => {`
`54`		`- Alert.alert('login success', JSON.stringify(error))`
	`54`	`+ Alert.alert('login fail', JSON.stringify(error))`
`55`	`55`	`})`
`56`	`56`	`}`
`57`	`57`