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
05589497
Commit
05589497
authored
Apr 17, 2019
by
Lee Jaebin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#33433 報告(回答)で、同期後に所属グループを変更すると、プレビュー表示にならない(P006エラー処理)
parent
1b2722bb
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
14 deletions
+8
-14
ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/OperationLogic.java
+4
-8
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java
+4
-6
No files found.
ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/OperationLogic.java
View file @
05589497
...
...
@@ -1129,8 +1129,8 @@ public class OperationLogic extends AbstractLogic {
* @return
* @throws Exception
*/
public
boolean
sendTaskReportSendData
(
long
operationId
,
Callback
progressCallback
)
throws
Exception
{
return
sendTaskReportSendData
(
operationId
,
null
,
null
,
progressCallback
);
public
void
sendTaskReportSendData
(
long
operationId
,
Callback
progressCallback
)
throws
Exception
{
sendTaskReportSendData
(
operationId
,
null
,
null
,
progressCallback
);
}
/**
...
...
@@ -1139,7 +1139,7 @@ public class OperationLogic extends AbstractLogic {
* @param taskKey
* @throws Exception
*/
public
boolean
sendTaskReportSendData
(
long
operationId
,
String
taskKey
,
Integer
taskReportLevel
,
Callback
progressCallback
)
throws
Exception
{
public
void
sendTaskReportSendData
(
long
operationId
,
String
taskKey
,
Integer
taskReportLevel
,
Callback
progressCallback
)
throws
Exception
{
OperationDto
operationDto
=
mOperationDao
.
getOperation
(
operationId
);
List
<
TaskReportDto
>
taskReportDtoList
=
null
;
int
maxProgress
=
0
;
...
...
@@ -1214,10 +1214,7 @@ public class OperationLogic extends AbstractLogic {
FileUtil
.
delete
(
ABVEnvironment
.
getInstance
().
getOperationTaskReportSendDirFilePath
(
operationId
,
taskReportSendDto
.
taskKey
,
taskReportSendDto
.
taskReportSendId
));
}
catch
(
AcmsException
ex
)
{
if
(
ex
.
getCode
()
==
ABVExceptionCode
.
P_E_ACMS_P005
)
{
mTaskReportSendDao
.
deleteBySendId
(
taskReportSendDto
.
taskReportSendId
);
FileUtil
.
delete
(
ABVEnvironment
.
getInstance
().
getOperationTaskReportSendDirFilePath
(
operationId
,
taskReportSendDto
.
taskKey
,
taskReportSendDto
.
taskReportSendId
));
}
else
if
(
ex
.
getCode
()
==
ABVExceptionCode
.
P_E_ACMS_P006
)
{
if
(
ex
.
getCode
()
==
ABVExceptionCode
.
P_E_ACMS_P005
||
ex
.
getCode
()
==
ABVExceptionCode
.
P_E_ACMS_P006
)
{
mTaskReportSendDao
.
deleteBySendId
(
taskReportSendDto
.
taskReportSendId
);
FileUtil
.
delete
(
ABVEnvironment
.
getInstance
().
getOperationTaskReportSendDirFilePath
(
operationId
,
taskReportSendDto
.
taskKey
,
taskReportSendDto
.
taskReportSendId
));
taskReportDto
.
dataSendFlg
=
false
;
...
...
@@ -1247,7 +1244,6 @@ public class OperationLogic extends AbstractLogic {
}
}
}
return
false
;
}
/**
...
...
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java
View file @
05589497
...
...
@@ -726,12 +726,7 @@ public class OperationListActivity extends ABVUIActivity {
};
// 報告送信
if
(
mOperationLogic
.
sendTaskReportSendData
(
operationId
,
progressCallback
))
{
// 作業報告タイプが定期点検且つ、P005のエラーの場合、以下のエラーをトーストメッセージで表示
handleErrorMessageToast
(
PatternStringUtil
.
patternToInt
(
getApplicationContext
(),
R
.
string
.
P005
,
getUserPref
(
AppDefType
.
UserPrefKey
.
RESOURCE_PATTERN_TYPE
,
0
)));
}
mOperationLogic
.
sendTaskReportSendData
(
operationId
,
progressCallback
);
progressDialogHorizontal
.
setProgress
(
60
);
// 報告受信
...
...
@@ -774,6 +769,9 @@ public class OperationListActivity extends ABVUIActivity {
R
.
string
.
P004
,
getUserPref
(
AppDefType
.
UserPrefKey
.
RESOURCE_PATTERN_TYPE
,
0
)));
break
;
case
P_E_ACMS_P005:
showSimpleAlertDialog
(
R
.
string
.
app_name
,
R
.
string
.
P005
);
break
;
case
P_E_ACMS_P006:
showSimpleAlertDialog
(
R
.
string
.
app_name
,
R
.
string
.
P006
);
break
;
...
...
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