Skip to content

A
abook_check
Commit 82126852 by Lee Munkyeong
Options

Merge branch '1.2.360_develop_mk_local' into 'features/1.2.360_develop_mk' 

既存のバグ修正。

See merge request !76
parents 974ea145 fdf9ac5e
Showing with 27 additions and 13 deletions
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ABookSettingActivity.java
...@@ -108,6 +108,11 @@ public class ABookSettingActivity extends PreferenceActivity { ...@@ -108,6 +108,11 @@ public class ABookSettingActivity extends PreferenceActivity {
public void stopContentRefresher() { public void stopContentRefresher() {
ABVUIActivity activity = ActivityHandlingHelper.getInstance().getPreviousOfSettingActivity(); ABVUIActivity activity = ActivityHandlingHelper.getInstance().getPreviousOfSettingActivity();
activity.stopContentRefresher(); if (activity == null) {
ParentWebViewActivity chatActivity = ActivityHandlingHelper.getInstance().getPreviousForChatOfSettingActivity();
chatActivity.stopContentRefresher();
}else{
activity.stopContentRefresher();
}
} }
} }
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebviewActivity.java
...@@ -98,6 +98,15 @@ public class ChatWebviewActivity extends ParentWebViewActivity { ...@@ -98,6 +98,15 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
settings.setAppCacheEnabled(false); settings.setAppCacheEnabled(false);
settings.setCacheMode(WebSettings.LOAD_NO_CACHE); settings.setCacheMode(WebSettings.LOAD_NO_CACHE);
settings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
settings.setDomStorageEnabled(true);
settings.setDatabaseEnabled(true);
settings.setMediaPlaybackRequiresUserGesture(false);
settings.setAllowFileAccess(true);
settings.setUseWideViewPort(true);
settings.setAllowContentAccess(true);
settings.setAllowFileAccessFromFileURLs(true);
settings.setAllowUniversalAccessFromFileURLs(true);
if (Logger.isDebugEnabled()) { if (Logger.isDebugEnabled()) {
mChatWebView.setWebContentsDebuggingEnabled(true); //デバッグモード（chromeからinspect可) mChatWebView.setWebContentsDebuggingEnabled(true); //デバッグモード（chromeからinspect可)
} }
...@@ -131,7 +140,7 @@ public class ChatWebviewActivity extends ParentWebViewActivity { ...@@ -131,7 +140,7 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
// 画像が選択された場合 // 画像が選択された場合
if (fileChooserParams.getAcceptTypes()[0].toLowerCase().indexOf(ABookKeys.IMAGE) != -1) { if (fileChooserParams.getAcceptTypes()[0].toLowerCase().indexOf(ABookKeys.IMAGE) != -1) {
result = startCameraIntent(ABOOK_CHECK_TASK_IMAGE, "Camera", ABookKeys.IMAGE, true); result = startCameraIntent(ABOOK_CHECK_TASK_IMAGE, "Camera", ABookKeys.IMAGE, true);
// 動画が選択された場合 // 動画が選択された場合
} else if (fileChooserParams.getAcceptTypes()[0].toLowerCase().indexOf(ABookKeys.VIDEO) != -1) { } else if (fileChooserParams.getAcceptTypes()[0].toLowerCase().indexOf(ABookKeys.VIDEO) != -1) {
result = startCameraIntent(ABOOK_CHECK_TASK_VIDEO, "Camera", ABookKeys.VIDEO, true); result = startCameraIntent(ABOOK_CHECK_TASK_VIDEO, "Camera", ABookKeys.VIDEO, true);
} }
...@@ -197,7 +206,7 @@ public class ChatWebviewActivity extends ParentWebViewActivity { ...@@ -197,7 +206,7 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
// サーバと接続された場合、チャット画面を閉じる // サーバと接続された場合、チャット画面を閉じる
if (tempMessage.equals(getString(R.string.msg_error_chat_disconnected)) || tempMessage.equals(getString(R.string.msg_error_chat_room_sc_forbidden))) { 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()"); mChatWebView.loadUrl("javascript:CHAT.leaveRoom()");
finish(); finish();
} else if (tempMessage.equals(getString(R.string.msg_error_chat_join))) { } else if (tempMessage.equals(getString(R.string.msg_error_chat_join))) {
getLogin(); getLogin();
...@@ -221,7 +230,7 @@ public class ChatWebviewActivity extends ParentWebViewActivity { ...@@ -221,7 +230,7 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
message = getString(R.string.msg_chat_confirm_exit); message = getString(R.string.msg_chat_confirm_exit);
} else if (message.equals("Do you want to remove selected members from the list?")) { } else if (message.equals("Do you want to remove selected members from the list?")) {
message = getString(R.string.msg_chat_confirm_member); message = getString(R.string.msg_chat_confirm_member);
// #36128 // #36128
} else if (message.equals("Do you want to delete this room?")) { } else if (message.equals("Do you want to delete this room?")) {
message = getString(R.string.msg_chat_confirm_delete); message = getString(R.string.msg_chat_confirm_delete);
} else { } else {
...@@ -281,7 +290,7 @@ public class ChatWebviewActivity extends ParentWebViewActivity { ...@@ -281,7 +290,7 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
if (DownloadManager.ACTION_DOWNLOAD_COMPLETE.equals(intent.getAction())) { if (DownloadManager.ACTION_DOWNLOAD_COMPLETE.equals(intent.getAction())) {
mChatWebView.loadUrl("javascript:dismissLoadingIndicator()"); mChatWebView.loadUrl("javascript:CHAT_UI.dismissLoadingIndicator()");
} }
} }
}; };
...@@ -307,7 +316,7 @@ public class ChatWebviewActivity extends ParentWebViewActivity { ...@@ -307,7 +316,7 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
// イメージをダウンロードする(png, jpg, jpeg, mp4, mov) // イメージをダウンロードする(png, jpg, jpeg, mp4, mov)
if (url.toLowerCase().endsWith(".png") || url.toLowerCase().endsWith(".jpg") || url.toLowerCase().endsWith(".jpeg") if (url.toLowerCase().endsWith(".png") || url.toLowerCase().endsWith(".jpg") || url.toLowerCase().endsWith(".jpeg")
|| url.toLowerCase().endsWith(".mov") || url.toLowerCase().endsWith(".mp4")) { || url.toLowerCase().endsWith(".mov") || url.toLowerCase().endsWith(".mp4")) {
view.loadUrl("javascript:showLoadingIndicator()"); view.loadUrl("javascript:CHAT_UI.showLoadingIndicator()");
DownloadManager mdDownloadManager = (DownloadManager) getSystemService(Context.DOWNLOAD_SERVICE); DownloadManager mdDownloadManager = (DownloadManager) getSystemService(Context.DOWNLOAD_SERVICE);
DownloadManager.Request request = new DownloadManager.Request( DownloadManager.Request request = new DownloadManager.Request(
Uri.parse(url)); Uri.parse(url));
...@@ -332,7 +341,7 @@ public class ChatWebviewActivity extends ParentWebViewActivity { ...@@ -332,7 +341,7 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
mOperationRelatedContentButton.setOnClickListener(new View.OnClickListener() { mOperationRelatedContentButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
mChatWebView.loadUrl("javascript:leaveRoom()"); mChatWebView.loadUrl("javascript:CHAT.leaveRoom()");
finish(); finish();
showCommonContent(); showCommonContent();
} }
...@@ -581,7 +590,7 @@ public class ChatWebviewActivity extends ParentWebViewActivity { ...@@ -581,7 +590,7 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
* 作業一覧へ遷移 * 作業一覧へ遷移
*/ */
private void backToHome() { private void backToHome() {
mChatWebView.loadUrl("javascript:leaveRoom()"); mChatWebView.loadUrl("javascript:CHAT.leaveRoom()");
finish(); finish();
Intent intent = new Intent(); Intent intent = new Intent();
intent.setClass(ChatWebviewActivity.this, OperationListActivity.class); intent.setClass(ChatWebviewActivity.this, OperationListActivity.class);
...@@ -613,7 +622,7 @@ public class ChatWebviewActivity extends ParentWebViewActivity { ...@@ -613,7 +622,7 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
// 設定画面へ遷移 // 設定画面へ遷移
public void onClickSetting(View v) { public void onClickSetting(View v) {
mChatWebView.loadUrl("javascript:leaveRoom()"); mChatWebView.loadUrl("javascript:CHAT.leaveRoom()");
finish(); finish();
showSetting(); showSetting();
} }
......
gradle.properties
...@@ -38,12 +38,12 @@ app_versioncode=1 ...@@ -38,12 +38,12 @@ app_versioncode=1
# abvEnvironments.xml # abvEnvironments.xml
#cms server #cms server
acms_address=https://abook189.abook.bz/acms acms_address=https://chatdev2.abook.bz/acms
download_server_address=https://abook189.abook.bz/acms download_server_address=https://chatdev2.abook.bz/acms
#syncview server #syncview server
websocket_server_http_url=https://abookplus.agentec.jp/v1 websocket_server_http_url=https://chatdev2.abook.bz/v1
websocket_server_ws_url=wss://abookplus.agentec.jp/v1 websocket_server_ws_url=wss://chatdev2.abook.bz/v1
#WebSocket debug出力 #WebSocket debug出力
websocket_debug=false websocket_debug=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