Commit f84cf88a by Takatoshi Miura

Merge branch 'origin/#605_namecard_group_path' into 'develop'

[iOS] チャットルームのネームカードからグループに遷移する処理を実装

See merge request !125
parents 29cc7d91 11e84410
...@@ -221,10 +221,16 @@ ...@@ -221,10 +221,16 @@
let groupId; let groupId;
if (typeof(android) != "undefined") { if (typeof(android) != "undefined") {
groupId = android.getToMoveGroupId(); groupId = android.getToMoveGroupId();
} else {
groupId = CHAT_DB.getToMoveGroupId();
} }
if (groupId != "" && groupId != undefined) { if (groupId != "" && groupId != undefined) {
CHAT_UI.refreshAllGroupSearch(groupId); CHAT_UI.refreshAllGroupSearch(groupId);
android.setToMoveGroupId(""); if (typeof(android) != "undefined") {
android.setToMoveGroupId("");
} else {
webkit.messageHandlers.setToMoveGroupId.postMessage("");
}
} else { } else {
CHAT_UI.refreshContactScreen(); CHAT_UI.refreshContactScreen();
} }
......
...@@ -351,3 +351,10 @@ CHAT_DB.createContentView = function() { ...@@ -351,3 +351,10 @@ CHAT_DB.createContentView = function() {
return callNativeApp("createContentView", {}); return callNativeApp("createContentView", {});
} }
}; };
CHAT_DB.getToMoveGroupId = function() {
// Androidは実装不要
if (CHAT_UTIL.isIOS()) {
return callNativeApp("getToMoveGroupId", {});
}
};
...@@ -1526,7 +1526,11 @@ CHAT_UI.refreshAllGroupSearch = function(paramGroupId) { ...@@ -1526,7 +1526,11 @@ CHAT_UI.refreshAllGroupSearch = function(paramGroupId) {
var groupId = paramGroupId; var groupId = paramGroupId;
if (window.location.pathname.includes("chat_room")) { if (window.location.pathname.includes("chat_room")) {
if (groupId == "") return; if (groupId == "") return;
android.setToMoveGroupId(groupId); if (typeof(android) != "undefined") {
android.setToMoveGroupId(groupId);
} else {
webkit.messageHandlers.setToMoveGroupId.postMessage(groupId);
}
window.location.href = "contact.html"; window.location.href = "contact.html";
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment