Commit 79decaa6 by Kim Peace

Fixed parse bool and string

parent 0aaa71bf
......@@ -15,6 +15,10 @@ function callNativeApp(iosKey, jsonData) {
return result;
}
function parseBoolStringToBool(str) {
return str == "true" ? true : false;
}
var NativeBridgeDataSource = {};
NativeBridgeDataSource.removeFavoriteGroup = function (groupID) {
......@@ -22,7 +26,7 @@ NativeBridgeDataSource.removeFavoriteGroup = function (groupID) {
const result = callNativeApp(NATIVE_KEY_IOS.removeFavoriteGroup, {
groupId: groupID,
});
return result == "true" ? true : false;
return parseBoolStringToBool(result);
} else {
return android.removeFavoriteGroup(groupID);
}
......@@ -35,11 +39,7 @@ NativeBridgeDataSource.addFavoriteGroup = function (groupID) {
const result = callNativeApp(NATIVE_KEY_IOS.addFavoriteGroup, {
groupId: groupID,
});
if (result == "true") {
return true;
} else {
return false;
}
return parseBoolStringToBool(result);
}
};
......@@ -352,14 +352,10 @@ NativeBridgeDataSource.getBeforeRoomType = function () {
NativeBridgeDataSource.removeFavoriteUser = function (shopMemberId) {
if (deviceInfo.isiOS()) {
var result = callNativeApp(NATIVE_KEY_IOS.removeFavoriteUser, {
const result = callNativeApp(NATIVE_KEY_IOS.removeFavoriteUser, {
shopMemberId: shopMemberId,
});
if (result == "true") {
return true;
} else {
return false;
}
return parseBoolStringToBool(result);
} else {
return android.removeFavoriteUser(shopMemberId);
}
......@@ -367,14 +363,10 @@ NativeBridgeDataSource.removeFavoriteUser = function (shopMemberId) {
NativeBridgeDataSource.addFavoriteUser = function (shopMemberId) {
if (deviceInfo.isiOS()) {
var result = callNativeApp(NATIVE_KEY_IOS.addFavoriteUser, {
const result = callNativeApp(NATIVE_KEY_IOS.addFavoriteUser, {
shopMemberId: shopMemberId,
});
if (result == "true") {
return true;
} else {
return false;
}
return parseBoolStringToBool(result);
} else {
return android.addFavoriteUser(shopMemberId);
}
......@@ -391,8 +383,6 @@ NativeBridgeDataSource.getJoinCollaborationType = function () {
}
};
NativeBridgeDataSource.getUserInfoList = function (shopMemberId) {
if (deviceInfo.isiOS()) {
return callNativeApp(NATIVE_KEY_IOS.getUserInfoList, {
......@@ -425,4 +415,4 @@ NativeBridgeDataSource.getHostRequestFlg = function () {
} else {
return android.getHostRequestFlg();
}
};
};
\ No newline at end of file
......@@ -270,7 +270,7 @@ NativeBridgeDelegate.updateMessages = function (roomID) {
NativeBridgeDelegate.saveVisitRoomInfo = function (roomID = "", roomName = "") {
if (deviceInfo.isiOS()) {
webkit.messageHandlers.roomInfosaveMessageHandlerId.postMessage({
webkit.messageHandlers.roomInfoSaveMessageHandlerId.postMessage({
roomId: roomID,
roomName: roomName,
});
......
......@@ -22,7 +22,7 @@
<button type="button" class="border-0 bg_navy"
onclick="CollaborationUI.removeFavoriteUserInCollaboration({{shopMemberId}})" id="favoriteButton">
<div class="d-flex flex-column">
<span class="star active shopmember_890" onclick="CHAT_UI.favoriteUserChange(890,this)"></span>
<span class="star active shopmember_{{shopMemberId}}" onclick="CHAT_UI.favoriteUserChange('{{shopMemberId}}',this)"></span>
<span>お気に入り解除</span>
</div>
</button>
......@@ -31,7 +31,7 @@
<button type="button" class="border-0 bg_navy"
onclick="CollaborationUI.insertFavoriteUserInCollaboration({{shopMemberId}})" id="favoriteButton">
<div class="d-flex flex-column">
<span class="star disable shopmember_3690" onclick="Namecard.favoriteUserChange(3690,this)"></span>
<span class="star disable shopmember_{{shopMemberId}}" onclick="Namecard.favoriteUserChange('{{shopMemberId}}',this)"></span>
<span>お気に入り登録</span>
</div>
</button>
......
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