Merge branch 'origin/archive' into 'release_sp3'

iosアーカイブ連動

See merge request !45

public_new/js/chat-db.js

@@ -235,7 +235,7 @@ CHAT_DB.getMyGroupUsersNotInRoom = function() {
 
 
 CHAT_DB.getUserInfo = function(shopMemberId) {
 CHAT_DB.getUserInfo = function(shopMemberId) {
     if (CHAT_UTIL.isIOS()) {
     if (CHAT_UTIL.isIOS()) {
-        //TODO IOS処理追加必要
+        return JSON.parse(callNativeApp("getUserInfo", {"shopMemberId": shopMemberId}));
     } else if (CHAT_UTIL.isAndroid()) {
     } else if (CHAT_UTIL.isAndroid()) {
         //String形式をJsonに変更してReturn
         //String形式をJsonに変更してReturn
     	return JSON.parse(android.getUserInfo(shopMemberId));
     	return JSON.parse(android.getUserInfo(shopMemberId));