Merge pull request #384 from zsw666/master

v10.0.0-beta

Author: shine2008

NEChatUIKit/NEChatUIKit.podspec

@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   #
 
   s.name         = 'NEChatUIKit'
-  s.version      = '9.7.0'
+  s.version      = '10.0.0-beta'
   s.summary      = 'Chat Module of IM.'
 
   # This description is used to generate tags and improve search results.

NEChatUIKit/NEChatUIKit/Assets/NEBaseChatUIKit.xcassets/Map/chat_map_default.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "location_default 1.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "location_default.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

NEChatUIKit/NEChatUIKit/Assets/NEBaseChatUIKit.xcassets/Map/chat_map_default.imageset/location_default 1.png

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

NEChatUIKit/NEChatUIKit/Assets/NEBaseChatUIKit.xcassets/Map/chat_map_default.imageset/location_default.png

@@ -17,7 +17,6 @@
 "record_too_short"="Time is too short";
 "no_microphone_permission"="no micro permission";
 "choose"="select";
-"take_photo"="camera";
 "select_from_album"="album";
 "select_from_icloud"="icloud";
 "editing"="typing";
@@ -51,9 +50,10 @@
 "team_join_mode" = "join mode";
 "team_be_invited_mode" = "invite mode";
 "team_be_invited_permission" = "Invite Permission";
-"team_be_invited_author" = "是否需要被邀请者同意权限";
-"team_update_info_permission" = "update info permission";
+"team_be_invited_author" = "BeInvite Permission";
+"team_update_info_permission" = "Update info permission";
 "team_update_client_custom"="Update Permission";
+"team_at_permission"="@All Permission update to ";
 
 "team_custom_info" = "custom info";
 "not_mute" = "unmute";
@@ -169,6 +169,7 @@
 "failed_operation"="Failed Operation";
 "team_not_exist"="team not exist";
 "unpin_failed"="Unpin failed";
+"pin_limit_exceeded"="The number of pin has reached the upper limit";
 
 "fun_hold_to_talk"="Hold to talk";
 
@@ -194,6 +195,7 @@
 "multiForward_open_failed"="Failed to obtain information";
 "file_check_failed"="File verification failed";
 "per_item_forward_limit"="Forward one by one to limit %d messages";
+"selete_messages_limit"="Delete limits %d messages";
 "multiForward_forward_limit"="Combined forwarding limits %d messages";
 "exception_description"="Exception description";