Skip to content

A
abook_check
Opened by  

Communication/develop

{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Kim Jinsung
    @kim_j started a discussion on commit ac47e259
    Last updated by onuma
    ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ShowPushMessageDailogActivity.java
    147 }
    148 }
    149
    150 /**
    151 * チャットルームへ遷移するための処理
    152 * @param extras
    153 */
    154 private void moveChatRoom(Bundle extras) {
    155 Long roomId = extras.getLong(AppDefType.ChatPushMessageKey.roomId, 0);
    156 String roomName = extras.getString(AppDefType.ChatPushMessageKey.roomName);
    157 String pushSendLoginId = extras.getString(AppDefType.ChatPushMessageKey.pushSendLoginId);
    158 long pushSendDate = extras.getLong(AppDefType.ChatPushMessageKey.pushSendDate);
    159 String collaborationType = extras.getString(AppDefType.ChatPushMessageKey.collaborationType);
    160 String roomType = extras.getString(AppDefType.ChatPushMessageKey.roomType);
    161 if (roomId > 0 && !StringUtil.isNullOrEmpty(roomName)) {
    162 List<PushMessageDto> pushMessageDtoList = AbstractLogic.getLogic(PushMessageLogic.class).getAllPushMessageList();
    • Kim Jinsung @kim_j commented
      Developer

      pushMessageDtoList この変数を使っている箇所はログ出力しかないですが、、いらないのではないでしょうか？ ここからFor文までは、、不要な処理だと思います。

    • onuma @onuma commented
      Master

      ログ出力も含めて削除します。pushSendLoginIdも未使用なので削除します。

    Please register or sign in to reply
  • Kim Jinsung
    @kim_j started a discussion on commit 862d7cbe
    Last updated by onuma
    ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ShowPushMessageDailogActivity.java
    175 169 handler.post(new Runnable() {
    176 170 @Override
    177 171 public void run() {
    172 String dialogMessage = null;
    173 if (isMeetingRoomConnected) {
    174 dialogMessage = getRString(R.string.chat_open_fail_meeting_connected);
    175 }
    176 if (isCollabration) {
    177 dialogMessage = getRString(R.string.chat_open_fail_collaborattion_connected);
    178 }
    • Kim Jinsung @kim_j commented
      Developer

      コラボレーション時にもisMeetingRoomConnectedがtrueになるので、 isCollabrationからチェックを行ったほうがよいかと思われます。 if (isCollabration) {

      } else if (isMeetingRoomConnected) { }

    • onuma @onuma commented
      Master

      確認して修正します。

    Please register or sign in to reply
  • Kim Jinsung
    @kim_j started a discussion on commit f4c426c5
    Last updated by onuma
    ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/json/ChatPushDataJSON.java
    48 48 }
    49 49 PushMessageDto pushMessageDto = new PushMessageDto();
    50 50 String tempDate = DateTimeUtil.toString(DateTimeUtil.toDate(pushMessagetJsonArray.getJSONObject(k).getString(PushSendDate), DateTimeFormat.yyyyMMddHHmmss_hyphen), DateTimeFormat.yyyyMMddHHmmssSSS_none);
    51 Logger.d("messageId","messageId : " + pushMessagetJsonArray.getJSONObject(k).getString(PushSendDate));
    52 Logger.d("oerationId","oerationId : " + pushMessagetJsonArray.getJSONObject(k).getString(PushSendDate)+1);
    53 Logger.d("date","date : " + tempDate);
    51 //Logger.d("messageId","messageId : " + pushMessagetJsonArray.getJSONObject(k).getString(PushSendDate));
    52 //Logger.d("oerationId","oerationId : " + pushMessagetJsonArray.getJSONObject(k).getString(PushSendDate)+1);
    53 //Logger.d("date","date : " + tempDate);
    Please register or sign in to reply
  • Kim Jinsung
    @kim_j started a discussion on commit f4c426c5
    Last updated by onuma
    ABVJE_UI_Android/src/jp/agentec/abook/abv/cl/push/ABVFcmListenerService.java
    170 pushMsgDialog.putExtra(AppDefType.PushMessageKey.message, textMessage);
    171 pushMsgDialog.putExtra(AppDefType.PushMessageKey.data, data);
    172 pushMsgDialog.putExtra(AppDefType.PushMessageKey.operationId, operationID);
    173 pushMsgDialog.putExtra(AppDefType.ChatPushMessageKey.roomId, roomID);
    174 pushMsgDialog.putExtra(AppDefType.ChatPushMessageKey.roomName, roomName);
    175 pushMsgDialog.putExtra(AppDefType.ChatPushMessageKey.pushSendLoginId, pushSendLoginId);
    176 pushMsgDialog.putExtra(AppDefType.ChatPushMessageKey.pushSendDate, pushSendDate);
    177 startActivity(pushMsgDialog);
    197 // プッシュメッセージは、受信した時のActivityで処理をわける（後処理が違うので）
    198 String fromClassName = currentActivity.getClass().getName();
    199 if (currentActivity.getClass().equals(HTMLWebViewActivity.class)){
    200 ((HTMLWebViewActivity)currentActivity).showChatRoomPopupMessage(textMessage, data, operationID, roomID, roomName, roomType, pushSendLoginId, pushSendDate, collaborationType);
    201 } else if (currentActivity.getClass().equals(ContentViewActivity.class)){
    202 ((ContentViewActivity)currentActivity).showChatRoomPopupMessage(textMessage, data, operationID, roomID, roomName, roomType, pushSendLoginId, pushSendDate, collaborationType);
    203 } else if (currentActivity.getClass().equals(OperationRelatedContentActivity.class)){
    204 ((ContentViewActivity)currentActivity).showChatRoomPopupMessage(textMessage, data, operationID, roomID, roomName, roomType, pushSendLoginId, pushSendDate, collaborationType);
    • Kim Jinsung @kim_j commented
      Developer

      キャスト(ContentViewActivity)これで正しいでしょうか？ 「OperationRelatedContentActivity」ではないでしょうか？

    • onuma @onuma commented
      Master

      修正します。

    Please register or sign in to reply
  • Kim Jinsung
    @kim_j started a discussion on commit f4c426c5
    ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/HTMLWebViewActivity.java
    720 732 return;
    721 733 }
    722 734 mUploadMessage.onReceiveValue(result);
    723 } else if (requestCode == ABOOK_CHECK_SELECT_SCENE) {
    735 } else if (requestCode == ABookCommConstants.ABOOK_CHECK_SELECT_SCENE) {
    724 736 if (intent != null && result != null) {
    725 737 confirmEntrySceneDialog(result[0]);
    726 738 }
    727 739 }
    728 740 mUploadMessage = null;
    729 741 }
    742
    743 /**
    744 * プッシュメッセージ受信後のダイアログを表示処理。
    745 */
    746 public void showChatRoomPopupMessage(
    • Kim Jinsung @kim_j commented
      Developer

      これって共通化できないのでしょうか？ 親クラスとかで、、

    Please register or sign in to reply
  • Kim Jinsung
    @kim_j started a discussion on commit 8624f482
    ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ActivityHandlingHelper.java
    1641 1641 String loginId = ABVDataCache.getInstance().getMemberInfo().loginId;
    1642 1642 String shopName = ABVDataCache.getInstance().getUrlPath();
    1643 1643 intent.putExtra("loginId", loginId);
    Please register or sign in to reply
  • Kim Peace
    @kim-p started a discussion on commit ad877e2d
    Please register or sign in to reply
  • Kim Jinsung
    @kim_j started a discussion on commit 50b97e6a
    Last updated by onuma
    ABVJE_UI_Android/src/jp/agentec/abook/abv/cl/push/ABVFcmListenerService.java
    98 98 msg.put(AppDefType.PushMessageKey.message, textMessage);
    99 99 }
    100 100
    101 String roomType = null;
    102 String[] inviteMessage;
    101 103 if (textMessage.contains(INVITE_COLLABORATION)) {
    102 String roomType = Integer.toString(json.getInt(AppDefType.ChatPushMessageKey.roomType));
    103 String[] inviteMessage = textMessage.split(CHAT_MESSAGE_SEPERATOR);
    104 showCollaborationPopUpMessage(roomId, roomName, roomType, pushSendLoginId, pushSendDate, inviteMessage[1]);
    105 return;
    104 roomType = Integer.toString(json.getInt(AppDefType.ChatPushMessageKey.roomType));
    105 inviteMessage = textMessage.split(CHAT_MESSAGE_SEPERATOR);
    106 //showCollaborationPopUpMessage(roomId, roomName, roomType, pushSendLoginId, pushSendDate, inviteMessage[1]);
    107 //return;
    108 Logger.i(TAG,"" + roomType);
    109 Logger.i(TAG,"" + inviteMessage[1]);
    • Kim Jinsung @kim_j commented
      Developer

      重要な情報でないので、Logger.dにしてください。 ログの確認時にはLogger.dを利用してください。

    • onuma @onuma commented
      Master

      この行は、d901cb70 のコミットで消しました。最後のコミットのファイルで確認していただけますか？

    Please register or sign in to reply
  • onuma
    @onuma started a discussion on commit d901cb70
    Please register or sign in to reply
  • Kim Peace
    @kim-p started a discussion on commit 484b514b
    Please register or sign in to reply
  • Kim Eunchul @kim-ec

    merged

    merged

    Toggle commit list
  • Kim Eunchul @kim-ec

    mentioned in commit 6c803151

    mentioned in commit 6c803151

    Toggle commit list
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