Skip to content

A
abook_check
Commit 856dd495 by onuma
Options

放射温度計を操作してくださいのダイアログが表示されてる時だけ、値を取得するように修正

parent 80a3681c
Showing with 14 additions and 5 deletions
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVCheckContentViewActivity.java
...@@ -282,11 +282,14 @@ public class ABVCheckContentViewActivity extends ABVContentViewActivity { ...@@ -282,11 +282,14 @@ public class ABVCheckContentViewActivity extends ABVContentViewActivity {
Logger.d(TAG,"-------------------------------------------------"); Logger.d(TAG,"-------------------------------------------------");
Logger.d(TAG, "onGetDeviceInfo temperature [%s]", strTemp); Logger.d(TAG, "onGetDeviceInfo temperature [%s]", strTemp);
Logger.d(TAG,"-------------------------------------------------"); Logger.d(TAG,"-------------------------------------------------");
setThermometerData(strTemp); // 値取得待ちのダイアログ表示中のみ値を取得、設定する
// 取得できたら、ダイアログ消すだけ。 if (mWaitingDialog != null) {
// onuma 切断しない setThermometerData(strTemp);
bleManagerDisconnect(false); // 取得できたら、ダイアログ消すだけ。
dismissWaitngDialog(); // onuma 切断しない
bleManagerDisconnect(false);
dismissWaitngDialog();
}
} }
@Override @Override
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVContentViewActivity.java
...@@ -1010,6 +1010,9 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity { ...@@ -1010,6 +1010,9 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
mAttachedFileName = abookCheckParam.get(ABookKeys.FILE_NAME); mAttachedFileName = abookCheckParam.get(ABookKeys.FILE_NAME);
getAttachedDataUrl(abookCheckParam.get(ABookKeys.TASK_KEY)); getAttachedDataUrl(abookCheckParam.get(ABookKeys.TASK_KEY));
} else if (mCmd.equals(ABookKeys.CMD_SHOW_REPORT_OZD)) { } else if (mCmd.equals(ABookKeys.CMD_SHOW_REPORT_OZD)) {
Logger.d("-------------------------------------------------");
Logger.d("一時保存");
Logger.d("-------------------------------------------------");
mReportFileName = abookCheckParam.get(ABookKeys.REPORT_FILE_NAME); mReportFileName = abookCheckParam.get(ABookKeys.REPORT_FILE_NAME);
// 作業報告画面改善 // 作業報告画面改善
boolean mLocalSave = false; // 一時保存情報 boolean mLocalSave = false; // 一時保存情報
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ABookCheckWebViewHelper.java
...@@ -97,6 +97,9 @@ public class ABookCheckWebViewHelper extends ABookHelper { ...@@ -97,6 +97,9 @@ public class ABookCheckWebViewHelper extends ABookHelper {
sendTaskData(context, operationId, taskKey, taskReportLevel); sendTaskData(context, operationId, taskKey, taskReportLevel);
break; break;
case ABookKeys.CMD_LOCAL_SAVE_TASK_REPORT: // 一時保存 case ABookKeys.CMD_LOCAL_SAVE_TASK_REPORT: // 一時保存
Logger.d("-------------------------------------------------");
Logger.d("一時保存");
Logger.d("-------------------------------------------------");
insertOrUpdateTaskReport(taskKey, enableReportHistory, operationId, contentId, param, contentPath, reportType, taskReportLevel, true); insertOrUpdateTaskReport(taskKey, enableReportHistory, operationId, contentId, param, contentPath, reportType, taskReportLevel, true);
copyTaskAttachedMovie(operationId, contentId, taskKey, taskReportLevel); copyTaskAttachedMovie(operationId, contentId, taskKey, taskReportLevel);
ABVToastUtil.showMakeText(context, R.string.msg_temp_save_result, Toast.LENGTH_SHORT); ABVToastUtil.showMakeText(context, R.string.msg_temp_save_result, Toast.LENGTH_SHORT);
......
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