Merge branch 'features/1.2.360_ogawa-y' into 'features/1.2.360'

Features/1.2.360 ogawa y

See merge request !72

ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/AcmsClient.java

@@ -18,6 +18,7 @@ import jp.agentec.abook.abv.bl.acms.client.json.ApertureMasterDataJSON;
 import jp.agentec.abook.abv.bl.acms.client.json.AppLatestVersionJSON;
 import jp.agentec.abook.abv.bl.acms.client.json.AuthLevelJSON;
 import jp.agentec.abook.abv.bl.acms.client.json.CategoriesJSON;
+import jp.agentec.abook.abv.bl.acms.client.json.ChatPushDataJSON;
 import jp.agentec.abook.abv.bl.acms.client.json.ContentCheckDeliverableJSON;
 import jp.agentec.abook.abv.bl.acms.client.json.ContentVersionsJSON;
 import jp.agentec.abook.abv.bl.acms.client.json.FixPushMessageJSON;
@@ -504,6 +505,14 @@ public class AcmsClient implements AcmsClientResponseListener {
 		return json;
 	}
 
+	// チャットリスト取得
+	public ChatPushDataJSON getChatPushList(AcmsParameters param) throws NetworkDisconnectedException, AcmsException {
+		HttpResponse response = send(AcmsApis.ApiGetChatPushData, param);
+		ChatPushDataJSON json = new ChatPushDataJSON(response.httpResponseBody);
+
+		return json;
+	}
+
 	//作業者グループ取得
 	public WorkerGroupJSON getWorkingGroupList(AcmsParameters param) throws NetworkDisconnectedException, AcmsException {
 		HttpResponse response = send(AcmsApis.ApiWorkingGroupList, param);
@@ -616,19 +625,21 @@ public class AcmsClient implements AcmsClientResponseListener {
 	/**
 	 * パノラマで使用するシーンを登録
 	 * @param sid
+	 * @param contentId
 	 * @param FormFile シーンで使用する画像
 	 * @return
 	 * @throws IOException
 	 * @throws AcmsException
 	 */
-	public SceneEntryJSON sceneEntry(String sid, File FormFile) throws IOException, AcmsException, NetworkDisconnectedException {
+	public SceneEntryJSON sceneEntry(String sid, Long contentId, File FormFile) throws IOException, AcmsException, NetworkDisconnectedException {
 		if (networkAdapter != null && !networkAdapter.isNetworkConnected()) { // NWのチェック
 			throw new NetworkDisconnectedException();
 		}
         String apiUrl = AcmsApis.getApiUrl(env.acmsAddress, urlPath, AcmsApis.ApiSceneEntry);
         HttpMultipart part1 = new HttpMultipart(ABookKeys.SID, sid);
-        HttpMultipart part2 = new HttpMultipart(ABookKeys.FORM_FILE, FormFile);
-        HttpResponse result = HttpRequestSender.post(apiUrl, new HttpMultipart[]{part1, part2});
+		HttpMultipart part2 = new HttpMultipart(ABookKeys.CONTENT_ID, StringUtil.toString(contentId));
+        HttpMultipart part3 = new HttpMultipart(ABookKeys.FORM_FILE, FormFile);
+        HttpResponse result = HttpRequestSender.post(apiUrl, new HttpMultipart[]{part1, part2, part3});
 		SceneEntryJSON json = new SceneEntryJSON(result.httpResponseBody);
 		if (json.httpStatus != 200) {
 			if (json.errorMessage != null) {

ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/json/ChatPushDataJSON.java

+package jp.agentec.abook.abv.bl.acms.client.json;
+
+import jp.agentec.abook.abv.bl.acms.client.AcmsClient;
+import jp.agentec.abook.abv.bl.common.exception.AcmsException;
+import jp.agentec.abook.abv.bl.common.exception.JSONValidationException;
+import jp.agentec.abook.abv.bl.common.log.Logger;
+import jp.agentec.abook.abv.bl.common.util.JsonUtil;
+import jp.agentec.abook.abv.bl.dto.PushMessageDto;
+import jp.agentec.adf.util.DateTimeFormat;
+import jp.agentec.adf.util.DateTimeUtil;
+
+import org.json.adf.JSONArray;
+import org.json.adf.JSONObject;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * {@link AcmsClient#contentVersion} の戻り値です。
+ * @author Taejin Hong
+ * @version 1.0.0
+ */
+
+public class ChatPushDataJSON  extends AcmsCommonJSON {
+    private static final String PushMessage = "pushMessage";
+    private static final String PushSendLoginId = "pushSendLoginId";
+    private static final String PushSendDate = "pushSendDate";
+    private static final String RoomId = "roomId";
+    private static final String RoomName = "roomName";
+    private static final String ChatMessage = "chatMessage";
+
+    //public JSONObject pushMessage;
+    public ArrayList<PushMessageDto> pushMessageList;
+    public ChatPushDataJSON(String jsonString) throws AcmsException {
+        super(jsonString);
+    }
+
+    @Override
+    protected void parse(JSONObject json) throws JSONValidationException {
+        // 絞り検索のデータを取得
+        if(json.has(PushMessage)) {
+            JSONArray pushMessagetJsonArray = json.getJSONArray(PushMessage);
+            if (pushMessagetJsonArray != null) {
+                pushMessageList = new ArrayList<PushMessageDto>();
+                for (int k = 0; k < pushMessagetJsonArray.length(); k++) {
+                    if (pushMessagetJsonArray.getJSONObject(k).length() == 0) {
+                        break;
+                    }
+                    PushMessageDto pushMessageDto = new PushMessageDto();
+                    String tempDate = DateTimeUtil.toString(DateTimeUtil.toDate(pushMessagetJsonArray.getJSONObject(k).getString(PushSendDate), DateTimeFormat.yyyyMMddHHmmss_hyphen), DateTimeFormat.yyyyMMddHHmmssSSS_none);
+                    Logger.d("messageId","messageId : " + pushMessagetJsonArray.getJSONObject(k).getString(PushSendDate));
+                    Logger.d("oerationId","oerationId : " + pushMessagetJsonArray.getJSONObject(k).getString(PushSendDate)+1);
+                    Logger.d("date","date : " + tempDate);
+                    pushMessageDto.pushMessageId = Long.valueOf(tempDate);
+                    pushMessageDto.operationId = Long.valueOf(tempDate+1);
+                    pushMessageDto.pushSendLoginId = pushMessagetJsonArray.getJSONObject(k).getString(PushSendLoginId);
+                    pushMessageDto.pushSendDate = DateTimeUtil.toDate(pushMessagetJsonArray.getJSONObject(k).getString(PushSendDate), DateTimeFormat.yyyyMMddHHmmss_hyphen);
+                    pushMessageDto.roomId = pushMessagetJsonArray.getJSONObject(k).getLong(RoomId);
+                    pushMessageDto.roomName = pushMessagetJsonArray.getJSONObject(k).getString(RoomName);
+                    pushMessageDto.pushMessage = pushMessagetJsonArray.getJSONObject(k).getString(ChatMessage);
+                    pushMessageDto.readingFlg = false;
+                    pushMessageList.add(pushMessageDto);
+                }
+            }
+        }
+    }
+}
+

ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/type/AcmsApis.java

@@ -161,6 +161,10 @@ public class AcmsApis {
 	// 簡易帳票リビジョン一覧取得
 	public static final String ApiQuickReportRevision = "quickReportRevision";
 
+	// チャット
+	public static final String ChatApiUrlFormat = "%s/%s/chatapi/%s/";
+	public static final String ApiGetChatPushData = "push";
+
 	//	download
 	/**
 	 * コンテンツのZIPファイルを取得<br>
@@ -206,6 +210,8 @@ public class AcmsApis {
 				methodName.equals(ApiSendPushMessage) || methodName.equals(ApiGetPushMessages) || methodName.equals(ApiSendRoutineTaskData) ||
 				methodName.equals(ApiOperationGroupMaster) || methodName.equals(ApiGetApertureMasterData) || methodName.equals(ApiQuickReportSearch) || methodName.equals(ApiQuickReportRevision)) {
 			apiValue = Constant.ApiValue.checkapi;
+		} else if (methodName.equals(ApiGetChatPushData)) {	// pushActionはchatapiを指定
+			apiValue = Constant.ApiValue.chatapi;
 		}
 
 		switch (apiValue) {
@@ -221,6 +227,10 @@ public class AcmsApis {
 				//ABookCheck用のapi
 				url = String.format(CheckApiUrlFormat, StringUtil.trimLastSlashOrSpace(host), StringUtil.trimLastSlashOrSpace(urlPath), methodName);
 				break;
+			case Constant.ApiValue.chatapi:
+				// チャットAPI
+				url = String.format(ChatApiUrlFormat, StringUtil.trimLastSlashOrSpace(host), StringUtil.trimLastSlashOrSpace(urlPath), methodName);
+				break;
         }
 
 		return url;

ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/type/ServiceOption.java

 package jp.agentec.abook.abv.bl.acms.type;
 
-import jp.agentec.abook.abv.bl.logic.ContractLogic;
-
 public interface ServiceOption {
 	interface ServiceOptionId {
 		/**
@@ -158,5 +156,17 @@ public interface ServiceOption {
 		 * 利用しない：N(通常）、利用する：Y
 		 */
 		int AddUserPasswordSalt = 181;
+
+		/**
+		 * チャット機能
+		 * 利用しない：N(通常）、利用する：Y
+		 */
+		int Chat = 183;
+
+		/**
+		 * I/O帳票使用
+		 * 利用しない：N(通常）、利用する：Y
+		 */
+		int UsableIOReport = 186;
 	}
 }
\ No newline at end of file

ABVJE_BL/src/jp/agentec/abook/abv/bl/common/Constant.java

@@ -74,6 +74,7 @@ public class Constant {
 		int nuapi = 0;
 		int abvapi = 1;
 		int checkapi = 2;
+		int chatapi = 3;  // チャット
 	}
 
 	public interface XWalkOpenType {

ABVJE_BL/src/jp/agentec/abook/abv/bl/data/ABVDataCache.java

 package jp.agentec.abook.abv.bl.data;
 
 import java.util.ArrayList;
-import java.util.Calendar;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
@@ -336,6 +335,14 @@ public class ABVDataCache {
 			return isServiceOptionEnable(ServiceOptionId.PanoImage);
 		}
 
+		public boolean isChat() {
+			return isServiceOptionEnable(ServiceOptionId.Chat);
+		}
+
+		public boolean isUnableIOReport() {
+			return isServiceOptionEnable(ServiceOptionId.UsableIOReport);
+		}
+
 		/**
 		 * @version 1.2.300
 		 * サービスオプション（ユーザパスワードソルト付加）返す

ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/PushMessageDao.java

 package jp.agentec.abook.abv.bl.data.dao;
 
+import java.util.Date;
 import java.util.List;
 
 import jp.agentec.abook.abv.bl.common.db.Cursor;
@@ -46,6 +47,14 @@ public class PushMessageDao extends AbstractDao {
         if (column != -1) {
             dto.readingFlg = toBool(cursor.getInt(column));
         }
+        column = cursor.getColumnIndex("room_id");
+        if (column != -1) {
+            dto.roomId = cursor.getLong(column);
+        }
+        column = cursor.getColumnIndex("room_name");
+        if (column != -1) {
+            dto.roomName = cursor.getString(column);
+        }
         column = cursor.getColumnIndex("operation_name");
         if (column != -1) {
             dto.operationName = cursor.getString(column);
@@ -55,8 +64,8 @@ public class PushMessageDao extends AbstractDao {
     public void insert(PushMessageDto dto) {
         StringBuffer sql = new StringBuffer();
         sql.append(" INSERT OR IGNORE INTO t_push_message ");
-        sql.append(" (push_message_id, operation_id, push_send_login_id, push_send_date, push_message, reading_flg) ");
-        sql.append(" VALUES (?,?,?,?,?,?) ");
+        sql.append(" (push_message_id, operation_id, push_send_login_id, push_send_date, push_message, reading_flg, room_id, room_name) ");
+        sql.append(" VALUES (?,?,?,?,?,?,?,?) ");
         try {
             beginTransaction();
             insert(sql.toString(), dto.getInsertValues());
@@ -94,9 +103,9 @@ public class PushMessageDao extends AbstractDao {
 
     public List<PushMessageDto> selectAll() {
         StringBuffer sql = new StringBuffer();
-        sql.append(" SELECT tpm.push_message_id, tpm.operation_id, tpm.push_send_login_id, tpm.push_send_date, tpm.push_message, tpm.reading_flg, top.operation_name ");
+        sql.append(" SELECT tpm.push_message_id, tpm.operation_id, tpm.push_send_login_id, tpm.push_send_date, tpm.push_message, tpm.reading_flg, top.operation_name, tpm.room_id, tpm.room_name ");
         sql.append(" FROM t_push_message AS tpm ");
-        sql.append(" INNER JOIN t_operation AS top ");
+        sql.append(" LEFT OUTER JOIN t_operation AS top ");
         sql.append(" ON tpm.operation_id = top.operation_id ");
         sql.append(" ORDER BY tpm.push_message_id DESC ");
         Logger.v(TAG, "sql=%s", sql);
@@ -106,11 +115,25 @@ public class PushMessageDao extends AbstractDao {
     public PushMessageDto select(long pushMessageId) {
         String[] args = new String[] { "" + pushMessageId };
         StringBuffer sql = new StringBuffer();
-        sql.append(" SELECT tpm.push_message_id, tpm.operation_id, tpm.push_send_login_id, tpm.push_send_date, tpm.push_message, tpm.reading_flg, top.operation_name ");
+        sql.append(" SELECT tpm.push_message_id, tpm.operation_id, tpm.push_send_login_id, tpm.push_send_date, tpm.push_message, tpm.reading_flg, top.operation_name, tpm.room_id, tpm.room_name ");
+        sql.append(" FROM t_push_message AS tpm ");
+        sql.append(" INNER JOIN t_operation AS top ");
+        sql.append(" ON tpm.operation_id = top.operation_id ");
+        sql.append(" WHERE tpm.push_message_id = ? ");
+        Logger.v(TAG, "sql=%s", sql);
+        return rawQueryGetDto(sql.toString(), args, PushMessageDto.class);
+    }
+
+    public PushMessageDto selectChat(long pushMessageId, long pushOperstoinId, Date pushSendDate) {
+        String[] args = new String[] { "" + pushMessageId, "" + pushOperstoinId, "" + pushSendDate };
+        StringBuffer sql = new StringBuffer();
+        sql.append(" SELECT tpm.push_message_id, tpm.operation_id, tpm.push_send_login_id, tpm.push_send_date, tpm.push_message, tpm.reading_flg, top.operation_name, tpm.room_id, tpm.room_name ");
         sql.append(" FROM t_push_message AS tpm ");
         sql.append(" INNER JOIN t_operation AS top ");
         sql.append(" ON tpm.operation_id = top.operation_id ");
         sql.append(" WHERE tpm.push_message_id = ? ");
+        sql.append(" AND tpm.operation_id = ? ");
+        sql.append(" AND tpm.push_send_date = ? " );
         Logger.v(TAG, "sql=%s", sql);
         return rawQueryGetDto(sql.toString(), args, PushMessageDto.class);
     }

ABVJE_BL/src/jp/agentec/abook/abv/bl/data/tables/TPushMessage.java

@@ -26,8 +26,12 @@ public class TPushMessage extends SQLiteTableScript {
         sql.append("      , push_send_date DATE NOT NULL ");
         sql.append("      , push_message TEXT ");
         sql.append("      , reading_flg BOOLEAN NOT NULL DEFAULT 0 ");
+        sql.append("      , room_id BIGINT ");
+        sql.append("      , room_name VARCHAR(128) ");
         sql.append("      , PRIMARY KEY (push_message_id) ");
-        sql.append("      , FOREIGN KEY (operation_id) REFERENCES t_operation (operation_id) ");
+/**
+ * チャットのプッシュメッセージではoperation_idを使わないため外部キー制約はコメントアウト*/
+//        sql.append("      , FOREIGN KEY (operation_id) REFERENCES t_operation (operation_id) ");
         sql.append(" ) ");
         ddl.add(sql.toString());
 

ABVJE_BL/src/jp/agentec/abook/abv/bl/dto/PushMessageDto.java

@@ -14,6 +14,9 @@ public class PushMessageDto extends AbstractDto {
     public String pushMessage;
     public String operationName;
     public boolean readingFlg;
+    // Chat
+    public Long roomId;
+    public String roomName;
 
     @Override
     public String[] getKeyValues() {
@@ -22,6 +25,6 @@ public class PushMessageDto extends AbstractDto {
 
     @Override
     public Object[] getInsertValues() {
-        return new Object[] { pushMessageId, operationId, pushSendLoginId, pushSendDate, pushMessage, readingFlg  };
+        return new Object[] { pushMessageId, operationId, pushSendLoginId, pushSendDate, pushMessage, readingFlg, roomId, roomName };
     }
 }

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

@@ -17,6 +17,7 @@ import java.util.Map;
 import java.util.UUID;
 
 import jp.agentec.abook.abv.bl.acms.client.AcmsClient;
+import jp.agentec.abook.abv.bl.acms.client.json.ChatPushDataJSON;
 import jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON;
 import jp.agentec.abook.abv.bl.acms.client.json.OperationListJSON;
 import jp.agentec.abook.abv.bl.acms.client.json.SceneEntryJSON;
@@ -113,6 +114,16 @@ public class OperationLogic extends AbstractLogic {
         OperationListJSON json = AcmsClient.getInstance(cache.getUrlPath(), networkAdapter).getOperationList(param);
         List<OperationDto> serverOperations = json.operationList;
 
+        //サーバーからチャットプシュデータを取得
+        ChatPushDataJSON chatPushJson = AcmsClient.getInstance(cache.getUrlPath(), networkAdapter).getChatPushList(param);
+
+        for ( PushMessageDto dto : chatPushJson.pushMessageList) {
+            PushMessageDto dtoTemp = mPushMessageDao.selectChat(dto.pushMessageId, dto.operationId, dto.pushSendDate);
+            if (dtoTemp == null) {
+                mPushMessageDao.insert(dto);
+            }
+        }
+
         for (OperationDto serverOperationDto : serverOperations) {
             // 登録フラグ
             boolean insertFlg = true;
@@ -1380,11 +1391,12 @@ public class OperationLogic extends AbstractLogic {
     /**
      * シーンの登録
      * @param file
+     * @param contentId
      * @throws IOException
      * @throws AcmsException
      */
-    public Integer sendScene(File file) throws IOException, AcmsException, NetworkDisconnectedException {
-        SceneEntryJSON json = AcmsClient.getInstance(cache.getUrlPath(), networkAdapter).sceneEntry(cache.getMemberInfo().sid, file);
+    public Integer sendScene(File file, Long contentId) throws IOException, AcmsException, NetworkDisconnectedException {
+        SceneEntryJSON json = AcmsClient.getInstance(cache.getUrlPath(), networkAdapter).sceneEntry(cache.getMemberInfo().sid, contentId, file);
         return json.resourceId;
     }
 

ABVJE_Launcher_Android/AndroidManifest.xml

@@ -232,10 +232,14 @@
         <activity android:name="jp.agentec.abook.abv.ui.home.activity.OperationMeetingListActivityDialog" android:theme="@style/Theme.MyTheme.ModalDialog"/>
 
         <activity android:name="jp.agentec.abook.abv.ui.viewer.activity.CheckOZDViewActivity" android:configChanges="orientation|screenSize"/>
+
         <activity
             android:name="jp.agentec.abook.abv.ui.viewer.activity.OnlineHTMLWebViewActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
         </activity>
+
+        <activity android:name="jp.agentec.abook.abv.ui.home.activity.ChatWebviewActivity" android:configChanges="orientation|screenSize"/>
+
     </application>
 </manifest>
\ No newline at end of file

ABVJE_Res_Default_Android/res/drawable/btn_history_back_for_webview.xml

+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+	<item android:state_enabled="true" android:drawable="@drawable/ic_history_back_off" />
+	<item android:state_enabled="false" android:drawable="@drawable/ic_history_back_disable" />
+</selector>
\ No newline at end of file

ABVJE_Res_Default_Android/res/values-ja/strings.xml

@@ -344,7 +344,6 @@
     <string name="operation_related_content">関連資料</string>
     <string name="new_content">新着</string>
     <string name="save_all">一括保存</string>
-    <string name="content_update">更新</string>
     <string name="remote_support">遠隔支援</string>
     <string name="remote_support_list">遠隔支援一覧</string>
     <string name="new_make">新規作成</string>
@@ -534,7 +533,7 @@
     <string name="title_all_operation">全作業</string>
 
     <!-- ABookCheck 1.2.3 -->
-    <string name="title_quick_report_output">簡易帳票出力</string>
+    <string name="title_quick_report_output">帳票確認</string>
 
     <!-- 1.0.1 Resource Pattern 1 -->
     <!-- 1.9.0.0-->
@@ -1460,4 +1459,22 @@
     <string name="msg_device_location_off">端末の位置情報機能をONにしてください。</string>
 
     <string name="msg_theta_wifi_disconnect">THETAカメラとWi-Fi接続が切断されましたので、シーン画像選択画面に戻ります。</string>
+
+    <!-- Chat -->
+    <string name="chat">チャット</string>
+    <string name="msg_error_chat_disconnected">接続が切れました。</string>
+    <string name="msg_error_chat_connect">ネットワークに問題がありました。\nネットワークの接続状態を確認してください。</string>
+    <string name="msg_error_chat_server">サーバと通信できません。\nしばらく時間をおいて再度操作してください。</string>
+    <string name="msg_error_chat">チャットサーバーと接続に失敗しました。\nしばらく時間をおいて再度操作してください。</string>
+    <string name="msg_chat_confirm_exit">このチャットルームを出ますか？</string>
+    <string name="msg_error_chat_room_not_found">既に削除されたチャットルームです。</string>
+    <string name="msg_error_chat_500">チャットサーバーでシステムエラーが発生しました。</string>
+    <string name="msg_error_chat_join">チャットサーバーと接続に失敗しました。\n再度操作してください。</string>
+    <string name="msg_error_chat_text_length">メッセージの長さは0です。1文字以上を入力してください。</string>
+    <string name="msg_error_chat_input_roomname">ルーム名を入力してください。</string>
+    <string name="msg_chat_confirm_member">選択したメンバーをリストから削除しますか？</string>
+    <string name="msg_chat_confirm_delete">このチャットルームを削除しますか？</string>
+    <string name="msg_error_chat_room_name_too_long">ルーム名は文字列20字以内に入力してください。</string>
+    <string name="msg_error_chat_name_has_invalid_character">特殊文字 ;/?:@&amp;=+$,-_.!~*\'()#\\\"` はルーム名に含めることができません。</string>
+    <string name="msg_error_chat_room_sc_forbidden">認証に失敗しました。再度ログインが必要です。</string>
 </resources>

ABVJE_Res_Default_Android/res/values-ko/strings.xml

@@ -531,12 +531,12 @@
     <string name="msg_batch_sync_new_content_updating">새로운 정보갱신 중에는 일괄 동기을 하실 수 없습니다.</string>
     <string name="msg_batch_sync_error">「%1$s」정보갱신에 실패하였습니다. 동기처리을 중지합니다.\n</string>
     <string name="msg_batch_sync_move_operation_view">일괄 동기 처리 중에는 점검작업 보고화면으로 이동하실 수 없습니다.</string>
-    <string name="category_list">분류 일람</string>
+    <string name="category_list">분류 목록</string>
     <string name="title_category">분류</string>
     <string name="title_all_operation">전체 작업</string>
 
     <!-- ABookCheck 1.2.3 -->
-    <string name="title_quick_report_output">簡易帳票出力</string>
+    <string name="title_quick_report_output">장표 확인</string>
 
     <!-- 1.0.1 Resource Pattern 1 -->
     <!-- 1.9.0.0-->
@@ -1428,6 +1428,7 @@
     <string name="msg_confirm_close_edit_page">편집을 종료하시겠습니까?\n(저장되지 않은 변경 사항은 삭제됩니다.)</string>
     <string name="msg_error_edit_page_save">파일 저장 중에 예기치 않은 오류가 발생했습니다.\n편집창을 종료합니다.</string>
     <string name="msg_error_edit_page_open">편집창을 여는데 실패했습니다.</string>
+
     <!-- ABookCheck 1.2.300 -->
     <string name="title_scene_image_select">장면 이미지 선택</string>
     <string name="msg_image_select_max_count_over">장면 이미지의 선택 가능한 최대 개수는 %s개입니다.</string>
@@ -1464,4 +1465,22 @@
     <string name="title_theta_exposure_value">EV:%s</string>
     <string name="msg_device_location_off">단말기의 위치정보 기능을 ON으로 설정해 주세요.</string>
     <string name="msg_theta_wifi_disconnect">THETA 카메라 Wi-Fi 접속이 끊겼습니다. 장면 이미지 선택 화면으로 돌아갑니다.</string>
+
+    <!-- Chat -->
+    <string name="chat">채팅</string>
+    <string name="msg_error_chat_disconnected">서버와 접속이 끊어졌습니다.</string>
+    <string name="msg_error_chat_connect">네트워크에 문제가 발생했습니다.\n네트워크 연결상태를 확인하여 주십시요.</string>
+    <string name="msg_error_chat_server">서버와 통신할 수 없습니다.\n잠시 후 다시 시도해보시기 바랍니다.</string>
+    <string name="msg_error_chat">채팅서버 접속에 실패했습니다.\n잠시 후 다시 시도해보시기 바랍니다.</string>
+    <string name="msg_chat_confirm_exit">이 채팅방을 나가시겠습니까?</string>
+    <string name="msg_error_chat_room_not_found">이미 삭제된 채팅룸입니다.</string>
+    <string name="msg_error_chat_500">채팅 서버에서 시스템 오류가 발생했습니다.</string>
+    <string name="msg_error_chat_join">채팅서버 접속에 실패했습니다.\n다시 접속을 시도해보시기 바랍니다.</string>
+    <string name="msg_error_chat_text_length">메시지 길이가 0입니다. 한글자 이상의 문자를 입력하십시오.</string>
+    <string name="msg_error_chat_input_roomname">방 제목을 입력해 주십시오.</string>
+    <string name="msg_chat_confirm_member">목록에서 선택된 멤버를 삭제하시겠습니까?</string>
+    <string name="msg_chat_confirm_delete">이 방을 삭제 하시겠습니까?</string>
+    <string name="msg_error_chat_room_name_too_long">방 제목은 20자 이내로 입력해 주세요.</string>
+    <string name="msg_error_chat_name_has_invalid_character">특수문자 ;/?:@&amp;=+$,-_.!~*\'()#\\\"` 는 방 제목에 포함될 수 없습니다.</string>
+    <string name="msg_error_chat_room_sc_forbidden">사용자 정보를 확인할 수 없습니다. 다시 로그인하시기 바랍니다.</string>
 </resources>
\ No newline at end of file

ABVJE_Res_Default_Android/res/values/strings.xml

@@ -540,7 +540,7 @@
     <string name="title_all_operation">All</string>
 
     <!-- ABookCheck 1.2.3 -->
-    <string name="title_quick_report_output">簡易帳票出力</string>
+    <string name="title_quick_report_output">Report confirmation</string>
 
     <!-- 1.0.1 Resource Pattern 1 -->
     <!-- 1.9.0.0-->
@@ -1463,4 +1463,21 @@
     <string name="msg_device_location_off">Set the location information function of the Device to ON.</string>
     <string name="msg_theta_wifi_disconnect">THETA camera Wi-Fi connection has been lost. return to Select scene image screen.</string>
 
-    </resources>
\ No newline at end of file
+    <!-- Chat -->
+    <string name="chat">Chat</string>
+    <string name="msg_error_chat_disconnected">Disconnected from the server.</string>
+    <string name="msg_error_chat_connect">There was a problem with the network.\n Please check the connection status of the network.</string>
+    <string name="msg_error_chat_server">App will not be able to communicate with the server. \n After a few moments, please try again.</string>
+    <string name="msg_error_chat">Failed to connect to chat server.\n After a few moments, please try again.</string>
+    <string name="msg_chat_confirm_exit">Do you want to leave this room?</string>
+    <string name="msg_error_chat_room_not_found">This chat room has already been deleted.</string>
+    <string name="msg_error_chat_500">System error occurred on the chat server.</string>
+    <string name="msg_error_chat_join">Failed to connect to chat server.\nplease try again.</string>
+    <string name="msg_error_chat_text_length">Message length is 0. please type 1 or more character.</string>
+    <string name="msg_error_chat_input_roomname">Please enter a room name.</string>
+    <string name="msg_chat_confirm_member">Do you want to remove selected members from the list?</string>
+    <string name="msg_chat_confirm_delete">Do you want to delete this room?</string>
+    <string name="msg_error_chat_room_name_too_long">Please enter room name less than 20 characters.</string>
+    <string name="msg_error_chat_name_has_invalid_character">The character ;/?:@&amp;=+$,-_.!~*\'()#\\\"` cannot be included in the roomname.</string>
+    <string name="msg_error_chat_room_sc_forbidden">Failed to authenticate. Please login again.</string>
+</resources>

ABVJE_UI_Android/res/layout-large/ac_operation_list.xml

@@ -136,6 +136,7 @@
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/print_layout"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"

ABVJE_UI_Android/res/layout-large/ac_operation_related_content.xml

@@ -139,6 +139,7 @@
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/print_layout"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"

ABVJE_UI_Android/res/layout-normal/ac_operation_list.xml

@@ -136,6 +136,7 @@
         </LinearLayout>
 
         <LinearLayout
+            android:id="@+id/print_layout"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"

ABVJE_UI_Android/res/layout-normal/ac_operation_related_content.xml

@@ -129,6 +129,7 @@
         </LinearLayout>
 
         <LinearLayout
+            android:id="@+id/print_layout"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"

ABVJE_UI_Android/res/layout/ac_html_webview.xml

@@ -135,8 +135,8 @@
                 android:layout_weight="1"
                 android:background="@drawable/btn_operation_print_white"
                 android:contentDescription="@string/print"
-                android:scaleX="0.7"
-                android:scaleY="0.7"
+                android:scaleX="0.6"
+                android:scaleY="0.6"
                 android:visibility="gone" />
 
             <ImageButton

ABVJE_UI_Android/res/layout/ac_online_html_webview.xml

 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/LinearLayout1"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -12,22 +13,38 @@
         android:background="@color/app_color"
         android:minHeight="50dp" >
 
-        <Button
-            android:id="@+id/closeBtn"
+        <ImageButton
+            android:id="@+id/backBtn"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentLeft="false"
+            android:layout_alignParentLeft="true"
             android:layout_alignParentStart="true"
+            android:layout_alignTop="@+id/linearLayout"
             android:layout_centerVertical="true"
             android:layout_marginLeft="5dp"
             android:layout_marginStart="5dp"
+            android:background="@null"
+            android:src="@drawable/btn_history_back_for_webview" />
+
+        <Button
+            android:id="@+id/closeBtn"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentLeft="false"
+            android:layout_alignParentStart="false"
+            android:layout_centerVertical="true"
+            android:layout_marginEnd="5dp"
+            android:layout_marginRight="5dp"
             android:background="@drawable/btn_close"
-            android:contentDescription="@string/cont_desc" />
+            android:contentDescription="@string/cont_desc"
+            android:layout_alignParentRight="true" />
 
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_centerInParent="true">
+            android:layout_centerInParent="true"
+            android:id="@+id/linearLayout">
 
             <TextView
                 android:id="@+id/title"

ABVJE_UI_Android/res/layout/chat_webview.xml

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    style="@style/Theme_CustomProgressDialog"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/background" >
+
+    <!--
+    <RelativeLayout
+        android:id="@+id/toolbar_layout"
+        style="@style/OperationSearchToolBar"
+        android:layout_height="50dp"
+        android:layout_width="match_parent">
+
+        <TextView
+            android:id="@+id/title"
+            style="@style/DialogToolBarTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:layout_centerVertical="true"
+            android:text="@string/chat"
+            android:textColor="@color/edt_text"
+            android:textSize="18sp" />
+
+
+        <ImageButton
+            android:id="@+id/chat_close_btn"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="top|right"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:background="@drawable/ic_operation_close"/>
+
+    </RelativeLayout>
+    -->
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:orientation="vertical" >
+
+        <WebView
+            android:id="@+id/chatWebview2"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+    </FrameLayout>
+
+    <LinearLayout
+        android:id="@+id/toolbar2"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:background="@drawable/bottom_toolbar_border"
+        android:minHeight="50dp"
+        android:visibility="visible">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_weight="1"
+            android:gravity="center">
+
+            <ImageButton
+                android:id="@+id/btn_operation_home"
+                style="@style/ToolBarIcon"
+                android:src="@drawable/btn_operation_home" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_weight="1"
+            android:gravity="center">
+
+            <ImageButton
+                android:id="@+id/btn_common_content"
+                style="@style/ToolBarIcon"
+                android:src="@drawable/btn_common_content" />
+        </LinearLayout>
+
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_weight="1"
+            android:gravity="center">
+
+            <ImageButton
+                android:id="@+id/btn_communication_menu"
+                style="@style/ToolBarIcon"
+                android:layout_centerVertical="true"
+                android:src="@drawable/ic_communication_menu" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_weight="1"
+            android:gravity="center">
+
+            <ImageButton
+                android:id="@+id/btn_setting"
+                style="@style/ToolBarIcon"
+                android:layout_centerVertical="true"
+                android:src="@drawable/ic_operation_setting"
+                android:onClick="onClickSetting" />
+        </LinearLayout>
+
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file

ABVJE_UI_Android/res/layout/communication_menu_dialog.xml

@@ -211,6 +211,55 @@
             android:layout_height="1dp"
             android:background="@android:color/darker_gray"/>
 
+        <LinearLayout
+            android:id="@+id/ll_item_chat"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="5dp"
+            android:layout_marginTop="5dp"
+            android:layout_weight="3"
+            android:gravity="center"
+            android:orientation="horizontal"
+            android:background="@drawable/list_selector_holo_light"
+            android:focusable="true"
+            android:clickable="true"
+            android:visibility="visible">
+
+            <ImageView
+                android:id="@+id/btn_chat"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="0"
+                android:layout_alignParentLeft="true"
+                android:layout_centerVertical="true"
+                android:layout_marginRight="15dp"
+                android:src="@drawable/ic_communication_chat_list"
+                android:visibility="visible" />
+
+            <TextView
+                android:id="@+id/chat"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="15dp"
+                android:layout_toRightOf="@+id/btn_push_message"
+                android:layout_weight="0.8"
+                android:paddingLeft="6dip"
+                android:text="@string/chat"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textColor="@color/text_select" />
+
+            <ImageView
+                android:id="@+id/item4_nextLevel"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="0"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="false"
+                android:src="@drawable/ic_navigation_next_item"
+                android:visibility="visible" />
+
+        </LinearLayout>
+
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file

ABVJE_UI_Android/src/com/theta/network/HttpConnector.java

@@ -22,8 +22,11 @@ import java.math.RoundingMode;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Date;
+import java.util.TimeZone;
 import java.util.Timer;
 import java.util.TimerTask;
 
@@ -357,6 +360,7 @@ public class HttpConnector {
                     try {
                         //API2.0
                         if (mIsOldApi) {
+                            //画像ファイルの場合、「recordTime」がないのでJSONException発生
                             entry.getInt("recordTime");
                             //動画ファイルは保存しない。
                             continue;
@@ -1110,6 +1114,8 @@ public class HttpConnector {
             //API2.0
             if (mSessionId != null) {
                 parameters.put("sessionId", mSessionId);
+                //THETA S端末の時間初期化問題で、現在時間は常に設定
+                options.put("dateTimeZone", currentDateTimeZone());
             }
 
             parameters.put("options", options);
@@ -1520,4 +1526,12 @@ public class HttpConnector {
 
         return isSuccess;
     }
+
+    /**
+     * yyyy:MM:dd HH:mm:ssXXXフォマットで現在の日付を返す。
+     * @return 現在の日付
+     */
+    private String currentDateTimeZone() {
+        return new SimpleDateFormat("yyyy:MM:dd HH:mm:ssXXX").format(new Date());
+    }
 }

ABVJE_UI_Android/src/com/theta/view/MJpegView.java

@@ -12,16 +12,28 @@ import android.view.SurfaceView;
 
 import java.io.IOException;
 
+import jp.agentec.abook.abv.bl.common.log.Logger;
+
 /**
  * Motion JPEG view
  */
 public class MJpegView extends SurfaceView implements SurfaceHolder.Callback {
+    private static final String TAG = "MJpegView";
     private MJpegViewThread mMJpegViewThread = null;
     private MJpegInputStream mMJpegInputStream = null;
     private boolean existSurface = false;
     private int mDisplayWidth;
     private int mDisplayHeight;
 
+    private MJpegView.LiveCameraListener mListener;
+
+    public interface LiveCameraListener {
+        void liveCameraPlayFail();
+    }
+
+    public void setLiveCameraListenerListener(MJpegView.LiveCameraListener listener) {
+        this.mListener = listener;
+    }
     /**
      * Constructor
      * @param context
@@ -107,9 +119,13 @@ public class MJpegView extends SurfaceView implements SurfaceHolder.Callback {
      * @param source Source stream
      */
     public void setSource(MJpegInputStream source) {
+        if (source == null) { //mMJpegInputStreamのクローズ作業のため、現在スレッドをストップする。
+            stopPlay();
+        } else {
             mMJpegInputStream = source;
             play();
         }
+    }
 
     /**
      * Get source stream for receiving motion JPEG
@@ -185,7 +201,6 @@ public class MJpegView extends SurfaceView implements SurfaceHolder.Callback {
             Bitmap bitmap;
             Rect bitmapRect;
             Canvas bitmapCanvas = null;
-
             while (keepRunning) {
                 if (existSurface) {
                     try {
@@ -201,7 +216,9 @@ public class MJpegView extends SurfaceView implements SurfaceHolder.Callback {
                                 }
                             } catch (IOException e) {
                                 e.getStackTrace();
+                                Logger.e(TAG, "MJpegView IOException = " + e.toString());
                                 keepRunning = false;
+                                mListener.liveCameraPlayFail();
                             }
                         }
                     } finally {
@@ -226,8 +243,10 @@ public class MJpegView extends SurfaceView implements SurfaceHolder.Callback {
             if (mMJpegInputStream != null) {
                 try {
                     mMJpegInputStream.close();
+                    mMJpegInputStream = null;
                 } catch (IOException e) {
                     e.printStackTrace();
+                    Logger.e(TAG, "mMJpegInputStream IOException = " + e.toString());
                 }
             }
         }

ABVJE_UI_Android/src/jp/agentec/abook/abv/cl/push/ABVFcmListenerService.java

@@ -11,6 +11,8 @@ import android.util.Log;
 import com.google.firebase.messaging.FirebaseMessagingService;
 import com.google.firebase.messaging.RemoteMessage;
 
+import org.json.adf.JSONObject;
+
 import java.util.Map;
 
 import jp.agentec.abook.abv.bl.common.exception.ABVException;
@@ -54,12 +56,49 @@ public class ABVFcmListenerService extends FirebaseMessagingService {
             UserAuthenticateLogic logic = AbstractLogic.getLogic(UserAuthenticateLogic.class);
             MemberInfoDto memberInfo = logic.getMemberInfo();
             if (!StringUtil.isNullOrWhiteSpace(msg.get(AppDefType.PushMessageKey.message)) && this.getResources().getInteger(R.integer.push_message) == 1 && memberInfo != null) {
+
+                // Check pushmessage by chat
+                String tempMsg = msg.get(AppDefType.PushMessageKey.message);
+                String pushMsg = "";
+                Long roomId = null;
+                String roomName = "";
+                String pushSendLoginId = "";
+                long pushSendDate = 0;
+                Log.d(TAG,"tempMsg : "+ tempMsg);
+
+                if (tempMsg.indexOf("pushSendLoginId") > 0) {
+                    JSONObject json = new JSONObject(tempMsg);
+
+                    Object Obj = json.getString("pushSendLoginId");
+
+                    roomId = json.getLong("roomId");
+                    roomName = json.getString("roomName");
+                    pushSendLoginId = json.getString("pushSendLoginId");
+                    pushSendDate = json.getLong("pushSendDate");
+                    pushMsg = json.getString("message");
+
+                    if (pushMsg.length() > 0) {
+                        tempMsg = pushMsg;
+                    }
+                    if (AppUtil.isAppForground(this)) {
+                        msg.put(AppDefType.PushMessageKey.message, pushMsg);
+                    }
+                }
+
                 if (AppUtil.isAppForground(this)) {
                     Intent pushMsgDialog = new Intent(ABVFcmListenerService.this, ShowPushMessageDailogActivity.class);
                     pushMsgDialog.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                    pushMsgDialog.putExtra(AppDefType.PushMessageKey.message, msg.get(AppDefType.PushMessageKey.message));
+                    pushMsgDialog.putExtra(AppDefType.PushMessageKey.message, tempMsg);
                     pushMsgDialog.putExtra(AppDefType.PushMessageKey.data, msg.get(AppDefType.PushMessageKey.data));
                     pushMsgDialog.putExtra(AppDefType.PushMessageKey.operationId, msg.get(AppDefType.PushMessageKey.operationId));
+
+                    // push message
+                    if (roomName.length() > 0) {
+                        pushMsgDialog.putExtra(AppDefType.ChatPushMessageKey.roomId, roomId);  // Room Id
+                        pushMsgDialog.putExtra(AppDefType.ChatPushMessageKey.roomName, roomName);  // Room Name
+                        pushMsgDialog.putExtra(AppDefType.ChatPushMessageKey.pushSendLoginId, pushSendLoginId); // sendLoginId
+                        pushMsgDialog.putExtra(AppDefType.ChatPushMessageKey.pushSendDate, pushSendDate);
+                    }
                     startActivity(pushMsgDialog);
                 } else {
                     sendNotification(msg);
@@ -78,7 +117,49 @@ public class ABVFcmListenerService extends FirebaseMessagingService {
         if (message.get(AppDefType.PushMessageKey.operationId) != null) {
             intent.putExtra(AppDefType.PushMessageKey.operationId, message.get(AppDefType.PushMessageKey.operationId));
             intent.putExtra(AppDefType.PushMessageKey.message, message.get(AppDefType.PushMessageKey.message));
+        } else {
+            // Check pushmessage by chat
+            try {
+                // チャットプッシュメッセージがある場合
+                UserAuthenticateLogic logic = AbstractLogic.getLogic(UserAuthenticateLogic.class);
+                MemberInfoDto memberInfo = logic.getMemberInfo();
+                if (!StringUtil.isNullOrWhiteSpace(message.get(AppDefType.PushMessageKey.message))) {
+                    String tempMsg = message.get(AppDefType.PushMessageKey.message);
+                    String pushMsg = "";
+                    Long roomId = null;
+                    String roomName = "";
+                    String pushSendLoginId = "";
+                    long pushSendDate = 0;
+                    Log.d(TAG,"tempMsg : "+ tempMsg);
+
+                    if (tempMsg.indexOf("pushSendLoginId") > 0) {
+                        JSONObject json = new JSONObject(tempMsg);
+
+                        Object Obj = json.getString("pushSendLoginId");
+
+                        roomId = json.getLong("roomId");
+                        roomName = json.getString("roomName");
+                        pushSendLoginId = json.getString("pushSendLoginId");
+                        pushSendDate = json.getLong("pushSendDate");
+                        pushMsg = json.getString("message");
+
+                        message.put(AppDefType.PushMessageKey.message, pushMsg);
+
+                        // push message
+                        if (roomName.length() > 0) {
+                            intent.putExtra(AppDefType.ChatPushMessageKey.roomId, roomId);  // Room Id
+                            intent.putExtra(AppDefType.ChatPushMessageKey.roomName, roomName);  // Room Name
+                            intent.putExtra(AppDefType.ChatPushMessageKey.pushSendLoginId, pushSendLoginId); // sendLoginId
+                            intent.putExtra(AppDefType.ChatPushMessageKey.pushSendDate, pushSendDate);
+                        }
                     }
+                }
+            } catch (ABVException e) {
+                // ignore
+                Logger.e(TAG, e.toString());
+            }
+        }
+
         intent.setClassName(getApplicationContext(), SplashScreenActivity.class.getName());
 
         Notification notification;

ABVJE_UI_Android/src/jp/agentec/abook/abv/launcher/android/OnAppDownloadReceiver.java

@@ -26,24 +26,25 @@ public class OnAppDownloadReceiver extends BroadcastReceiver {
 
 	@Override
 	public void onReceive(Context context, Intent intent) {
-		if (intent.getAction().equals(DownloadManager.ACTION_DOWNLOAD_COMPLETE)) {
+		if (DownloadManager.ACTION_DOWNLOAD_COMPLETE.equals(intent.getAction())) {
 			long id = intent.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1);
 			Logger.d("Download Complete ID : " + id);
 
+            String downloadedTo = null;
             DownloadManager dm = (DownloadManager)context.getSystemService(context.DOWNLOAD_SERVICE);
             final Cursor cursor;
             if (dm != null) {
+                // 現在ダウンロードされたファイルを確認する。
                 cursor = dm.query(
                         new DownloadManager.Query().setFilterById(id));
                 if (cursor.moveToFirst()) {
-                    final String downloadedTo = cursor.getString(
+                    downloadedTo = cursor.getString(
                             cursor.getColumnIndex(DownloadManager.COLUMN_LOCAL_URI));
                     Log.d(TAG, "The file has been downloaded to: " + downloadedTo);
 
-                    if (downloadedTo != null && downloadedTo.endsWith(".pdf")) {
+                    if (downloadedTo != null && !downloadedTo.endsWith(".apk")) {
                         Toast.makeText(context, context.getResources().getString(R.string.download_success), //To notify the Client that the file is being downloaded
                                 Toast.LENGTH_LONG).show();
-                        // PDFファイルの場合はAPK用の処理は通過させない
                         return;
                     }
                 }
@@ -53,6 +54,8 @@ public class OnAppDownloadReceiver extends BroadcastReceiver {
                 // ダウンロードマネージャの通知領域をクリックした場合はメッセージ表示のみ
                 Toast.makeText(context, intent.getAction(), Toast.LENGTH_LONG).show();
             } else {
+                // APKファイルの場合
+                if (downloadedTo != null && downloadedTo.toLowerCase().endsWith(".apk")) {
                     File file = new File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), ABVEnvironment.APK_FILE_NAME);
                     if (file.exists()) {
                         Intent i = new Intent(Intent.ACTION_VIEW);
@@ -66,5 +69,6 @@ public class OnAppDownloadReceiver extends BroadcastReceiver {
                 }
             }
 		}
+	}
 
 }

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVAuthenticatedActivity.java

 package jp.agentec.abook.abv.ui.common.activity;
 
+import android.app.Dialog;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.net.ConnectivityManager;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.text.InputType;
-import android.view.Gravity;
 import android.view.KeyEvent;
-import android.view.MotionEvent;
 import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-import android.view.ViewGroup.LayoutParams;
-import android.webkit.WebSettings;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
+import android.view.Window;
+import android.widget.AdapterView;
 import android.widget.Button;
 import android.widget.CheckBox;
-import android.widget.CheckedTextView;
 import android.widget.EditText;
-import android.widget.FrameLayout;
 import android.widget.ImageButton;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.PopupWindow;
-import android.widget.ScrollView;
+import android.widget.ListView;
+import android.widget.RadioGroup;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.google.firebase.iid.FirebaseInstanceId;
-import com.google.zxing.WriterException;
-
-import org.xwalk.core.XWalkView;
 
 import java.io.FileNotFoundException;
-import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
 import jp.agentec.abook.abv.bl.acms.client.json.DownloadedContentInfoJSON;
 import jp.agentec.abook.abv.bl.acms.client.json.content.ContentJSON;
-import jp.agentec.abook.abv.bl.acms.type.DeliveryType;
 import jp.agentec.abook.abv.bl.acms.type.DownloadStatusType;
-import jp.agentec.abook.abv.bl.acms.type.LoginMode;
-import jp.agentec.abook.abv.bl.acms.type.UpdateSelect;
 import jp.agentec.abook.abv.bl.common.ABVEnvironment;
 import jp.agentec.abook.abv.bl.common.CommonExecutor;
 import jp.agentec.abook.abv.bl.common.Constant;
@@ -64,27 +51,23 @@ import jp.agentec.abook.abv.bl.common.util.ContentFileUtil;
 import jp.agentec.abook.abv.bl.data.ABVDataCache;
 import jp.agentec.abook.abv.bl.data.dao.AbstractDao;
 import jp.agentec.abook.abv.bl.data.dao.ContentDao;
-import jp.agentec.abook.abv.bl.data.dao.MemberInfoDao;
+import jp.agentec.abook.abv.bl.data.dao.OperationDao;
 import jp.agentec.abook.abv.bl.download.ContentDownloadListener;
 import jp.agentec.abook.abv.bl.download.ContentDownloader;
-import jp.agentec.abook.abv.bl.download.ContentFileExtractor;
 import jp.agentec.abook.abv.bl.download.ContentRefresher;
 import jp.agentec.abook.abv.bl.download.ContentZipDownloadNotification;
 import jp.agentec.abook.abv.bl.dto.ContentDto;
+import jp.agentec.abook.abv.bl.dto.FixPushMessageDto;
+import jp.agentec.abook.abv.bl.dto.OperationDto;
+import jp.agentec.abook.abv.bl.dto.PushMessageDto;
 import jp.agentec.abook.abv.bl.logic.AbstractLogic;
 import jp.agentec.abook.abv.bl.logic.BookmarkLogic;
-import jp.agentec.abook.abv.bl.logic.CategoryLogic;
-import jp.agentec.abook.abv.bl.logic.ContentLogic;
 import jp.agentec.abook.abv.bl.logic.ContractLogic;
-import jp.agentec.abook.abv.bl.logic.GroupLogic;
 import jp.agentec.abook.abv.bl.logic.MemoLogic;
+import jp.agentec.abook.abv.bl.logic.PushMessageLogic;
 import jp.agentec.abook.abv.bl.logic.UserAuthenticateLogic;
-import jp.agentec.abook.abv.cl.billing.Purchase;
 import jp.agentec.abook.abv.cl.helper.ABVUncaughtExceptionHandler;
-import jp.agentec.abook.abv.cl.util.AndroidStringUtil;
-import jp.agentec.abook.abv.cl.util.BitmapUtil;
 import jp.agentec.abook.abv.cl.util.PreferenceUtil;
-import jp.agentec.abook.abv.cl.util.RawResourceUtil;
 import jp.agentec.abook.abv.cl.util.StorageUtil;
 import jp.agentec.abook.abv.launcher.android.ABVApplication;
 import jp.agentec.abook.abv.launcher.android.R;
@@ -95,19 +78,26 @@ import jp.agentec.abook.abv.ui.common.constant.ErrorCode;
 import jp.agentec.abook.abv.ui.common.constant.ErrorMessage;
 import jp.agentec.abook.abv.ui.common.constant.NaviConsts;
 import jp.agentec.abook.abv.ui.common.dialog.ABookAlertDialog;
+import jp.agentec.abook.abv.ui.common.helper.ProgressDialogHelper;
+import jp.agentec.abook.abv.ui.common.util.ABVToastUtil;
 import jp.agentec.abook.abv.ui.common.util.AlertDialogUtil;
 import jp.agentec.abook.abv.ui.common.util.DisplayUtil;
 import jp.agentec.abook.abv.ui.common.util.Initializer;
+import jp.agentec.abook.abv.ui.common.util.KeyboardUtils;
+import jp.agentec.abook.abv.ui.common.util.PatternStringUtil;
 import jp.agentec.abook.abv.ui.common.view.ABVBatchSyncView;
 import jp.agentec.abook.abv.ui.common.vo.Size;
 import jp.agentec.abook.abv.ui.home.activity.HelpActivity;
 import jp.agentec.abook.abv.ui.home.activity.LoginActivity;
 import jp.agentec.abook.abv.ui.home.activity.OperationListActivity;
-import jp.agentec.abook.abv.ui.home.activity.SplashScreenActivity;
+import jp.agentec.abook.abv.ui.home.adapter.FixPushMessageAdapter;
+import jp.agentec.abook.abv.ui.home.adapter.OperationSelectAdapter;
+import jp.agentec.abook.abv.ui.home.adapter.PushMessageListAdapter;
 import jp.agentec.abook.abv.ui.home.helper.ActivityHandlingHelper;
 import jp.agentec.abook.abv.ui.home.helper.ContentViewHelper;
-import jp.agentec.abook.abv.ui.viewer.foxitPdf.PdfImageProvider;
 import jp.agentec.adf.net.http.HttpDownloadSimpleNotification;
+import jp.agentec.adf.util.DateTimeFormat;
+import jp.agentec.adf.util.DateTimeUtil;
 import jp.agentec.adf.util.StringUtil;
 
 public abstract class ABVAuthenticatedActivity extends ABVActivity implements ContentDownloadListener {
@@ -134,6 +124,22 @@ public abstract class ABVAuthenticatedActivity extends ABVActivity implements Co
 	// 一括同期ビュー（コントロール）
 	protected ABVBatchSyncView batchSyncView;
 
+	protected ABVUIActivity abvuiActivity;
+
+	protected Dialog mCommunicationMenuDialog;
+	protected Dialog mOperationSelectDialog;
+	protected ListView mOperationSelectListView;
+	protected Dialog mPushMessageListDialog;
+	protected ListView mPushMessageListView;
+	protected OperationSelectAdapter mOperationSelectAdapter;
+	protected PushMessageListAdapter mPushMessageListAdapter;
+	protected ListView mFixPushMessageListView;
+	protected Dialog mPushMessageSendDialog;
+	protected ImageButton communicationButton;                    // コミュニケーションボタン
+	protected int mSelectedFixPuchMessagePosition;
+	protected int mSendType;
+	protected PushMessageLogic pushMessageLogic = AbstractLogic.getLogic(PushMessageLogic.class);
+
 	/**
 	 * メッセージ表示タイプ
 	 */
@@ -173,6 +179,7 @@ public abstract class ABVAuthenticatedActivity extends ABVActivity implements Co
 			try {
 				// 既にMacAddress使用に同意している場合はMacAddressを使う
 				// 認証なしの場合はUUIDを使用する
+				//noinspection IfStatementWithNegatedCondition
 				if (ABVEnvironment.getInstance().deviceIdType != Constant.DeviceIdType.MAC_ADDRESS) {
 					AbstractLogic.getLogic(UserAuthenticateLogic.class).updateDeviceTokenByUUID(fcmToken);
 				} else {
@@ -796,4 +803,440 @@ public abstract class ABVAuthenticatedActivity extends ABVActivity implements Co
 			}
 		}, BUTTON_ENABLE_DELAY_MILLIS);
 	}
+
+	/**
+	 * コミュニケーションメニューダイアログ
+	 */
+	public void showCommunicationMenuDialog() {
+		mCommunicationMenuDialog = new Dialog(this);
+		mCommunicationMenuDialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+		mCommunicationMenuDialog.setCanceledOnTouchOutside(false);
+		mCommunicationMenuDialog.setContentView(R.layout.communication_menu_dialog);
+
+		List<PushMessageDto> pushMessageDtoList = pushMessageLogic.getAllPushMessageList();
+
+		boolean existUnreadFlg = false;
+		for (PushMessageDto pushMessageDto : pushMessageDtoList) {
+			if (!pushMessageDto.readingFlg) {
+				existUnreadFlg = true;
+				break;
+			}
+		}
+
+		ImageView ivIcon = (ImageView)mCommunicationMenuDialog.findViewById(R.id.btn_push_message_list);
+
+		if (existUnreadFlg) {
+			ivIcon.setBackgroundResource(R.drawable.ic_communication_push_message_list_with_badge);
+		} else {
+			ivIcon.setBackgroundResource(R.drawable.ic_communication_push_message_list);
+		}
+
+		LinearLayout ll_menuItem_meeting = (LinearLayout)mCommunicationMenuDialog.findViewById(R.id.ll_item_meeting);
+		ll_menuItem_meeting.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				ActivityHandlingHelper.getInstance().startMeetingActivity();
+				mCommunicationMenuDialog.dismiss();
+			}
+		});
+
+		LinearLayout ll_menuItem_push_message = (LinearLayout)mCommunicationMenuDialog.findViewById(R.id.ll_item_push_message);
+		ll_menuItem_push_message.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				showOperationSelectDialog();
+				mCommunicationMenuDialog.dismiss();
+			}
+		});
+
+		LinearLayout ll_menuItem_push_message_list = (LinearLayout)mCommunicationMenuDialog.findViewById(R.id.ll_item_push_message_list);
+		ll_menuItem_push_message_list.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				showPushMessageListDialog();
+				mCommunicationMenuDialog.dismiss();
+			}
+		});
+
+		// chat
+		LinearLayout ll_menuItem_chat = (LinearLayout)mCommunicationMenuDialog.findViewById(R.id.ll_item_chat);
+		if (ABVDataCache.getInstance().serviceOption.isChat()) {
+			ll_menuItem_chat.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View view) {
+					// チャット利用のはネットワークが繋がる時のみ
+					if (ABVEnvironment.getInstance().networkAdapter.isNetworkConnected()) {
+						ActivityHandlingHelper.getInstance().startChatWebviewActivity();
+						mCommunicationMenuDialog.dismiss();
+					} else {
+						ABVToastUtil.showMakeText(getABVApplication().getBaseContext(), R.string.request_network_connection, Toast.LENGTH_SHORT);
+						return;
+					}
+				}
+			});
+		} else {
+			ll_menuItem_chat.setVisibility(View.GONE);
+		}
+
+		mCommunicationMenuDialog.findViewById(R.id.close_btn).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				mCommunicationMenuDialog.dismiss();
+			}
+		});
+
+		mCommunicationMenuDialog.show();
+	}
+
+	private void showOperationSelectDialog() {
+		OperationDao operationDao = AbstractDao.getDao(OperationDao.class);
+		mOperationSelectDialog = new Dialog(this);
+		mOperationSelectDialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+		mOperationSelectDialog.setCanceledOnTouchOutside(false);
+		mOperationSelectDialog.setContentView(R.layout.operation_select_dialog);
+		mOperationSelectListView = (ListView) mOperationSelectDialog.findViewById(R.id.lv_operation_select);
+		List<OperationDto> operationDtoList = operationDao.getAllOperation();
+		mOperationSelectAdapter = new OperationSelectAdapter(this, operationDtoList);
+		mOperationSelectListView.setAdapter(mOperationSelectAdapter);
+
+		mOperationSelectListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+			@Override
+			public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+				OperationDto operationDto = mOperationSelectAdapter.getItem(position);
+				showPushMessageSendDialog(operationDto);
+				mOperationSelectDialog.dismiss();
+			}
+		});
+
+		// リソースパターンを適用
+		TextView operationSelect = (TextView) mOperationSelectDialog.findViewById(R.id.tv_toolbar_title);
+		operationSelect.setText(PatternStringUtil.patternToInt(getApplicationContext(),
+				R.string.operation_select,
+				getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)));
+
+		mOperationSelectDialog.findViewById(R.id.close_btn).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				mOperationSelectDialog.dismiss();
+			}
+		});
+
+		mOperationSelectDialog.show();
+	}
+
+	/**
+	 * プッシュメッセージダイアログ表示
+	 */
+	private void showPushMessageListDialog() {
+		mPushMessageListDialog = new Dialog(this);
+		mPushMessageListDialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+		mPushMessageListDialog.setCanceledOnTouchOutside(false);
+		mPushMessageListDialog.setContentView(R.layout.push_message_list_dialog);
+		mPushMessageListView = (ListView) mPushMessageListDialog.findViewById(R.id.lv_push_message);
+
+		final List<PushMessageDto> pushMessageDtoList = pushMessageLogic.getAllPushMessageList();
+		mPushMessageListAdapter = new PushMessageListAdapter(this, pushMessageDtoList);
+		mPushMessageListView.setAdapter(mPushMessageListAdapter);
+
+		mPushMessageListAdapter.setAdapterListener(new PushMessageListAdapter.PushMessageListAdapterListener() {
+			@Override
+			public void onDetailView(final PushMessageDto dto) {
+
+				if(dto.roomName != null && dto.roomId != 0)
+				{
+					pushMessageLogic.updateReadingFlg(dto.pushMessageId);
+					ActivityHandlingHelper.getInstance().startChatWebviewActivityWithPushMessage(dto);
+					mPushMessageListDialog.dismiss();
+				} else {
+					showPushMessageDetailView(dto);
+				}
+				// プッシュメッセージで未読がなければ、下辺ツールバーのコミュニケーションボタンのバッジを外す
+				List<PushMessageDto> checkPushMessageList = mPushMessageListAdapter.getItems();
+				if (!checkUnReadCommunication(checkPushMessageList)) {
+					communicationButton.setImageResource(R.drawable.ic_communication_menu);
+				}
+			}
+		});
+		mPushMessageListView.invalidate();
+		mPushMessageListView.setClickable(false);
+
+		mPushMessageListDialog.findViewById(R.id.back_btn).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				List<PushMessageDto> pushMessageDtoList = pushMessageLogic.getAllPushMessageList();
+				mPushMessageListAdapter.setItem(pushMessageDtoList);
+				showPushMessgeListView(true);
+			}
+		});
+
+		mPushMessageListDialog.findViewById(R.id.close_btn).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				mPushMessageListDialog.dismiss();
+			}
+		});
+
+		showPushMessgeListView(true);
+		mPushMessageListDialog.show();
+	}
+
+	// プッシュメッセージの詳細表示
+	private void showPushMessageDetailView(final PushMessageDto dto) {
+		dto.readingFlg = true;
+
+		TextView messageTextView = (TextView)mPushMessageListDialog.findViewById(R.id.tv_message);
+		TextView sendDateTextView = (TextView)mPushMessageListDialog.findViewById(R.id.tv_send_date);
+		TextView sendOperationNameTextView = (TextView)mPushMessageListDialog.findViewById(R.id.tv_operation_name);
+		TextView sendUserTextView = (TextView)mPushMessageListDialog.findViewById(R.id.tv_send_user);
+		messageTextView.setText(dto.pushMessage);
+		sendDateTextView.setText(DateTimeUtil.toString(dto.pushSendDate, DateTimeFormat.yyyyMMddHHmm_slash));
+		sendOperationNameTextView.setText(dto.operationName);
+		sendUserTextView.setText(dto.pushSendLoginId);
+
+		pushMessageLogic.updateReadingFlg(dto.pushMessageId);
+		showPushMessgeListView(false);
+	}
+
+	// プッシュメッセージの一覧表示
+	private void showPushMessgeListView(boolean pushMessageListViewFlg) {
+		TextView titleTextView = (TextView)mPushMessageListDialog.findViewById(R.id.tv_toolbar_title);
+		if (pushMessageListViewFlg) {
+			mPushMessageListView.setVisibility(View.VISIBLE);
+			mPushMessageListDialog.findViewById(R.id.close_btn).setVisibility(View.VISIBLE);
+			mPushMessageListDialog.findViewById(R.id.back_btn).setVisibility(View.GONE);
+			mPushMessageListDialog.findViewById(R.id.ll_detail).setVisibility(View.GONE);
+			// リソースパターンの適用
+			titleTextView.setText(PatternStringUtil.patternToString(getApplicationContext(),
+					R.string.push_message_list,
+					getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)));
+		} else {
+			mPushMessageListView.setVisibility(View.GONE);
+			mPushMessageListDialog.findViewById(R.id.close_btn).setVisibility(View.VISIBLE);
+			mPushMessageListDialog.findViewById(R.id.back_btn).setVisibility(View.VISIBLE);
+			mPushMessageListDialog.findViewById(R.id.ll_detail).setVisibility(View.VISIBLE);
+			// リソースパターンの適用
+			titleTextView.setText(PatternStringUtil.patternToString(getApplicationContext(),
+					R.string.title_message_detail,
+					getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)));
+		}
+	}
+
+	/**
+	 * プッシュメッセージ送信ダイヤログ表示
+	 */
+	private void showPushMessageSendDialog(final OperationDto operationDto) {
+		mPushMessageSendDialog = new Dialog(this);
+		mPushMessageSendDialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+		mPushMessageSendDialog.setCanceledOnTouchOutside(false);
+		mPushMessageSendDialog.setContentView(R.layout.push_message_send_dialog);
+		mFixPushMessageListView = (ListView) mPushMessageSendDialog.findViewById(R.id.listView);
+
+
+		mPushMessageSendDialog.findViewById(R.id.back_btn).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				showOperationSelectDialog();
+				mPushMessageSendDialog.dismiss();
+			}
+		});
+
+		mPushMessageSendDialog.findViewById(R.id.close_btn).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				mPushMessageSendDialog.dismiss();
+			}
+		});
+
+		mPushMessageSendDialog.findViewById(R.id.send_btn).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				sendPushMessageRequest(operationDto.operationId);
+			}
+		});
+
+		RadioGroup searchTarget = (RadioGroup) mPushMessageSendDialog.findViewById(R.id.send_target_group);
+		searchTarget.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
+			@Override
+			public void onCheckedChanged(RadioGroup group, int checkedId) {
+				if (checkedId == R.id.in_gourp) {
+					mSendType = Constant.PushMessageSendType.InGroup;
+				} else {
+					mSendType = Constant.PushMessageSendType.AllOperation;
+				}
+			}
+		});
+
+		mPushMessageSendDialog.findViewById(R.id.fix_push_message_layout).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				showFixPushMessageView();
+			}
+		});
+
+		TextView messageTitleTextView = (TextView) mPushMessageSendDialog.findViewById(R.id.message_title);
+		// リソースパターンの適用
+		messageTitleTextView.setText(PatternStringUtil.patternToString(getApplicationContext(),
+				R.string.free_input,
+				getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)) + " > ");
+
+		TextView tvOperationName = (TextView) mPushMessageSendDialog.findViewById(R.id.operation_name);
+		tvOperationName.setText(operationDto.operationName);
+
+		mPushMessageSendDialog.show();
+	}
+
+	/**
+	 * プッシュメッセージ送信画面、定型文一覧画面切り替え
+	 * @param sendPushMessageViewFlg (true : プッシュメッセージ送信画面、false : 定型文一覧画面)
+	 */
+	private void showSendPushMessgeView(boolean sendPushMessageViewFlg) {
+		if (sendPushMessageViewFlg) {
+			mFixPushMessageListView.setVisibility(View.GONE);
+			mPushMessageSendDialog.findViewById(R.id.back_btn).setVisibility(View.GONE);
+
+			mPushMessageSendDialog.findViewById(R.id.push_send_layout).setVisibility(View.VISIBLE);
+			mPushMessageSendDialog.findViewById(R.id.close_btn).setVisibility(View.VISIBLE);
+			EditText messageEditText = (EditText) mPushMessageSendDialog.findViewById(R.id.message);
+			KeyboardUtils.show(this, messageEditText);
+		} else {
+			mFixPushMessageListView.setVisibility(View.VISIBLE);
+			mPushMessageSendDialog.findViewById(R.id.back_btn).setVisibility(View.VISIBLE);
+
+			mPushMessageSendDialog.findViewById(R.id.push_send_layout).setVisibility(View.GONE);
+			mPushMessageSendDialog.findViewById(R.id.close_btn).setVisibility(View.GONE);
+		}
+	}
+
+	/**
+	 * プッシュメッセージ送信依頼
+	 */
+	private void sendPushMessageRequest(long operationId) {
+		if (!ABVEnvironment.getInstance().networkAdapter.isNetworkConnected()) {
+			ABVToastUtil.showMakeText(this, R.string.request_network_connection, Toast.LENGTH_SHORT);
+			return;
+		}
+		//文字列チェック
+		EditText messageEditText = (EditText) mPushMessageSendDialog.findViewById(R.id.message);
+		String message = messageEditText.getText().toString();
+
+		String checkMessage = message.replace(" ", "");
+		if (checkMessage.length() == 0) {
+			// リソースパターンの適用
+			ABVToastUtil.showMakeText(this, PatternStringUtil.patternToString(getApplicationContext(),
+					R.string.push_message_input_null,
+					getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)), Toast.LENGTH_SHORT);
+			return;
+		}
+		byte[] messageByte = message.getBytes(StandardCharsets.UTF_8);
+		if (messageByte.length >= 207) {
+			// リソースパターンの適用
+			ABVToastUtil.showMakeText(this, PatternStringUtil.patternToString(getApplicationContext(),
+					R.string.push_message_input_over,
+					getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)), Toast.LENGTH_SHORT);
+			return;
+		}
+
+		// リソースパターンの適用
+		ProgressDialogHelper.showProgressPopup(this, true, PatternStringUtil.patternToString(getApplicationContext(),
+				R.string.file_initialization,
+				getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)));
+		try {
+			boolean result = pushMessageLogic.sendPushMessageRequest(mSendType, message, operationId);
+			if (result) {
+				mPushMessageSendDialog.dismiss();
+				// リソースパターンの適用
+				ABVToastUtil.showMakeText(this, PatternStringUtil.patternToString(getApplicationContext(),
+						R.string.push_message_send_success,
+						getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)), Toast.LENGTH_SHORT);
+			} else {
+				// リソースパターンの適用
+				ABVToastUtil.showMakeText(this, PatternStringUtil.patternToString(getApplicationContext(),
+						R.string.push_message_send_fail,
+						getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)), Toast.LENGTH_SHORT);
+			}
+		} catch (Exception e) {
+			Logger.e(TAG, e);
+			// リソースパターンの適用
+			ABVToastUtil.showMakeText(this, PatternStringUtil.patternToString(getApplicationContext(),
+					R.string.push_message_send_fail,
+					getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)), Toast.LENGTH_SHORT);
+		} finally {
+			ProgressDialogHelper.closeProgressPopup();
+		}
+	}
+
+	private void showFixPushMessageView() {
+		if (!ABVEnvironment.getInstance().networkAdapter.isNetworkConnected()) {
+			ABVToastUtil.showMakeText(this, R.string.request_network_connection, Toast.LENGTH_SHORT);
+			return;
+		}
+		EditText messageEditText = (EditText) mPushMessageSendDialog.findViewById(R.id.message);
+		KeyboardUtils.hide(this, messageEditText);
+
+		// リソースパターンの適用
+		ProgressDialogHelper.showProgressPopup(this, true, PatternStringUtil.patternToString(getApplicationContext(),
+				R.string.file_initialization,
+				getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)));
+		try {
+			List<FixPushMessageDto> fixPushMessageList = pushMessageLogic.getFixPushMessage();
+			FixPushMessageDto dto = new FixPushMessageDto();
+			// リソースパターンの適用
+			dto.name = PatternStringUtil.patternToString(getApplicationContext(),
+					R.string.free_input,
+					getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0));
+			fixPushMessageList.add(0, dto);
+			mFixPushMessageListView.setAdapter(new FixPushMessageAdapter(this, fixPushMessageList, mSelectedFixPuchMessagePosition));
+			mFixPushMessageListView.invalidate();
+			mFixPushMessageListView.setClickable(true);
+			mFixPushMessageListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+				@Override
+				public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+					mSelectedFixPuchMessagePosition = position;
+					FixPushMessageDto item = (FixPushMessageDto)parent.getItemAtPosition(position);
+
+					TextView messageTitleTextView = (TextView) mPushMessageSendDialog.findViewById(R.id.message_title);
+					messageTitleTextView.setText(item.name + " > ");
+
+					EditText messageEditText = (EditText) mPushMessageSendDialog.findViewById(R.id.message);
+					messageEditText.setText(item.value);
+					messageEditText.setSelection(messageEditText.getText().length());
+
+					showSendPushMessgeView(true);
+				}
+			});
+			showSendPushMessgeView(false);
+		} catch (Exception e) {
+			Logger.e(TAG, e);
+			// リソースパターンの適用
+			ABVToastUtil.showMakeText(this, PatternStringUtil.patternToString(getApplicationContext(),
+					R.string.respons_fix_push_message_fail,
+					getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)), Toast.LENGTH_SHORT);
+		} finally {
+			ProgressDialogHelper.closeProgressPopup();
+		}
+	}
+
+	// コミュニケーションのアイコン設定（未既読があれば、バッチ付きアイコンでセット）
+	protected void setCommunicationImageButton() {
+		List<PushMessageDto> pushMessageDtoList = pushMessageLogic.getAllPushMessageList();
+		boolean existUnreadFlg = checkUnReadCommunication(pushMessageDtoList);
+		communicationButton.setImageResource(existUnreadFlg ? R.drawable.ic_communication_menu_with_badge : R.drawable.ic_communication_menu);
+	}
+
+	/**
+	 * 未読のプッシュメッセージが存在するかチェック
+	 * @param pushMessageDtoList チェックするリスト
+	 * @return
+	 */
+	private boolean checkUnReadCommunication(List<PushMessageDto> pushMessageDtoList) {
+		boolean existUnreadFlg = false;
+		for (PushMessageDto pushMessageDto : pushMessageDtoList) {
+			if (!pushMessageDto.readingFlg) {
+				existUnreadFlg = true;
+				break;
+			}
+		}
+		return existUnreadFlg;
+	}
+
 }

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVContentViewActivity.java

@@ -90,6 +90,7 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
 	private static final String TAG ="ABVContentViewActivity";
 	public final static int ABOOK_CHECK_TASK_IMAGE = 103;
 	public final static int ABOOK_CHECK_TASK_VIDEO = 104;
+	protected final static int ABOOK_CHECK_SELECT_SCENE = 105;
 
 	protected long contentId;// 表示中のコンテンツID
 	protected long objectId;  // オブジェクトID（オブジェクト用のActivityのときのみ使用）

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVNoAuthenticatedActivity.java

@@ -377,6 +377,14 @@ public abstract class ABVNoAuthenticatedActivity extends ABVActivity {
             if (extras != null && !StringUtil.isNullOrEmpty(extras.getString(AppDefType.PushMessageKey.operationId))) {
                 intent.putExtra(AppDefType.PushMessageKey.operationId, extras.getString(AppDefType.PushMessageKey.operationId));
                 intent.putExtra(AppDefType.PushMessageKey.message, extras.getString(AppDefType.PushMessageKey.message));
+			} else {
+				// チャットのプッシュメッセージがある場合
+				if (extras != null && !StringUtil.isNullOrEmpty(extras.getString(AppDefType.ChatPushMessageKey.roomName))) {
+					intent.putExtra(AppDefType.ChatPushMessageKey.roomId, extras.getLong(AppDefType.ChatPushMessageKey.roomId));  // Room Id
+					intent.putExtra(AppDefType.ChatPushMessageKey.roomName, extras.getString(AppDefType.ChatPushMessageKey.roomName));  // Room Name
+					intent.putExtra(AppDefType.ChatPushMessageKey.pushSendLoginId, extras.getString(AppDefType.ChatPushMessageKey.pushSendLoginId)); // sendLoginId
+					intent.putExtra(AppDefType.ChatPushMessageKey.pushSendDate, extras.getString(AppDefType.ChatPushMessageKey.pushSendDate));
+				}
 			}
 			intent.setClassName(getApplicationContext().getPackageName(), getMainActivityClassName()).setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
 			final Uri data = getIntent().getData();

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVUIActivity.java

@@ -85,22 +85,6 @@ public abstract class ABVUIActivity extends ABVAuthenticatedActivity {
 	protected TextView mUpdatedDate; // add by jang
 	protected TextView mLoadingText; // add by jang;
 
-	protected ImageButton communicationButton;                    // コミュニケーションボタン
-	private Dialog mCommunicationMenuDialog;
-	private Dialog mOperationSelectDialog;
-	private ListView mOperationSelectListView;
-	private Dialog mPushMessageListDialog;
-	private ListView mPushMessageListView;
-	private OperationSelectAdapter mOperationSelectAdapter;
-	private PushMessageListAdapter mPushMessageListAdapter;
-	private ListView mFixPushMessageListView;
-	private Dialog mPushMessageSendDialog;
-	private int mSelectedFixPuchMessagePosition;
-	private int mSendType;
-
-	protected PushMessageLogic pushMessageLogic = AbstractLogic.getLogic(PushMessageLogic.class);
-
-
 	// 新着更新処理の終了後、プルダウンを完了させるためのビュー
 	protected PullToRefreshBase refreshBaseView;
 
@@ -544,415 +528,6 @@ public abstract class ABVUIActivity extends ABVAuthenticatedActivity {
 		finish();
 	}
 
-
-	/**
-	 * コミュニケーションメニューダイアログ
-	 */
-	public void showCommunicationMenuDialog() {
-		mCommunicationMenuDialog = new Dialog(this);
-		mCommunicationMenuDialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-		mCommunicationMenuDialog.setCanceledOnTouchOutside(false);
-		mCommunicationMenuDialog.setContentView(R.layout.communication_menu_dialog);
-
-		List<PushMessageDto> pushMessageDtoList = pushMessageLogic.getAllPushMessageList();
-
-		boolean existUnreadFlg = false;
-		for (PushMessageDto pushMessageDto : pushMessageDtoList) {
-			if (!pushMessageDto.readingFlg) {
-				existUnreadFlg = true;
-				break;
-			}
-		}
-
-		ImageView ivIcon = (ImageView)mCommunicationMenuDialog.findViewById(R.id.btn_push_message_list);
-
-		if (existUnreadFlg) {
-			ivIcon.setBackgroundResource(R.drawable.ic_communication_push_message_list_with_badge);
-		} else {
-			ivIcon.setBackgroundResource(R.drawable.ic_communication_push_message_list);
-		}
-
-		LinearLayout ll_menuItem_meeting = (LinearLayout)mCommunicationMenuDialog.findViewById(R.id.ll_item_meeting);
-		ll_menuItem_meeting.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View view) {
-				ActivityHandlingHelper.getInstance().startMeetingActivity();
-				mCommunicationMenuDialog.dismiss();
-			}
-		});
-
-		LinearLayout ll_menuItem_push_message = (LinearLayout)mCommunicationMenuDialog.findViewById(R.id.ll_item_push_message);
-		ll_menuItem_push_message.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View view) {
-				showOperationSelectDialog();
-				mCommunicationMenuDialog.dismiss();
-			}
-		});
-
-		LinearLayout ll_menuItem_push_message_list = (LinearLayout)mCommunicationMenuDialog.findViewById(R.id.ll_item_push_message_list);
-		ll_menuItem_push_message_list.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View view) {
-				showPushMessageListDialog();
-				mCommunicationMenuDialog.dismiss();
-			}
-		});
-
-		mCommunicationMenuDialog.findViewById(R.id.close_btn).setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				mCommunicationMenuDialog.dismiss();
-			}
-		});
-
-		mCommunicationMenuDialog.show();
-	}
-
-	private void showOperationSelectDialog() {
-		OperationDao operationDao = AbstractDao.getDao(OperationDao.class);
-		mOperationSelectDialog = new Dialog(this);
-		mOperationSelectDialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-		mOperationSelectDialog.setCanceledOnTouchOutside(false);
-		mOperationSelectDialog.setContentView(R.layout.operation_select_dialog);
-		mOperationSelectListView = (ListView) mOperationSelectDialog.findViewById(R.id.lv_operation_select);
-		List<OperationDto> operationDtoList = operationDao.getAllOperation();
-		mOperationSelectAdapter = new OperationSelectAdapter(this, operationDtoList);
-		mOperationSelectListView.setAdapter(mOperationSelectAdapter);
-
-		mOperationSelectListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-			@Override
-			public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-				OperationDto operationDto = mOperationSelectAdapter.getItem(position);
-				showPushMessageSendDialog(operationDto);
-				mOperationSelectDialog.dismiss();
-			}
-		});
-
-		// リソースパターンを適用
-		TextView operationSelect = (TextView) mOperationSelectDialog.findViewById(R.id.tv_toolbar_title);
-		operationSelect.setText(PatternStringUtil.patternToInt(getApplicationContext(),
-				R.string.operation_select,
-				getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)));
-
-		mOperationSelectDialog.findViewById(R.id.close_btn).setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				mOperationSelectDialog.dismiss();
-			}
-		});
-
-		mOperationSelectDialog.show();
-	}
-
-	/**
-	 * プッシュメッセージダイアログ表示
-	 */
-	private void showPushMessageListDialog() {
-		mPushMessageListDialog = new Dialog(this);
-		mPushMessageListDialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-		mPushMessageListDialog.setCanceledOnTouchOutside(false);
-		mPushMessageListDialog.setContentView(R.layout.push_message_list_dialog);
-		mPushMessageListView = (ListView) mPushMessageListDialog.findViewById(R.id.lv_push_message);
-
-		final List<PushMessageDto> pushMessageDtoList = pushMessageLogic.getAllPushMessageList();
-		mPushMessageListAdapter = new PushMessageListAdapter(this, pushMessageDtoList);
-		mPushMessageListView.setAdapter(mPushMessageListAdapter);
-
-		mPushMessageListAdapter.setAdapterListener(new PushMessageListAdapter.PushMessageListAdapterListener() {
-			@Override
-			public void onDetailView(final PushMessageDto dto) {
-				showPushMessageDetailView(dto);
-
-				// プッシュメッセージで未読がなければ、下辺ツールバーのコミュニケーションボタンのバッジを外す
-				List<PushMessageDto> checkPushMessageList = mPushMessageListAdapter.getItems();
-				if (!checkUnReadCommunication(checkPushMessageList)) {
-					communicationButton.setImageResource(R.drawable.ic_communication_menu);
-				}
-			}
-		});
-		mPushMessageListView.invalidate();
-		mPushMessageListView.setClickable(false);
-
-		mPushMessageListDialog.findViewById(R.id.back_btn).setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				List<PushMessageDto> pushMessageDtoList = pushMessageLogic.getAllPushMessageList();
-				mPushMessageListAdapter.setItem(pushMessageDtoList);
-				showPushMessgeListView(true);
-			}
-		});
-
-		mPushMessageListDialog.findViewById(R.id.close_btn).setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				mPushMessageListDialog.dismiss();
-			}
-		});
-
-		showPushMessgeListView(true);
-		mPushMessageListDialog.show();
-	}
-
-	// プッシュメッセージの詳細表示
-	private void showPushMessageDetailView(final PushMessageDto dto) {
-		dto.readingFlg = true;
-
-		TextView messageTextView = (TextView)mPushMessageListDialog.findViewById(R.id.tv_message);
-		TextView sendDateTextView = (TextView)mPushMessageListDialog.findViewById(R.id.tv_send_date);
-		TextView sendOperationNameTextView = (TextView)mPushMessageListDialog.findViewById(R.id.tv_operation_name);
-		TextView sendUserTextView = (TextView)mPushMessageListDialog.findViewById(R.id.tv_send_user);
-		messageTextView.setText(dto.pushMessage);
-		sendDateTextView.setText(DateTimeUtil.toString(dto.pushSendDate, DateTimeFormat.yyyyMMddHHmm_slash));
-		sendOperationNameTextView.setText(dto.operationName);
-		sendUserTextView.setText(dto.pushSendLoginId);
-
-		pushMessageLogic.updateReadingFlg(dto.pushMessageId);
-		showPushMessgeListView(false);
-	}
-
-	// プッシュメッセージの一覧表示
-	private void showPushMessgeListView(boolean pushMessageListViewFlg) {
-		TextView titleTextView = (TextView)mPushMessageListDialog.findViewById(R.id.tv_toolbar_title);
-		if (pushMessageListViewFlg) {
-			mPushMessageListView.setVisibility(View.VISIBLE);
-			mPushMessageListDialog.findViewById(R.id.close_btn).setVisibility(View.VISIBLE);
-			mPushMessageListDialog.findViewById(R.id.back_btn).setVisibility(View.GONE);
-			mPushMessageListDialog.findViewById(R.id.ll_detail).setVisibility(View.GONE);
-			// リソースパターンの適用
-			titleTextView.setText(PatternStringUtil.patternToString(getApplicationContext(),
-					R.string.push_message_list,
-					getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)));
-		} else {
-			mPushMessageListView.setVisibility(View.GONE);
-			mPushMessageListDialog.findViewById(R.id.close_btn).setVisibility(View.VISIBLE);
-			mPushMessageListDialog.findViewById(R.id.back_btn).setVisibility(View.VISIBLE);
-			mPushMessageListDialog.findViewById(R.id.ll_detail).setVisibility(View.VISIBLE);
-			// リソースパターンの適用
-			titleTextView.setText(PatternStringUtil.patternToString(getApplicationContext(),
-					R.string.title_message_detail,
-					getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)));
-		}
-	}
-
-	/**
-	 * プッシュメッセージ送信ダイヤログ表示
-	 */
-	private void showPushMessageSendDialog(final OperationDto operationDto) {
-		mPushMessageSendDialog = new Dialog(this);
-		mPushMessageSendDialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-		mPushMessageSendDialog.setCanceledOnTouchOutside(false);
-		mPushMessageSendDialog.setContentView(R.layout.push_message_send_dialog);
-		mFixPushMessageListView = (ListView) mPushMessageSendDialog.findViewById(R.id.listView);
-
-
-		mPushMessageSendDialog.findViewById(R.id.back_btn).setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				showOperationSelectDialog();
-				mPushMessageSendDialog.dismiss();
-			}
-		});
-
-		mPushMessageSendDialog.findViewById(R.id.close_btn).setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				mPushMessageSendDialog.dismiss();
-			}
-		});
-
-		mPushMessageSendDialog.findViewById(R.id.send_btn).setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				sendPushMessageRequest(operationDto.operationId);
-			}
-		});
-
-		RadioGroup searchTarget = (RadioGroup) mPushMessageSendDialog.findViewById(R.id.send_target_group);
-		searchTarget.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
-			@Override
-			public void onCheckedChanged(RadioGroup group, int checkedId) {
-				if (checkedId == R.id.in_gourp) {
-					mSendType = Constant.PushMessageSendType.InGroup;
-				} else {
-					mSendType = Constant.PushMessageSendType.AllOperation;
-				}
-			}
-		});
-
-		mPushMessageSendDialog.findViewById(R.id.fix_push_message_layout).setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				showFixPushMessageView();
-			}
-		});
-
-		TextView messageTitleTextView = (TextView) mPushMessageSendDialog.findViewById(R.id.message_title);
-		// リソースパターンの適用
-		messageTitleTextView.setText(PatternStringUtil.patternToString(getApplicationContext(),
-				R.string.free_input,
-				getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)) + " > ");
-
-		TextView tvOperationName = (TextView) mPushMessageSendDialog.findViewById(R.id.operation_name);
-		tvOperationName.setText(operationDto.operationName);
-
-		mPushMessageSendDialog.show();
-	}
-
-	/**
-	 * プッシュメッセージ送信画面、定型文一覧画面切り替え
-	 * @param sendPushMessageViewFlg (true : プッシュメッセージ送信画面、false : 定型文一覧画面)
-	 */
-	private void showSendPushMessgeView(boolean sendPushMessageViewFlg) {
-		if (sendPushMessageViewFlg) {
-			mFixPushMessageListView.setVisibility(View.GONE);
-			mPushMessageSendDialog.findViewById(R.id.back_btn).setVisibility(View.GONE);
-
-			mPushMessageSendDialog.findViewById(R.id.push_send_layout).setVisibility(View.VISIBLE);
-			mPushMessageSendDialog.findViewById(R.id.close_btn).setVisibility(View.VISIBLE);
-			EditText messageEditText = (EditText) mPushMessageSendDialog.findViewById(R.id.message);
-			KeyboardUtils.show(this, messageEditText);
-		} else {
-			mFixPushMessageListView.setVisibility(View.VISIBLE);
-			mPushMessageSendDialog.findViewById(R.id.back_btn).setVisibility(View.VISIBLE);
-
-			mPushMessageSendDialog.findViewById(R.id.push_send_layout).setVisibility(View.GONE);
-			mPushMessageSendDialog.findViewById(R.id.close_btn).setVisibility(View.GONE);
-		}
-	}
-
-	/**
-	 * プッシュメッセージ送信依頼
-	 */
-	private void sendPushMessageRequest(long operationId) {
-		if (!ABVEnvironment.getInstance().networkAdapter.isNetworkConnected()) {
-			ABVToastUtil.showMakeText(this, R.string.request_network_connection, Toast.LENGTH_SHORT);
-			return;
-		}
-		//文字列チェック
-		EditText messageEditText = (EditText) mPushMessageSendDialog.findViewById(R.id.message);
-		String message = messageEditText.getText().toString();
-
-		String checkMessage = message.replace(" ", "");
-		if (checkMessage.length() == 0) {
-			// リソースパターンの適用
-			ABVToastUtil.showMakeText(this, PatternStringUtil.patternToString(getApplicationContext(),
-					R.string.push_message_input_null,
-					getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)), Toast.LENGTH_SHORT);
-			return;
-		}
-		byte[] messageByte = message.getBytes(StandardCharsets.UTF_8);
-		if (messageByte.length >= 207) {
-			// リソースパターンの適用
-			ABVToastUtil.showMakeText(this, PatternStringUtil.patternToString(getApplicationContext(),
-					R.string.push_message_input_over,
-					getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)), Toast.LENGTH_SHORT);
-			return;
-		}
-
-		// リソースパターンの適用
-		ProgressDialogHelper.showProgressPopup(this, true, PatternStringUtil.patternToString(getApplicationContext(),
-				R.string.file_initialization,
-				getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)));
-		try {
-			boolean result = pushMessageLogic.sendPushMessageRequest(mSendType, message, operationId);
-			if (result) {
-				mPushMessageSendDialog.dismiss();
-				// リソースパターンの適用
-				ABVToastUtil.showMakeText(this, PatternStringUtil.patternToString(getApplicationContext(),
-						R.string.push_message_send_success,
-						getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)), Toast.LENGTH_SHORT);
-			} else {
-				// リソースパターンの適用
-				ABVToastUtil.showMakeText(this, PatternStringUtil.patternToString(getApplicationContext(),
-						R.string.push_message_send_fail,
-						getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)), Toast.LENGTH_SHORT);
-			}
-		} catch (Exception e) {
-			Logger.e(TAG, e);
-			// リソースパターンの適用
-			ABVToastUtil.showMakeText(this, PatternStringUtil.patternToString(getApplicationContext(),
-					R.string.push_message_send_fail,
-					getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)), Toast.LENGTH_SHORT);
-		} finally {
-			ProgressDialogHelper.closeProgressPopup();
-		}
-	}
-
-	private void showFixPushMessageView() {
-		if (!ABVEnvironment.getInstance().networkAdapter.isNetworkConnected()) {
-			ABVToastUtil.showMakeText(this, R.string.request_network_connection, Toast.LENGTH_SHORT);
-			return;
-		}
-		EditText messageEditText = (EditText) mPushMessageSendDialog.findViewById(R.id.message);
-		KeyboardUtils.hide(this, messageEditText);
-
-		// リソースパターンの適用
-		ProgressDialogHelper.showProgressPopup(this, true, PatternStringUtil.patternToString(getApplicationContext(),
-				R.string.file_initialization,
-				getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)));
-		try {
-			List<FixPushMessageDto> fixPushMessageList = pushMessageLogic.getFixPushMessage();
-			FixPushMessageDto dto = new FixPushMessageDto();
-			// リソースパターンの適用
-			dto.name = PatternStringUtil.patternToString(getApplicationContext(),
-					R.string.free_input,
-					getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0));
-			fixPushMessageList.add(0, dto);
-			mFixPushMessageListView.setAdapter(new FixPushMessageAdapter(this, fixPushMessageList, mSelectedFixPuchMessagePosition));
-			mFixPushMessageListView.invalidate();
-			mFixPushMessageListView.setClickable(true);
-			mFixPushMessageListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-				@Override
-				public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-					mSelectedFixPuchMessagePosition = position;
-					FixPushMessageDto item = (FixPushMessageDto)parent.getItemAtPosition(position);
-
-					TextView messageTitleTextView = (TextView) mPushMessageSendDialog.findViewById(R.id.message_title);
-					messageTitleTextView.setText(item.name + " > ");
-
-					EditText messageEditText = (EditText) mPushMessageSendDialog.findViewById(R.id.message);
-					messageEditText.setText(item.value);
-					messageEditText.setSelection(messageEditText.getText().length());
-
-					showSendPushMessgeView(true);
-				}
-			});
-			showSendPushMessgeView(false);
-		} catch (Exception e) {
-			Logger.e(TAG, e);
-			// リソースパターンの適用
-			ABVToastUtil.showMakeText(this, PatternStringUtil.patternToString(getApplicationContext(),
-					R.string.respons_fix_push_message_fail,
-					getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)), Toast.LENGTH_SHORT);
-		} finally {
-			ProgressDialogHelper.closeProgressPopup();
-		}
-	}
-
-	// コミュニケーションのアイコン設定（未既読があれば、バッチ付きアイコンでセット）
-	protected void setCommunicationImageButton() {
-		List<PushMessageDto> pushMessageDtoList = pushMessageLogic.getAllPushMessageList();
-		boolean existUnreadFlg = checkUnReadCommunication(pushMessageDtoList);
-		communicationButton.setImageResource(existUnreadFlg ? R.drawable.ic_communication_menu_with_badge : R.drawable.ic_communication_menu);
-	}
-
-	/**
-	 * 未読のプッシュメッセージが存在するかチェック
-	 * @param pushMessageDtoList チェックするリスト
-	 * @return
-	 */
-	private boolean checkUnReadCommunication(List<PushMessageDto> pushMessageDtoList) {
-		boolean existUnreadFlg = false;
-		for (PushMessageDto pushMessageDto : pushMessageDtoList) {
-			if (!pushMessageDto.readingFlg) {
-				existUnreadFlg = true;
-				break;
-			}
-		}
-		return existUnreadFlg;
-	}
-
 	/**
 	 * デバイスのWifi有効・無効チェックし
 	 * 無効の場合、ダイアログ表示

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ShowPushMessageDailogActivity.java

@@ -3,10 +3,15 @@ package jp.agentec.abook.abv.ui.common.activity;
 import android.content.DialogInterface;
 import android.os.Bundle;
 
+import java.util.Date;
+import java.util.List;
+
 import jp.agentec.abook.abv.bl.common.log.Logger;
 import jp.agentec.abook.abv.bl.dto.OperationDto;
+import jp.agentec.abook.abv.bl.dto.PushMessageDto;
 import jp.agentec.abook.abv.bl.logic.AbstractLogic;
 import jp.agentec.abook.abv.bl.logic.OperationLogic;
+import jp.agentec.abook.abv.bl.logic.PushMessageLogic;
 import jp.agentec.abook.abv.launcher.android.R;
 import jp.agentec.abook.abv.ui.common.appinfo.AppDefType;
 import jp.agentec.abook.abv.ui.common.appinfo.AppDefType.PushMessageKey;
@@ -16,6 +21,8 @@ import jp.agentec.abook.abv.ui.common.util.AlertDialogUtil;
 import jp.agentec.abook.abv.ui.common.util.PatternStringUtil;
 import jp.agentec.abook.abv.ui.home.activity.OperationListActivity;
 import jp.agentec.abook.abv.ui.home.helper.ActivityHandlingHelper;
+import jp.agentec.adf.util.DateTimeFormat;
+import jp.agentec.adf.util.DateTimeUtil;
 import jp.agentec.adf.util.StringUtil;
 
 public class ShowPushMessageDailogActivity extends ABVUIActivity {
@@ -110,6 +117,32 @@ public class ShowPushMessageDailogActivity extends ABVUIActivity {
 				alertDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
 					@Override
 					public void onDismiss(DialogInterface dialog) {
+                        // Check PushMessage
+                        Bundle extras = getIntent().getExtras();
+                        if (extras != null) {
+                            Long roomId = extras.getLong(AppDefType.ChatPushMessageKey.roomId, 0);
+                            String roomName = extras.getString(AppDefType.ChatPushMessageKey.roomName);
+                            String pushSendLoginId = extras.getString(AppDefType.ChatPushMessageKey.pushSendLoginId);
+                            long pushSendDate = extras.getLong(AppDefType.ChatPushMessageKey.pushSendDate);
+                            if (roomId > 0 && !StringUtil.isNullOrEmpty(roomName)) {
+                                List<PushMessageDto> pushMessageDtoList = AbstractLogic.getLogic(PushMessageLogic.class).getAllPushMessageList();
+
+
+                                Logger.d("pushSendDate","pushSendDate : " + pushSendDate);
+                                String pushSendDateDate = DateTimeUtil.toString(new Date(pushSendDate), DateTimeFormat.yyyyMMddHHmmssSSS_none);
+                                Logger.d("pushSendDate","pushSendDateDate : " + pushSendDateDate);
+                                String pushSendDateDate2 = DateTimeUtil.toString(DateTimeUtil.toDate(pushSendDateDate, DateTimeFormat.yyyyMMddHHmmssSSS_none), DateTimeFormat.yyyyMMddHHmmssSSS_none);
+                                Logger.d("pushSendDate","pushSendDateDate2 : " + pushSendDateDate2);
+
+                                for (int i=0; i < pushMessageDtoList.size() - 1; i++) {
+                                    String tempDate = DateTimeUtil.toString(pushMessageDtoList.get(i).pushSendDate, DateTimeFormat.yyyyMMddHHmmssSSS_none);
+
+                                    Logger.d("tempDate","date : " + tempDate);
+                                }
+
+                                ActivityHandlingHelper.getInstance().startChatWebviewActivity(roomId, roomName);
+                            }
+                        }
                         finish();
 					}
 				});

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/appinfo/AppDefType.java

@@ -68,6 +68,9 @@ public interface AppDefType {
 		String OPERATION_SORT_CONDITION = "operation_sort_condition"; // 作業のソート
 
 		String APERTURE_MASTER_DATA_FETCH_DATE = "apertureMasterDataFetchDate";  // 絞り検索マスタデータのFetchDate
+
+		String CHAT_LAST_ROOMNAME = "chatLastRoom";  // 最後のルーム名
+		String CHAT_LAST_ROOMID = "chatLastRoomId";  // 最後のルームID
 	}
 
 	interface SubMenuType {
@@ -131,4 +134,12 @@ public interface AppDefType {
 	interface UrlPattern {
 		String smart360 = "smart360";
 	}
+
+	// Chat PushMessage
+	interface ChatPushMessageKey {
+		String roomId = "roomId";
+		String roomName = "roomName";
+		String pushSendLoginId = "pushSendLoginId";
+		String pushSendDate = "pushSendDate";
+	}
 }

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

@@ -14,10 +14,12 @@ import java.io.InputStream;
 
 import jp.agentec.abook.abv.bl.common.ABVEnvironment;
 import jp.agentec.abook.abv.bl.common.log.Logger;
+import jp.agentec.abook.abv.bl.data.ABVDataCache;
 import jp.agentec.abook.abv.bl.download.ContentFileExtractor;
 import jp.agentec.abook.abv.launcher.android.R;
 import jp.agentec.abook.abv.ui.common.activity.ABVUIActivity;
 import jp.agentec.abook.abv.ui.home.helper.ActivityHandlingHelper;
+import jp.agentec.abook.abv.ui.viewer.activity.ParentWebViewActivity;
 import jp.agentec.adf.util.FileUtil;
 
 public class ABookSettingActivity extends PreferenceActivity {
@@ -72,7 +74,28 @@ public class ABookSettingActivity extends PreferenceActivity {
 
     private void backToHome() {
 		ABVUIActivity activity = ActivityHandlingHelper.getInstance().getPreviousOfSettingActivity();
-		Intent intent = new Intent(this, (activity != null ? activity.getClass() : OperationListActivity.class));
+
+		// Chat
+		ParentWebViewActivity chatActity = null;
+		Intent intent = null;
+		if (activity == null) {
+			chatActity = ActivityHandlingHelper.getInstance().getPreviousForChatOfSettingActivity();
+			intent = new Intent(this, (chatActity != null ? chatActity.getClass() : OperationListActivity.class));
+			//noinspection VariableNotUsedInsideIf
+			if (chatActity != null) {
+				intent.putExtra("chatWebviewUrl", ABVEnvironment.getInstance().acmsAddress + ABVDataCache.getInstance().getUrlPath() + "/chatapi/chat/");
+				String sid = ABVDataCache.getInstance().getMemberInfo().sid;
+				intent.putExtra("sid", sid);
+				String loginId = ABVDataCache.getInstance().getMemberInfo().loginId;
+				String shopName = ABVDataCache.getInstance().getUrlPath();
+				intent.putExtra("loginId", loginId);
+				intent.putExtra("shopName", shopName);
+			}
+		}
+
+		if (chatActity == null) {
+			intent = new Intent(this, (activity != null ? activity.getClass() : OperationListActivity.class));
+		}
 
 		intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
 		startActivity(intent);

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

+package jp.agentec.abook.abv.ui.home.activity;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.DownloadManager;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.res.Configuration;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Environment;
+import android.view.View;
+import android.view.Window;
+import android.webkit.CookieManager;
+import android.webkit.DownloadListener;
+import android.webkit.JavascriptInterface;
+import android.webkit.JsResult;
+import android.webkit.ValueCallback;
+import android.webkit.WebChromeClient;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+import android.widget.ImageButton;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.Toast;
+
+import java.io.File;
+import java.util.List;
+import java.util.Objects;
+
+import jp.agentec.abook.abv.bl.common.ABVEnvironment;
+import jp.agentec.abook.abv.bl.common.constant.ABookKeys;
+import jp.agentec.abook.abv.bl.common.log.Logger;
+import jp.agentec.abook.abv.bl.dto.PushMessageDto;
+import jp.agentec.abook.abv.cl.util.PreferenceUtil;
+import jp.agentec.abook.abv.launcher.android.R;
+import jp.agentec.abook.abv.ui.common.appinfo.AppDefType;
+import jp.agentec.abook.abv.ui.common.constant.ErrorCode;
+import jp.agentec.abook.abv.ui.common.constant.ErrorMessage;
+import jp.agentec.abook.abv.ui.common.constant.NaviConsts;
+import jp.agentec.abook.abv.ui.common.dialog.ABookAlertDialog;
+import jp.agentec.abook.abv.ui.common.util.ABVToastUtil;
+import jp.agentec.abook.abv.ui.common.util.AlertDialogUtil;
+import jp.agentec.abook.abv.ui.home.helper.ActivityHandlingHelper;
+import jp.agentec.abook.abv.ui.viewer.activity.ParentWebViewActivity;
+
+/**
+ * Created by AIS-NB-048 on 2019/07/31.
+ */
+
+public class ChatWebviewActivity extends ParentWebViewActivity {
+    private WebView mChatWebView;
+    private String chatWebviewUrl;
+
+    private final String TAG = "ChatWebviewActivity";
+    //AISDevelop
+    private JsInf jsInf = new JsInf();
+
+    private ValueCallback<Uri[]> mUploadMessage;
+
+    private String sid, roomName, loginId, shopName;
+    private Long roomId;
+
+    public AlertDialog myAlertDialog;
+
+    private ImageButton mOperationHomeButton;                // ホームボタン
+    private ImageButton mOperationRelatedContentButton;      // 関連資料ボタン
+
+    private BroadcastReceiver receiver;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        if (isNormalSize()) {
+            setPortraitIfNormal();
+        }
+
+        setContentView(R.layout.chat_webview);
+        Intent intent = getIntent();
+        chatWebviewUrl = intent.getStringExtra("chatWebviewUrl");
+        sid = intent.getStringExtra("sid");
+        roomId = intent.getLongExtra("roomId", 0);
+        roomName = intent.getStringExtra("roomName");
+        loginId = intent.getStringExtra("loginId");
+        shopName = intent.getStringExtra("shopName");
+
+        mChatWebView = findViewById(R.id.chatWebview2);
+        mChatWebView.setOverScrollMode(View.OVER_SCROLL_NEVER);  //オーバースクロールしない。
+        mChatWebView.setVerticalScrollBarEnabled(false); //スクロールバーを消す。
+
+        WebSettings settings = mChatWebView.getSettings();
+        settings.setJavaScriptEnabled(true); //Javascriptを有効にする。
+        settings.setAppCacheEnabled(false);
+        settings.setCacheMode(WebSettings.LOAD_NO_CACHE);
+
+        if (Logger.isDebugEnabled()) {
+            mChatWebView.setWebContentsDebuggingEnabled(true); //デバッグモード（chromeからinspect可)
+        }
+
+        // 最後のチャットのルーム名
+        String lastRoomName = PreferenceUtil.getUserPref(getApplicationContext(), AppDefType.UserPrefKey.CHAT_LAST_ROOMNAME, "");
+        // 最後のチャットのルーム
+        String lastRoomId = PreferenceUtil.getUserPref(getApplicationContext(), AppDefType.UserPrefKey.CHAT_LAST_ROOMID, "");
+
+        mChatWebView.addJavascriptInterface(jsInf, "android");
+        String fixedParam = "&platform=android&isMobile=true";
+        //ページをロード
+        if(roomId != 0 && roomName != null) {  // by push message
+            String parameterData = "sid=" + sid + "&loginId=" + loginId +  "&shopName=" + shopName +  "&roomId=" + roomId + "&roomName=" + roomName + fixedParam;
+            mChatWebView.postUrl(chatWebviewUrl, parameterData.getBytes());
+        }
+        else {  // Chat
+            if (lastRoomName.length() > 0 && lastRoomId.length() > 0) {
+                String parameterData = "sid=" + sid + "&loginId=" + loginId +  "&shopName=" + shopName +  "&roomId=" + lastRoomId + "&roomName=" + lastRoomName + fixedParam;
+                mChatWebView.postUrl(chatWebviewUrl, parameterData.getBytes());
+            } else {
+                String parameterData = "sid=" + sid + "&loginId=" + loginId + "&shopName=" + shopName + fixedParam;
+                mChatWebView.postUrl(chatWebviewUrl, parameterData.getBytes());
+            }
+        }
+
+        mChatWebView.setWebChromeClient(new WebChromeClient() {
+            @Override
+            public boolean onShowFileChooser(WebView webView, ValueCallback<Uri[]> filePathCallback, FileChooserParams fileChooserParams) {
+                boolean result = false;
+                // 画像が選択された場合
+                if (fileChooserParams.getAcceptTypes()[0].toLowerCase().indexOf(ABookKeys.IMAGE) != -1) {
+                    result = startCameraIntent(ABOOK_CHECK_TASK_IMAGE, "Camera", ABookKeys.IMAGE, true);
+                // 動画が選択された場合
+                } else if (fileChooserParams.getAcceptTypes()[0].toLowerCase().indexOf(ABookKeys.VIDEO) != -1) {
+                    result = startCameraIntent(ABOOK_CHECK_TASK_VIDEO, "Camera", ABookKeys.VIDEO, true);
+                }
+                if (result) {
+                    if (mUploadMessage != null) {
+                        mUploadMessage.onReceiveValue(null);
+                    }
+                    mUploadMessage = filePathCallback;
+                }
+                return result;
+            }
+
+            // WebView内のAlert Dialogを処理する
+            @Override
+            public boolean onJsAlert(WebView view, String url, String message, final JsResult result) {
+                if (myAlertDialog != null && myAlertDialog.isShowing()) {
+                    result.confirm();
+                    return true;
+                }
+
+                if (message.equals("server error Ocurred")) {
+                    message = getString(R.string.msg_error_chat_server);
+                } else if (message.equals("Disconnected from the server")) {
+                    message = getString(R.string.msg_error_chat_disconnected);
+                } else if (message.equals("connect_error")) {
+                    message = getString(R.string.msg_error_chat_connect);
+                } else if (message.equals("Room not found")) {
+                    message = getString(R.string.msg_error_chat_room_not_found);
+                } else if (message.equals("ServerError 500")) {
+                    message = getString(R.string.msg_error_chat_500);
+                } else if (message.equals("error chat join")) {
+                    message = getString(R.string.msg_error_chat_join);
+                } else if (message.equals("Message length error")) {
+                    message = getString(R.string.msg_error_chat_text_length);
+                    // #36130 start
+                } else if (message.equals("Input RoomName")) {
+                    message = getString(R.string.msg_error_chat_input_roomname);
+                    // #36130 end
+                    // #36142
+                } else if (message.equals("Please enter room name less than 20 characters")) {
+                    message = getString(R.string.msg_error_chat_room_name_too_long);
+                } else if (message.equals("InvalidSpecialCharacterRoomName")) {
+                    message = getString(R.string.msg_error_chat_name_has_invalid_character);
+                } else if (message.equals("SC_FORBIDDEN")) {
+                    message = getString(R.string.msg_error_chat_room_sc_forbidden);
+                } else {
+                    message = message;
+                }
+
+                final String tempMessage = message;
+
+                ABookAlertDialog dialog = AlertDialogUtil.createAlertDialog(ChatWebviewActivity.this, R.string.app_name);
+                dialog.setMessage(message);
+                dialog.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        dialog.dismiss();
+                    }
+                });
+                dialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
+                    @Override
+                    public void onDismiss(DialogInterface dialog) {
+                        // サーバと接続された場合、チャット画面を閉じる
+
+                        if (tempMessage.equals(getString(R.string.msg_error_chat_disconnected)) || tempMessage.equals(getString(R.string.msg_error_chat_room_sc_forbidden))) {
+                            mChatWebView.loadUrl("javascript:leaveRoom()");
+                            finish();
+                        } else if (tempMessage.equals(getString(R.string.msg_error_chat_join))) {
+                            getLogin();
+                            finish();
+                        }
+                    }
+                });
+
+                myAlertDialog = dialog;
+                if (!isFinishing()) {
+                    dialog.show();
+                }
+                result.confirm();
+                return true;
+            }
+
+            // WebView内のConfirm Dialogを処理する
+            @Override
+            public boolean onJsConfirm(WebView view, String url, String message, final JsResult result) {
+                if (message.equals("Do you want to leave this room?")) {
+                    message = getString(R.string.msg_chat_confirm_exit);
+                } else if (message.equals("Do you want to remove selected members from the list?")) {
+                    message = getString(R.string.msg_chat_confirm_member);
+                // #36128
+                } else if (message.equals("Do you want to delete this room?")) {
+                    message = getString(R.string.msg_chat_confirm_delete);
+                } else {
+                    message = "Confirm ?";
+                }
+                ABookAlertDialog confirmAlert = AlertDialogUtil.createAlertDialog(ChatWebviewActivity.this, R.string.app_name);
+                confirmAlert.setMessage(message);
+                confirmAlert.setButton(DialogInterface.BUTTON_POSITIVE, getResources().getString(R.string.confirm), new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        result.confirm();
+                    }
+                });
+                confirmAlert.setButton(DialogInterface.BUTTON_NEGATIVE, getResources().getString(R.string.cancel), new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        result.cancel();
+                    }
+                });
+                confirmAlert.setCancelable(false);
+                showAlertDialog(confirmAlert);
+
+                return true;
+            }
+        });
+
+        mChatWebView.setDownloadListener(new DownloadListener() {
+            @Override
+            public void onDownloadStart(String url, String userAgent,
+                                        String contentDisposition, String mimetype,
+                                        long contentLength) {
+                Uri uri = Uri.parse(url);
+                DownloadManager.Request request = new DownloadManager.Request(uri);
+
+                final String fileName = uri.getQueryParameter("fileName");
+
+                //------------------------COOKIE!!------------------------
+                String cookies = CookieManager.getInstance().getCookie(url);
+                request.addRequestHeader("cookie", cookies);
+                //------------------------COOKIE!!------------------------
+                request.addRequestHeader("User-Agent", userAgent);
+                request.setTitle(fileName);
+                request.allowScanningByMediaScanner();
+                request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED); //Notify client once download is completed!
+                request.setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, fileName);
+                DownloadManager dm = (DownloadManager) getSystemService(DOWNLOAD_SERVICE);
+                if (dm != null) {
+                    dm.enqueue(request);
+                }
+                Toast.makeText(getApplicationContext(), getString(R.string.download_start), //To notify the Client that the file is being downloaded
+                        Toast.LENGTH_LONG).show();
+            }
+        });
+
+        // ブロードキャストレシーバーの追加
+        receiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                if (DownloadManager.ACTION_DOWNLOAD_COMPLETE.equals(intent.getAction())) {
+                    mChatWebView.loadUrl("javascript:dismissLoadingIndicator()");
+                }
+            }
+        };
+
+        // レシーバーオブジェクトの生成
+        IntentFilter tempIntent = new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE);
+        registerReceiver(receiver, tempIntent);
+
+        mChatWebView.setWebViewClient(new WebViewClient() {
+            @Override
+            public void onReceivedError(WebView view, int errorCode,
+                                        String description, String failingUrl) {
+                Logger.d("WEB_VIEW_TEST", "error code:" + errorCode + " - " + description);
+            }
+
+            @Override
+            public boolean shouldOverrideUrlLoading(WebView view, String url) {
+                Logger.d("url", "url : " + url);
+
+                Uri uri = Uri.parse(url);
+                String fileName = new File(Objects.requireNonNull(uri.getPath())).getName();
+
+                // イメージをダウンロードする(png, jpg, jpeg, mp4, mov)
+                if (url.toLowerCase().endsWith(".png") || url.toLowerCase().endsWith(".jpg") || url.toLowerCase().endsWith(".jpeg")
+                        || url.toLowerCase().endsWith(".mov") || url.toLowerCase().endsWith(".mp4")) {
+                    view.loadUrl("javascript:showLoadingIndicator()");
+                    DownloadManager mdDownloadManager = (DownloadManager) getSystemService(Context.DOWNLOAD_SERVICE);
+                    DownloadManager.Request request = new DownloadManager.Request(
+                            Uri.parse(url));
+                    File destinationFile = new File(Environment.getExternalStorageDirectory(), fileName);                    request.setDescription("Downloading ...");
+                    request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
+                    request.setDestinationUri(Uri.fromFile(destinationFile));
+                    assert mdDownloadManager != null;
+                    mdDownloadManager.enqueue(request);
+                } else {  // その他のファイルはurlのみ確認
+                    Logger.d("download ", "download URL :" + url);
+                }
+                return false;
+            }
+        });
+
+        // ホームボタン（作業一覧へ遷移ボタン）
+        mOperationHomeButton = (ImageButton) findViewById(R.id.btn_operation_home);
+        // 共通資料ボタン
+        mOperationRelatedContentButton = (ImageButton) findViewById(R.id.btn_common_content);
+
+        // 共通関連資料ボタン
+        mOperationRelatedContentButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mChatWebView.loadUrl("javascript:leaveRoom()");
+                finish();
+                showCommonContent();
+            }
+        });
+        communicationButton = (ImageButton) findViewById(R.id.btn_communication_menu);
+
+        // Toolbar
+        settingBottomToolbar();
+        setOnButtonEvent();
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        if (isNormalSize()) {
+            setPortraitIfNormal();
+        }
+    }
+
+    @Override
+    public void onDestroy(){
+        super.onDestroy();
+
+        if (receiver != null) {
+            unregisterReceiver(receiver);
+            receiver = null;
+        }
+    }
+
+    // 下辺のツールバー設定
+    private void settingBottomToolbar() {
+        // ホームボタン活性化
+        mOperationHomeButton.setEnabled(true);
+        // 共通資料ボタンの非活性化
+        mOperationRelatedContentButton.setEnabled(true);
+        // バッチを付けるか判定して、イメージを設定
+        setCommunicationImageButton();
+
+
+        // コミュニケーションボタン
+        communicationButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                showCommunicationMenuDialog();
+            }
+        });
+    }
+
+    /**
+     * コミュニケーションメニューダイアログ
+     */
+    public void showCommunicationMenuDialog2() {
+        mCommunicationMenuDialog = new Dialog(this);
+        mCommunicationMenuDialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        mCommunicationMenuDialog.setCanceledOnTouchOutside(false);
+        mCommunicationMenuDialog.setContentView(R.layout.communication_menu_dialog);
+
+        List<PushMessageDto> pushMessageDtoList = pushMessageLogic.getAllPushMessageList();
+
+        boolean existUnreadFlg = false;
+        for (PushMessageDto pushMessageDto : pushMessageDtoList) {
+            if (!pushMessageDto.readingFlg) {
+                existUnreadFlg = true;
+                break;
+            }
+        }
+
+        ImageView ivIcon = (ImageView)mCommunicationMenuDialog.findViewById(R.id.btn_push_message_list);
+
+        if (existUnreadFlg) {
+            ivIcon.setBackgroundResource(R.drawable.ic_communication_push_message_list_with_badge);
+        } else {
+            ivIcon.setBackgroundResource(R.drawable.ic_communication_push_message_list);
+        }
+
+        LinearLayout ll_menuItem_meeting = (LinearLayout)mCommunicationMenuDialog.findViewById(R.id.ll_item_meeting);
+        ll_menuItem_meeting.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                ActivityHandlingHelper.getInstance().startMeetingActivity();
+                mCommunicationMenuDialog.dismiss();
+            }
+        });
+
+        LinearLayout ll_menuItem_push_message = (LinearLayout)mCommunicationMenuDialog.findViewById(R.id.ll_item_push_message);
+        ll_menuItem_push_message.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+//                showOperationSelectDialog();
+                mCommunicationMenuDialog.dismiss();
+            }
+        });
+
+        LinearLayout ll_menuItem_push_message_list = (LinearLayout)mCommunicationMenuDialog.findViewById(R.id.ll_item_push_message_list);
+        ll_menuItem_push_message_list.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+//                showPushMessageListDialog();
+                mCommunicationMenuDialog.dismiss();
+            }
+        });
+
+        // chat
+        LinearLayout ll_menuItem_chat = (LinearLayout)mCommunicationMenuDialog.findViewById(R.id.ll_item_chat);
+        ll_menuItem_chat.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                // チャット利用のはネットワークが繋がる時のみ
+                if (ABVEnvironment.getInstance().networkAdapter.isNetworkConnected()) {
+                    ActivityHandlingHelper.getInstance().startChatWebviewActivity();
+                    mCommunicationMenuDialog.dismiss();
+                } else {
+                    ABVToastUtil.showMakeText(ChatWebviewActivity.this, R.string.request_network_connection, Toast.LENGTH_SHORT);
+                    return;
+                }
+            }
+        });
+
+        mCommunicationMenuDialog.findViewById(R.id.close_btn).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mCommunicationMenuDialog.dismiss();
+            }
+        });
+
+        mCommunicationMenuDialog.show();
+    }
+
+    // 保存するファイルをjpgに固定する
+    public String getFileName(String url) {
+        String filenameWithoutExtension = "";
+        filenameWithoutExtension = String.valueOf(System.currentTimeMillis()
+                + ".jpg");
+        return filenameWithoutExtension;
+    }
+
+    public void getLogin() {
+        // ローカルの言語を確認する
+        String localLanguage = ActivityHandlingHelper.getInstance().getLocaleFileName();
+        // 最後のチャットのルーム名
+        String lastRoomName = PreferenceUtil.getUserPref(getApplicationContext(), AppDefType.UserPrefKey.CHAT_LAST_ROOMNAME, "");
+        // 最後のチャットのルーム
+        String lastRoomId = PreferenceUtil.getUserPref(getApplicationContext(), AppDefType.UserPrefKey.CHAT_LAST_ROOMID, "");
+
+        if (roomId != 0 && roomName != null) {
+            // 最後のチャットのルーム名
+            PreferenceUtil.putUserPref(getApplicationContext(), AppDefType.UserPrefKey.CHAT_LAST_ROOMNAME, roomName);
+            // 最後のチャットのルーム
+            PreferenceUtil.putUserPref(getApplicationContext(), AppDefType.UserPrefKey.CHAT_LAST_ROOMID, String.valueOf(roomId));
+
+            mChatWebView.loadUrl(String.format("javascript:getLoginParameter('%s', '%s', '%s', '%s', '%s', '%s');", sid, loginId, shopName, roomId, roomName, localLanguage));
+        } else {
+            if (lastRoomName.length() > 0 && lastRoomId.length() > 0) {
+                mChatWebView.loadUrl(String.format("javascript:getLoginParameter('%s', '%s', '%s', '%s', '%s', '%s');", sid, loginId, shopName, lastRoomId, lastRoomName, localLanguage));
+            } else {
+                mChatWebView.loadUrl(String.format("javascript:getLoginParameter('%s', '%s', '%s', undefined, undefined, '%s');", sid, loginId, shopName, localLanguage));
+            }
+        }
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        Uri[] result = null;
+        Uri dataUri = null;
+        if (data != null && resultCode == RESULT_OK) {
+            String dataString = data.getDataString();
+            if (dataString != null) {
+                dataUri = Uri.parse(dataString);
+                result = new Uri[]{dataUri};
+            }
+        }
+
+        if (requestCode == ABOOK_CHECK_TASK_IMAGE) {
+            if (mUploadMessage == null) {
+                return;
+            }
+            // 画像
+            try {
+                if (dataUri == null) {
+                    dataUri = imageUri;
+                }
+                Uri responseUri = attachmentImageProcessing(dataUri);
+                if (responseUri != null) {
+                    mUploadMessage.onReceiveValue(new Uri[]{responseUri});
+                } else {
+                    mUploadMessage.onReceiveValue(null);
+                }
+            } catch (Exception e) {
+                Logger.e(TAG, e);
+                mUploadMessage.onReceiveValue(null);
+                ErrorMessage.showErrorMessageToast(getApplicationContext(), ErrorCode.E107);
+            }
+        } else if (requestCode == ABOOK_CHECK_TASK_VIDEO) {
+            if (mUploadMessage == null) {
+                return;
+            }
+            mUploadMessage.onReceiveValue(result);
+        } else if (requestCode == ABOOK_CHECK_SELECT_SCENE) {
+            if (data != null && result != null) {
+                confirmEntrySceneDialog(result[0]);
+            }
+        }
+        mUploadMessage = null;
+    }
+
+    /**
+     * 未読のプッシュメッセージが存在するかチェック
+     * @param pushMessageDtoList チェックするリスト
+     * @return
+     */
+    private boolean checkUnReadCommunication(List<PushMessageDto> pushMessageDtoList) {
+        boolean existUnreadFlg = false;
+        for (PushMessageDto pushMessageDto : pushMessageDtoList) {
+            if (!pushMessageDto.readingFlg) {
+                existUnreadFlg = true;
+                break;
+            }
+        }
+        return existUnreadFlg;
+    }
+
+    private class JsInf {
+        @JavascriptInterface
+        public void saveVisitRoomInfo(String roomId, String roomName) {
+            System.out.println("roomName : " + roomName);
+            System.out.println("roomId : " + roomId);
+            // 最後のチャットのルーム名
+            PreferenceUtil.putUserPref(getApplicationContext(), AppDefType.UserPrefKey.CHAT_LAST_ROOMNAME, roomName);
+            // 最後のチャットのルーム
+            PreferenceUtil.putUserPref(getApplicationContext(), AppDefType.UserPrefKey.CHAT_LAST_ROOMID, roomId);
+        }
+        @JavascriptInterface
+        public void getLoginParameter() {
+            mChatWebView.post(new Runnable() {
+                @Override
+                public void run() {
+                    getLogin();
+                }
+            });
+        }
+
+    }
+
+    /**
+     * 作業一覧へ遷移
+     */
+    private void backToHome() {
+        mChatWebView.loadUrl("javascript:leaveRoom()");
+        finish();
+        Intent intent = new Intent();
+        intent.setClass(ChatWebviewActivity.this, OperationListActivity.class);
+        intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
+        startActivity(intent, NaviConsts.Left);
+    }
+
+    /**　
+     * ボタンイベント設定
+     */
+    private void setOnButtonEvent() {
+        // 作業のホーム画面へ
+        mOperationHomeButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                backToHome();
+            }
+        });
+    }
+
+    // 共通資料画面表示
+    private void showCommonContent() {
+        Intent intent = new Intent();
+        intent.setClass(ChatWebviewActivity.this, OperationRelatedContentActivity.class);
+        intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
+        startActivity(intent, NaviConsts.Left);
+//        overridePendingTransition(R.anim.viewin_left_to_right, R.anim.viewin_left_to_right);
+    }
+
+    // 設定画面へ遷移
+    public void onClickSetting(View v) {
+        mChatWebView.loadUrl("javascript:leaveRoom()");
+        finish();
+        showSetting();
+    }
+
+}

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

@@ -398,8 +398,13 @@ public class LoginActivity extends ABVLoginActivity {
 		CommonExecutor.execute(new Runnable() {
 			@Override
             public void run() {
+				if (oldMemberInfoDto != null && oldMemberInfoDto.loginStatus == LoginStatus.LimitLogin.statusCode()) {
+					// アプリロックの場合サーバ認証せずにログイン
+					offlineLogin();
+				} else {
 					fcmRegister();
 				}
+			}
 		});
 	}
 
@@ -627,6 +632,10 @@ public class LoginActivity extends ABVLoginActivity {
 								} else {
 									changeUserInit2();
 								}
+
+								// ユーザ変更があった場合、チャットのルーム情報をクリアする
+								clearChatLastRoom();
+
 								//ユーザ変更があった場合、FetchDateをクリアする
 								AcmsDao dao =  AbstractDao.getDao(AcmsDao.class);
 								dao.clearFetchDate();
@@ -698,4 +707,12 @@ public class LoginActivity extends ABVLoginActivity {
 	protected void goNext() {
 		showMainActivity(mLoginId);
 	}
+
+	// チャットのルーム情報をクリア
+	private void clearChatLastRoom() {
+		// 最後のチャットのルーム名
+		PreferenceUtil.putUserPref(getApplicationContext(), UserPrefKey.CHAT_LAST_ROOMNAME, "");
+		// 最後のチャットのルーム
+		PreferenceUtil.putUserPref(getApplicationContext(), UserPrefKey.CHAT_LAST_ROOMID, "");
+	}
 }

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

@@ -259,6 +259,7 @@ public class OperationListActivity extends ABVUIActivity {
             }
         });
 
+        if (ABVDataCache.getInstance().serviceOption.isUnableIOReport()) {
             // 簡易帳票印刷ボタン
             mQuickReportPrintButton.setOnClickListener(new View.OnClickListener() {
                 @Override
@@ -267,6 +268,10 @@ public class OperationListActivity extends ABVUIActivity {
                     }
                 });
             mQuickReportPrintButton.setVisibility(View.VISIBLE);
+        } else {
+            findViewById(R.id.print_layout).setVisibility(View.GONE);
+            mQuickReportPrintButton.setVisibility(View.GONE);
+        }
 
         // 一括同期ボタン
         mOperationBatchSyncButton.setOnClickListener(new View.OnClickListener() {
@@ -349,6 +354,14 @@ public class OperationListActivity extends ABVUIActivity {
                 alertDialog.show();
             }
         }
+        // プッシュメッセージがある場合
+        else if (!StringUtil.isNullOrEmpty(getIntent().getStringExtra(AppDefType.ChatPushMessageKey.roomName)) &&
+                getIntent().getLongExtra(AppDefType.ChatPushMessageKey.roomId, '0') > 0) {
+            ActivityHandlingHelper.getInstance().startChatWebviewActivity(
+                    getIntent().getLongExtra(AppDefType.ChatPushMessageKey.roomId, '0'),
+                    getIntent().getStringExtra(AppDefType.ChatPushMessageKey.roomName));
+        }
+
         // リスト更新
         setOperationListView();
     }

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

@@ -109,8 +109,12 @@ public class OperationRelatedContentActivity extends ABVUIActivity {
                 showCommunicationMenuDialog();
             }
         });
-        // 印刷ボタン活性化
+        if (ABVDataCache.getInstance().serviceOption.isUnableIOReport()) {
             mQuickReportPrintButton.setVisibility(View.VISIBLE);
+        } else {
+            findViewById(R.id.print_layout).setVisibility(View.GONE);
+            mQuickReportPrintButton.setVisibility(View.GONE);
+        }
     }
 
     @Override

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ActivityHandlingHelper.java

@@ -24,6 +24,7 @@ import java.net.MalformedURLException;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Locale;
 import java.util.Observable;
 import java.util.Stack;
 
@@ -48,6 +49,7 @@ import jp.agentec.abook.abv.bl.download.ContentRefresher;
 import jp.agentec.abook.abv.bl.download.ContentZipDownloadNotification;
 import jp.agentec.abook.abv.bl.dto.ContentDto;
 import jp.agentec.abook.abv.bl.dto.MeetingDto;
+import jp.agentec.abook.abv.bl.dto.PushMessageDto;
 import jp.agentec.abook.abv.bl.logic.AbstractLogic;
 import jp.agentec.abook.abv.bl.logic.ContentLogic;
 import jp.agentec.abook.abv.bl.logic.ContentReadingLogLogic;
@@ -72,6 +74,7 @@ import jp.agentec.abook.abv.ui.common.constant.NaviConsts;
 import jp.agentec.abook.abv.ui.common.dialog.ABookAlertDialog;
 import jp.agentec.abook.abv.ui.common.util.ABVToastUtil;
 import jp.agentec.abook.abv.ui.common.util.AlertDialogUtil;
+import jp.agentec.abook.abv.ui.home.activity.ChatWebviewActivity;
 import jp.agentec.abook.abv.ui.home.activity.OperationListActivity;
 import jp.agentec.abook.abv.ui.home.activity.OperationMeetingListActivity;
 import jp.agentec.abook.abv.ui.home.activity.OperationRelatedContentActivity;
@@ -123,6 +126,9 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
     private static Dialog meetingAlertDialog;
     private ABVUIActivity previousOfSettingActivity;
 
+    // Chat
+    private ParentWebViewActivity previousOfSettingActivity2;
+
     protected ContentRefresher contentRefresher = ContentRefresher.getInstance();
 
     private ActivityHandlingHelper() {
@@ -628,7 +634,6 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
 
         int size = currentActivityStack.size();
 
-        if (size > 0) {
         for(int i = size-1; i >= 0; i--) {
             ABVAuthenticatedActivity activity = currentActivityStack.elementAt(i);
             if (activity instanceof OperationListActivity) {
@@ -636,9 +641,6 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
             }
         }
         return null;
-        } else {
-            return null;
-        }
     }
 
     public synchronized void setCurrentActivity(ABVAuthenticatedActivity currentActivity) {
@@ -1306,12 +1308,12 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
 
     // 資料更新画面表示
     private void showUpdateConfirm(final long contentId, final String contentName) {
-        if (!ABVEnvironment.getInstance().networkAdapter.isNetworkConnected()) {
-            // インターネットが繋がってない場合は、更新前の関連資料を開く
-            startContentActivity(contentId, 0);
-        } else {
+        if (ABVEnvironment.getInstance().networkAdapter.isNetworkConnected()) {
             createUpdateConfirm(contentId, contentName);
             updateConfirmDialog.show();
+        } else {
+            // インターネットが繋がってない場合は、更新前の関連資料を開く
+            startContentActivity(contentId, 0);
         }
     }
 
@@ -1549,6 +1551,138 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
         PreferenceUtil.putUserPref(mContext, UserPrefKey.MEETING_ENTERED_FLG, false); // フラグをオフにする
     }
 
+    public String getLocaleFileName() {
+        Locale primaryLocale = mContext.getResources().getConfiguration().getLocales().get(0);
+        String locale = primaryLocale.getDisplayName();
+        String localeLanguage = "en";
+        if (primaryLocale.equals(Locale.JAPAN) || primaryLocale.equals(Locale.JAPANESE)) {
+            localeLanguage = "ja";
+        } else if (primaryLocale.equals(Locale.KOREA) || primaryLocale.equals(Locale.KOREAN)){
+            localeLanguage = "ko";
+        }
+        return localeLanguage;
+    }
+
+    //プシュメッセージ一覧からチャットに入る
+    public void startChatWebviewActivityWithPushMessage(PushMessageDto dto) {
+        String className = ChatWebviewActivity.class.getName();
+        boolean isNormalSize = (mContext.getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) == Configuration.SCREENLAYOUT_SIZE_NORMAL;
+        Intent intent = new Intent();
+
+        intent.putExtra("chatWebviewUrl",ABVEnvironment.getInstance().acmsAddress + ABVDataCache.getInstance().getUrlPath() + "/chatapi/chat/");
+        String sid = ABVDataCache.getInstance().getMemberInfo().sid;
+        intent.putExtra("sid", sid);
+        String loginId = ABVDataCache.getInstance().getMemberInfo().loginId;
+        String shopName = ABVDataCache.getInstance().getUrlPath();
+        intent.putExtra("loginId", loginId);
+        intent.putExtra("shopName", shopName);
+        if(dto != null)
+        {
+            intent.putExtra("roomId",dto.roomId);
+            intent.putExtra("roomName", dto.roomName);
+        }
+        intent.setClassName(mContext.getPackageName(), className);
+
+        Activity activity2 = null;
+        if (!currentActivityStack.isEmpty()) {
+            int size = currentActivityStack.size();
+
+            for(int i = size-1; i >= 0; i--) {
+                ABVAuthenticatedActivity activity = currentActivityStack.elementAt(i);
+                if (activity instanceof ChatWebviewActivity) {
+                    activity2 = (ChatWebviewActivity) activity;
+                }
+            }
+        }
+
+        if (activity2 != null) {
+            activity2.finish();
+            activity2.startActivity(intent);
+        } else {
+            Activity activity = getCurrentActivity();
+            if (activity != null) {
+                activity.startActivity(intent);
+            }
+        }
+    }
+
+    //チャットに入る
+    public void startChatWebviewActivity() {
+        String className = ChatWebviewActivity.class.getName();
+        boolean isNormalSize = (mContext.getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) == Configuration.SCREENLAYOUT_SIZE_NORMAL;
+        Intent intent = new Intent();
+        intent.putExtra("chatWebviewUrl",ABVEnvironment.getInstance().acmsAddress + ABVDataCache.getInstance().getUrlPath() + "/chatapi/chat/");
+        String sid = ABVDataCache.getInstance().getMemberInfo().sid;
+        intent.putExtra("sid", sid);
+        String loginId = ABVDataCache.getInstance().getMemberInfo().loginId;
+        String shopName = ABVDataCache.getInstance().getUrlPath();
+        intent.putExtra("loginId", loginId);
+        intent.putExtra("shopName", shopName);
+        intent.setClassName(mContext.getPackageName(), className);
+
+        Activity activity2 = null;
+        if (!currentActivityStack.isEmpty()) {
+            int size = currentActivityStack.size();
+
+            for(int i = size-1; i >= 0; i--) {
+                ABVAuthenticatedActivity activity = currentActivityStack.elementAt(i);
+                if (activity instanceof ChatWebviewActivity) {
+                    activity2 = (ChatWebviewActivity) activity;
+                }
+            }
+        }
+
+        if (activity2 != null) {
+            activity2.finish();
+            activity2.startActivity(intent);
+        } else {
+            Activity activity = getCurrentActivity();
+            if (activity != null) {
+                activity.startActivity(intent);
+            }
+        }
+    }
+
+    // プシュメッセージからチャットに入る
+    public void startChatWebviewActivity(Long roomId, String roomName) {
+        String className = ChatWebviewActivity.class.getName();
+        boolean isNormalSize = (mContext.getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) == Configuration.SCREENLAYOUT_SIZE_NORMAL;
+        Intent intent = new Intent();
+        intent.putExtra("chatWebviewUrl",ABVEnvironment.getInstance().acmsAddress + ABVDataCache.getInstance().getUrlPath() + "/chatapi/chat/");
+        String sid = ABVDataCache.getInstance().getMemberInfo().sid;
+        intent.putExtra("sid", sid);
+        String loginId = ABVDataCache.getInstance().getMemberInfo().loginId;
+        String shopName = ABVDataCache.getInstance().getUrlPath();
+        intent.putExtra("loginId", loginId);
+        intent.putExtra("shopName", shopName);
+        intent.putExtra("roomId", roomId);
+        intent.putExtra("roomName", roomName);
+
+        intent.setClassName(mContext.getPackageName(), className);
+
+        Activity activity2 = null;
+        if (!currentActivityStack.isEmpty()) {
+            int size = currentActivityStack.size();
+
+            for(int i = size-1; i >= 0; i--) {
+                ABVAuthenticatedActivity activity = currentActivityStack.elementAt(i);
+                if (activity instanceof ChatWebviewActivity) {
+                    activity2 = (ChatWebviewActivity) activity;
+                }
+            }
+        }
+
+        if (activity2 != null) {
+            activity2.finish();
+            activity2.startActivity(intent);
+        } else {
+            Activity activity = getCurrentActivity();
+            if (activity != null) {
+                activity.startActivity(intent);
+            }
+        }
+    }
+
     /**
      * 会議に再度参加する
      *
@@ -1731,6 +1865,7 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
      * @param activity
      */
     public void setPreviousOfSettingActivity(ABVUIActivity activity) {
+        this.previousOfSettingActivity2 = null;
         this.previousOfSettingActivity = activity;
     }
 
@@ -1744,4 +1879,21 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
             }
         }
     }
+
+    /**
+     * 設定画面から戻る用
+     * @return 設定画面へ遷移前の画面
+     */
+    public ParentWebViewActivity getPreviousForChatOfSettingActivity() {
+        return previousOfSettingActivity2;
+    }
+
+    /**
+     * 設定画面遷移前に設定
+     * @param activity
+     */
+    public void setPreviousOfSettingActivity(ParentWebViewActivity activity) {
+        this.previousOfSettingActivity = null;
+        this.previousOfSettingActivity2 = activity;
+    }
 }

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

@@ -364,7 +364,14 @@ public class CheckOZDViewActivity extends ABVContentViewActivity {
 
     @Override
     public boolean onKeyUp(int keyCode, KeyEvent event) {
-        if (keyCode != KeyEvent.KEYCODE_BACK) {
+        if (keyCode == KeyEvent.KEYCODE_BACK) {
+            if (mAddReport) {
+                ozdCancelProcess(); // Ozd作業画面を閉じる
+            } else {
+                // 作業追加区分がなしの場合
+                goToMain();  // 一覧画面に遷移
+            }
+        } else {
             return super.onKeyUp(keyCode, event);
         }
         return false;

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

@@ -1535,6 +1535,10 @@ public class ContentViewActivity extends ABVContentViewActivity {
 	public boolean onKeyUp(int keyCode, KeyEvent event) {
 		if (keyCode == KeyEvent.KEYCODE_BACK) {
 			Logger.d(TAG, "KeyEvent.KEYCODE_BACK");
+
+            if (mOperationId != null && mOperationId > -1) {
+				putUserPref(AppDefType.UserPrefKey.SYNC_TARGET_OPERATION_ID, mOperationId);
+            }
 			if (isVideoMax) {
 				videoMaxToDefault();
 			} else if (isMarking) {

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

@@ -623,7 +623,7 @@ public class HTMLWebViewActivity extends ParentWebViewActivity {
      */
     private void printButtonActivityControl() {
         OperationDto operation = mOperationDao.getOperation(mOperationId);
-        if (operation != null && operation.quickReport == 1) {
+        if (operation != null && operation.quickReport == 1 && ABVDataCache.getInstance().serviceOption.isUnableIOReport()) {
             printButton.setVisibility(View.VISIBLE);
         } else {
             printButton.setVisibility(View.GONE);
@@ -709,6 +709,10 @@ public class HTMLWebViewActivity extends ParentWebViewActivity {
                 return;
             }
             mUploadMessage.onReceiveValue(result);
+        } else if (requestCode == ABOOK_CHECK_SELECT_SCENE) {
+            if (intent != null && result != null) {
+                confirmEntrySceneDialog(result[0]);
+            }
         }
         mUploadMessage = null;
     }

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

@@ -729,6 +729,10 @@ public class HTMLXWalkWebViewActivity extends ParentWebViewActivity {
             }
             // 動画
             mUploadMessage.onReceiveValue(result);
+        } else if (requestCode == ABOOK_CHECK_SELECT_SCENE) {
+            if (intent != null && result != null) {
+                confirmEntrySceneDialog(result);
+            }
         }
         mUploadMessage = null;
     }

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

@@ -10,10 +10,12 @@ import android.view.Window;
 import android.webkit.CookieManager;
 import android.webkit.DownloadListener;
 import android.webkit.URLUtil;
+import android.webkit.WebBackForwardList;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.Button;
+import android.widget.ImageButton;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -34,6 +36,7 @@ public class OnlineHTMLWebViewActivity extends ABVContentViewActivity {
     private WebView webView;
 
     private Button closeButton;
+    private ImageButton backButton;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -59,7 +62,7 @@ public class OnlineHTMLWebViewActivity extends ABVContentViewActivity {
         OnlineHTMLWebViewLogic logic = AbstractLogic.getLogic(OnlineHTMLWebViewLogic.class);
         webView.postUrl(url, logic.getPostData(param));
 
-        // ***** 戻るボタン
+        // ***** 閉じるボタン
         closeButton = findViewById(R.id.closeBtn);
         closeButton.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -67,6 +70,26 @@ public class OnlineHTMLWebViewActivity extends ABVContentViewActivity {
                 finishActivity();
             }
         });
+
+        // ***** 戻るボタン
+        backButton = findViewById(R.id.backBtn);
+        backButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                // PDFダウンロードの場合はスキップする
+                WebBackForwardList bfList = webView.copyBackForwardList();
+                for (int i = 0, len = bfList.getCurrentIndex(); i < len; i++) {
+                    String url = bfList.getItemAtIndex(len - i).getUrl();
+                    if (url.contains("fileSelect")) {
+                        continue;
+                    }
+                    if (webView.canGoBackOrForward(-1 * (i + 1))) {
+                        webView.goBackOrForward(-1 * (i + 1));
+                        break;
+                    }
+                }
+            }
+        });
     }
 
     private void setWebView() {
@@ -98,6 +121,12 @@ public class OnlineHTMLWebViewActivity extends ABVContentViewActivity {
                 Logger.v(TAG, "shouldOverrideUrlLoading: %s", url);
                 return false;
             }
+            @Override
+            public void onPageFinished(WebView view, String url) {
+                // ***** 戻るボタンの活性制御
+                backButton.setEnabled(webView.canGoBack());
+                super.onPageFinished(view, url);
+            }
         });
 
         webView.setDownloadListener(new DownloadListener() {

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

@@ -4,6 +4,7 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.net.Uri;
 import android.view.KeyEvent;
 import android.view.View;
 import android.widget.Button;
@@ -11,6 +12,7 @@ import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 
+import java.io.File;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -19,23 +21,30 @@ import jp.agentec.abook.abv.bl.acms.client.json.content.ContentJSON;
 import jp.agentec.abook.abv.bl.acms.type.OperationType;
 import jp.agentec.abook.abv.bl.common.ABVEnvironment;
 import jp.agentec.abook.abv.bl.common.Callback;
+import jp.agentec.abook.abv.bl.common.CommonExecutor;
 import jp.agentec.abook.abv.bl.common.Constant;
 import jp.agentec.abook.abv.bl.common.constant.ABookKeys;
+import jp.agentec.abook.abv.bl.common.exception.ABVExceptionCode;
+import jp.agentec.abook.abv.bl.common.exception.AcmsException;
 import jp.agentec.abook.abv.bl.common.log.Logger;
 import jp.agentec.abook.abv.bl.data.dao.AbstractDao;
 import jp.agentec.abook.abv.bl.data.dao.ContentDao;
 import jp.agentec.abook.abv.bl.dto.ContentDto;
 import jp.agentec.abook.abv.bl.logic.AbstractLogic;
 import jp.agentec.abook.abv.bl.logic.ContentObjectLogLogic;
+import jp.agentec.abook.abv.bl.logic.OperationLogic;
 import jp.agentec.abook.abv.cl.util.ContentLogUtil;
 import jp.agentec.abook.abv.cl.util.PreferenceUtil;
 import jp.agentec.abook.abv.launcher.android.R;
 import jp.agentec.abook.abv.ui.common.activity.ABVContentViewActivity;
 import jp.agentec.abook.abv.ui.common.appinfo.AppDefType;
+import jp.agentec.abook.abv.ui.common.constant.ErrorCode;
+import jp.agentec.abook.abv.ui.common.constant.ErrorMessage;
 import jp.agentec.abook.abv.ui.common.dialog.ABookAlertDialog;
 import jp.agentec.abook.abv.ui.common.util.AlertDialogUtil;
 import jp.agentec.abook.abv.ui.common.util.PatternStringUtil;
 import jp.agentec.abook.abv.ui.home.helper.ABookPermissionHelper;
+import jp.agentec.abook.abv.ui.home.activity.ABookSettingActivity;
 import jp.agentec.abook.abv.ui.home.helper.ActivityHandlingHelper;
 import jp.agentec.abook.abv.ui.home.helper.ContentViewHelper;
 import jp.agentec.adf.util.DateTimeFormat;
@@ -222,6 +231,9 @@ public class ParentWebViewActivity extends ABVContentViewActivity {
             if (mXWalkOpenType == Constant.XWalkOpenType.PANO_EDIT) {
                 showConfirmSavePanoEdit();
             } else {
+                if (mOperationId != null && mOperationId > -1) {
+                    putUserPref(AppDefType.UserPrefKey.SYNC_TARGET_OPERATION_ID, mOperationId);
+                }
                 if (isLinkedContent) {
                     goToBack();
                 } else {
@@ -261,6 +273,125 @@ public class ParentWebViewActivity extends ABVContentViewActivity {
         super.onDestroy();
     }
 
+    // シーン追加ダイアログ表示
+    protected void confirmEntrySceneDialog(Uri result) {
+        // 画像
+        try {
+            final Uri responseUri = attachmentImageProcessing(result);
+            // リソースパターンの適用
+            ABookAlertDialog alertDialog = AlertDialogUtil.createAlertDialog(this, PatternStringUtil.patternToInt(getApplicationContext(),
+                                                                                            R.string.pano_edit,
+                                                                                            getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)));
+            alertDialog.setMessage(PatternStringUtil.patternToInt(getApplicationContext(),
+                                    R.string.msg_confirm_entry_scene,
+                                    getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)));
+            alertDialog.setNegativeButton(R.string.cancel, null);
+            alertDialog.setPositiveButton(R.string.ok,
+                    new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+                            dialog.dismiss();
+                            // リソースパターンの適用
+                            showProgressView(PatternStringUtil.patternToString(getApplicationContext(),
+                                                R.string.msg_common_processing,
+                                                getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)));
+                            CommonExecutor.execute(new Runnable() {
+                                @Override
+                                public void run() {
+                                    if (responseUri != null && responseUri.getPath() != null) {
+                                        File file = new File(responseUri.getPath());
+                                        try {
+                                            final Integer resourceId = AbstractLogic.getLogic(OperationLogic.class).sendScene(file, contentId);
+                                            if (resourceId != null) {
+                                                runOnUiThread(new Runnable() {
+                                                    @Override
+                                                    public void run() {
+                                                        progressDialogHorizontal.setProgress(20);
+                                                        webViewLoadUrl(String.format("javascript:CHK_E.checkResourceEntry('%s')", resourceId));
+                                                    }
+                                                });
+
+                                                handler.post(new Runnable() {
+                                                    @Override
+                                                    public void run() {
+                                                        int progress = progressDialogHorizontal.getProgress();
+
+                                                        if (progress == 0) {
+                                                            return;
+                                                        } else if (progress == 100) {
+                                                            progressDialogHorizontal.setProgress(0);
+                                                            closeProgressPopup();
+                                                        } else if (progress < 100 && progress > 80) {
+                                                            progressDialogHorizontal.setProgress(progress + 1);
+                                                            handler.postDelayed(this, 2000);
+                                                        } else if (progress <= 80 && progress >= 60) {
+                                                            progressDialogHorizontal.setProgress(progress + 2);
+                                                            handler.postDelayed(this, 1000);
+                                                        } else if (progress < 60) {
+                                                            progressDialogHorizontal.setProgress(progress + 4);
+                                                            handler.postDelayed(this, 1000);
+                                                        }
+                                                    }
+                                                });
+                                            } else {
+                                                Logger.e(TAG, "resourceId == null");
+                                                handler.post(new Runnable() {
+                                                    @Override
+                                                    public void run() {
+                                                        closeProgressPopup();
+                                                    }
+                                                });
+                                            }
+                                        } catch (AcmsException ex) {
+                                            Logger.e(TAG, ex);
+                                            if (ex.getCode() == ABVExceptionCode.P_E_ACMS_P007) {
+                                                // シーン追加時、ロック状態である場合
+                                                runOnUiThread(new Runnable() {
+                                                    @Override
+                                                    public void run() {
+                                                        closeProgressPopup();
+                                                        webViewLoadUrl(String.format("javascript:EDC.handleError({ 'status' : 400 }, '', {'message' : 'C018'})"));
+                                                    }
+                                                });
+                                            } else {
+                                                handler.post(new Runnable() {
+                                                    @Override
+                                                    public void run() {
+                                                        closeProgressPopup();
+                                                        showFailedSceneApiDialog();
+                                                    }
+                                                });
+                                            }
+                                        } catch (Exception e) {
+                                            Logger.e(TAG, e);
+                                            handler.post(new Runnable() {
+                                                @Override
+                                                public void run() {
+                                                    closeProgressPopup();
+                                                    showFailedSceneApiDialog();
+                                                }
+                                            });
+                                        } finally {
+                                            //アプリ内のファイルのみ削除（Galleryファイルは削除しない）
+                                            if (mLocalFile != null && mLocalFile.getPath().contains(getPackageName())) {
+                                                FileUtil.delete(mLocalFile);
+                                            }
+                                            mLocalFile = null;
+                                        }
+
+                                    }
+                                }
+                            });
+                        }
+                    });
+            alertDialog.show();
+        } catch (Exception e) {
+            Logger.e(TAG, e);
+            closeProgressPopup();
+            ErrorMessage.showErrorMessageToast(getApplicationContext(), ErrorCode.E107);
+        }
+    }
+
     /**
      * シーン追加API通信で失敗時のダイアログ表示
      */
@@ -293,10 +424,10 @@ public class ParentWebViewActivity extends ABVContentViewActivity {
     public String doParameter(Map<String, String> param, Context context, long contentId, Integer lastPageNo, Integer readingLogId, Date lastPageStartDate, Callback callback) {
         String uri = param.get(ABookKeys.URI);
         Long dstContentId = Long.valueOf(param.get("contentId"));
-        Integer pageNo = param.containsKey("pageNo")? Integer.valueOf(param.get("pageNo")) - 1: 0; // 1スタートを0スタート
+        Integer pageNoInQuery = param.containsKey("pageNo")? Integer.valueOf(param.get("pageNo")) - 1: 0; // 1スタートを0スタート
 
         if (uri.startsWith(ABookKeys.CONTENTLINK)) {
-            int result = ContentViewHelper.getInstance().linkDownloadChecked(dstContentId, pageNo);
+            int result = ContentViewHelper.getInstance().linkDownloadChecked(dstContentId, pageNoInQuery);
             Logger.d(TAG, "linkDownloadChecked result=%s", result);
             if (result == ContentViewHelper.LinkContentStatus.NoExist) {
                 return context.getString(R.string.msg_require_content_refresh);
@@ -308,7 +439,7 @@ public class ParentWebViewActivity extends ABVContentViewActivity {
                 if (currentActivity instanceof HTMLWebViewActivity) {
                     currentActivity.finish();
                 }
-                ActivityHandlingHelper.getInstance().startContentActivity(dstContentId, pageNo);
+                ActivityHandlingHelper.getInstance().startContentActivity(dstContentId, pageNoInQuery);
             } else {
                 int prePage = 0;
                 ABVContentViewActivity viewActivity = ActivityHandlingHelper.getInstance().getContentViewActivity();
@@ -324,24 +455,24 @@ public class ParentWebViewActivity extends ABVContentViewActivity {
             if (readingLogId == null) { // 開始
                 readingLogId = ContentLogUtil.getInstance().startContentReadLog(context, contentId, PreferenceUtil.getUserPref(context, AppDefType.DefPrefKey.PERMISSION_ACCESS_LOCATION, false));
             }
-            AbstractLogic.getLogic(ContentObjectLogLogic.class).insertContentObjectLog(contentId, readingLogId, pageNo, param);
+            AbstractLogic.getLogic(ContentObjectLogLogic.class).insertContentObjectLog(contentId, readingLogId, pageNoInQuery, param);
         } else if (uri.startsWith(ABookKeys.MOVEPAGE)) { // ブラウザから送られてきた時間は使わず、アプリの時間を用いる
             if (readingLogId == null) { // 開始ページ
                 readingLogId = ContentLogUtil.getInstance().startContentReadLog(context, contentId, PreferenceUtil.getUserPref(context, AppDefType.DefPrefKey.PERMISSION_ACCESS_LOCATION, false));
-                ContentLogUtil.getInstance().startContentPageReadLog(contentId, readingLogId, pageNo);
+                ContentLogUtil.getInstance().startContentPageReadLog(contentId, readingLogId, pageNoInQuery);
             } else {
                 if (param.get("readingEndDate") != null) { // 終了時刻有
-                    ContentLogUtil.getInstance().endContentPageReadLog(contentId, pageNo, readingLogId);
+                    ContentLogUtil.getInstance().endContentPageReadLog(contentId, pageNoInQuery, readingLogId);
                 } else {
                     ContentLogUtil.getInstance().endContentPageReadLog(contentId, lastPageNo, readingLogId); // crosswalkのときもjsではローカルサーバに送るが受取がないためここで終了を呼び出す。ただしローカルサーバを使う場合2重に処理が走る。
-                    ContentLogUtil.getInstance().startContentPageReadLog(contentId, readingLogId, pageNo);
+                    ContentLogUtil.getInstance().startContentPageReadLog(contentId, readingLogId, pageNoInQuery);
                 }
             }
             String[] readingStartDate = param.get("readingStartDate").split(",");
             Date pageStartDate = DateTimeUtil.toDate(readingStartDate[0], readingStartDate[1], DateTimeFormat.yyyyMMddHHmmss_hyphen);
             if (lastPageStartDate == null || lastPageStartDate.before(pageStartDate)) {
                 lastPageStartDate = pageStartDate;
-                lastPageNo = pageNo;
+                lastPageNo = pageNoInQuery;
             }
         }
 
@@ -364,4 +495,16 @@ public class ParentWebViewActivity extends ABVContentViewActivity {
     public void callViewLoadUrl(String url) {
         webViewLoadUrl(url);
     }
+
+    // 設定画面表示
+    public void showSetting() {
+        Intent intent = new Intent();
+        intent.setClassName(getApplicationContext().getPackageName(), ABookSettingActivity.class.getName());
+        intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        // 設定画面の前のActivityを保存する（設定画面から戻る用）
+        ActivityHandlingHelper.getInstance().setPreviousOfSettingActivity(this);
+        startActivity(intent);
+        // ※ 設定画面からログアウトした場合、このActivityも残らないようにfinishして遷移する
+        finish();
+    }
 }

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

@@ -38,7 +38,9 @@ public class ThetaCameraActivity extends ThetaActivity {
     private static final String TAG = "ThetaCameraActivity";
     //画面表示後、ライブビューア取得を0.5秒後に取得
     private static final int LIVE_VIEW_START_DELAY = 500;
+    private static final int LIVE_VIEW_FAIL_START_DELAY = 1000;
     private static final int EV_TEXT_VIEW_TEXT_SIZE_PHONE = 16;
+    private static final int LIVE_VIDEO_FAIL_MAX_COUNT = 3;
     private MJpegView mLiveView;
     private ShowLiveViewTask mLivePreviewTask;
     private Button mShootBtn;
@@ -46,6 +48,8 @@ public class ThetaCameraActivity extends ThetaActivity {
     private TextView mExposureTextView;
     private SeekBar mExposureSeekBar;
     private int mCurrentSeekBarProgress;
+    private int mLiveViewFailCount;
+    private boolean mInitOnResumeFlg = false;
     private static final List<String> mExposureValues = new ArrayList<>(Arrays.asList("-2.0", "-1.7", "-1.3", "-1.0", "-0.7", "-0.3", "0.0", "0.3", "0.7", "1.0", "1.3", "1.7", "2.0"));
 
     @Override
@@ -78,6 +82,7 @@ public class ThetaCameraActivity extends ThetaActivity {
                 showProgressPopup();
                 new ShootTask(ThetaCameraActivity.this).execute();
                 mLiveView.setSource(null);
+                mLiveViewFailCount = 0;
             }
         });
 
@@ -90,22 +95,54 @@ public class ThetaCameraActivity extends ThetaActivity {
                 Intent intent = new Intent();
                 intent.setClassName(getPackageName(), ThetaImageListActivity.class.getName());
                 startActivity(intent);
+                mLiveViewFailCount = 0;
             }
         });
         //露出シークバー
         settingSeekbar();
-
         showProgressPopup();
+        startLiveCameraTask(false);
+        mLiveViewFailCount = 0;
+        mLiveView.setLiveCameraListenerListener(new MJpegView.LiveCameraListener() {
+            @Override
+            public void liveCameraPlayFail() {
+                mLiveViewFailCount++;
+                Logger.e(TAG,"mLiveViewFailCount = " + mLiveViewFailCount);
+                if (mLiveViewFailCount == LIVE_VIDEO_FAIL_MAX_COUNT) {
+                    handler.post(new Runnable() {
+                        @Override
+                        public void run() {
+                            mLiveView.setSource(null);
+                            thetaConnectError(R.string.msg_theta_live_image_fail);
+                        }
+                    });
+                    return;
+                }
+
+                startLiveCameraTask(true);
+            }
+        });
+    }
 
+    private void startLiveCameraTask(final boolean isFailRetry) {
+        int delayTime = LIVE_VIEW_START_DELAY;
+        if (isFailRetry) { //失敗時にはリトライを1秒後に行うように設定
+            delayTime = LIVE_VIEW_FAIL_START_DELAY;
+        }
         handler.postDelayed(new Runnable() {
             @Override
             public void run() {
+                if (isFailRetry) {
+                    showProgressPopup();
+                }
+                if (mLivePreviewTask != null) {
+                    mLivePreviewTask.cancel(true);
+                }
                 mLivePreviewTask = new ShowLiveViewTask(ThetaCameraActivity.this);
                 mLivePreviewTask.execute();
             }
-        }, LIVE_VIEW_START_DELAY);
+        }, delayTime);
     }
-
     //端末の戻るボタン禁止
     @Override
     public boolean dispatchKeyEvent(KeyEvent event) {
@@ -121,19 +158,18 @@ public class ThetaCameraActivity extends ThetaActivity {
     @Override
     protected void onPause() {
         super.onPause();
-        mLiveView.stopPlay();
+        mLiveView.setSource(null);
     }
 
     @Override
     protected void onResume() {
         super.onResume();
-        mLiveView.play();
-
-        if (mLivePreviewTask != null) {
-            mLivePreviewTask.cancel(true);
-            mLivePreviewTask = new ShowLiveViewTask(this);
-            mLivePreviewTask.execute();
+        Logger.d(TAG, "super.onResume()");
+        if (mInitOnResumeFlg) { //初回呼ばれた時は実行しない。（初期表示時）
+            showProgressPopup();
+            startLiveCameraTask(false);
         }
+        mInitOnResumeFlg = true;
     }
     @Override
     protected void onDestroy() {
@@ -189,8 +225,6 @@ public class ThetaCameraActivity extends ThetaActivity {
             public void onStartTrackingTouch(SeekBar seekBar) {}
 
         });
-
-
     }
 
     /**
@@ -225,7 +259,7 @@ public class ThetaCameraActivity extends ThetaActivity {
             mLiveView.setSource(mJpegInputStream);
             new GetOptionExposureTask(ThetaCameraActivity.this).execute();
         } else {
-            Logger.e("failed to start live view");
+            Logger.e(TAG, "failed to start live view");
             thetaConnectError(R.string.msg_theta_live_image_fail);
         }
     }

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/theta/task/ShowLiveViewTask.java

@@ -25,7 +25,7 @@ import jp.agentec.abook.abv.ui.viewer.activity.theta.ThetaCameraActivity;
  */
 public class ShowLiveViewTask extends AsyncTask<Void, String, MJpegInputStream> {
     private static final String TAG = "ShowLiveViewTask";
-    private static final int FAIL_RETRAY_DELAY_MILLIS = 500;
+    private static final int FAIL_RETRAY_DELAY_MILLIS = 1000;
     private final WeakReference<ThetaCameraActivity> refActivity;
 
     public ShowLiveViewTask(ThetaCameraActivity refActivity) {
@@ -43,8 +43,20 @@ public class ShowLiveViewTask extends AsyncTask<Void, String, MJpegInputStream>
                 HttpConnector camera = new HttpConnector(ABookValues.THETA_IP_ADDRESS, isOldApi);
                 InputStream is = camera.getLivePreview();
                 mjis = new MJpegInputStream(is);
+                //正常にライブ再生されるか確認
+                mjis.readMJpegFrame();
+
                 retryCount = MAX_RETRY_COUNT;
             } catch (IOException e) {
+                Logger.e(TAG,"doInBackground fail e = " + e.toString());
+                if (mjis != null) {
+                    try {
+                        mjis.close();
+                    } catch (IOException ex) {
+                        Logger.e(TAG, "doInBackground fail ex = " + ex.toString());
+                    }
+                }
+
                 try {
                     Thread.sleep(FAIL_RETRAY_DELAY_MILLIS);
                 } catch (InterruptedException e1) {

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/helper/SceneSendHelper.java

@@ -58,7 +58,7 @@ public class SceneSendHelper {
                         if (isBaseSceneUpload && !isBaseSceneUploadSuccess && firstFilePath.equals(filePath)) {
                             AbstractLogic.getLogic(OperationLogic.class).sendPanoContent(operationId, OperationName, file);
                         } else {
-                            AbstractLogic.getLogic(OperationLogic.class).sendScene(file);
+                            AbstractLogic.getLogic(OperationLogic.class).sendScene(file, null);
                         }
                         needSendImages.remove(filePath);
 

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/view/OperationTaskLayout.java

@@ -72,9 +72,12 @@ public class OperationTaskLayout extends RelativeLayout {
         super(context);
         mContext = (ContentViewActivity)context;
 
-        if (isNormalSize) {
-            setPadding(0, 130, 0, 0);
-        }
+        // #39410 【Check】報告タブの上部にグレー帯と×ボタンが表示されない
+        // android 10 で setPaddingすると、Paddingの値分WebView が表示されないので
+        // setPaddingを実行せずに、WebViewを全画面表示にする。
+        //if (isNormalSize) {
+        //    setPadding(0, 130, 0, 0);
+        //}
 
         mWebView = new EnqueteWebView(context);
         mWebView.setVerticalScrollbarOverlay(true); // スクロールバー部分の隙間を消す

gradle.properties

@@ -86,8 +86,8 @@ is_check_invalid_passward_limit=true
 repeat_default=true
 
 #Setting Info(設定画面のABookについての設定情報)
-version_name=1.2.300
-release_date=2020/07/06
+version_name=1.2.301
+release_date=2020/08/31
 copy_right=2016 AGENTEC Co.,Ltd. All rights reserved.
 hope_page=http://www.agentec.jp
 contact_email=abook-appsupport@agentec.jp