文書協業

ABVJE_BL/src/jp/agentec/abook/abv/bl/common/constant/ABookCommConstants.java

@@ -68,6 +68,13 @@ public interface ABookCommConstants {
         String ATTEND_USER_IDS = "attendUserIds";
         String ATTEND_USER_IDS = "attendUserIds";
         String ARCHIVE_INFO_LAST_UPDATE_DATE = "archiveInfoLastUpdateDate";
         String ARCHIVE_INFO_LAST_UPDATE_DATE = "archiveInfoLastUpdateDate";
 
 
+
+        String CONTENT_ID = "contentId";
+        String CONTENT_NAEM = "contentName";
+        String THUMBNAIL_NORMAL_PATH = "thumbnailNormalPath";
+        String THUMBNAIL_BIG_PATH = "thumbnailBigPath";
+        String RESOURCE_PATH = "resourcePath";
+
         String COLLABORATION_DEATAIL_ID = "collaborationDetailId";
         String COLLABORATION_DEATAIL_ID = "collaborationDetailId";
 
 
         String ROOT_GROUP_ID = "rootGroupId";
         String ROOT_GROUP_ID = "rootGroupId";

ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/CommunicationLogic.java

@@ -18,11 +18,13 @@ import jp.agentec.abook.abv.bl.data.dao.ArchiveDao;
 import jp.agentec.abook.abv.bl.data.dao.ChatGroupDao;
 import jp.agentec.abook.abv.bl.data.dao.ChatGroupDao;
 import jp.agentec.abook.abv.bl.data.dao.ChatMessageDao;
 import jp.agentec.abook.abv.bl.data.dao.ChatMessageDao;
 import jp.agentec.abook.abv.bl.data.dao.ChatRoomDao;
 import jp.agentec.abook.abv.bl.data.dao.ChatRoomDao;
+import jp.agentec.abook.abv.bl.data.dao.ContentDao;
 import jp.agentec.abook.abv.bl.data.dao.ShopMemberDao;
 import jp.agentec.abook.abv.bl.data.dao.ShopMemberDao;
 import jp.agentec.abook.abv.bl.dto.ArchiveDto;
 import jp.agentec.abook.abv.bl.dto.ArchiveDto;
 import jp.agentec.abook.abv.bl.dto.ChatMessageDto;
 import jp.agentec.abook.abv.bl.dto.ChatMessageDto;
 import jp.agentec.abook.abv.bl.dto.ChatRoomDto;
 import jp.agentec.abook.abv.bl.dto.ChatRoomDto;
 import jp.agentec.abook.abv.bl.dto.ChatGroupDto;
 import jp.agentec.abook.abv.bl.dto.ChatGroupDto;
+import jp.agentec.abook.abv.bl.dto.ContentDto;
 import jp.agentec.abook.abv.bl.dto.ShopMemberDto;
 import jp.agentec.abook.abv.bl.dto.ShopMemberDto;
 import jp.agentec.adf.util.ArrayUtil;
 import jp.agentec.adf.util.ArrayUtil;
 import jp.agentec.adf.util.CollectionUtil;
 import jp.agentec.adf.util.CollectionUtil;
@@ -39,6 +41,7 @@ public class CommunicationLogic extends AbstractLogic {
 	private ChatMessageDao chatMessageDao = AbstractDao.getDao(ChatMessageDao.class);
 	private ChatMessageDao chatMessageDao = AbstractDao.getDao(ChatMessageDao.class);
 	private ShopMemberDao shopMemberDao = AbstractDao.getDao(ShopMemberDao.class);
 	private ShopMemberDao shopMemberDao = AbstractDao.getDao(ShopMemberDao.class);
 	private ChatGroupDao chatGroupDao = AbstractDao.getDao(ChatGroupDao.class);
 	private ChatGroupDao chatGroupDao = AbstractDao.getDao(ChatGroupDao.class);
+	private ContentDao contentDao = AbstractDao.getDao(ContentDao.class);
 
 
 	private String localFilePath;
 	private String localFilePath;
 	private ArchiveDao archiveDao = AbstractDao.getDao(ArchiveDao.class);
 	private ArchiveDao archiveDao = AbstractDao.getDao(ArchiveDao.class);
@@ -994,7 +997,18 @@ public class CommunicationLogic extends AbstractLogic {
 	}
 	}
 
 
 	public String getContentList() {
 	public String getContentList() {
-		return "asd";
-
+		List<ContentDto> contentDtoList = contentDao.getDownloadedContents();
+		JSONArray resultJsonArray = new JSONArray();
+		for (ContentDto contentDto : contentDtoList) {
+			Map<String, Object> contentMap = new HashMap<String, Object>();
+			contentMap.put(ABookCommConstants.KEY.CONTENT_ID, contentDto.contentId);
+			contentMap.put(ABookCommConstants.KEY.CONTENT_NAEM, contentDto.contentName);
+			contentMap.put(ABookCommConstants.KEY.THUMBNAIL_NORMAL_PATH, contentDto.thumbnailNormalPath);
+			contentMap.put(ABookCommConstants.KEY.THUMBNAIL_BIG_PATH, contentDto.thumbnailBigPath);
+			contentMap.put(ABookCommConstants.KEY.RESOURCE_PATH, contentDto.resourcePath);
+			JSONObject jsonObject = new JSONObject(contentMap);
+			resultJsonArray.put(jsonObject);
+		}
+		return resultJsonArray.toString();
 	}
 	}
 }
 }

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebviewActivity.java

@@ -1273,7 +1273,7 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
         }
         }
 
 
         @JavascriptInterface
         @JavascriptInterface
-        public String getCOntentList() {
+        public String getContentList() {
             return communicationLogic.getContentList();
             return communicationLogic.getContentList();
         }
         }
     }
     }

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/ContentViewActivity.java

@@ -348,7 +348,7 @@ public class ContentViewActivity extends ABVContentViewActivity {
 		super.onCreate(savedInstanceState);
 		super.onCreate(savedInstanceState);
 
 
 		// 全画面表示
 		// 全画面表示
-		getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
+		//getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
 
 
 		// 初期値設定
 		// 初期値設定
 		pageBGMPathList = new SparseArray<>();
 		pageBGMPathList = new SparseArray<>();