Merge branch 'dev' of github.com:jpush/imui into dev

jpush · Aug 2, 2017 · e70d6ad · e70d6ad
2 parents 80dd00f + a54e9bf
commit e70d6ad
Show file tree

Hide file tree

Showing 9 changed files with 134 additions and 95 deletions.
diff --git a/ReactNative/ios/RCTAuroraIMUI/MyMessageModel.swift b/ReactNative/ios/RCTAuroraIMUI/MyMessageModel.swift
@@ -84,12 +84,14 @@ open class RCTMessageModel: IMUIMessageModel {
     let statusString = messageDic.object(forKey: RCTMessageModel.kMsgKeyStatus) as? String
     let isOutgoing = messageDic.object(forKey: RCTMessageModel.kMsgKeyisOutgoing) as? Bool
 
-    let timeString = messageDic.object(forKey: RCTMessageModel.ktimeString) as? String
+    var timeString = messageDic.object(forKey: RCTMessageModel.ktimeString) as? String
     var needShowTime = false
     if let timeString = timeString {
       if timeString != "" {
         needShowTime = true
       }
+    } else {
+      timeString = ""
     }
 
     var mediaPath = messageDic.object(forKey: RCTMessageModel.kMsgKeyMediaFilePath) as? String
@@ -245,6 +247,7 @@ open class RCTMessageModel: IMUIMessageModel {
 
       messageDic.setValue(userDic, forKey: "fromUser")
       messageDic.setValue(self.msgId, forKey: "msgId")
+      messageDic.setValue(self.timeString, forKey: "timeString")
       return messageDic
     }
   }

diff --git a/ReactNative/ios/RCTAuroraIMUI/MyUser.swift b/ReactNative/ios/RCTAuroraIMUI/MyUser.swift
@@ -42,6 +42,16 @@ open class RCTUser: NSObject, IMUIUserProtocol {
   }
 
   public func Avatar() -> UIImage {
-    return UIImage(named: "defoult_header")!
+    if let path = self.rAvatarFilePath {
+      let url = NSURL(fileURLWithPath: path)
+      let fileManager = FileManager.default
+      if fileManager.fileExists(atPath: path) {
+        return UIImage(contentsOfFile: path)!
+      } else {
+        return UIImage(named: "defoult_header")!
+      }
+    } else {
+      return UIImage(named: "defoult_header")!
+    }
   }
 }
diff --git a/ReactNative/messagelist.ios.js b/ReactNative/messagelist.ios.js
@@ -61,7 +61,6 @@ export default class MessageList extends Component {
   }
 
   _onPullToRefresh(event: Event) {
-    console.log("huangmin888")
     if (!this.props.onPullToRefresh) {
       return;
     }

diff --git a/ReactNative/sample/index.ios.js b/ReactNative/sample/index.ios.js
@@ -17,7 +17,7 @@ import {
 } from 'react-native';
 
 var ReactNative = require('react-native');                
-const AuroraIController = NativeModules.RNTAuroraIController;
+const AuroraIController = NativeModules.AuroraIMUIModule;
 import IMUI from 'aurora-imui-react-native'
 var InputView = IMUI.ChatInput;
 var MessageListView = IMUI.MessageList;
@@ -67,6 +67,8 @@ export default class TestRNIMUI extends Component {
 
   onStatusViewClick = (message) => {
       console.log(message)
+      message.status = 'send_succeed'
+      AuroraIController.updateMessage(message)
     }
 
   onBeginDragMessageList = () => {
@@ -84,6 +86,7 @@ export default class TestRNIMUI extends Component {
 
     message.msgType = "text"
     message.text = text
+    message.timeString = 'fsdafafaf'
 
     AuroraIController.appendMessages([message])
     AuroraIController.scrollToBottom(true)

diff --git a/ReactNative/sample/ios/TestRNIMUI.xcodeproj/project.pbxproj b/ReactNative/sample/ios/TestRNIMUI.xcodeproj/project.pbxproj
diff --git a/ReactNative/sample/ios/TestRNIMUI/Images.xcassets/AppIcon.appiconset/Contents.json b/ReactNative/sample/ios/TestRNIMUI/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -1,5 +1,15 @@
 {
   "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "3x"
+    },
     {
       "idiom" : "iphone",
       "size" : "29x29",

diff --git a/iOS/IMUIInputView/Controllers/IMUIRecordVoiceHelper.swift b/iOS/IMUIInputView/Controllers/IMUIRecordVoiceHelper.swift
@@ -97,10 +97,17 @@ class IMUIRecordVoiceHelper: NSObject {
       print(error.localizedDescription)
     }
 
-    let recordSettings:[String : AnyObject] = [
-      AVFormatIDKey: NSNumber(value: kAudioFormatAppleIMA4 as UInt32),
-      AVNumberOfChannelsKey: 1 as AnyObject,
-      AVSampleRateKey : 16000.0 as AnyObject
+//    let recordSettings:[String : AnyObject] = [
+//      AVFormatIDKey: NSNumber(value: kAudioFormatAppleIMA4 as UInt32),
+//      AVNumberOfChannelsKey: 1 as AnyObject,
+//      AVSampleRateKey : 16000.0 as AnyObject
+//    ]
+
+    let recordSettings = [
+      AVFormatIDKey: Int(kAudioFormatMPEG4AAC),
+      AVSampleRateKey: 16000,
+      AVNumberOfChannelsKey: 1,
+      AVEncoderAudioQualityKey: AVAudioQuality.high.rawValue
     ]
 
     do {

diff --git a/iOS/IMUIInputView/Views/IMUIRecordVoiceCell.swift b/iOS/IMUIInputView/Views/IMUIRecordVoiceCell.swift
@@ -260,7 +260,8 @@ class IMUIRecordVoiceCell: UICollectionViewCell, IMUIFeatureCellProtocal {
     recorderPath = "\(NSHomeDirectory())/Documents/"
 
     dateFormatter.dateFormat = "yyyy-MM-dd-hh-mm-ss"
-    recorderPath?.append("\(dateFormatter.string(from: now))-MySound.ilbc")
+    recorderPath?.append("\(dateFormatter.string(from: now))-MySound.m4a")
+    print("\(recorderPath)")
     return recorderPath!
   }
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "aurora-imui-react-native",
-    "version": "0.4.3",
+    "version": "0.4.5",
     "description": "aurora imui plugin for react native application",
     "main": "index.js",