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
70a563e4
Commit
70a563e4
authored
Sep 10, 2022
by
NGUYEN HOANG SON
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug crash with cmd "updateTaskReport" when currentTaskDto is null
parent
15db22bf
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
0 deletions
+6
-0
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/ContentViewActivity.java
+6
-0
No files found.
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/ContentViewActivity.java
View file @
70a563e4
...
...
@@ -5415,8 +5415,10 @@ public class ContentViewActivity extends ABVContentViewActivity {
JSONObject
hotspot
=
null
;
if
(
checkParam
.
get
(
ABookKeys
.
HOT_SPOT
)
!=
null
)
{
hotspot
=
new
JSONObject
(
checkParam
.
get
(
ABookKeys
.
HOT_SPOT
));
if
(
hotspot
.
has
(
ABookKeys
.
TASK_CODE
))
{
taskCode
=
hotspot
.
getString
(
ABookKeys
.
TASK_CODE
);
}
}
OperationDto
operation
=
mOperationDao
.
getOperation
(
mOperationId
);
String
jsonPath
=
""
;
if
((
operation
.
operationType
==
PANO
||
operation
.
operationType
==
DRAWING
||
operation
.
operationType
==
PDF
)
&&
operation
.
reportType
==
Constant
.
ReportType
.
ReportContinuous
)
{
...
...
@@ -5426,8 +5428,10 @@ public class ContentViewActivity extends ABVContentViewActivity {
for
(
TaskDto
task
:
taskList
)
{
if
(
task
.
phaseNo
==
1
)
{
operationTaskLayout
.
setIconStatus
(
taskKey
,
true
);
if
(
operationTaskLayout
.
currentTaskDto
!=
null
)
{
operationTaskLayout
.
currentTaskDto
.
taskKey
=
task
.
taskKey
;
operationTaskLayout
.
currentTaskDto
.
taskCode
=
task
.
taskCode
;
}
jsonPath
=
mContentPath
.
replaceAll
(
ABookKeys
.
PANO_IMAGE
,
ABookKeys
.
PROCESS_LIST
).
replaceAll
(
ABookKeys
.
TASK_PDF
,
ABookKeys
.
PROCESS_LIST
)
+
"/"
+
ABookKeys
.
PHASE_INFO_JSON
;
JSONObject
phaseInfo
=
null
;
int
lastPhase
=
0
;
...
...
@@ -5451,6 +5455,7 @@ public class ContentViewActivity extends ABVContentViewActivity {
lastTask
=
compareTask
;
}
}
if
(
operationTaskLayout
.
currentTaskDto
!=
null
)
{
if
(
lastTask
!=
null
)
{
operationTaskLayout
.
currentTaskDto
.
isFinished
=
(
lastTask
.
taskStatus
==
FINISHED_STATUS
);
}
else
{
...
...
@@ -5461,6 +5466,7 @@ public class ContentViewActivity extends ABVContentViewActivity {
operationTaskLayout
.
addOperationTaskIcon
(
operationTaskLayout
.
currentLayout
,
operationTaskLayout
.
currentTaskDto
);
}
}
}
}
else
{
operationTaskLayout
.
setIconStatus
(
taskKey
,
true
);
if
(
operationTaskLayout
.
currentTaskDto
!=
null
)
{
...
...
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