js連動

public_new/js/chat-db.js

@@ -58,7 +58,7 @@ CHAT_DB.getMessages = function(roomId) {
 
 CHAT_DB.getFavoriteUsersNotInRoom = function() {
     if (CHAT_UTIL.isIOS()) {
-        //TODO IOS処理追加必要
+        return JSON.parse(callNativeApp("getFavoriteUsersNotInRoom", {}));
     } else if (CHAT_UTIL.isAndroid()) {
         //String形式をJsonに変更してReturn
     	return JSON.parse(android.getFavoriteUsersNotInRoom());
@@ -103,7 +103,7 @@ CHAT_DB.getGroupInfo = function(groupId) {
 
 CHAT_DB.loadSelectedUsers = function() {
     if (CHAT_UTIL.isIOS()) {
-        //TODO IOS処理追加必要
+        return JSON.parse(callNativeApp("getSelectedUserList", {}));
     } else if (CHAT_UTIL.isAndroid()) {
         //String形式をJsonに変更してReturn
         console.log(JSON.parse(android.getSelectedUserList()));
@@ -218,7 +218,7 @@ CHAT_DB.updateArchiveDetail = function(archiveId) {
 
 CHAT_DB.searchMessages = function(keyword, userList) {
     if (CHAT_UTIL.isIOS()) {
-        // TODO
+        return JSON.parse(callNativeApp("searchMessages", {"keyWord": keyword, "userList": userList}));
     } else if (CHAT_UTIL.isAndroid()) {
         return JSON.parse(android.searchMessages(keyword, userList));
     }

public_new/js/chat-ui.js

@@ -1316,12 +1316,22 @@ $('#tabAllGroupOnMakeRoom').on('click', function(e) {
 });
 
 $('#makeRoomConfirmBtn').on('click', function(e) {
-    android.saveSelectedUserList(CHAT.globalSelectedUserList.join(","));
+    if (typeof(android) != "undefined") {
+        android.saveSelectedUserList(CHAT.globalSelectedUserList.join(","));
+    } else {
+        var userList = CHAT.globalSelectedUserList.join(",");
+        webkit.messageHandlers.saveSelectedUserList.postMessage({userList});
+    }
     $('#makeRoomForm').submit();
 });
 
 $('#addUserConfirmBtn').on('click', function(e) {
-    android.saveSelectedUserList(CHAT.globalSelectedUserList.join(","));
+    if (typeof(android) != "undefined") {
+        android.saveSelectedUserList(CHAT.globalSelectedUserList.join(","));
+    } else {
+        var userList = CHAT.globalSelectedUserList.join(",");
+        webkit.messageHandlers.saveSelectedUserList.postMessage({userList});
+    }
     $('#addUserForm').submit();
 });
 
@@ -1751,10 +1761,17 @@ CHAT_UI.refreshMyGroupForMakeRoom = function() {
     });
 
     if (IS_ONLINE == 'true') {
-        android.updateGroupInfo('0');
-        android.updateMyInfo();
-        android.updateGroupUser();
-        android.updateFavorite();
+        if (typeof(android) != "undefined") {
+            android.updateGroupInfo('0');
+            android.updateMyInfo();
+            android.updateGroupUser();
+            android.updateFavorite();
+        } else {
+            webkit.messageHandlers.updateGroupInfo.postMessage("0");
+            webkit.messageHandlers.updateMyInfo.postMessage({});
+            webkit.messageHandlers.updateGroupUser.postMessage({});
+            webkit.messageHandlers.updateFavorite.postMessage({});
+        }
     }
 
     //お気に入りグループ取得。
@@ -2108,10 +2125,17 @@ CHAT_UI.refreshMyGroupForAddUser = function() {
     });
 
     if (IS_ONLINE == 'true') {
-        android.updateGroupInfo('0');
-        android.updateMyInfo();
-        android.updateGroupUser();
-        android.updateFavorite();
+        if (typeof(android) != "undefined") {
+            android.updateGroupInfo('0');
+            android.updateMyInfo();
+            android.updateGroupUser();
+            android.updateFavorite();
+        } else {
+            webkit.messageHandlers.updateGroupInfo.postMessage("0");
+            webkit.messageHandlers.updateMyInfo.postMessage({});
+            webkit.messageHandlers.updateGroupUser.postMessage({});
+            webkit.messageHandlers.updateFavorite.postMessage({});
+        }
     }
 
     //お気に入りグループ取得。