Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
abook_check
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abook_android
abook_check
Commits
856dd495
Commit
856dd495
authored
Jul 21, 2020
by
onuma
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
放射温度計を操作してくださいのダイアログが表示されてる時だけ、値を取得するように修正
parent
80a3681c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
5 deletions
+14
-5
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVCheckContentViewActivity.java
+8
-5
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVContentViewActivity.java
+3
-0
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ABookCheckWebViewHelper.java
+3
-0
No files found.
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVCheckContentViewActivity.java
View file @
856dd495
...
...
@@ -282,11 +282,14 @@ public class ABVCheckContentViewActivity extends ABVContentViewActivity {
Logger
.
d
(
TAG
,
"-------------------------------------------------"
);
Logger
.
d
(
TAG
,
"onGetDeviceInfo temperature [%s]"
,
strTemp
);
Logger
.
d
(
TAG
,
"-------------------------------------------------"
);
setThermometerData
(
strTemp
);
// 取得できたら、ダイアログ消すだけ。
// onuma 切断しない
bleManagerDisconnect
(
false
);
dismissWaitngDialog
();
// 値取得待ちのダイアログ表示中のみ値を取得、設定する
if
(
mWaitingDialog
!=
null
)
{
setThermometerData
(
strTemp
);
// 取得できたら、ダイアログ消すだけ。
// onuma 切断しない
bleManagerDisconnect
(
false
);
dismissWaitngDialog
();
}
}
@Override
...
...
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVContentViewActivity.java
View file @
856dd495
...
...
@@ -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
;
// 一時保存情報
...
...
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ABookCheckWebViewHelper.java
View file @
856dd495
...
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment