Commit 1ecfdc06 by Lee Munkyeong

プッシュメッセージボタン追加。

parent b5e324fe
......@@ -3,6 +3,7 @@
<string name="progress">Loading&#8230;</string>
<string name="edit">編集</string>
<string name="ok">OK</string>
<string name="move">遷移</string>
<string name="yes">はい</string>
<string name="confirm">確認</string>
<string name="no">いいえ</string>
......
......@@ -3,6 +3,7 @@
<string name="progress">로딩&#8230;</string>
<string name="edit">편집</string>
<string name="ok">OK</string>
<string name="move">이동</string>
<string name="yes"></string>
<string name="confirm">확인</string>
<string name="no">아니오</string>
......
......@@ -3,6 +3,7 @@
<string name="progress">Loading&#8230;</string>
<string name="edit">Edit</string>
<string name="ok">OK</string>
<string name="move">Move</string>
<string name="yes">Yes</string>
<string name="confirm">Confirm</string>
<string name="no">No</string>
......
......@@ -113,10 +113,9 @@ public class ShowPushMessageDailogActivity extends ABVUIActivity {
alertDialog.show();
} 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) {
alertDialog.setPositiveButton(R.string.move, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
// Check PushMessage
Bundle extras = getIntent().getExtras();
if (extras != null) {
......@@ -144,6 +143,19 @@ public class ShowPushMessageDailogActivity extends ABVUIActivity {
}
}
finish();
}
});
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();
......
......@@ -210,6 +210,8 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
} catch (Exception e) {
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;
mChatWebView.postUrl(CHAT_ROOM_PAGE_URL, parameterData.getBytes());
}
......@@ -225,8 +227,6 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
mChatWebView.setWebChromeClient(new FullscreenableChromeClient(this) {
@Override
public boolean onShowFileChooser(WebView webView, ValueCallback<Uri[]> filePathCallback, FileChooserParams fileChooserParams) {
boolean result = false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment