Merge branch 'features/#521.#520_プッシュメッセージから入場すると操作ができない' into 'features/abcomm_sp6'

Features/#521.#520 プッシュメッセージから入場すると操作ができない

See merge request !106

ABVJE_Res_Default_Android/res/values-ja/strings.xml

@@ -3,6 +3,7 @@
     <string name="progress">Loading&#8230;</string>
     <string name="progress">Loading&#8230;</string>
     <string name="edit">編集</string>
     <string name="edit">編集</string>
     <string name="ok">OK</string>
     <string name="ok">OK</string>
+    <string name="move">遷移</string>
     <string name="yes">はい</string>
     <string name="yes">はい</string>
     <string name="confirm">確認</string>
     <string name="confirm">確認</string>
     <string name="no">いいえ</string>
     <string name="no">いいえ</string>

ABVJE_Res_Default_Android/res/values-ko/strings.xml

@@ -3,6 +3,7 @@
     <string name="progress">로딩&#8230;</string>
     <string name="progress">로딩&#8230;</string>
     <string name="edit">편집</string>
     <string name="edit">편집</string>
     <string name="ok">OK</string>
     <string name="ok">OK</string>
+    <string name="move">이동</string>
     <string name="yes">예</string>
     <string name="yes">예</string>
     <string name="confirm">확인</string>
     <string name="confirm">확인</string>
     <string name="no">아니오</string>
     <string name="no">아니오</string>

ABVJE_Res_Default_Android/res/values/strings.xml

@@ -3,6 +3,7 @@
     <string name="progress">Loading&#8230;</string>
     <string name="progress">Loading&#8230;</string>
     <string name="edit">Edit</string>
     <string name="edit">Edit</string>
     <string name="ok">OK</string>
     <string name="ok">OK</string>
+    <string name="move">Move</string>
     <string name="yes">Yes</string>
     <string name="yes">Yes</string>
     <string name="confirm">Confirm</string>
     <string name="confirm">Confirm</string>
     <string name="no">No</string>
     <string name="no">No</string>

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

@@ -30,11 +30,11 @@ public class ShowPushMessageDailogActivity extends ABVUIActivity {
 
 
     OperationLogic mOperationLogic = AbstractLogic.getLogic(OperationLogic.class);
     OperationLogic mOperationLogic = AbstractLogic.getLogic(OperationLogic.class);
 
 
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		String data = getIntent().getExtras() != null ? getIntent().getExtras().getString(PushMessageKey.data) : null;
-		if (StringUtil.isNullOrEmpty(data)) {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        String data = getIntent().getExtras() != null ? getIntent().getExtras().getString(PushMessageKey.data) : null;
+        if (StringUtil.isNullOrEmpty(data)) {
             final long operationId = StringUtil.isNullOrEmpty(getIntent().getExtras().getString(PushMessageKey.operationId)) ? 0 : Long.parseLong(getIntent().getExtras().getString(PushMessageKey.operationId));
             final long operationId = StringUtil.isNullOrEmpty(getIntent().getExtras().getString(PushMessageKey.operationId)) ? 0 : Long.parseLong(getIntent().getExtras().getString(PushMessageKey.operationId));
 
 
             if (operationId > 0) {
             if (operationId > 0) {
@@ -112,11 +112,10 @@ public class ShowPushMessageDailogActivity extends ABVUIActivity {
 
 
                 alertDialog.show();
                 alertDialog.show();
             } else {
             } else {
-				final ABookAlertDialog alertDialog = AlertDialogUtil.createAlertDialog(ShowPushMessageDailogActivity.this, getRString(R.string.app_name), getIntent().getExtras().getString(PushMessageKey.message));
-				alertDialog.setPositiveButton(R.string.ok, null);
-				alertDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
-					@Override
-					public void onDismiss(DialogInterface dialog) {
+                final ABookAlertDialog alertDialog = AlertDialogUtil.createAlertDialog(ShowPushMessageDailogActivity.this, getRString(R.string.app_name), getIntent().getExtras().getString(PushMessageKey.message));
+                alertDialog.setPositiveButton(R.string.move, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
                         // Check PushMessage
                         // Check PushMessage
                         Bundle extras = getIntent().getExtras();
                         Bundle extras = getIntent().getExtras();
                         if (extras != null) {
                         if (extras != null) {
@@ -144,10 +143,23 @@ public class ShowPushMessageDailogActivity extends ABVUIActivity {
                             }
                             }
                         }
                         }
                         finish();
                         finish();
-					}
-				});
-				alertDialog.show();
+                    }
+                });
+                alertDialog.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        finish();
+                    }
+                });
+                alertDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
+                    @Override
+                    public void onDismiss(DialogInterface dialog) {
+
+                    }
+                });
+                alertDialog.show();
             }
             }
-		}
-	}
+        }
+    }
 }
 }

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

@@ -210,6 +210,8 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
             } catch (Exception e) {
             } catch (Exception e) {
                 e.printStackTrace();
                 e.printStackTrace();
             }
             }
+            Integer integerRoomId = Integer.parseInt(roomId.toString());
+            roomType = communicationLogic.getChatRoom(integerRoomId).type.toString();
             String parameterData = "sid=" + sid + "&loginId=" + loginId +  "&shopName=" + shopName +  "&roomId=" + roomId + "&roomName=" + roomName + fixedParam;
             String parameterData = "sid=" + sid + "&loginId=" + loginId +  "&shopName=" + shopName +  "&roomId=" + roomId + "&roomName=" + roomName + fixedParam;
             mChatWebView.postUrl(CHAT_ROOM_PAGE_URL, parameterData.getBytes());
             mChatWebView.postUrl(CHAT_ROOM_PAGE_URL, parameterData.getBytes());
         }
         }
@@ -225,8 +227,6 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
 
 
         mChatWebView.setWebChromeClient(new FullscreenableChromeClient(this) {
         mChatWebView.setWebChromeClient(new FullscreenableChromeClient(this) {
 
 
-
-
             @Override
             @Override
             public boolean onShowFileChooser(WebView webView, ValueCallback<Uri[]> filePathCallback, FileChooserParams fileChooserParams) {
             public boolean onShowFileChooser(WebView webView, ValueCallback<Uri[]> filePathCallback, FileChooserParams fileChooserParams) {
                 boolean result = false;
                 boolean result = false;