Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
A
abook_check
  • Overview
    • Overview
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 0
    • Issues 0
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 0
    • Merge Requests 0
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • abook_android
  • abook_check
  • Merge Requests
  • !87

Merged
Opened Jan 25, 2021 by Lee Munkyeong@lee-mk 3 of 4 tasks completed3/4 tasks
  • Report abuse
Report abuse

Features/1.2.360 develop abcomm 265 offline対応

  • Kim peace
  • Kang donghun
  • Lee daehyun
  • Jung kwangkyu
Edited Feb 04, 2021 by Jung Kwangkyu
  • Discussion 56
  • Commits 14
  • Changes 60
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Lee Daehyun
    @lee-dh started a discussion on an old version of the diff Jan 25, 2021
    Resolved by Lee Munkyeong Jan 26, 2021
    ABVJE_BL/src/jp/agentec/abook/abv/bl/data/tables/TArchive.java 0 → 100644
    1 package jp.agentec.abook.abv.bl.data.tables;
    2
    3 import java.util.ArrayList;
    4 import java.util.List;
    5
    6 import jp.agentec.abook.abv.bl.common.db.SQLiteDatabase;
    7
    8 public class TArchive extends SQLiteTableScript {
    9
    10 public TArchive(){
    • Lee Daehyun @lee-dh commented Jan 25, 2021
      Developer

      {のスペース合わしてください

      Edited Jan 26, 2021
      `{`のスペース合わしてください
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Jan 26, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/87/diffs?diff_id=4912&start_sha=8c77c52553bcbed2d1f29fb30c9fd2fe91a47bea#abe23e67634c79be734451938aa3c355acb8ce87_10_10)
      Toggle commit list
    Please register or sign in to reply
  • Lee Daehyun
    @lee-dh started a discussion on an old version of the diff Jan 25, 2021
    Resolved by Lee Munkyeong Jan 26, 2021
    ABVJE_BL/src/jp/agentec/abook/abv/bl/data/tables/TChatMessage.java 0 → 100644
    1 package jp.agentec.abook.abv.bl.data.tables;
    2
    3 import java.util.ArrayList;
    4 import java.util.List;
    5
    6 import jp.agentec.abook.abv.bl.common.db.SQLiteDatabase;
    7
    8 public class TChatMessage extends SQLiteTableScript {
    9
    10 public TChatMessage(){
    • Lee Daehyun @lee-dh commented Jan 25, 2021
      Developer

      {のスペース合わしてください

      Edited Jan 26, 2021
      `{`のスペース合わしてください
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Jan 26, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/87/diffs?diff_id=4912&start_sha=8c77c52553bcbed2d1f29fb30c9fd2fe91a47bea#58f8bb1471025f1155868c41fa47ce89ea362293_10_10)
      Toggle commit list
    Please register or sign in to reply
  • Lee Daehyun
    @lee-dh started a discussion on an old version of the diff Jan 25, 2021
    Resolved by Lee Munkyeong Jan 26, 2021
    ABVJE_BL/src/jp/agentec/abook/abv/bl/data/tables/TCollaboration.java 0 → 100644
    1 package jp.agentec.abook.abv.bl.data.tables;
    2
    3 import java.util.ArrayList;
    4 import java.util.List;
    5
    6 import jp.agentec.abook.abv.bl.common.db.SQLiteDatabase;
    7
    8 public class TCollaboration extends SQLiteTableScript {
    9
    10 public TCollaboration(){
    • Lee Daehyun @lee-dh commented Jan 25, 2021
      Developer

      {のスペース合わしてください

      Edited Jan 26, 2021
      `{`のスペース合わしてください
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Jan 26, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/87/diffs?diff_id=4912&start_sha=8c77c52553bcbed2d1f29fb30c9fd2fe91a47bea#82eedb53638a0b514d6a444a639de8fecb21111c_10_10)
      Toggle commit list
    Please register or sign in to reply
  • Lee Daehyun
    @lee-dh started a discussion on an old version of the diff Jan 25, 2021
    Resolved by Lee Munkyeong Jan 26, 2021
    ABVJE_BL/src/jp/agentec/abook/abv/bl/data/tables/TCollaborationDetail.java 0 → 100644
    1 package jp.agentec.abook.abv.bl.data.tables;
    2
    3 import java.util.ArrayList;
    4 import java.util.List;
    5
    6 import jp.agentec.abook.abv.bl.common.db.SQLiteDatabase;
    7
    8 public class TCollaborationDetail extends SQLiteTableScript {
    9
    10 public TCollaborationDetail(){
    • Lee Daehyun @lee-dh commented Jan 25, 2021
      Developer

      {のスペース合わしてください

      Edited Jan 26, 2021
      `{`のスペース合わしてください
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Jan 26, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/87/diffs?diff_id=4912&start_sha=8c77c52553bcbed2d1f29fb30c9fd2fe91a47bea#87134b4e53ffe60f903c4db5c7cd2a1e73c27cc9_10_10)
      Toggle commit list
    Please register or sign in to reply
  • Lee Daehyun
    @lee-dh started a discussion on an old version of the diff Jan 25, 2021
    Resolved by Lee Munkyeong Jan 26, 2021
    ABVJE_BL/src/jp/agentec/abook/abv/bl/data/tables/TChatRoom.java 0 → 100644
    1 package jp.agentec.abook.abv.bl.data.tables;
    2
    3 import java.util.ArrayList;
    4 import java.util.List;
    5
    6 import jp.agentec.abook.abv.bl.common.db.SQLiteDatabase;
    7
    8 public class TChatRoom extends SQLiteTableScript {
    9
    10 public TChatRoom(){
    • Lee Daehyun @lee-dh commented Jan 25, 2021
      Developer

      {のスペース合わしてください

      Edited Jan 26, 2021
      `{`のスペース合わしてください
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Jan 26, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/87/diffs?diff_id=4912&start_sha=8c77c52553bcbed2d1f29fb30c9fd2fe91a47bea#b7d56aeea87d1a753835041ba0f5d823c2fa642c_10_10)
      Toggle commit list
    Please register or sign in to reply
  • Lee Daehyun
    @lee-dh started a discussion on an old version of the diff Jan 25, 2021
    Resolved by Lee Munkyeong Jan 26, 2021
    ABVJE_BL/src/jp/agentec/abook/abv/bl/data/tables/MShopMember.java 0 → 100644
    1 package jp.agentec.abook.abv.bl.data.tables;
    2
    3 import java.util.ArrayList;
    4 import java.util.List;
    5
    6 import jp.agentec.abook.abv.bl.common.db.SQLiteDatabase;
    7
    8 public class MShopMember extends SQLiteTableScript {
    9
    10 public MShopMember(){
    • Lee Daehyun @lee-dh commented Jan 25, 2021
      Developer

      {のスペース合わしてください

      Edited Jan 26, 2021
      `{`のスペース合わしてください
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Jan 26, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/87/diffs?diff_id=4912&start_sha=8c77c52553bcbed2d1f29fb30c9fd2fe91a47bea#063f2a8f91ef130e85b0bdea84bc9ee8d8e14222_10_10)
      Toggle commit list
    Please register or sign in to reply
  • Lee Daehyun
    @lee-dh started a discussion on an old version of the diff Jan 25, 2021
    Resolved by Lee Munkyeong Jan 26, 2021
    ABVJE_BL/src/jp/agentec/abook/abv/bl/data/tables/MShopMember.java 0 → 100644
    1 package jp.agentec.abook.abv.bl.data.tables;
    2
    3 import java.util.ArrayList;
    4 import java.util.List;
    5
    6 import jp.agentec.abook.abv.bl.common.db.SQLiteDatabase;
    7
    8 public class MShopMember extends SQLiteTableScript {
    9
    10 public MShopMember(){
    • Lee Daehyun @lee-dh commented Jan 25, 2021
      Developer

      {のスペース合わしてください

      Edited Jan 26, 2021
      `{`のスペース合わしてください
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Jan 26, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/87/diffs?diff_id=4912&start_sha=8c77c52553bcbed2d1f29fb30c9fd2fe91a47bea#063f2a8f91ef130e85b0bdea84bc9ee8d8e14222_10_10)
      Toggle commit list
    Please register or sign in to reply
  • Lee Daehyun
    @lee-dh started a discussion on an old version of the diff Jan 25, 2021
    Resolved by Lee Munkyeong Jan 26, 2021
    ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/CommunicationLogic.java 0 → 100644
    57 * context Androidとの互換性の為のプロパティです。Androidの android.content.Context のインスタンスを指定します。<br>
    58 * UIがAndroidでない場合、何かのオブジェクトを指定しても、nullと見なします。
    59 * @see AbstractLogic
    60 * @since 1.2.3.6
    61 */
    62 /*package*/ CommunicationLogic() {
    63 }
    64
    65 public String getChatRoomList() {
    66
    67 List<ChatRoomDto> chatRoomList = chatRoomDao.getAllChatRoom();
    68
    69 JSONArray resultJsonArray = new JSONArray();
    70 for (ChatRoomDto chatRoomDto : chatRoomList) {
    71 Map<String, Object> chatRoomMap = new HashMap<String, Object>();
    72 chatRoomMap.put("chatRoomId",chatRoomDto.chatRoomId);
    • Lee Daehyun @lee-dh commented Jan 25, 2021
      Developer

      ,スペース合わしてください

      Edited Jan 26, 2021
      `,`スペース合わしてください
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Jan 26, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/87/diffs?diff_id=4912&start_sha=8c77c52553bcbed2d1f29fb30c9fd2fe91a47bea#9dade916e7e6e24d1df91b7df12a428931b7a74c_72_72)
      Toggle commit list
    Please register or sign in to reply
  • Lee Daehyun
    @lee-dh started a discussion on an old version of the diff Jan 25, 2021
    Resolved by Lee Munkyeong Jan 26, 2021
    ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/CommunicationLogic.java 0 → 100644
    66
    67 List<ChatRoomDto> chatRoomList = chatRoomDao.getAllChatRoom();
    68
    69 JSONArray resultJsonArray = new JSONArray();
    70 for (ChatRoomDto chatRoomDto : chatRoomList) {
    71 Map<String, Object> chatRoomMap = new HashMap<String, Object>();
    72 chatRoomMap.put("chatRoomId",chatRoomDto.chatRoomId);
    73 chatRoomMap.put("chatRoomName",chatRoomDto.chatRoomName);
    74 chatRoomMap.put("type",chatRoomDto.type);
    75 chatRoomMap.put("favoriteRegisterDate",chatRoomDto.favoriteRegisterDate);
    76 chatRoomMap.put("unreadCount",chatRoomDto.unreadCount);
    77 chatRoomMap.put("message",chatRoomDto.message);
    78 chatRoomMap.put("messageType",chatRoomDto.messageType);
    79 chatRoomMap.put("insertDate",chatRoomDto.insertDate);
    80 chatRoomMap.put("userCount",chatRoomDto.userCount);
    81 JSONObject jsonObject =new JSONObject(chatRoomMap);
    • Lee Daehyun @lee-dh commented Jan 25, 2021
      Developer

      =スペース合わしてください

      Edited Jan 26, 2021
      `=`スペース合わしてください
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Jan 26, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/87/diffs?diff_id=4912&start_sha=8c77c52553bcbed2d1f29fb30c9fd2fe91a47bea#9dade916e7e6e24d1df91b7df12a428931b7a74c_81_72)
      Toggle commit list
    Please register or sign in to reply
  • Lee Daehyun
    @lee-dh started a discussion on an old version of the diff Jan 25, 2021
    Resolved by Lee Munkyeong Jan 26, 2021
    ABVJE_BL/src/jp/agentec/adf/util/DateTimeUtil.java
    584 584
    585 585 return calendar1.before(calendar2);
    586 586 }
    587
    588
    589 public static String millToDateString(long mills) {
    590 SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
    • Lee Daehyun @lee-dh commented Jan 25, 2021
      Developer

      変数名を明確にしてください

      Edited Jan 26, 2021
      変数名を明確にしてください
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Jan 26, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/87/diffs?diff_id=4912&start_sha=8c77c52553bcbed2d1f29fb30c9fd2fe91a47bea#7bcd27b1d62a30d4c032338775efaff518b2d7fd_590_590)
      Toggle commit list
    Please register or sign in to reply
  • Lee Daehyun
    @lee-dh started a discussion on the diff Jan 25, 2021
    Resolved by Lee Munkyeong Jan 26, 2021
    ABVJE_Launcher_Android/assets/chat/public/js/chat-ui.js
    489 jQuery('.titleRoomName').show();
    490 jQuery('.roomListIcon, .chatRoomIcon, #userSelectionConfirmBtn, #newRoomName, #userSelectionDeleteBtn').hide();
    491 jQuery('#backButton').hide();
    444 $('.titleRoomName').show();
    445 $('.roomListIcon, .chatRoomIcon, #userSelectionConfirmBtn, #newRoomName, #userSelectionDeleteBtn').hide();
    446 $('#backButton').hide();
    492 447 break;
    493 448 }
    494 449 });
    495 450
    496 451 // Tab Close/Hidden Event
    497 jQuery('a[data-toggle="pill"]').on('hide.bs.tab', function (e){
    498 var target = jQuery(e.target).attr("href"); // e.target : activated tab
    452 $('a[data-toggle="pill"]').on('hide.bs.tab', function (e){
    453 var target = $(e.target).attr("href"); // e.target : activated tab
    499 454 switch(target) {
    • Lee Daehyun @lee-dh commented Jan 25, 2021
      Developer

      (のスペース合わしてください

      Edited Jan 26, 2021
      `(`のスペース合わしてください
    Please register or sign in to reply
  • Lee Daehyun
    @lee-dh started a discussion on an old version of the diff Jan 25, 2021
    Resolved by Lee Munkyeong Jan 26, 2021
    ABVJE_Launcher_Android/assets/chat/public/js/chat-websocket.js
    159 // Rotate
    160 if(CHAT_UI.isLandscapeMode()) {
    161 $(".chat_list").removeClass("col-12").addClass("col-6");
    162 }
    163
    164 $("#userSelectionDeleteBtn").hide();
    165 // チャットルームリスト画面に遷移
    166 $('#pills-chatlist-tab').tab('show');
    167
    168 // loadingIndicatorを表示しない
    169 CHAT_UI.dismissLoadingIndicator();
    170 });*/
    171
    172 // New Message
    173 // #36170
    174 socket.on('newMessage', function (message, roomId, roomName){
    • Lee Daehyun @lee-dh commented Jan 25, 2021
      Developer

      funcionと(のスペース合わしてください

      Edited Jan 26, 2021
      funcionと`(`のスペース合わしてください
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Jan 26, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/87/diffs?diff_id=4912&start_sha=8c77c52553bcbed2d1f29fb30c9fd2fe91a47bea#74f3840f68202794d2f55db87d7db0052c7f055d_174_174)
      Toggle commit list
    Please register or sign in to reply
  • Lee Daehyun
    @lee-dh started a discussion on an old version of the diff Jan 25, 2021
    Resolved by Lee Munkyeong Jan 26, 2021
    ABVJE_Launcher_Android/assets/chat/public/js/chat-websocket.js
    212 // 新しいメッセージを受信する場合の処理
    213 // #36170
    214 socket.on('loadMessages', function(messages, shopMemberId, users, roomId, roomName){
    215 let jQueryMessages = $('#messages');
    216 // スクロールの変化を防ぐため以前画面の高さを保存する
    217 let beforeHeight = jQueryMessages.prop('scrollHeight');
    218 // メッセージ文字列の生成
    219 let workVal = "";
    220 messages.forEach(function(message) {
    221 let template = $('#message-template').html();
    222 if (message.shopMemberId == shopMemberId) {
    223 template = $('#message-template-me').html();
    224 }
    225 let messageTime = CHAT_UTIL.formatDate(message.time.time);
    226
    227 if(users != undefined) {
    • Lee Daehyun @lee-dh commented Jan 25, 2021
      Developer

      ifのスペース合わしてください

      Edited Jan 26, 2021
      ifのスペース合わしてください
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Jan 26, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/87/diffs?diff_id=4912&start_sha=8c77c52553bcbed2d1f29fb30c9fd2fe91a47bea#74f3840f68202794d2f55db87d7db0052c7f055d_227_227)
      Toggle commit list
    Please register or sign in to reply
  • Lee Daehyun
    @lee-dh started a discussion on an old version of the diff Jan 25, 2021
    Resolved by Lee Munkyeong Jan 26, 2021
    ABVJE_Launcher_Android/assets/chat/public/js/chat-websocket.js
    216 // スクロールの変化を防ぐため以前画面の高さを保存する
    217 let beforeHeight = jQueryMessages.prop('scrollHeight');
    218 // メッセージ文字列の生成
    219 let workVal = "";
    220 messages.forEach(function(message) {
    221 let template = $('#message-template').html();
    222 if (message.shopMemberId == shopMemberId) {
    223 template = $('#message-template-me').html();
    224 }
    225 let messageTime = CHAT_UTIL.formatDate(message.time.time);
    226
    227 if(users != undefined) {
    228 let user = users.find((user) => user.loginId == message.loginId)
    229
    230 // userProfilePathが使えるpathかをcheckして使えないpathの場合、default画像の経路に変更
    231 if(user) {
    • Lee Daehyun @lee-dh commented Jan 25, 2021
      Developer

      ifのスペース合わしてください

      Edited Jan 26, 2021
      ifのスペース合わしてください
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Jan 26, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/87/diffs?diff_id=4912&start_sha=8c77c52553bcbed2d1f29fb30c9fd2fe91a47bea#74f3840f68202794d2f55db87d7db0052c7f055d_231_231)
      Toggle commit list
    Please register or sign in to reply
  • Lee Daehyun
    @lee-dh started a discussion on an old version of the diff Jan 25, 2021
    Resolved by Lee Munkyeong Jan 26, 2021
    ABVJE_Launcher_Android/assets/chat/public/js/chat-websocket.js
    295
    296 const ul = $('<ul/>', {class: 'list-unstyled components'});
    297 // ユーザーリストを入れる前にユーザー招待ボタンを入れてくれる。
    298 let inviteString = getLocalizedString("inviteUsersButton")
    299
    300 ul.append($('<li/>').append(`<a>${inviteString} <i class='fa fa-user-plus'><i/></a>`).on('click', function(event){
    301 $('#dismiss').click();
    302 // loadingIndicatorを表示
    303 CHAT_UI.showLoadingIndicator();
    304 let isInvite = true;
    305 CHAT.globalIsInvite = isInvite;
    306 socket.emit('getGroupList', isInvite);
    307 }));
    308
    309 // ユーザーリストを入れる
    310 users.forEach(function (user){
    • Lee Daehyun @lee-dh commented Jan 25, 2021
      Developer

      fucntionのスペース合わしてください

      Edited Jan 26, 2021
      fucntionのスペース合わしてください
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Jan 26, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/87/diffs?diff_id=4912&start_sha=8c77c52553bcbed2d1f29fb30c9fd2fe91a47bea#74f3840f68202794d2f55db87d7db0052c7f055d_310_310)
      Toggle commit list
    Please register or sign in to reply
  • Lee Daehyun
    @lee-dh started a discussion on an old version of the diff Jan 25, 2021
    Resolved by Lee Munkyeong Jan 26, 2021
    ABVJE_Launcher_Android/assets/chat/public/js/chat-websocket.js
    316 }
    317 li.append(a);
    318 ul.append(li);
    319 });
    320 $('#users').html(ul);
    321 });
    322
    323 // Update Group List(Invite)
    324 socket.on('refreshGroupList', function(groups, isInvite){
    325 $('#group_list').html('');
    326 const template = $('#group-template').html();
    327 if (groups.length === 0) {
    328 $('#group_list').append('<center class="text-secondary">'+ getLocalizedString(everyoneIsHere) +'</center>');
    329 }
    330 // グループ名と人数を表記する。
    331 groups.forEach( function(group) {
    • Lee Daehyun @lee-dh commented Jan 25, 2021
      Developer

      (のスペース合わしてください

      Edited Jan 26, 2021
      `(`のスペース合わしてください
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Jan 26, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/87/diffs?diff_id=4912&start_sha=8c77c52553bcbed2d1f29fb30c9fd2fe91a47bea#74f3840f68202794d2f55db87d7db0052c7f055d_331_331)
      Toggle commit list
    Please register or sign in to reply
  • Lee Daehyun
    @lee-dh started a discussion on an old version of the diff Jan 25, 2021
    Resolved by Lee Munkyeong Jan 26, 2021
    ABVJE_Launcher_Android/assets/chat/public/js/chat-websocket.js
    332 let html = Mustache.render(template, {
    333 name: group.groupName,
    334 info: group.memberCnt + getLocalizedString("people")
    335 });
    336 // グループをクリックすると、該当グループのユーザーリストを読み込むようにイベントを与える
    337 let obj = $(jQuery.parseHTML(html)).on('click',function(){
    338 // loadingIndicatorを表示
    339 CHAT_UI.showLoadingIndicator();
    340 socket.emit('getUserListInGroup', group.groupId, isInvite);
    341 $('#groupName').text(group.groupName);
    342 });
    343 $('#group_list').append(obj);
    344 });
    345
    346 // Rotate
    347 if(CHAT_UI.isLandscapeMode()) {
    • Lee Daehyun @lee-dh commented Jan 25, 2021
      Developer

      ifのスペース合わしてください

      Edited Jan 26, 2021
      ifのスペース合わしてください
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Jan 26, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/87/diffs?diff_id=4912&start_sha=8c77c52553bcbed2d1f29fb30c9fd2fe91a47bea#74f3840f68202794d2f55db87d7db0052c7f055d_347_347)
      Toggle commit list
    Please register or sign in to reply
  • Lee Daehyun
    @lee-dh started a discussion on an old version of the diff Jan 25, 2021
    Resolved by Lee Munkyeong Jan 26, 2021
    ABVJE_Launcher_Android/assets/chat/public/js/chat-websocket.js
    322
    323 // Update Group List(Invite)
    324 socket.on('refreshGroupList', function(groups, isInvite){
    325 $('#group_list').html('');
    326 const template = $('#group-template').html();
    327 if (groups.length === 0) {
    328 $('#group_list').append('<center class="text-secondary">'+ getLocalizedString(everyoneIsHere) +'</center>');
    329 }
    330 // グループ名と人数を表記する。
    331 groups.forEach( function(group) {
    332 let html = Mustache.render(template, {
    333 name: group.groupName,
    334 info: group.memberCnt + getLocalizedString("people")
    335 });
    336 // グループをクリックすると、該当グループのユーザーリストを読み込むようにイベントを与える
    337 let obj = $(jQuery.parseHTML(html)).on('click',function(){
    • Lee Daehyun @lee-dh commented Jan 25, 2021
      Developer

      ,のスペース合わしてください

      Edited Jan 26, 2021
      `,`のスペース合わしてください
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Jan 26, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/87/diffs?diff_id=4912&start_sha=8c77c52553bcbed2d1f29fb30c9fd2fe91a47bea#74f3840f68202794d2f55db87d7db0052c7f055d_337_337)
      Toggle commit list
    Please register or sign in to reply
  • Lee Daehyun
    @lee-dh started a discussion on the diff Jan 25, 2021
    Resolved by Lee Munkyeong Jan 26, 2021
    ABVJE_Launcher_Android/assets/chat/public/js/chat-websocket.js
    386 socket.emit('getRoomList');
    387 }
    388 });
    389 });
    390
    391 // Update User List(Invite)
    392 // #36170
    393 socket.on('refreshUserListInGroup', function(users, groupId, isInvite){
    394 $('#user_list').html('');
    395 const template = $('#user-template').html();
    396
    397 // Set Title
    398 let memberSelectTitle = getLocalizedString("userSearch")
    399 $('.titleRoomName').text(memberSelectTitle);
    400
    401 users.forEach( function(user) {
    • Lee Daehyun @lee-dh commented Jan 25, 2021
      Developer

      (のスペース合わしてください

      Edited Jan 26, 2021
      `(`のスペース合わしてください
    Please register or sign in to reply
  • Lee Daehyun
    @lee-dh started a discussion on an old version of the diff Jan 25, 2021
    Resolved by Lee Munkyeong Jan 26, 2021
    ABVJE_Launcher_Android/assets/chat/public/js/chat-websocket.js
    431 });
    432
    433 let findObj = CHAT.globalSelectedUserList.find(function(selectedUser) {
    434 return selectedUser.loginId == user.loginId;
    435 })
    436
    437 if (findObj) {
    438 $(obj).find('.userCheckBox').toggleClass('active');
    439 }
    440
    441 $('#user_list').append(obj);
    442 })
    443 $('.userCheckBox').show();
    444
    445 // Rotate
    446 if(CHAT_UI.isLandscapeMode()) {
    • Lee Daehyun @lee-dh commented Jan 25, 2021
      Developer

      ifのスペース合わしてください

      Edited Jan 26, 2021
      ifのスペース合わしてください
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Jan 26, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/87/diffs?diff_id=4912&start_sha=8c77c52553bcbed2d1f29fb30c9fd2fe91a47bea#74f3840f68202794d2f55db87d7db0052c7f055d_446_446)
      Toggle commit list
    Please register or sign in to reply
  • Lee Daehyun
    @lee-dh started a discussion on an old version of the diff Jan 25, 2021
    Resolved by Lee Munkyeong Jan 26, 2021
    ABVJE_Launcher_Android/assets/chat/public/js/chat-websocket.js
    463 $('#backButton').show();
    464 $('.roomListIcon, .chatRoomIcon').hide();
    465 $('#userSelectionConfirmBtn').show();
    466 $('.userCheckBox').show();
    467 $('#pills-user-tab').tab('show');
    468 });
    469
    470 /* ---------------------------------------------------------------------- */
    471 /* Show Error Log */
    472 /* ---------------------------------------------------------------------- */
    473
    474 socket.on('showServerError', function (message){
    475 // #36174
    476
    477 // #36215
    478 if(message.includes("SC_FORBIDDEN"))
    • Lee Daehyun @lee-dh commented Jan 25, 2021
      Developer

      ifのスペース合わしてください

      Edited Jan 26, 2021
      ifのスペース合わしてください
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Jan 26, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/87/diffs?diff_id=4912&start_sha=8c77c52553bcbed2d1f29fb30c9fd2fe91a47bea#74f3840f68202794d2f55db87d7db0052c7f055d_478_478)
      Toggle commit list
    Please register or sign in to reply
  • Lee Daehyun
    @lee-dh started a discussion on the diff Jan 25, 2021
    Resolved by Lee Munkyeong Jan 26, 2021
    ABVJE_Launcher_Android/assets/chat/public/js/chat-websocket.js
    459 CHAT_UI.showLoadingIndicator();
    460 CHAT_UI.setConfirmButtonEvent(isInvite);
    461 });
    462
    463 $('#backButton').show();
    464 $('.roomListIcon, .chatRoomIcon').hide();
    465 $('#userSelectionConfirmBtn').show();
    466 $('.userCheckBox').show();
    467 $('#pills-user-tab').tab('show');
    468 });
    469
    470 /* ---------------------------------------------------------------------- */
    471 /* Show Error Log */
    472 /* ---------------------------------------------------------------------- */
    473
    474 socket.on('showServerError', function (message){
    • Lee Daehyun @lee-dh commented Jan 25, 2021
      Developer

      function(のスペース合わしてください

      Edited Jan 26, 2021
      function`(`のスペース合わしてください
    Please register or sign in to reply
  • Lee Daehyun
    @lee-dh started a discussion on an old version of the diff Jan 25, 2021
    Resolved by Lee Munkyeong Jan 26, 2021
    ABVJE_Launcher_Android/assets/chat/public/js/chat-websocket.js
    485 message = getLocalizedString("serverErrorOccured");
    486 } else if (message == 'Room not found') {
    487 message = getLocalizedString("errorRoomNotFound");
    488 }
    489 $("#customAlertTitle").text(message);
    490 $("#customAlertOk").text(getLocalizedString("yesTitle"));
    491
    492 $('#customAlert').appendTo("body").modal({
    493 backdrop: 'static',
    494 keyboard: false
    495 })
    496 .on('click', '#customAlertOk', function(e) {
    497 });
    498 CHAT_UI.dismissLoadingIndicator();
    499
    500 if(message == "Room not found"){
    • Lee Daehyun @lee-dh commented Jan 25, 2021
      Developer

      ifのスペース合わしてください

      Edited Jan 26, 2021
      ifのスペース合わしてください
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Jan 26, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/87/diffs?diff_id=4912&start_sha=8c77c52553bcbed2d1f29fb30c9fd2fe91a47bea#74f3840f68202794d2f55db87d7db0052c7f055d_500_500)
      Toggle commit list
    Please register or sign in to reply
  • Lee Daehyun
    @lee-dh started a discussion on an old version of the diff Jan 25, 2021
    Resolved by Lee Munkyeong Jan 26, 2021
    ABVJE_Launcher_Android/assets/chat/public/js/chat-websocket.js
    504
    505 // server's request : user info (retry join)
    506 socket.on("retryJoinProcess", () => {
    507 var ua = window.navigator.userAgent.toLowerCase();
    508 //if((ua.indexOf('iphone') > 0 || ua.indexOf('ipad') > 0) && ua.indexOf("safari") == -1) {
    509 if (CHAT_UTIL.isIOS()) {
    510 // iosでの場合
    511 webkit.messageHandlers.loginInfoRequestMessageHandlerId.postMessage({});
    512 // } else if(ua.indexOf('android') > 0 && ua.indexOf('linux') == -1){
    513 } else if (CHAT_UTIL.isAndroid()) {
    514 // androidでの場合
    515 android.getLoginParameter();
    516 } else {
    517 CHAT_UI.htmlElementTextInitialize("ko")
    518 // webでのsocket connect
    519 socket.emit('join', params, function (err) {
    • Lee Daehyun @lee-dh commented Jan 25, 2021
      Developer

      function(のスペース合わしてください

      Edited Jan 26, 2021
      function`(`のスペース合わしてください
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Jan 26, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/87/diffs?diff_id=4912&start_sha=8c77c52553bcbed2d1f29fb30c9fd2fe91a47bea#74f3840f68202794d2f55db87d7db0052c7f055d_519_519)
      Toggle commit list
    Please register or sign in to reply
  • Lee Daehyun
    @lee-dh started a discussion on an old version of the diff Jan 25, 2021
    Resolved by Lee Munkyeong Jan 26, 2021
    ABVJE_Launcher_Android/assets/chat/public/js/chat.js
    231 231 CHAT_UI.htmlElementTextInitialize(languageCode)
    232 232
    233 socket.emit('join', loginParam, function (err) {
    234 if (err) {
    235 // #36174
    236 $("#customAlertTitle").text(err);
    237 $("#customAlertOk").text(getLocalizedString("yesTitle"));
    238
    239 $('#customAlert').appendTo("body").modal({
    240 backdrop: 'static',
    241 keyboard: false
    242 })
    243 .on('click', '#customAlertOk', function(e) {
    244 });
    233 if (IS_ONLINE == 'true') {
    234 socket.emit('join', loginParam, function (err) {
    • Lee Daehyun @lee-dh commented Jan 25, 2021
      Developer

      functionのスペース合わしてください

      Edited Jan 26, 2021
      functionのスペース合わしてください
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Jan 26, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/87/diffs?diff_id=4912&start_sha=8c77c52553bcbed2d1f29fb30c9fd2fe91a47bea#81b5df31870ae33caa0b56fc1b089707b2acc561_234_234)
      Toggle commit list
    Please register or sign in to reply
  • Lee Daehyun
    @lee-dh started a discussion on the diff Jan 25, 2021
    Resolved by Lee Munkyeong Jan 26, 2021
    ABVJE_Launcher_Android/assets/chat/public/js/chat.js
    241 keyboard: false
    242 })
    243 .on('click', '#customAlertOk', function(e) {
    244 });
    233 if (IS_ONLINE == 'true') {
    234 socket.emit('join', loginParam, function (err) {
    235 if (err) {
    236 // #36174
    237 $("#customAlertTitle").text(err);
    238 $("#customAlertOk").text(getLocalizedString("yesTitle"));
    239
    240 $('#customAlert').appendTo("body").modal({
    241 backdrop: 'static',
    242 keyboard: false
    243 })
    244 .on('click', '#customAlertOk', function(e) {
    • Lee Daehyun @lee-dh commented Jan 25, 2021
      Developer

      functionのスペース合わしてください

      Edited Jan 26, 2021
      functionのスペース合わしてください
    Please register or sign in to reply
  • Lee Daehyun
    @lee-dh started a discussion on an old version of the diff Jan 25, 2021
    Resolved by Lee Munkyeong Jan 26, 2021
    ABVJE_Launcher_Android/assets/chat/public/socket.io/lib/socket.js 0 → 100644
    383 }
    384 this.subs = null;
    385 }
    386
    387 this.io.destroy(this);
    388 };
    389
    390 /**
    391 * Disconnects the socket manually.
    392 *
    393 * @return {Socket} self
    394 * @api public
    395 */
    396
    397 Socket.prototype.close =
    398 Socket.prototype.disconnect = function () {
    • Lee Daehyun @lee-dh commented Jan 25, 2021
      Developer

      functionのスペース合わしてください

      Edited Jan 26, 2021
      functionのスペース合わしてください
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Jan 26, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/87/diffs?diff_id=4912&start_sha=8c77c52553bcbed2d1f29fb30c9fd2fe91a47bea#9a52440d2f5e8253ef92a9e2d805e2a5e41cf525_398_398)
      Toggle commit list
    Please register or sign in to reply
  • Lee Daehyun
    @lee-dh started a discussion on an old version of the diff Jan 25, 2021
    Resolved by Lee Munkyeong Jan 26, 2021
    ABVJE_Launcher_Android/assets/chat/public/socket.io/lib/socket.js 0 → 100644
    363
    364 Socket.prototype.ondisconnect = function () {
    365 debug('server disconnect (%s)', this.nsp);
    366 this.destroy();
    367 this.onclose('io server disconnect');
    368 };
    369
    370 /**
    371 * Called upon forced client/server side disconnections,
    372 * this method ensures the manager stops tracking us and
    373 * that reconnections don't get triggered for this.
    374 *
    375 * @api private.
    376 */
    377
    378 Socket.prototype.destroy = function () {
    • Lee Daehyun @lee-dh commented Jan 25, 2021
      Developer

      functionのスペース合わしてください

      Edited Jan 26, 2021
      functionのスペース合わしてください
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Jan 26, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/87/diffs?diff_id=4912&start_sha=8c77c52553bcbed2d1f29fb30c9fd2fe91a47bea#9a52440d2f5e8253ef92a9e2d805e2a5e41cf525_378_378)
      Toggle commit list
    Please register or sign in to reply
  • Lee Daehyun
    @lee-dh started a discussion on an old version of the diff Jan 25, 2021
    Resolved by Lee Munkyeong Jan 26, 2021
    ABVJE_Launcher_Android/assets/chat/public/socket.io/lib/socket.js 0 → 100644
    349 }
    350 this.receiveBuffer = [];
    351
    352 for (i = 0; i < this.sendBuffer.length; i++) {
    353 this.packet(this.sendBuffer[i]);
    354 }
    355 this.sendBuffer = [];
    356 };
    357
    358 /**
    359 * Called upon server disconnect.
    360 *
    361 * @api private
    362 */
    363
    364 Socket.prototype.ondisconnect = function () {
    • Lee Daehyun @lee-dh commented Jan 25, 2021
      Developer

      functionのスペース合わしてください

      Edited Jan 26, 2021
      functionのスペース合わしてください
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Jan 26, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/87/diffs?diff_id=4912&start_sha=8c77c52553bcbed2d1f29fb30c9fd2fe91a47bea#9a52440d2f5e8253ef92a9e2d805e2a5e41cf525_364_364)
      Toggle commit list
    Please register or sign in to reply
  • Lee Daehyun
    @lee-dh started a discussion on an old version of the diff Jan 25, 2021
    Resolved by Lee Munkyeong Jan 26, 2021
    ABVJE_Launcher_Android/assets/chat/public/socket.io/lib/socket.js 0 → 100644
    330 */
    331
    332 Socket.prototype.onconnect = function () {
    333 this.connected = true;
    334 this.disconnected = false;
    335 this.emit('connect');
    336 this.emitBuffered();
    337 };
    338
    339 /**
    340 * Emit buffered events (received and emitted).
    341 *
    342 * @api private
    343 */
    344
    345 Socket.prototype.emitBuffered = function () {
    • Lee Daehyun @lee-dh commented Jan 25, 2021
      Developer

      functionのスペース合わしてください

      Edited Jan 26, 2021
      functionのスペース合わしてください
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Jan 26, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/87/diffs?diff_id=4912&start_sha=8c77c52553bcbed2d1f29fb30c9fd2fe91a47bea#9a52440d2f5e8253ef92a9e2d805e2a5e41cf525_345_345)
      Toggle commit list
    Please register or sign in to reply
  • Lee Daehyun
    @lee-dh started a discussion on an old version of the diff Jan 25, 2021
    Resolved by Lee Munkyeong Jan 26, 2021
    ABVJE_Launcher_Android/assets/chat/public/socket.io/lib/socket.js 0 → 100644
    317 if ('function' === typeof ack) {
    318 debug('calling ack %s with %j', packet.id, packet.data);
    319 ack.apply(this, packet.data);
    320 delete this.acks[packet.id];
    321 } else {
    322 debug('bad ack %s', packet.id);
    323 }
    324 };
    325
    326 /**
    327 * Called upon server connect.
    328 *
    329 * @api private
    330 */
    331
    332 Socket.prototype.onconnect = function () {
    • Lee Daehyun @lee-dh commented Jan 25, 2021
      Developer

      functionのスペース合わしてください

      Edited Jan 26, 2021
      functionのスペース合わしてください
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Jan 26, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/87/diffs?diff_id=4912&start_sha=8c77c52553bcbed2d1f29fb30c9fd2fe91a47bea#9a52440d2f5e8253ef92a9e2d805e2a5e41cf525_332_332)
      Toggle commit list
    Please register or sign in to reply
  • Lee Daehyun
    @lee-dh started a discussion on an old version of the diff Jan 25, 2021
    Resolved by Lee Munkyeong Jan 26, 2021
    ABVJE_Launcher_Android/assets/chat/public/socket.io/lib/socket.js 0 → 100644
    300 self.packet({
    301 type: hasBin(args) ? parser.BINARY_ACK : parser.ACK,
    302 id: id,
    303 data: args
    304 });
    305 };
    306 };
    307
    308 /**
    309 * Called upon a server acknowlegement.
    310 *
    311 * @param {Object} packet
    312 * @api private
    313 */
    314
    315 Socket.prototype.onack = function (packet) {
    • Lee Daehyun @lee-dh commented Jan 25, 2021
      Developer

      functionのスペース合わしてください

      Edited Jan 26, 2021
      functionのスペース合わしてください
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Jan 26, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/87/diffs?diff_id=4912&start_sha=8c77c52553bcbed2d1f29fb30c9fd2fe91a47bea#9a52440d2f5e8253ef92a9e2d805e2a5e41cf525_315_315)
      Toggle commit list
    Please register or sign in to reply
  • Lee Daehyun
    @lee-dh started a discussion on the diff Jan 25, 2021
    Resolved by Lee Munkyeong Jan 26, 2021
    ABVJE_Launcher_Android/assets/chat/public/socket.io/lib/socket.js 0 → 100644
    278 emit.apply(this, args);
    279 } else {
    280 this.receiveBuffer.push(args);
    281 }
    282 };
    283
    284 /**
    285 * Produces an ack callback to emit with an event.
    286 *
    287 * @api private
    288 */
    289
    290 Socket.prototype.ack = function (id) {
    291 var self = this;
    292 var sent = false;
    293 return function () {
    • Lee Daehyun @lee-dh commented Jan 25, 2021
      Developer

      functionのスペース合わしてください

      Edited Jan 26, 2021
      functionのスペース合わしてください
    Please register or sign in to reply
  • Lee Daehyun
    @lee-dh started a discussion on an old version of the diff Jan 25, 2021
    Resolved by Lee Munkyeong Jan 26, 2021
    ABVJE_Launcher_Android/assets/chat/public/socket.io/lib/socket.js 0 → 100644
    275 }
    276
    277 if (this.connected) {
    278 emit.apply(this, args);
    279 } else {
    280 this.receiveBuffer.push(args);
    281 }
    282 };
    283
    284 /**
    285 * Produces an ack callback to emit with an event.
    286 *
    287 * @api private
    288 */
    289
    290 Socket.prototype.ack = function (id) {
    • Lee Daehyun @lee-dh commented Jan 25, 2021
      Developer

      functionのスペース合わしてください

      Edited Jan 26, 2021
      functionのスペース合わしてください
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Jan 26, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/87/diffs?diff_id=4912&start_sha=8c77c52553bcbed2d1f29fb30c9fd2fe91a47bea#9a52440d2f5e8253ef92a9e2d805e2a5e41cf525_290_290)
      Toggle commit list
    Please register or sign in to reply
  • Lee Daehyun
    @lee-dh started a discussion on an old version of the diff Jan 25, 2021
    Resolved by Lee Munkyeong Jan 26, 2021
    ABVJE_Launcher_Android/assets/chat/public/socket.io/lib/socket.js 0 → 100644
    253 break;
    254
    255 case parser.ERROR:
    256 this.emit('error', packet.data);
    257 break;
    258 }
    259 };
    260
    261 /**
    262 * Called upon a server event.
    263 *
    264 * @param {Object} packet
    265 * @api private
    266 */
    267
    268 Socket.prototype.onevent = function (packet) {
    • Lee Daehyun @lee-dh commented Jan 25, 2021
      Developer

      functionのスペース合わしてください

      Edited Jan 26, 2021
      functionのスペース合わしてください
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Jan 26, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/87/diffs?diff_id=4912&start_sha=8c77c52553bcbed2d1f29fb30c9fd2fe91a47bea#9a52440d2f5e8253ef92a9e2d805e2a5e41cf525_268_268)
      Toggle commit list
    Please register or sign in to reply
  • Lee Daehyun
    @lee-dh started a discussion on an old version of the diff Jan 25, 2021
    Resolved by Lee Munkyeong Jan 26, 2021
    ABVJE_Launcher_Android/assets/chat/public/socket.io/lib/socket.js 0 → 100644
    209 Socket.prototype.onclose = function (reason) {
    210 debug('close (%s)', reason);
    211 this.connected = false;
    212 this.disconnected = true;
    213 delete this.id;
    214 this.emit('disconnect', reason);
    215 };
    216
    217 /**
    218 * Called with socket packet.
    219 *
    220 * @param {Object} packet
    221 * @api private
    222 */
    223
    224 Socket.prototype.onpacket = function (packet) {
    • Lee Daehyun @lee-dh commented Jan 25, 2021
      Developer

      functionのスペース合わしてください

      Edited Jan 26, 2021
      functionのスペース合わしてください
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Jan 26, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/87/diffs?diff_id=4912&start_sha=8c77c52553bcbed2d1f29fb30c9fd2fe91a47bea#9a52440d2f5e8253ef92a9e2d805e2a5e41cf525_224_224)
      Toggle commit list
    Please register or sign in to reply
  • Lee Daehyun
    @lee-dh started a discussion on an old version of the diff Jan 25, 2021
    Resolved by Lee Munkyeong Jan 26, 2021
    ABVJE_Launcher_Android/assets/chat/public/socket.io/lib/socket.js 0 → 100644
    194 debug('sending connect packet with query %s', query);
    195 this.packet({type: parser.CONNECT, query: query});
    196 } else {
    197 this.packet({type: parser.CONNECT});
    198 }
    199 }
    200 };
    201
    202 /**
    203 * Called upon engine `close`.
    204 *
    205 * @param {String} reason
    206 * @api private
    207 */
    208
    209 Socket.prototype.onclose = function (reason) {
    • Lee Daehyun @lee-dh commented Jan 25, 2021
      Developer

      functionのスペース合わしてください

      Edited Jan 26, 2021
      functionのスペース合わしてください
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Jan 26, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/87/diffs?diff_id=4912&start_sha=8c77c52553bcbed2d1f29fb30c9fd2fe91a47bea#9a52440d2f5e8253ef92a9e2d805e2a5e41cf525_209_209)
      Toggle commit list
    Please register or sign in to reply
  • Lee Daehyun
    @lee-dh started a discussion on an old version of the diff Jan 25, 2021
    Resolved by Lee Munkyeong Jan 26, 2021
    ABVJE_Launcher_Android/assets/chat/public/socket.io/lib/socket.js 0 → 100644
    161 this.sendBuffer.push(packet);
    162 }
    163
    164 this.flags = {};
    165
    166 return this;
    167 };
    168
    169 /**
    170 * Sends a packet.
    171 *
    172 * @param {Object} packet
    173 * @api private
    174 */
    175
    176 Socket.prototype.packet = function (packet) {
    • Lee Daehyun @lee-dh commented Jan 25, 2021
      Developer

      functionのスペース合わしてください

      Edited Jan 26, 2021
      functionのスペース合わしてください
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Jan 26, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/87/diffs?diff_id=4912&start_sha=8c77c52553bcbed2d1f29fb30c9fd2fe91a47bea#9a52440d2f5e8253ef92a9e2d805e2a5e41cf525_176_176)
      Toggle commit list
    Please register or sign in to reply
  • Lee Daehyun
    @lee-dh started a discussion on an old version of the diff Jan 25, 2021
    Resolved by Lee Munkyeong Jan 26, 2021
    ABVJE_Launcher_Android/assets/chat/public/socket.io/lib/socket.js 0 → 100644
    121 var args = toArray(arguments);
    122 args.unshift('message');
    123 this.emit.apply(this, args);
    124 return this;
    125 };
    126
    127 /**
    128 * Override `emit`.
    129 * If the event is in `events`, it's emitted normally.
    130 *
    131 * @param {String} event name
    132 * @return {Socket} self
    133 * @api public
    134 */
    135
    136 Socket.prototype.emit = function (ev) {
    • Lee Daehyun @lee-dh commented Jan 25, 2021
      Developer

      functionのスペース合わしてください

      Edited Jan 26, 2021
      functionのスペース合わしてください
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Jan 26, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/87/diffs?diff_id=4912&start_sha=8c77c52553bcbed2d1f29fb30c9fd2fe91a47bea#9a52440d2f5e8253ef92a9e2d805e2a5e41cf525_136_136)
      Toggle commit list
    Please register or sign in to reply
  • Lee Daehyun
    @lee-dh started a discussion on an old version of the diff Jan 25, 2021
    Resolved by Lee Munkyeong Jan 26, 2021
    ABVJE_Launcher_Android/assets/chat/public/socket.io/lib/socket.js 0 → 100644
    105
    106 this.subEvents();
    107 this.io.open(); // ensure open
    108 if ('open' === this.io.readyState) this.onopen();
    109 this.emit('connecting');
    110 return this;
    111 };
    112
    113 /**
    114 * Sends a `message` event.
    115 *
    116 * @return {Socket} self
    117 * @api public
    118 */
    119
    120 Socket.prototype.send = function () {
    • Lee Daehyun @lee-dh commented Jan 25, 2021
      Developer

      functionのスペース合わしてください

      Edited Jan 26, 2021
      functionのスペース合わしてください
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Jan 26, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/87/diffs?diff_id=4912&start_sha=8c77c52553bcbed2d1f29fb30c9fd2fe91a47bea#9a52440d2f5e8253ef92a9e2d805e2a5e41cf525_120_120)
      Toggle commit list
    Please register or sign in to reply
  • Lee Daehyun
    @lee-dh started a discussion on an old version of the diff Jan 25, 2021
    Resolved by Lee Munkyeong Jan 26, 2021
    ABVJE_Launcher_Android/assets/chat/public/socket.io/lib/socket.js 0 → 100644
    88 var io = this.io;
    89 this.subs = [
    90 on(io, 'open', bind(this, 'onopen')),
    91 on(io, 'packet', bind(this, 'onpacket')),
    92 on(io, 'close', bind(this, 'onclose'))
    93 ];
    94 };
    95
    96 /**
    97 * "Opens" the socket.
    98 *
    99 * @api public
    100 */
    101
    102 Socket.prototype.open =
    103 Socket.prototype.connect = function () {
    • Lee Daehyun @lee-dh commented Jan 25, 2021
      Developer

      functionのスペース合わしてください

      Edited Jan 26, 2021
      functionのスペース合わしてください
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Jan 26, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/87/diffs?diff_id=4912&start_sha=8c77c52553bcbed2d1f29fb30c9fd2fe91a47bea#9a52440d2f5e8253ef92a9e2d805e2a5e41cf525_103_103)
      Toggle commit list
    Please register or sign in to reply
  • Lee Daehyun
    @lee-dh started a discussion on an old version of the diff Jan 25, 2021
    Resolved by Lee Munkyeong Jan 26, 2021
    ABVJE_Launcher_Android/assets/chat/public/socket.io/lib/socket.js 0 → 100644
    70 if (this.io.autoConnect) this.open();
    71 }
    72
    73 /**
    74 * Mix in `Emitter`.
    75 */
    76
    77 Emitter(Socket.prototype);
    78
    79 /**
    80 * Subscribe to open, close and packet events
    81 *
    82 * @api private
    83 */
    84
    85 Socket.prototype.subEvents = function () {
    • Lee Daehyun @lee-dh commented Jan 25, 2021
      Developer

      functionのスペース合わしてください

      Edited Jan 26, 2021
      functionのスペース合わしてください
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Jan 26, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/87/diffs?diff_id=4912&start_sha=8c77c52553bcbed2d1f29fb30c9fd2fe91a47bea#9a52440d2f5e8253ef92a9e2d805e2a5e41cf525_85_85)
      Toggle commit list
    Please register or sign in to reply
  • Lee Daehyun
    @lee-dh started a discussion on an old version of the diff Jan 25, 2021
    Resolved by Lee Munkyeong Jan 26, 2021
    ABVJE_Launcher_Android/assets/chat/public/socket.io/lib/on.js 0 → 100644
    2 /**
    3 * Module exports.
    4 */
    5
    6 module.exports = on;
    7
    8 /**
    9 * Helper for subscriptions.
    10 *
    11 * @param {Object|EventEmitter} obj with `Emitter` mixin or `EventEmitter`
    12 * @param {String} event name
    13 * @param {Function} callback
    14 * @api public
    15 */
    16
    17 function on (obj, ev, fn) {
    • Lee Daehyun @lee-dh commented Jan 25, 2021
      Developer

      onのスペース合わしてください

      Edited Jan 26, 2021
      onのスペース合わしてください
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Jan 26, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/87/diffs?diff_id=4912&start_sha=8c77c52553bcbed2d1f29fb30c9fd2fe91a47bea#f6a0dff3616af71f3865d5d02d45bbfe8dd5154c_17_17)
      Toggle commit list
    Please register or sign in to reply
  • Lee Daehyun
    @lee-dh started a discussion on an old version of the diff Jan 25, 2021
    Resolved by Lee Munkyeong Jan 26, 2021
    ABVJE_Launcher_Android/assets/chat/public/index.html
    50 432 <script src="./js/language_ko.js" charset="UTF-8"></script>
    51 433 <script src="./js/language_ja.js" charset="UTF-8"></script>
    52 434 <script src="./js/language_en.js" charset="UTF-8"></script>
    435 <script src="./js/constant.js"></script>
    436 <script src="./js/chat.js"></script>
    437 <script src="./js/chat-ui.js"></script>
    53 438 <script src="./js/chat-util.js"></script>
    54 <script src="./js/chat-error.js"></script>
    439 <script src="./js/chat-db.js"></script>
    440 <script src="./js/chat-websocket.js"></script>
    55 441 </body>
    442 <script>
    443 jQuery('#homeButton').on('click', function(){
    • Lee Daehyun @lee-dh commented Jan 25, 2021
      Developer

      function() {}に合わしてください

      Edited Jan 26, 2021
      `function() {}`に合わしてください
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Jan 26, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/87/diffs?diff_id=4912&start_sha=8c77c52553bcbed2d1f29fb30c9fd2fe91a47bea#96005255b14d579203026e92a5c5d0d5f5bf682f_443_443)
      Toggle commit list
    Please register or sign in to reply
  • Lee Daehyun
    @lee-dh started a discussion on an old version of the diff Jan 25, 2021
    Resolved by Lee Munkyeong Jan 26, 2021
    ABVJE_Launcher_Android/assets/chat/public/js/chat-ui.js
    3 3
    4 4 $(function(){
    • Lee Daehyun @lee-dh commented Jan 25, 2021
      Developer

      function() {}に合わしてください

      Edited Jan 26, 2021
      `function() {}`に合わしてください
    • Lee Munkyeong @lee-mk

      changed this line in version 3 of the diff

      Jan 26, 2021

      changed this line in version 3 of the diff

      changed this line in [version 3 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/87/diffs?diff_id=4913&start_sha=a64b4d318d1de6e4472467921de9a4cdb995a40b#9e355821df920c728f78c719efe5e85f6f9a98bd_4_4)
      Toggle commit list
    Please register or sign in to reply
  • Lee Daehyun
    @lee-dh started a discussion on an old version of the diff Jan 25, 2021
    Resolved by Lee Munkyeong Jan 26, 2021
    ABVJE_Launcher_Android/assets/chat/public/js/chat-ui.js
    40 44
    41 45 // New Room
    42 46 // チャットルーム生成ボタン処理
    43 jQuery('#createChatRoom').on('click', function(){
    47 $('#createChatRoom').on('click', function(){
    • Lee Daehyun @lee-dh commented Jan 25, 2021
      Developer

      function() {}に合わしてください

      Edited Jan 26, 2021
      `function() {}`に合わしてください
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Jan 26, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/87/diffs?diff_id=4912&start_sha=8c77c52553bcbed2d1f29fb30c9fd2fe91a47bea#9e355821df920c728f78c719efe5e85f6f9a98bd_47_47)
      Toggle commit list
    Please register or sign in to reply
  • Lee Daehyun
    @lee-dh started a discussion on an old version of the diff Jan 25, 2021
    Resolved by Lee Munkyeong Jan 26, 2021
    ABVJE_Launcher_Android/assets/chat/public/js/chat-ui.js
    51 55
    52 56 // Room Delete
    53 57 // チャットルーム削除ボタン処理
    54 jQuery('#roomDeleteButton').on('click', function(e){
    55 if (jQuery('.deleteBox').is(':visible')) {
    58 $('#roomDeleteButton').on('click', function(e){
    • Lee Daehyun @lee-dh commented Jan 25, 2021
      Developer

      function() {}に合わしてください

      Edited Jan 26, 2021
      `function() {}`に合わしてください
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Jan 26, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/87/diffs?diff_id=4912&start_sha=8c77c52553bcbed2d1f29fb30c9fd2fe91a47bea#9e355821df920c728f78c719efe5e85f6f9a98bd_58_58)
      Toggle commit list
    Please register or sign in to reply
  • Lee Daehyun
    @lee-dh started a discussion on an old version of the diff Jan 25, 2021
    Resolved by Lee Munkyeong Jan 26, 2021
    ABVJE_Launcher_Android/assets/chat/public/js/chat-ui.js
    51 55
    52 56 // Room Delete
    53 57 // チャットルーム削除ボタン処理
    54 jQuery('#roomDeleteButton').on('click', function(e){
    55 if (jQuery('.deleteBox').is(':visible')) {
    58 $('#roomDeleteButton').on('click', function(e){
    59 if ($('.deleteBox').is(':visible')) {
    56 60 // チャットルーム削除アイコンが表示されている時、ブラインド処理を行う
    57 jQuery('.deleteBox').finish().show().fadeTo('slow',0,function(){
    58 jQuery(this).hide();
    61 $('.deleteBox').finish().show().fadeTo('slow',0,function(){
    • Lee Daehyun @lee-dh commented Jan 25, 2021
      Developer

      function() {}に合わしてください

      Edited Jan 26, 2021
      `function() {}`に合わしてください
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Jan 26, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/87/diffs?diff_id=4912&start_sha=8c77c52553bcbed2d1f29fb30c9fd2fe91a47bea#9e355821df920c728f78c719efe5e85f6f9a98bd_61_61)
      Toggle commit list
    Please register or sign in to reply
  • Lee Daehyun
    @lee-dh started a discussion on an old version of the diff Jan 25, 2021
    Resolved by Lee Munkyeong Jan 26, 2021
    ABVJE_Launcher_Android/assets/chat/public/js/chat-websocket.js
    33 function setSocketAction () {
    34 socket.on('connect', function (){
    • Lee Daehyun @lee-dh commented Jan 25, 2021
      Developer

      function() {}に合わしてください

      Edited Jan 26, 2021
      `function() {}`に合わしてください
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Jan 26, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/87/diffs?diff_id=4912&start_sha=8c77c52553bcbed2d1f29fb30c9fd2fe91a47bea#74f3840f68202794d2f55db87d7db0052c7f055d_34_34)
      Toggle commit list
    Please register or sign in to reply
  • Lee Daehyun
    @lee-dh started a discussion on an old version of the diff Jan 25, 2021
    Resolved by Lee Munkyeong Jan 26, 2021
    ABVJE_Launcher_Android/assets/chat/public/js/chat.js
    231 231 CHAT_UI.htmlElementTextInitialize(languageCode)
    232 232
    233 socket.emit('join', loginParam, function (err) {
    234 if (err) {
    235 // #36174
    236 $("#customAlertTitle").text(err);
    237 $("#customAlertOk").text(getLocalizedString("yesTitle"));
    238
    239 $('#customAlert').appendTo("body").modal({
    240 backdrop: 'static',
    241 keyboard: false
    242 })
    243 .on('click', '#customAlertOk', function(e) {
    244 });
    233 if (IS_ONLINE == 'true') {
    234 socket.emit('join', loginParam, function (err) {
    • Lee Daehyun @lee-dh commented Jan 25, 2021
      Developer

      function() {}に合わしてください

      Edited Jan 26, 2021
      `function() {}`に合わしてください
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Jan 26, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/87/diffs?diff_id=4912&start_sha=8c77c52553bcbed2d1f29fb30c9fd2fe91a47bea#81b5df31870ae33caa0b56fc1b089707b2acc561_234_234)
      Toggle commit list
    Please register or sign in to reply
  • Lee Daehyun
    @lee-dh started a discussion on an old version of the diff Jan 25, 2021
    Resolved by Lee Munkyeong Jan 26, 2021
    ABVJE_Launcher_Android/assets/chat/public/socket.io/lib/manager.js 0 → 100644
    63 this.encoding = false;
    64 this.packetBuffer = [];
    65 var _parser = opts.parser || parser;
    66 this.encoder = new _parser.Encoder();
    67 this.decoder = new _parser.Decoder();
    68 this.autoConnect = opts.autoConnect !== false;
    69 if (this.autoConnect) this.open();
    70 }
    71
    72 /**
    73 * Propagate given event to sockets and emit on `this`
    74 *
    75 * @api private
    76 */
    77
    78 Manager.prototype.emitAll = function () {
    • Lee Daehyun @lee-dh commented Jan 25, 2021
      Developer

      function() {}に合わしてください

      Edited Jan 26, 2021
      `function() {}`に合わしてください
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Jan 26, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/87/diffs?diff_id=4912&start_sha=8c77c52553bcbed2d1f29fb30c9fd2fe91a47bea#1aa009a943f97fec0e22186a08caf663d8909efe_78_78)
      Toggle commit list
    Please register or sign in to reply
  • Lee Daehyun @lee-dh

    assigned to @lee-mk

    Jan 25, 2021

    assigned to @lee-mk

    assigned to @lee-mk
    Toggle commit list
  • Lee Daehyun @lee-dh

    marked the task Lee daehyun as completed

    Jan 26, 2021

    marked the task Lee daehyun as completed

    marked the task **Lee daehyun** as completed
    Toggle commit list
  • Lee Munkyeong @lee-mk

    added 1 commit

    • a64b4d31 - マージリクエストのコメント対応

    Compare with previous version

    Jan 26, 2021

    added 1 commit

    • a64b4d31 - マージリクエストのコメント対応

    Compare with previous version

    added 1 commit * a64b4d31 - マージリクエストのコメント対応 [Compare with previous version](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/87/diffs?diff_id=4912&start_sha=8c77c52553bcbed2d1f29fb30c9fd2fe91a47bea)
    Toggle commit list
  • Lee Munkyeong @lee-mk

    resolved all discussions

    Jan 26, 2021

    resolved all discussions

    resolved all discussions
    Toggle commit list
  • Lee Munkyeong @lee-mk

    added 1 commit

    • a368af94 - マージリクエストのコメント対応

    Compare with previous version

    Jan 26, 2021

    added 1 commit

    • a368af94 - マージリクエストのコメント対応

    Compare with previous version

    added 1 commit * a368af94 - マージリクエストのコメント対応 [Compare with previous version](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/87/diffs?diff_id=4913&start_sha=a64b4d318d1de6e4472467921de9a4cdb995a40b)
    Toggle commit list
  • Lee Munkyeong @lee-mk

    assigned to @kang-dh

    Jan 26, 2021

    assigned to @kang-dh

    assigned to @kang-dh
    Toggle commit list
  • Kang Donghun @kang-dh

    assigned to @lee-mk

    Feb 02, 2021

    assigned to @lee-mk

    assigned to @lee-mk
    Toggle commit list
  • Kang Donghun @kang-dh

    marked the task Kang donghun as completed

    Feb 02, 2021

    marked the task Kang donghun as completed

    marked the task **Kang donghun** as completed
    Toggle commit list
  • Kim Peace
    @kim-p started a discussion on an old version of the diff Feb 03, 2021
    Last updated by Lee Munkyeong Feb 03, 2021
    ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/json/RoomListJSON.java 0 → 100644
    27 private static final String ShopMemberId = "shopMemberId";
    28 private static final String MessageType = "messageType";
    29 private static final String UnreadCount = "unreadCount";
    30 private static final String AttendUsers = "attendUsers";
    31
    32 public ArrayList<ChatRoomDto> roomList;
    33
    34 public RoomListJSON(String jsonString) throws AcmsException {
    35 super(jsonString);
    36 }
    37
    38 @Override
    39 protected void parse(JSONObject json) throws JSONValidationException {
    40
    41 // ルーム一覧情報を取得
    42 if (json.has(Body)) {
    • Kim Peace @kim-p commented Feb 03, 2021
      Master

      [nits]

      // not preferred
      if (...) {
          ...
          if (...) {
              ...
          }
      }
      
      // preferred
      if (...) { return; }
      ...
      if (...) { return; }
      ...
      [nits] ```java // not preferred if (...) { ... if (...) { ... } } // preferred if (...) { return; } ... if (...) { return; } ... ```
    • Lee Munkyeong @lee-mk

      changed this line in version 4 of the diff

      Feb 03, 2021

      changed this line in version 4 of the diff

      changed this line in [version 4 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/87/diffs?diff_id=5004&start_sha=a368af94f40cfd2b7aad460e82493cbdeb1022d4#dcdc95931123ba5e907b139b72a6d0ac8fd9abe3_42_42)
      Toggle commit list
    Please register or sign in to reply
  • Lee Munkyeong @lee-mk

    assigned to @kim-p

    Feb 03, 2021

    assigned to @kim-p

    assigned to @kim-p
    Toggle commit list
  • Kim Peace
    @kim-p started a discussion on an old version of the diff Feb 03, 2021
    Last updated by Lee Munkyeong Feb 03, 2021
    ABVJE_BL/src/jp/agentec/abook/abv/bl/dto/ChatMessageDto.java 0 → 100644
    3 import java.util.Date;
    4
    5 public class ChatMessageDto extends AbstractDto {
    6 public Integer chatMessageId;
    7 public Integer chatRoomId;
    8 public Integer shopMemberId;
    9 public String message;
    10 public Integer messageType;
    11 public String imageName;
    12 public String downloadFileName;
    13 public String savePath;
    14 public String insertDate;
    15
    16 @Override
    17 public Object[] getInsertValues() {
    18 Object[] test = new Object[]{chatMessageId, chatRoomId, shopMemberId, message, messageType, imageName, downloadFileName, savePath, insertDate};
    • Kim Peace @kim-p commented Feb 03, 2021
      Master

      [nits] testをもう使わないなら、削除お願いします。

      [nits] `test`をもう使わないなら、削除お願いします。
    • Lee Munkyeong @lee-mk

      changed this line in version 4 of the diff

      Feb 03, 2021

      changed this line in version 4 of the diff

      changed this line in [version 4 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/87/diffs?diff_id=5004&start_sha=a368af94f40cfd2b7aad460e82493cbdeb1022d4#0d0a482cdac476fc2df196b26e2206cbf8eac005_18_18)
      Toggle commit list
    Please register or sign in to reply
  • Kim Peace
    @kim-p started a discussion on an old version of the diff Feb 03, 2021
    Last updated by Lee Munkyeong Feb 03, 2021
    ABVJE_BL/src/jp/agentec/abook/abv/bl/dto/ChatMessageDto.java 0 → 100644
    14 public String insertDate;
    15
    16 @Override
    17 public Object[] getInsertValues() {
    18 Object[] test = new Object[]{chatMessageId, chatRoomId, shopMemberId, message, messageType, imageName, downloadFileName, savePath, insertDate};
    19 return new Object[]{chatMessageId, chatRoomId, shopMemberId, message, messageType, imageName, downloadFileName, savePath, insertDate};
    20 }
    21
    22 @Override
    23 public Object[] getUpdateValues() {
    24 return new Object[]{chatRoomId, shopMemberId, message, messageType, imageName, downloadFileName, savePath, insertDate, chatMessageId};
    25 }
    26
    27 @Override
    28 public String[] getKeyValues() {
    29 return new String[]{""+ chatMessageId};
    • Kim Peace @kim-p commented Feb 03, 2021
      Master

      [nits] +は前後ともにスペースを空けてください。

      [nits] `+`は前後ともにスペースを空けてください。
    • Lee Munkyeong @lee-mk

      changed this line in version 4 of the diff

      Feb 03, 2021

      changed this line in version 4 of the diff

      changed this line in [version 4 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/87/diffs?diff_id=5004&start_sha=a368af94f40cfd2b7aad460e82493cbdeb1022d4#0d0a482cdac476fc2df196b26e2206cbf8eac005_29_28)
      Toggle commit list
    Please register or sign in to reply
  • Kim Peace
    @kim-p started a discussion on an old version of the diff Feb 03, 2021
    Last updated by Lee Munkyeong Feb 03, 2021
    ABVJE_Launcher_Android/assets/chat/public/js/chat.js
    230 230 }
    231 231 CHAT_UI.htmlElementTextInitialize(languageCode)
    232 232
    233 socket.emit('join', loginParam, function (err) {
    234 if (err) {
    235 // #36174
    236 $("#customAlertTitle").text(err);
    237 $("#customAlertOk").text(getLocalizedString("yesTitle"));
    238
    239 $('#customAlert').appendTo("body").modal({
    240 backdrop: 'static',
    241 keyboard: false
    242 })
    243 .on('click', '#customAlertOk', function(e) {
    244 });
    233 if (IS_ONLINE == 'true') {
    • Kim Peace @kim-p commented Feb 03, 2021
      Master

      indent?

      indent?
    • Lee Munkyeong @lee-mk

      changed this line in version 4 of the diff

      Feb 03, 2021

      changed this line in version 4 of the diff

      changed this line in [version 4 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/87/diffs?diff_id=5004&start_sha=a368af94f40cfd2b7aad460e82493cbdeb1022d4#81b5df31870ae33caa0b56fc1b089707b2acc561_233_233)
      Toggle commit list
    Please register or sign in to reply
  • Kim Peace
    @kim-p started a discussion on the diff Feb 03, 2021
    ABVJE_Launcher_Android/assets/chat/public/js/chat.js
    247 } else {
    248 console.log('No error');
    249 if (loginParam.roomName != undefined && loginParam.roomName != "null") {
    250 $('.titleRoomName').text(loginParam.roomName).data('roomName', loginParam.roomName);
    251 } else {
    252 // 設定されていたroomNameがない場合
    253 let roomListTitle = getLocalizedString("roomListTitle")
    254 $('.titleRoomName').text(roomListTitle).data('roomName', roomListTitle);
    255 }
    256 }
    257 // loadingIndicatorを表示しない
    258 CHAT_UI.dismissLoadingIndicator();
    259 });
    260 } else {
    261 // loadingIndicatorを表示しない
    262 CHAT_UI.dismissLoadingIndicator();
    • Kim Peace @kim-p commented Feb 03, 2021
      Master

      indent?

      indent?
    Please register or sign in to reply
  • Kim Peace @kim-p

    assigned to @jung-k

    Feb 03, 2021

    assigned to @jung-k

    assigned to @jung-k
    Toggle commit list
  • Lee Munkyeong @lee-mk

    added 1 commit

    • cd300e10 - コードレビュー対応。

    Compare with previous version

    Feb 03, 2021

    added 1 commit

    • cd300e10 - コードレビュー対応。

    Compare with previous version

    added 1 commit * cd300e10 - コードレビュー対応。 [Compare with previous version](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/87/diffs?diff_id=5004&start_sha=a368af94f40cfd2b7aad460e82493cbdeb1022d4)
    Toggle commit list
  • Jung Kwangkyu @jung-k

    marked the task Jung kwangkyu as completed

    Feb 04, 2021

    marked the task Jung kwangkyu as completed

    marked the task **Jung kwangkyu** as completed
    Toggle commit list
  • Lee Munkyeong @lee-mk

    added 1 commit

    • 381469fa - DAO処理にトランザクション処理を追加

    Compare with previous version

    Feb 04, 2021

    added 1 commit

    • 381469fa - DAO処理にトランザクション処理を追加

    Compare with previous version

    added 1 commit * 381469fa - DAO処理にトランザクション処理を追加 [Compare with previous version](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/87/diffs?diff_id=5020&start_sha=cd300e1019af4b05a9ec9ad9221ecdbe3e0351c7)
    Toggle commit list
  • Lee Munkyeong @lee-mk

    merged

    Feb 05, 2021

    merged

    merged
    Toggle commit list
  • Lee Munkyeong @lee-mk

    mentioned in commit 0b614d87

    Feb 05, 2021

    mentioned in commit 0b614d87

    mentioned in commit 0b614d877a58a45617fce3f669191ca8e84aacaa
    Toggle commit list
  • Write
  • Preview
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 sign in to comment
Jung Kwangkyu
Assignee
Jung Kwangkyu @jung-k
Assign to
None
Milestone
None
Assign milestone
Time tracking
5
5 participants
Reference: abook_android/abook_check!87
×

Revert this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.