Commit 856dd495 by onuma

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

parent 80a3681c
......@@ -282,12 +282,15 @@ public class ABVCheckContentViewActivity extends ABVContentViewActivity {
Logger.d(TAG,"-------------------------------------------------");
Logger.d(TAG, "onGetDeviceInfo temperature [%s]", strTemp);
Logger.d(TAG,"-------------------------------------------------");
// 値取得待ちのダイアログ表示中のみ値を取得、設定する
if (mWaitingDialog != null) {
setThermometerData(strTemp);
// 取得できたら、ダイアログ消すだけ。
// onuma 切断しない
bleManagerDisconnect(false);
dismissWaitngDialog();
}
}
@Override
public void onGetDeviceInfoFailed(int status) { // bluetooth機器からデータ取得エラー
......
......@@ -1010,6 +1010,9 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
mAttachedFileName = abookCheckParam.get(ABookKeys.FILE_NAME);
getAttachedDataUrl(abookCheckParam.get(ABookKeys.TASK_KEY));
} else if (mCmd.equals(ABookKeys.CMD_SHOW_REPORT_OZD)) {
Logger.d("-------------------------------------------------");
Logger.d("一時保存");
Logger.d("-------------------------------------------------");
mReportFileName = abookCheckParam.get(ABookKeys.REPORT_FILE_NAME);
// 作業報告画面改善
boolean mLocalSave = false; // 一時保存情報
......
......@@ -97,6 +97,9 @@ public class ABookCheckWebViewHelper extends ABookHelper {
sendTaskData(context, operationId, taskKey, taskReportLevel);
break;
case ABookKeys.CMD_LOCAL_SAVE_TASK_REPORT: // 一時保存
Logger.d("-------------------------------------------------");
Logger.d("一時保存");
Logger.d("-------------------------------------------------");
insertOrUpdateTaskReport(taskKey, enableReportHistory, operationId, contentId, param, contentPath, reportType, taskReportLevel, true);
copyTaskAttachedMovie(operationId, contentId, taskKey, taskReportLevel);
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