{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
-
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); -
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); -
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( -
Developer
これって共通化できないのでしょうか？ 親クラスとかで、、
-
-
1695 nextActivity = className; 1696 } 1697 1698 intent.setClassName(mContext.getPackageName(), nextActivity); 1699 intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); 1700 getCurrentActivity().startActivity(intent); 1701 } 1702 1703 /** 1704 * プシュメッセージからチャットに入る（協業） 1705 */ 1706 public void startChatWebViewActivityWithCollaboration(String fromClassName, Long roomId, String roomName, String collaborationType, String roomType) { 1707 String className = ChatWebViewActivity.class.getName(); 1708 boolean isNormalSize = (mContext.getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) == Configuration.SCREENLAYOUT_SIZE_NORMAL; 1709 Intent intent = new Intent(); 1710 intent.putExtra("chatWebviewUrl",ABVEnvironment.getInstance().acmsAddress + ABVDataCache.getInstance().getUrlPath() + "/chatapi/chat/"); -
5551 String roomName, 5552 String roomType, 5553 String pushSendLoginId, 5554 long pushSendDate, 5555 String collaborationType 5556 ) { 5557 String fromClassName = getClass().getName(); 5558 Intent pushMsgDialog = new Intent(ContentViewActivity.this, ShowPushMessageDailogActivity.class); 5559 pushMsgDialog.putExtra(AppDefType.PushMessageKey.message, textMessage); 5560 pushMsgDialog.putExtra(AppDefType.PushMessageKey.data, data); 5561 pushMsgDialog.putExtra(AppDefType.PushMessageKey.operationId, operationID); 5562 pushMsgDialog.putExtra(AppDefType.ChatPushMessageKey.roomId, roomID); 5563 pushMsgDialog.putExtra(AppDefType.ChatPushMessageKey.roomName, roomName); 5564 pushMsgDialog.putExtra(AppDefType.ChatPushMessageKey.pushSendLoginId, pushSendLoginId); 5565 pushMsgDialog.putExtra(AppDefType.ChatPushMessageKey.pushSendDate, pushSendDate); 5566 pushMsgDialog.putExtra(AppDefType.ChatPushMessageKey.fromClassName ,fromClassName); -
Master
[nits]
,の前はスペースを削除、後はスペースを開けてください -
-
-
Toggle commit list
-
merged
Toggle commit list
