Skip to content

A
abook_check
Commit 498ac70c by Lee Jaebin
Options

#35097 報告回答の保存時に添付画像の設問に設定した画像が欠落する問題対応

parent 10818bb5
Showing with 17 additions and 35 deletions
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVContentViewActivity.java
...@@ -863,7 +863,9 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity { ...@@ -863,7 +863,9 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
abookCheckParam.put(key, uri.getQueryParameter(key)); abookCheckParam.put(key, uri.getQueryParameter(key));
} }
mCmd = abookCheckParam.get(ABookKeys.CMD); mCmd = abookCheckParam.get(ABookKeys.CMD);
mTaskKey = abookCheckParam.get(ABookKeys.TASK_KEY); if (abookCheckParam.containsKey(ABookKeys.TASK_KEY)) {
mTaskKey = abookCheckParam.get(ABookKeys.TASK_KEY);
}
int taskReportLevel = 0; // 作業報告レベル（0：報告、１：報告（回答）、２：報告（回答）） int taskReportLevel = 0; // 作業報告レベル（0：報告、１：報告（回答）、２：報告（回答））
if (abookCheckParam.containsKey(ABookKeys.TASK_REPORT_LEVEL)) { if (abookCheckParam.containsKey(ABookKeys.TASK_REPORT_LEVEL)) {
...@@ -998,7 +1000,7 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity { ...@@ -998,7 +1000,7 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
} }
} else if (mCmd.equals(ABookKeys.CMD_SAVE_ATTACHED)) { } else if (mCmd.equals(ABookKeys.CMD_SAVE_ATTACHED)) {
mAttachedFileName = abookCheckParam.get(ABookKeys.FILE_NAME); mAttachedFileName = abookCheckParam.get(ABookKeys.FILE_NAME);
getAttachedDataUrl(); getAttachedDataUrl(abookCheckParam.get(ABookKeys.TASK_KEY));
} else if (mCmd.equals(ABookKeys.CMD_SHOW_REPORT_OZD)) { } else if (mCmd.equals(ABookKeys.CMD_SHOW_REPORT_OZD)) {
mReportFileName = abookCheckParam.get(ABookKeys.REPORT_FILE_NAME); mReportFileName = abookCheckParam.get(ABookKeys.REPORT_FILE_NAME);
// 作業報告画面改善 // 作業報告画面改善
...@@ -1076,11 +1078,11 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity { ...@@ -1076,11 +1078,11 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
} }
} }
public void commonAttachedDataUrl (String data) { public void commonAttachedDataUrl (String taskKey, String data) {
boolean isError = false; boolean isError = false;
if (data != null) { if (data != null) {
try { try {
String imagePath = ABVEnvironment.getInstance().getTempFilePath(getContentId(), mTaskKey, mAttachedFileName); String imagePath = ABVEnvironment.getInstance().getTempFilePath(getContentId(), taskKey, mAttachedFileName);
ABookCheckWebViewHelper.getInstance().decodeToImage(data, imagePath); ABookCheckWebViewHelper.getInstance().decodeToImage(data, imagePath);
//アプリ内のファイルのみ削除（Galleryファイルは削除しない） //アプリ内のファイルのみ削除（Galleryファイルは削除しない）
if (mLocalFile != null && mLocalFile.getPath().contains(getPackageName())) { if (mLocalFile != null && mLocalFile.getPath().contains(getPackageName())) {
...@@ -1092,7 +1094,7 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity { ...@@ -1092,7 +1094,7 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
Logger.e(TAG, e); Logger.e(TAG, e);
} }
} }
afterABookCheckApi(mCmd, mTaskKey, isError ? 1 : 0, "", null); afterABookCheckApi(mCmd, taskKey, isError ? 1 : 0, "", null);
} }
protected Uri attachmentImageProcessing(Uri uri) throws Exception { protected Uri attachmentImageProcessing(Uri uri) throws Exception {
...@@ -1145,12 +1147,12 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity { ...@@ -1145,12 +1147,12 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
/** /**
* 添付ファイルのBase64文字列取得 * 添付ファイルのBase64文字列取得
*/ */
public void getAttachedDataUrl() { public void getAttachedDataUrl(final String taskKey) {
runOnUiThread(new Runnable() { runOnUiThread(new Runnable() {
@Override @Override
public void run() { public void run() {
webViewLoadUrl("javascript:android.getAttachedDataUrl(CHK.getAttachedDataUrl())"); webViewLoadUrl("javascript:android.getAttachedDataUrl('" + taskKey + "', CHK.getAttachedDataUrl())");
} }
}); });
} }
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/HTMLWebViewActivity.java
...@@ -485,8 +485,8 @@ public class HTMLWebViewActivity extends ParentWebViewActivity { ...@@ -485,8 +485,8 @@ public class HTMLWebViewActivity extends ParentWebViewActivity {
} }
@JavascriptInterface @JavascriptInterface
public void getAttachedDataUrl(String data) { public void getAttachedDataUrl(String taskKey, String data) {
commonAttachedDataUrl(data); commonAttachedDataUrl(taskKey, data);
} }
} }
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/HTMLXWalkWebViewActivity.java
...@@ -522,8 +522,8 @@ public class HTMLXWalkWebViewActivity extends ParentWebViewActivity { ...@@ -522,8 +522,8 @@ public class HTMLXWalkWebViewActivity extends ParentWebViewActivity {
} }
@org.xwalk.core.JavascriptInterface @org.xwalk.core.JavascriptInterface
public void getAttachedDataUrl(String data) { public void getAttachedDataUrl(String taskKey, String data) {
commonAttachedDataUrl(data); commonAttachedDataUrl(taskKey, data);
} }
} }
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/ParentWebViewActivity.java
...@@ -131,26 +131,6 @@ public class ParentWebViewActivity extends ABVCheckContentViewActivity { ...@@ -131,26 +131,6 @@ public class ParentWebViewActivity extends ABVCheckContentViewActivity {
} }
@Override @Override
public void commonAttachedDataUrl (String data) {
boolean isError = false;
if (data != null) {
try {
String imagePath = ABVEnvironment.getInstance().getTempFilePath(getContentId(), mTaskKey, mAttachedFileName);
ABookCheckWebViewHelper.getInstance().decodeToImage(data, imagePath);
//アプリ内のファイルのみ削除（Galleryファイルは削除しない）
if (mLocalFile != null && mLocalFile.getPath().contains(getPackageName())) {
FileUtil.delete(mLocalFile);
}
mLocalFile = null;
} catch (Exception e) {
isError = true;
Logger.e(TAG, e);
}
}
afterABookCheckApi(mCmd, mTaskKey, isError ? 1 : 0, "", null);
}
@Override
protected void commonConfigureHeader() { protected void commonConfigureHeader() {
if (mStatusCode == Constant.XWalkWebViewDisplayStatus.InitView) { //フォームが非表示時のみヘルプボタン表示 if (mStatusCode == Constant.XWalkWebViewDisplayStatus.InitView) { //フォームが非表示時のみヘルプボタン表示
helpButton.setVisibility(View.VISIBLE); helpButton.setVisibility(View.VISIBLE);
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/view/OperationTaskLayout.java
...@@ -530,8 +530,8 @@ public class OperationTaskLayout extends RelativeLayout { ...@@ -530,8 +530,8 @@ public class OperationTaskLayout extends RelativeLayout {
private class JsInf { private class JsInf {
@JavascriptInterface @JavascriptInterface
public void getAttachedDataUrl(String data) { public void getAttachedDataUrl(String taskKey, String data) {
((ABVContentViewActivity) OperationTaskLayout.this.mContext).commonAttachedDataUrl(data); ((ABVContentViewActivity) OperationTaskLayout.this.mContext).commonAttachedDataUrl(taskKey, data);
} }
} }
} }
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